From 9f642c81079e7e2012a03b6aea30c6ff1f8b32e9 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Tue, 28 Jul 2020 17:55:23 +0100
Subject: [PATCH] Added moment package resolution to pin 2.24.0

refs https://github.com/TryGhost/Ghost/commit/1a17f8069bd126df786795c8a9407ac69e54795b

- sub-dependency update bumped moment versions to 2.27.0 which caused timezone problems again with dates not being written to the database in UTC
- added a resolution in package.json to pin all moment sub-dependencies to the same version we specify in our top-level dependencies
---
 package.json |  1 +
 yarn.lock    | 12 +-----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 03af1b1875..18dd8360b3 100644
--- a/package.json
+++ b/package.json
@@ -166,6 +166,7 @@
     "tmp": "0.0.33"
   },
   "resolutions": {
+    "moment": "2.24.0",
     "moment-timezone": "0.5.23"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index c02208b173..279b5a4e87 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6079,21 +6079,11 @@ moment-timezone@0.5.23, moment-timezone@0.5.28:
   dependencies:
     moment ">= 2.9.0"
 
-moment@2.24.0:
+moment@2.24.0, moment@2.25.1, "moment@>= 2.9.0", moment@^2.10.6, moment@^2.15.2, moment@^2.18.1:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
 
-moment@2.25.1:
-  version "2.25.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.25.1.tgz#1cb546dca1eccdd607c9324747842200b683465d"
-  integrity sha512-nRKMf9wDS4Fkyd0C9LXh2FFXinD+iwbJ5p/lh3CHitW9kZbRbJ8hCruiadiIXZVbeAqKZzqcTvHnK3mRhFjb6w==
-
-"moment@>= 2.9.0", moment@^2.10.6, moment@^2.15.2, moment@^2.18.1:
-  version "2.27.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
-  integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"