Merge pull request #14718 from webpack/fix-managed-path

sokra · web-flow · commit 81f6c5b61cac · 2021-11-12T14:42:05.000+01:00
fix regexp in managed paths
diff --git a/lib/config/defaults.js b/lib/config/defaults.js
@@ -383,7 +383,7 @@ const applySnapshotDefaults = (snapshot, { production, futureDefaults }) => {
 					return [path.resolve(match[1], "unplugged")];
 				}
 			} else {
-				const match = /^(.+?[\\/]node_modules)[\\/]/.exec(
+				const match = /^(.+?[\\/]node_modules[\\/])/.exec(
 					// eslint-disable-next-line node/no-extraneous-require
 					require.resolve("watchpack")
 				);
diff --git a/test/Defaults.unittest.js b/test/Defaults.unittest.js
@@ -599,7 +599,7 @@ describe("Defaults", () => {
 		    },
 		    "immutablePaths": Array [],
 		    "managedPaths": Array [
-		      "<cwd>/node_modules",
+		      "<cwd>/node_modules/",
 		    ],
 		    "module": Object {
 		      "timestamp": true,
@@ -1952,7 +1952,7 @@ describe("Defaults", () => {
 			-     "hashFunction": "md4",
 			+     "hashFunction": "xxhash64",
 			@@ ... @@
-			-       "<cwd>/node_modules",
+			-       "<cwd>/node_modules/",
 			+       /^(.+?[\\\\/]node_modules[\\\\/])/,
 		`)
 	);

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ const applySnapshotDefaults = (snapshot, { production, futureDefaults }) => {`
`383`	`383`	`return [path.resolve(match[1], "unplugged")];`
`384`	`384`	`}`
`385`	`385`	`} else {`
`386`		`- const match = /^(.+?[\\/]node_modules)[\\/]/.exec(`
	`386`	`+ const match = /^(.+?[\\/]node_modules[\\/])/.exec(`
`387`	`387`	`// eslint-disable-next-line node/no-extraneous-require`
`388`	`388`	`require.resolve("watchpack")`
`389`	`389`	`);`