Merge pull request webpack#6039 from webpack/refactoring/plugin-system-resolve

sokra · web-flow · commit caa20eae75da · 2017-11-30T11:06:16.000+01:00
Upgrade enhanced-resolve version
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "ajv": "^5.1.5",
     "ajv-keywords": "^2.0.0",
     "async": "^2.1.2",
-    "enhanced-resolve": "^3.4.0",
+    "enhanced-resolve": "4.0.0-beta.2",
     "eslint-scope": "^3.7.1",
     "interpret": "^1.0.0",
     "loader-runner": "^2.3.0",
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -661,6 +661,10 @@
           "description": "Enable resolving symlinks to the original location",
           "type": "boolean"
         },
+        "concord": {
+          "description": "Enable condord resolving extras",
+          "type": "boolean"
+        },
         "unsafeCache": {
           "description": "Enable caching of successfully resolved requests",
           "anyOf": [
diff --git a/test/TestCases.test.js b/test/TestCases.test.js
@@ -163,7 +163,8 @@ describe("TestCases", () => {
 									modules: ["web_modules", "node_modules"],
 									mainFields: ["webpack", "browser", "web", "browserify", ["jam", "main"], "main"],
 									aliasFields: ["browser"],
-									extensions: [".mjs", ".webpack.js", ".web.js", ".js", ".json"]
+									extensions: [".mjs", ".webpack.js", ".web.js", ".js", ".json"],
+									concord: true
 								},
 								resolveLoader: {
 									modules: ["web_loaders", "web_modules", "node_loaders", "node_modules"],
diff --git a/yarn.lock b/yarn.lock
@@ -1100,14 +1100,13 @@ encoding@^0.1.11:
   dependencies:
     iconv-lite "~0.4.13"
 
-enhanced-resolve@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
+enhanced-resolve@4.0.0-beta.2:
+  version "4.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.0.0-beta.2.tgz#a13a9da2340712c4f3dacf27e26717e2eae69c24"
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
-    object-assign "^4.0.1"
-    tapable "^0.2.7"
+    tapable "^1.0.0-beta.4"
 
 errno@^0.1.1, errno@^0.1.3:
   version "0.1.4"
@@ -4018,9 +4017,9 @@ tapable@1.0.0-beta.3:
   version "1.0.0-beta.3"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0-beta.3.tgz#1f56bb6fec924ac9570cd8f6ff788e5bcf4808f1"
 
-tapable@^0.2.7:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
+tapable@^1.0.0-beta.4:
+  version "1.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0-beta.4.tgz#0b32094cbb6eb217f5dd049fc27c3a7e99705b9e"
 
 tar-pack@^3.4.0:
   version "3.4.0"
