From 217a0be9039747dc314e721c1f66e407a27deb65 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Wed, 20 Oct 2021 10:41:48 +0200
Subject: [PATCH] fix managed paths regexp handling

---
 lib/FileSystemInfo.js                                       | 4 ++--
 test/configCases/managedPaths/futureDefaults/index.js       | 5 +++++
 .../futureDefaults/node_modules/package/index.js            | 1 +
 .../futureDefaults/node_modules/package/package.json        | 4 ++++
 .../managedPaths/futureDefaults/webpack.config.js           | 6 ++++++
 5 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 test/configCases/managedPaths/futureDefaults/index.js
 create mode 100644 test/configCases/managedPaths/futureDefaults/node_modules/package/index.js
 create mode 100644 test/configCases/managedPaths/futureDefaults/node_modules/package/package.json
 create mode 100644 test/configCases/managedPaths/futureDefaults/webpack.config.js

diff --git a/lib/FileSystemInfo.js b/lib/FileSystemInfo.js
index 5ee48f62be9..b98215d1b9e 100644
--- a/lib/FileSystemInfo.js
+++ b/lib/FileSystemInfo.js
@@ -1988,7 +1988,7 @@ class FileSystemInfo {
 			for (const managedPath of this.managedPathsRegExps) {
 				const match = managedPath.exec(path);
 				if (match) {
-					const managedItem = getManagedItem(managedPath[1], path);
+					const managedItem = getManagedItem(match[1], path);
 					if (managedItem) {
 						managedItems.add(managedItem);
 						managedSet.add(path);
@@ -2962,7 +2962,7 @@ class FileSystemInfo {
 					for (const managedPath of this.managedPathsRegExps) {
 						const match = managedPath.exec(path);
 						if (match) {
-							const managedItem = getManagedItem(managedPath[1], path);
+							const managedItem = getManagedItem(match[1], path);
 							if (managedItem) {
 								// construct timestampHash from managed info
 								return this.managedItemQueue.add(managedItem, (err, info) => {
diff --git a/test/configCases/managedPaths/futureDefaults/index.js b/test/configCases/managedPaths/futureDefaults/index.js
new file mode 100644
index 00000000000..f191f157474
--- /dev/null
+++ b/test/configCases/managedPaths/futureDefaults/index.js
@@ -0,0 +1,5 @@
+import value from "package";
+
+it("should work", () => {
+	expect(value).toBe(42);
+});
diff --git a/test/configCases/managedPaths/futureDefaults/node_modules/package/index.js b/test/configCases/managedPaths/futureDefaults/node_modules/package/index.js
new file mode 100644
index 00000000000..7a4e8a723a4
--- /dev/null
+++ b/test/configCases/managedPaths/futureDefaults/node_modules/package/index.js
@@ -0,0 +1 @@
+export default 42;
diff --git a/test/configCases/managedPaths/futureDefaults/node_modules/package/package.json b/test/configCases/managedPaths/futureDefaults/node_modules/package/package.json
new file mode 100644
index 00000000000..75b93e3b25a
--- /dev/null
+++ b/test/configCases/managedPaths/futureDefaults/node_modules/package/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "package",
+  "version": "1.0.0"
+}
diff --git a/test/configCases/managedPaths/futureDefaults/webpack.config.js b/test/configCases/managedPaths/futureDefaults/webpack.config.js
new file mode 100644
index 00000000000..bf94f1dd4e2
--- /dev/null
+++ b/test/configCases/managedPaths/futureDefaults/webpack.config.js
@@ -0,0 +1,6 @@
+/** @type {import("../../../../").Configuration} */
+module.exports = {
+	experiments: {
+		futureDefaults: true
+	}
+};