Add back moment resolutions as yarn causes duplicates

Remove when yarnpkg/yarn#3778 is fixed.
etalab · Apr 16, 2018 · d8c1381 · d8c1381
1 parent bbfd1da
commit d8c1381
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -41,6 +41,9 @@
     "react-table": "^6.7.5",
     "underscore.string": "^3.3.4"
   },
+  "resolutions": {
+    "chart.js/moment": "^2.22.1"
+  },
   "devDependencies": {
     "babel-eslint": "^8.2.3",
     "babel-plugin-inline-import": "^2.0.6",

diff --git a/yarn.lock b/yarn.lock
@@ -5347,18 +5347,14 @@ mock-local-storage@^1.0.5:
     core-js "^0.8.3"
     global "^4.3.2"
 
-moment@^2.10.2:
-  version "2.19.4"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.4.tgz#17e5e2c6ead8819c8ecfad83a0acccb312e94682"
+moment@^2.10.2, moment@^2.22.1:
+  version "2.22.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
 
 moment@^2.11.2:
   version "2.18.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
 
-moment@^2.22.1:
-  version "2.22.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
-
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"