root
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Upgrade enhanced-resolve version

This commit is contained in:
Tobias Koppers 2017-11-29 16:34:49 +01:00
parent 9596a4facf
commit 9b8a1322c5
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -9,7 +9,7 @@
"ajv": "^5.1.5", "ajv": "^5.1.5",
"ajv-keywords": "^2.0.0", "ajv-keywords": "^2.0.0",
"async": "^2.1.2", "async": "^2.1.2",
"enhanced-resolve": "^3.4.0", "enhanced-resolve": "4.0.0-beta.1",
"eslint-scope": "^3.7.1", "eslint-scope": "^3.7.1",
"interpret": "^1.0.0", "interpret": "^1.0.0",
"loader-runner": "^2.3.0", "loader-runner": "^2.3.0",

4
schemas/WebpackOptions.json
View File

@ -661,6 +661,10 @@
"description": "Enable resolving symlinks to the original location", "description": "Enable resolving symlinks to the original location",
"type": "boolean" "type": "boolean"
}, },
"concord": {
"description": "Enable condord resolving extras",
"type": "boolean"
},
"unsafeCache": { "unsafeCache": {
"description": "Enable caching of successfully resolved requests", "description": "Enable caching of successfully resolved requests",
"anyOf": [ "anyOf": [

3
test/TestCases.test.js
View File

@ -163,7 +163,8 @@ describe("TestCases", () => {
modules: ["web_modules", "node_modules"], modules: ["web_modules", "node_modules"],
mainFields: ["webpack", "browser", "web", "browserify", ["jam", "main"], "main"], mainFields: ["webpack", "browser", "web", "browserify", ["jam", "main"], "main"],
aliasFields: ["browser"], aliasFields: ["browser"],
extensions: [".mjs", ".webpack.js", ".web.js", ".js", ".json"] extensions: [".mjs", ".webpack.js", ".web.js", ".js", ".json"],
concord: true
}, },
resolveLoader: { resolveLoader: {
modules: ["web_loaders", "web_modules", "node_loaders", "node_modules"], modules: ["web_loaders", "web_modules", "node_loaders", "node_modules"],

15
yarn.lock
View File

@ -1100,14 +1100,13 @@ encoding@^0.1.11:
dependencies: dependencies:
iconv-lite "~0.4.13" iconv-lite "~0.4.13"
enhanced-resolve@^3.4.0: enhanced-resolve@4.0.0-beta.1:
version "3.4.1" version "4.0.0-beta.1"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.0.0-beta.1.tgz#f8257df604491e83eed7a3d20568fcd4c849c251"
dependencies: dependencies:
graceful-fs "^4.1.2" graceful-fs "^4.1.2"
memory-fs "^0.4.0" memory-fs "^0.4.0"
object-assign "^4.0.1" tapable "^1.0.0-beta.4"
tapable "^0.2.7"
errno@^0.1.1, errno@^0.1.3: errno@^0.1.1, errno@^0.1.3:
version "0.1.4" version "0.1.4"
@ -4018,9 +4017,9 @@ tapable@1.0.0-beta.3:
version "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" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0-beta.3.tgz#1f56bb6fec924ac9570cd8f6ff788e5bcf4808f1"
tapable@^0.2.7: tapable@^1.0.0-beta.4:
version "0.2.8" version "1.0.0-beta.4"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0-beta.4.tgz#0b32094cbb6eb217f5dd049fc27c3a7e99705b9e"
tar-pack@^3.4.0: tar-pack@^3.4.0:
version "3.4.0" version "3.4.0"