Merge pull request webpack#12387 from webpack/bugfix/12386

sokra · web-flow · commit 758bb253528c · 2021-01-11T14:39:02.000+01:00
enable backward-compatible behavior for resolve.roots
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -26,9 +26,9 @@ jobs:
       - script: |
           set -e
           export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
-          export JEST_JUNIT_OUTPUT=./basic-junit.xml
+          export JEST_JUNIT_OUTPUT_NAME=basic-junit.xml
           yarn test:basic --ci --reporters=jest-junit
-          export JEST_JUNIT_OUTPUT=./unit-junit.xml
+          export JEST_JUNIT_OUTPUT_NAME=unit-junit.xml
           yarn test:unit --ci --reporters=jest-junit
         displayName: "Run basic tests"
       - task: PublishTestResults@2
diff --git a/declarations/WebpackOptions.d.ts b/declarations/WebpackOptions.d.ts
@@ -683,6 +683,10 @@ export interface ResolveOptions {
 	fileSystem?: {
 		[k: string]: any;
 	};
+	/**
+	 * Enable to ignore fatal errors happening during resolving of 'resolve.roots'. Usually such errors should not happen, but this option is provided for backward-compatibility.
+	 */
+	ignoreRootsErrors?: boolean;
 	/**
 	 * Field names from the description file (package.json) which are used to find the default entry point
 	 */
@@ -703,14 +707,18 @@ export interface ResolveOptions {
 	 * Plugins for the resolver
 	 */
 	plugins?: (WebpackPluginInstance | WebpackPluginFunction)[];
+	/**
+	 * Prefer to resolve server-relative URLs (starting with '/') as absolute paths before falling back to resolve in 'resolve.roots'.
+	 */
+	preferAbsolute?: boolean;
 	/**
 	 * Custom resolver
 	 */
 	resolver?: {
 		[k: string]: any;
 	};
 	/**
-	 * A list of directories in which requests that are server-relative URLs (starting with '/') are resolved. On non-windows system these requests are tried to resolve as absolute path first.
+	 * A list of directories in which requests that are server-relative URLs (starting with '/') are resolved.
 	 */
 	roots?: string[];
 	/**
diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
@@ -356,6 +356,16 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 				options.resolve.plugins.length > 0
 			);
 		});
+		this.set(
+			"resolve.preferAbsolute",
+			"make",
+			options => !options.resolve.roots || options.resolve.roots.length === 0
+		);
+		this.set(
+			"resolve.ignoreRootsErrors",
+			"make",
+			options => !options.resolve.roots || options.resolve.roots.length === 0
+		);
 		this.set("resolve.roots", "make", options => [options.context]);
 
 		this.set("resolveLoader", "call", value => Object.assign({}, value));
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "ajv": "^6.10.2",
     "ajv-keywords": "^3.4.1",
     "chrome-trace-event": "^1.0.2",
-    "enhanced-resolve": "^4.3.0",
+    "enhanced-resolve": "^4.5.0",
     "eslint-scope": "^4.0.3",
     "json-parse-better-errors": "^1.0.2",
     "loader-runner": "^2.4.0",
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -1179,6 +1179,10 @@
         "fileSystem": {
           "description": "Filesystem for the resolver"
         },
+        "ignoreRootsErrors": {
+          "description": "Enable to ignore fatal errors happening during resolving of 'resolve.roots'. Usually such errors should not happen, but this option is provided for backward-compatibility.",
+          "type": "boolean"
+        },
         "mainFields": {
           "description": "Field names from the description file (package.json) which are used to find the default entry point",
           "anyOf": [
@@ -1226,11 +1230,15 @@
             ]
           }
         },
+        "preferAbsolute": {
+          "description": "Prefer to resolve server-relative URLs (starting with '/') as absolute paths before falling back to resolve in 'resolve.roots'.",
+          "type": "boolean"
+        },
         "resolver": {
           "description": "Custom resolver"
         },
         "roots": {
-          "description": "A list of directories in which requests that are server-relative URLs (starting with '/') are resolved. On non-windows system these requests are tried to resolve as absolute path first.",
+          "description": "A list of directories in which requests that are server-relative URLs (starting with '/') are resolved.",
           "type": "array",
           "items": {
             "description": "Directory in which requests that are server-relative URLs (starting with '/') are resolved.",
diff --git a/test/configCases/resolving/issue-12386/index.js b/test/configCases/resolving/issue-12386/index.js
@@ -0,0 +1,3 @@
+it("should be possible to import an absolute path", () => {
+	require(__filename);
+});
diff --git a/test/configCases/resolving/issue-12386/webpack.config.js b/test/configCases/resolving/issue-12386/webpack.config.js
@@ -0,0 +1,14 @@
+module.exports = {
+	resolve: {
+		plugins: [
+			{
+				apply(resolver) {
+					resolver.hooks.file.tap("Test", (request, resolverContext) => {
+						if (/test.configCases.*test.configCases/.test(request.path))
+							throw new Error("Trying to resolve outside of test cases");
+					});
+				}
+			}
+		]
+	}
+};
diff --git a/yarn.lock b/yarn.lock
@@ -2015,10 +2015,10 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
-  integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==
+enhanced-resolve@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
+  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.5.0"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+it("should be possible to import an absolute path", () => {`
	`2`	`+ require(__filename);`
	`3`	`+});`