From 3df5463ca975ae407704dce8836195e0e5f4d644 Mon Sep 17 00:00:00 2001
From: "Michael J. Radwin" <michael@radwin.org>
Date: Thu, 7 Nov 2024 22:38:38 -0800
Subject: [PATCH] Update for new ESM modularized base packages

---
 package.json            | 16 ++++++++--------
 src/hdate-en.js         |  2 +-
 src/hdate-he-NoNikud.js |  2 +-
 src/hdate-he.js         |  2 +-
 src/hdate.bundle.js     |  2 +-
 src/hebcalResults.js    |  2 +-
 src/parsha-csv.js       |  4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 55b6fde3..a9afe7eb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hebcal-web",
-  "version": "3.1.5",
+  "version": "3.2.0",
   "description": "Hebcal server-side Node.js for www.hebcal.com and download.hebcal.com",
   "repository": {
     "type": "git",
@@ -41,17 +41,17 @@
     "bootstrap5-autocomplete": "^1.1.33",
     "csv-parse": "^5.5.6",
     "eslint": "^9.14.0",
-    "eslint-plugin-n": "^17.12.0",
-    "globals": "^15.11.0",
-    "rollup": "^4.24.3"
+    "eslint-plugin-n": "^17.13.1",
+    "globals": "^15.12.0",
+    "rollup": "^4.24.4"
   },
   "dependencies": {
-    "@hebcal/core": "^5.6.1",
+    "@hebcal/core": "^5.7.7",
     "@hebcal/geo-sqlite": "^5.0.6",
-    "@hebcal/hdate": "^0.11.5",
+    "@hebcal/hdate": "^0.12.0",
     "@hebcal/icalendar": "^5.1.1",
     "@hebcal/learning": "^5.1.2",
-    "@hebcal/leyning": "^8.2.9",
+    "@hebcal/leyning": "^9.0.1",
     "@hebcal/locales": "^5.0.1",
     "@hebcal/rest-api": "^5.2.0",
     "@hebcal/triennial": "^5.1.3",
@@ -79,7 +79,7 @@
     "koa-timeout-v2": "^1.0.0",
     "maxmind": "^4.3.22",
     "murmurhash3": "^0.5.0",
-    "mysql2": "^3.11.3",
+    "mysql2": "^3.11.4",
     "nodemailer": "^6.9.16",
     "nodemailer-html-to-text": "^3.2.0",
     "pdfkit": "^0.15.1",
diff --git a/src/hdate-en.js b/src/hdate-en.js
index fa8c02e5..41bad639 100644
--- a/src/hdate-en.js
+++ b/src/hdate-en.js
@@ -1,5 +1,5 @@
 import {greg2abs} from '@hebcal/hdate/dist/esm/greg';
-import {abs2hebrew, getMonthName} from '@hebcal/hdate/dist/esm/hdate-base';
+import {abs2hebrew, getMonthName} from '@hebcal/hdate/dist/esm/hdateBase';
 function ordinal(n) {
   const s = ['th', 'st', 'nd', 'rd'];
   const v = n % 100;
diff --git a/src/hdate-he-NoNikud.js b/src/hdate-he-NoNikud.js
index ffb5639a..0bc107f3 100644
--- a/src/hdate-he-NoNikud.js
+++ b/src/hdate-he-NoNikud.js
@@ -1,6 +1,6 @@
 import {greg2abs} from '@hebcal/hdate/dist/esm/greg';
 import {gematriya} from '@hebcal/hdate/dist/esm/gematriya';
-import {abs2hebrew, months, isLeapYear} from '@hebcal/hdate/dist/esm/hdate-base';
+import {abs2hebrew, months, isLeapYear} from '@hebcal/hdate/dist/esm/hdateBase';
 
 const ADAR_I = months.ADAR_I;
 const monthNames = [
diff --git a/src/hdate-he.js b/src/hdate-he.js
index ae584dca..8b04c4fc 100644
--- a/src/hdate-he.js
+++ b/src/hdate-he.js
@@ -1,5 +1,5 @@
 import {greg2abs} from '@hebcal/hdate/dist/esm/greg';
-import {abs2hebrew} from '@hebcal/hdate/dist/esm/hdate-base';
+import {abs2hebrew} from '@hebcal/hdate/dist/esm/hdateBase';
 import {gematriyaDate0} from './gematriyaDate';
 function hdateStr() {
   const dt = new Date();
diff --git a/src/hdate.bundle.js b/src/hdate.bundle.js
index 018621e5..6149bccd 100644
--- a/src/hdate.bundle.js
+++ b/src/hdate.bundle.js
@@ -1,2 +1,2 @@
 export {greg2abs} from '@hebcal/hdate/dist/esm/greg';
-export {abs2hebrew, getMonthName} from '@hebcal/hdate/dist/esm/hdate-base';
+export {abs2hebrew, getMonthName} from '@hebcal/hdate/dist/esm/hdateBase';
diff --git a/src/hebcalResults.js b/src/hebcalResults.js
index 29e4e9f3..9622f86b 100644
--- a/src/hebcalResults.js
+++ b/src/hebcalResults.js
@@ -1,7 +1,7 @@
 import dayjs from 'dayjs';
 import {pad2, pad4} from '@hebcal/hdate/dist/esm/pad';
 import {greg2abs} from '@hebcal/hdate/dist/esm/greg';
-import {abs2hebrew, getMonthName} from '@hebcal/hdate/dist/esm/hdate-base';
+import {abs2hebrew, getMonthName} from '@hebcal/hdate/dist/esm/hdateBase';
 
 /**
  * @private
diff --git a/src/parsha-csv.js b/src/parsha-csv.js
index 4867b2fa..3a8b7344 100644
--- a/src/parsha-csv.js
+++ b/src/parsha-csv.js
@@ -1,7 +1,7 @@
 import {basename} from 'path';
 import {PassThrough} from 'stream';
-import {writeFullKriyahCsv, getLeyningOnDate,
-  formatAliyahWithBook} from '@hebcal/leyning';
+import {getLeyningOnDate, formatAliyahWithBook} from '@hebcal/leyning';
+import {writeFullKriyahCsv} from '@hebcal/leyning/dist/esm/csv';
 import {writeTriennialCsv} from '@hebcal/triennial';
 import createError from 'http-errors';
 import {HDate, months} from '@hebcal/core';