RN-1112: Bump moment-timezone to ≥0.5.35 (#5482)

* bump `moment-timezone` to 0.5.45 * remove `@types/moment-timezone` * update lockfile * update lockfile * use `moment-timezone` in `web-config-server` * import `moment` from `moment-timezone` * again * Revert "import `moment` from `moment-timezone`" This reverts commit b6695ec. * Revert "again" This reverts commit 4113e10. * import `moment` from `moment-timezone`
beyondessential · Mar 20, 2024 · 81e314e · 81e314e
1 parent d4b956d
commit 81e314e
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 56 deletions.
diff --git a/packages/central-server/package.json b/packages/central-server/package.json
@@ -60,7 +60,7 @@
     "lodash.merge": "^4.6.2",
     "lodash.pick": "^4.4.0",
     "moment": "^2.24.0",
-    "moment-timezone": "^0.5.28",
+    "moment-timezone": "^0.5.45",
     "morgan": "^1.9.0",
     "multer": "^1.4.3",
     "public-ip": "^2.5.0",

diff --git a/packages/e2e/package.json b/packages/e2e/package.json
@@ -32,7 +32,7 @@
     "lodash": "^4.17.4",
     "markdown-to-jsx": "^6.4.1",
     "moment": "^2.24.0",
-    "moment-timezone": "^0.5.14",
+    "moment-timezone": "^0.5.45",
     "node-fetch": "^1.7.3",
     "npm-run-all": "^4.1.5",
     "regenerator-runtime": "^0.13.9"

diff --git a/packages/meditrak-app-server/package.json b/packages/meditrak-app-server/package.json
@@ -42,7 +42,7 @@
     "lodash.groupby": "^4.6.0",
     "lodash.keyby": "^4.6.0",
     "moment": "^2.24.0",
-    "moment-timezone": "^0.5.27",
+    "moment-timezone": "^0.5.45",
     "semver-compare": "^1.0.0",
     "winston": "^3.3.3"
   },

diff --git a/packages/tsutils/package.json b/packages/tsutils/package.json
@@ -28,11 +28,10 @@
     "camelcase-keys": "^6.2.2",
     "lodash.get": "^4.4.2",
     "moment": "^2.24.0",
-    "moment-timezone": "^0.5.25",
+    "moment-timezone": "^0.5.45",
     "yup": "^0.32.9"
   },
   "devDependencies": {
-    "@types/lodash.get": "^4.4.2",
-    "@types/moment-timezone": "0.5.13"
+    "@types/lodash.get": "^4.4.2"
   }
 }
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -33,7 +33,7 @@
     "lodash.get": "^4.4.2",
     "lodash.pickby": "^4.6.0",
     "moment": "^2.24.0",
-    "moment-timezone": "^0.5.28",
+    "moment-timezone": "^0.5.45",
     "node-fetch": "^1.7.3",
     "numeral": "^2.0.6",
     "prop-types": "^15.6.2",

diff --git a/packages/web-config-server/package.json b/packages/web-config-server/package.json
@@ -60,6 +60,7 @@
     "lodash.tail": "^4.1.1",
     "lodash.zipobject": "^4.1.3",
     "moment": "^2.24.0",
+    "moment-timezone": "^0.5.45",
     "morgan": "^1.9.0",
     "nodemailer": "^4.6.7",
     "promise": "^7.3.1",

diff --git a/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js b/packages/web-config-server/src/apiV1/dataBuilders/modules/covid-samoa/flight/Flight.js
@@ -1,4 +1,4 @@
-import moment from 'moment';
+import moment from 'moment-timezone';
 
 export const FLIGHT_DATE = 'QMIA028';
 const TIMEZONE_SAMOA = 'Pacific/Apia';

diff --git a/yarn.lock b/yarn.lock
@@ -12088,7 +12088,7 @@ __metadata:
     lodash.pick: ^4.4.0
     mocha: ^10.2.0
     moment: ^2.24.0
-    moment-timezone: ^0.5.28
+    moment-timezone: ^0.5.45
     morgan: ^1.9.0
     multer: ^1.4.3
     npm-run-all: ^4.1.5
@@ -12336,7 +12336,7 @@ __metadata:
     lodash: ^4.17.4
     markdown-to-jsx: ^6.4.1
     moment: ^2.24.0
-    moment-timezone: ^0.5.14
+    moment-timezone: ^0.5.45
     node-fetch: ^1.7.3
     npm-run-all: ^4.1.5
     regenerator-runtime: ^0.13.9
@@ -12474,7 +12474,7 @@ __metadata:
     lodash.groupby: ^4.6.0
     lodash.keyby: ^4.6.0
     moment: ^2.24.0
-    moment-timezone: ^0.5.27
+    moment-timezone: ^0.5.45
     semver-compare: ^1.0.0
     winston: ^3.3.3
   languageName: unknown
@@ -12716,14 +12716,13 @@ __metadata:
     "@tupaia/types": "workspace:*"
     "@tupaia/utils": "workspace:*"
     "@types/lodash.get": ^4.4.2
-    "@types/moment-timezone": 0.5.13
     ajv: ^8.12.0
     ajv-formats: v3.0.0-rc.0
     better-ajv-errors: ^1.2.0
     camelcase-keys: ^6.2.2
     lodash.get: ^4.4.2
     moment: ^2.24.0
-    moment-timezone: ^0.5.25
+    moment-timezone: ^0.5.45
     yup: ^0.32.9
   languageName: unknown
   linkType: soft
@@ -12931,7 +12930,7 @@ __metadata:
     lodash.get: ^4.4.2
     lodash.pickby: ^4.6.0
     moment: ^2.24.0
-    moment-timezone: ^0.5.28
+    moment-timezone: ^0.5.45
     node-fetch: ^1.7.3
     npm-run-all: ^4.1.5
     numeral: ^2.0.6
@@ -12996,6 +12995,7 @@ __metadata:
     lodash.tail: ^4.1.1
     lodash.zipobject: ^4.1.3
     moment: ^2.24.0
+    moment-timezone: ^0.5.45
     morgan: ^1.9.0
     nodemailer: ^4.6.7
     promise: ^7.3.1
@@ -13828,15 +13828,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/moment-timezone@npm:0.5.13":
-  version: 0.5.13
-  resolution: "@types/moment-timezone@npm:0.5.13"
-  dependencies:
-    moment: ">=2.14.0"
-  checksum: 35bd6414b790663e4879e38b4a344526ebe87b3f795929f9bc38f91f7caa373c65dd19a0e836182319f929d0f7fcff9b629efc6dbcef23d386bf0c87597f5b49
-  languageName: node
-  linkType: hard
-
 "@types/ms@npm:*":
   version: 0.7.31
   resolution: "@types/ms@npm:0.7.31"
@@ -32811,50 +32802,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"moment-timezone@npm:^0.5.14":
-  version: 0.5.27
-  resolution: "moment-timezone@npm:0.5.27"
-  dependencies:
-    moment: ">= 2.9.0"
-  checksum: 814bc11cf1f62cd93852499b469baa362c969ba354ba44f14eafbba1662f7ab22c026219786d9454c8f2781f12046c07aa4723f3a30083ebef9151b8dcd84f32
-  languageName: node
-  linkType: hard
-
-"moment-timezone@npm:^0.5.25":
-  version: 0.5.39
-  resolution: "moment-timezone@npm:0.5.39"
-  dependencies:
-    moment: ">= 2.9.0"
-  checksum: 9f972d3a29b2726d4fd1464df27738b756441fe57575f087cda91b7716a5a31d2cfd274255e3edfb15eb60af3ccf33fd339527b456092cac1a2a4124e4369c8b
-  languageName: node
-  linkType: hard
-
-"moment-timezone@npm:^0.5.27":
-  version: 0.5.37
-  resolution: "moment-timezone@npm:0.5.37"
-  dependencies:
-    moment: ">= 2.9.0"
-  checksum: b3fc24848a396ee3801331a4b5511591df0e22241e59f55200a475603f23a8429f01887294c7a0c005dae25b8e4bef20472fbc875ff20080f26fded066559f1a
-  languageName: node
-  linkType: hard
-
-"moment-timezone@npm:^0.5.28":
-  version: 0.5.43
-  resolution: "moment-timezone@npm:0.5.43"
+"moment-timezone@npm:^0.5.45":
+  version: 0.5.45
+  resolution: "moment-timezone@npm:0.5.45"
   dependencies:
     moment: ^2.29.4
-  checksum: 8075c897ed8a044f992ef26fe8cdbcad80caf974251db424cae157473cca03be2830de8c74d99341b76edae59f148c9d9d19c1c1d9363259085688ec1cf508d0
+  checksum: a22e9f983fbe1a01757ce30685bce92e3f6efa692eb682afd47b82da3ff960b3c8c2c3883ec6715c124bc985a342b57cba1f6ba25a1c8b4c7ad766db3cd5e1d0
   languageName: node
   linkType: hard
 
-"moment@npm:2.x.x, moment@npm:>= 2.9.0, moment@npm:^2.24.0":
+"moment@npm:2.x.x, moment@npm:^2.24.0":
   version: 2.24.0
   resolution: "moment@npm:2.24.0"
   checksum: 9cd93a251a2b33cb1b532eade0e496a2a7547faa6cfe37a283ee7bf69e202cd7c8ab0673d66883b5b29aed051353176dc0e6684f04073a75b0a155c500be1580
   languageName: node
   linkType: hard
 
-"moment@npm:>=2.14.0, moment@npm:^2.18.1, moment@npm:^2.29.4":
+"moment@npm:^2.18.1, moment@npm:^2.29.4":
   version: 2.29.4
   resolution: "moment@npm:2.29.4"
   checksum: 0ec3f9c2bcba38dc2451b1daed5daded747f17610b92427bebe1d08d48d8b7bdd8d9197500b072d14e326dd0ccf3e326b9e3d07c5895d3d49e39b6803b76e80e