Append hebcal-web version number to JSON version string

hebcal · Oct 29, 2024 · 8e4492e · 8e4492e
1 parent 179d8ee
commit 8e4492e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hebcal-web",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "description": "Hebcal server-side Node.js for www.hebcal.com and download.hebcal.com",
   "repository": {
     "type": "git",

diff --git a/src/hebcal.js b/src/hebcal.js
@@ -31,9 +31,12 @@ import dayjs from 'dayjs';
 import localeData from 'dayjs/plugin/localeData.js';
 import './dayjs-locales.js';
 import '@hebcal/locales';
+import {readJSON} from './readJSON.js';
 
 dayjs.extend(localeData);
 
+const pkg = readJSON('../package.json');
+
 export async function hebcalApp(ctx) {
   if (ctx.method === 'POST') {
     ctx.set('Allow', 'GET');
@@ -436,6 +439,9 @@ function renderJson(ctx) {
     options.heDateParts = true;
   }
   let obj = eventsToClassicApi(events, options, !leyningOff);
+  if (typeof obj.version === 'string') {
+    obj.version += '-' + pkg.version;
+  }
   const cb = empty(q.callback) ? false : q.callback.replace(/[^\w\.]/g, '');
   if (cb) {
     obj = cb + '(' + JSON.stringify(obj) + ')\n';

diff --git a/src/shabbat.js b/src/shabbat.js
@@ -21,10 +21,13 @@ import utc from 'dayjs/plugin/utc.js';
 import timezone from 'dayjs/plugin/timezone.js';
 import './dayjs-locales.js';
 import {GeoDb} from '@hebcal/geo-sqlite';
+import {readJSON} from './readJSON.js';
 
 dayjs.extend(utc);
 dayjs.extend(timezone);
 
+const pkg = readJSON('../package.json');
+
 const BASE_URL = 'https://www.hebcal.com/shabbat';
 
 export async function shabbatApp(ctx) {
@@ -82,6 +85,9 @@ export async function shabbatApp(ctx) {
       ctx.state.options.heDateParts = true;
     }
     let obj = eventsToClassicApi(ctx.state.events, ctx.state.options, !leyningOff);
+    if (typeof obj.version === 'string') {
+      obj.version += '-' + pkg.version;
+    }
     const cb = empty(q.callback) ? false : q.callback.replace(/[^\w\.]/g, '');
     if (cb) {
       obj = cb + '(' + JSON.stringify(obj) + ')\n';

diff --git a/src/yahrzeit.js b/src/yahrzeit.js
@@ -24,9 +24,12 @@ import {getMaxYahrzeitId, isNumKey, summarizeAnniversaryTypes,
 import {makeLogInfo} from './logger.js';
 import {isDeepStrictEqual} from 'node:util';
 import {murmur128HexSync, murmur32HexSync} from 'murmurhash3';
+import {readJSON} from './readJSON.js';
 
 const urlPrefix = process.env.NODE_ENV == 'production' ? 'https://download.hebcal.com' : 'http://127.0.0.1:8081';
 
+const pkg = readJSON('../package.json');
+
 /**
  * @param {*} ctx
  * @return {*}
@@ -211,6 +214,9 @@ async function renderJson(maxId, q) {
     options.heDateParts = true;
   }
   const results = eventsToClassicApi(events, options, false);
+  if (typeof results.version === 'string') {
+    results.version += '-' + pkg.version;
+  }
   for (const item of results.items) {
     delete item.hebrew;
     delete item.category;