From 61ee1d1aa2002ed94b0586d18e307185467abfd5 Mon Sep 17 00:00:00 2001
From: Christian Zosel <christian@zosel.ch>
Date: Tue, 6 Apr 2021 11:12:56 +0200
Subject: [PATCH] chore(deps): upgrade momentjs

The issue that made us downgrade moment has been fixed in
ember-moment-shim 3.8.0.
https://github.com/adopted-ember-addons/ember-pikaday/issues/343
---
 .github/workflows/test.yml | 12 ++++++------
 package.json               |  2 +-
 yarn.lock                  |  7 +------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a64cec721..7aa8a8e72 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -56,10 +56,10 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: node_modules
-          key: node-modules-${{ hashFiles('yarn.lock') }}
+          key: node-modules-v2-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            node-modules-${{ hashFiles('yarn.lock') }}
-            node-modules-
+            node-modules-v2-${{ hashFiles('yarn.lock') }}
+            node-modules-v2-
 
       - name: Install dependencies
         run: yarn install
@@ -157,10 +157,10 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: node_modules
-          key: node-modules-${{ hashFiles('yarn.lock') }}
+          key: node-modules-v2-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            node-modules-${{ hashFiles('yarn.lock') }}
-            node-modules-
+            node-modules-v2-${{ hashFiles('yarn.lock') }}
+            node-modules-v2-
 
       - name: Install dependencies
         run: yarn install
diff --git a/package.json b/package.json
index a0a63d2f9..cdb8202ae 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "jexl": "^2.3.0",
     "lodash.clonedeep": "^4.5.0",
     "lodash.isequal": "^4.5.0",
-    "moment": "2.24.0",
+    "moment": "^2.29.1",
     "proxy-polyfill": "^0.3.2",
     "sass": "^1.32.8",
     "slugify": "^1.5.0",
diff --git a/yarn.lock b/yarn.lock
index 00e49db39..cc0aa5c5a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13721,12 +13721,7 @@ moment-timezone@^0.5.13:
   dependencies:
     moment ">= 2.9.0"
 
-moment@2.24.0:
-  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.9.0", moment@^2.19.3:
+"moment@>= 2.9.0", moment@^2.19.3, moment@^2.29.1:
   version "2.29.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
   integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==