Merge branch 'develop' into fix/build-devdep-docgen

algolia · Oct 12, 2017 · 7bb9f1b · 7bb9f1b
2 parents fee6dfd + 33a073c
commit 7bb9f1b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/docgen/package.json b/docgen/package.json
@@ -30,7 +30,7 @@
     "metalsmith-layouts": "1.8.1",
     "metalsmith-navigation": "0.2.9",
     "metalsmith-sass": "1.4.0",
-    "ms-webpack": "2.0.0-alpha.1",
+    "ms-webpack": "2.0.0",
     "netlify-cli": "1.2.2",
     "node-sass": "4.5.3",
     "postcss-scss": "0.4.1",

diff --git a/docgen/yarn.lock b/docgen/yarn.lock
@@ -1545,7 +1545,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0:
+chalk@^2.0.0, chalk@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
   dependencies:
@@ -4373,14 +4373,7 @@ mem@^1.1.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-memory-fs@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.3.0.tgz#7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-memory-fs@^0.4.0, memory-fs@~0.4.1:
+memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   dependencies:
@@ -4648,13 +4641,13 @@ module-deps-sortable@4.0.6:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
-ms-webpack@2.0.0-alpha.1:
-  version "2.0.0-alpha.1"
-  resolved "https://registry.yarnpkg.com/ms-webpack/-/ms-webpack-2.0.0-alpha.1.tgz#91c4151dc8a2382610af657fdda1709f3cbf110d"
+ms-webpack@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms-webpack/-/ms-webpack-2.0.0.tgz#a7e074df43971da88770061745f7bc52faee0e98"
   dependencies:
-    chalk "^1.1.3"
-    memory-fs "^0.3.0"
-    supports-color "^3.1.2"
+    chalk "^2.1.0"
+    memory-fs "^0.4.1"
+    supports-color "^4.2.1"
 
 ms@0.7.1:
   version "0.7.1"
@@ -6648,7 +6641,7 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3:
+supports-color@^3.1.0, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies: