Merge pull request webpack#7350 from jdelStrother/dynamic-requires

sokra · web-flow · commit 6ff5b8fd5937 · 2018-05-21T21:50:39.000+02:00
Record relative dynamic-require paths
diff --git a/lib/util/identifier.js b/lib/util/identifier.js
@@ -12,6 +12,11 @@ const path = require("path");
  * @returns {boolean} returns true if path is "Absolute Path"-like
  */
 const looksLikeAbsolutePath = maybeAbsolutePath => {
+	if (/^\/.*\/$/.test(maybeAbsolutePath)) {
+		// this 'path' is actually a regexp generated by dynamic requires.
+		// Don't treat it as an absolute path.
+		return false;
+	}
 	return /^(?:[a-z]:\\|\/)/i.test(maybeAbsolutePath);
 };
 
diff --git a/test/__snapshots__/ConfigTestCases.test.js.snap b/test/__snapshots__/ConfigTestCases.test.js.snap
@@ -0,0 +1,61 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ConfigTestCases records issue-2991 exported tests should write relative paths to records 1`] = `
+"{
+  \\"modules\\": {
+    \\"byIdentifier\\": {
+      \\"external \\\\\\"path\\\\\\"\\": 0,
+      \\"external \\\\\\"fs\\\\\\"\\": 1,
+      \\"ignored  pkgs/somepackage/foo\\": 2,
+      \\"test.js\\": 3
+    },
+    \\"usedIds\\": {
+      \\"0\\": 0,
+      \\"1\\": 1,
+      \\"2\\": 2,
+      \\"3\\": 3
+    }
+  },
+  \\"chunks\\": {
+    \\"byName\\": {
+      \\"main\\": 0
+    },
+    \\"bySource\\": {},
+    \\"usedIds\\": [
+      0
+    ]
+  }
+}"
+`;
+
+exports[`ConfigTestCases records issue-7339 exported tests should write relative dynamic-require paths to records 1`] = `
+"{
+  \\"modules\\": {
+    \\"byIdentifier\\": {
+      \\"dependencies/foo.js\\": 0,
+      \\"dependencies/bar.js\\": 1,
+      \\"external \\\\\\"path\\\\\\"\\": 2,
+      \\"external \\\\\\"fs\\\\\\"\\": 3,
+      \\"dependencies sync /^\\\\\\\\.\\\\\\\\/.*$/\\": 4,
+      \\"test.js\\": 5
+    },
+    \\"usedIds\\": {
+      \\"0\\": 0,
+      \\"1\\": 1,
+      \\"2\\": 2,
+      \\"3\\": 3,
+      \\"4\\": 4,
+      \\"5\\": 5
+    }
+  },
+  \\"chunks\\": {
+    \\"byName\\": {
+      \\"main\\": 0
+    },
+    \\"bySource\\": {},
+    \\"usedIds\\": [
+      0
+    ]
+  }
+}"
+`;
diff --git a/test/configCases/records/issue-2991/test.js b/test/configCases/records/issue-2991/test.js
@@ -1,34 +1,10 @@
 try {
 	require("pkgs/somepackage/foo");
-} catch(e){}
+} catch (e) {}
 
 it("should write relative paths to records", function() {
 	var fs = require("fs");
 	var path = require("path");
 	var content = fs.readFileSync(path.join(__dirname, "records.json"), "utf-8");
-	expect(content).toEqual(`{
-  "modules": {
-    "byIdentifier": {
-      "external \\"path\\"": 0,
-      "external \\"fs\\"": 1,
-      "ignored  pkgs/somepackage/foo": 2,
-      "test.js": 3
-    },
-    "usedIds": {
-      "0": 0,
-      "1": 1,
-      "2": 2,
-      "3": 3
-    }
-  },
-  "chunks": {
-    "byName": {
-      "main": 0
-    },
-    "bySource": {},
-    "usedIds": [
-      0
-    ]
-  }
-}`);
+	expect(content).toMatchSnapshot();
 });
diff --git a/test/configCases/records/issue-7339/dependencies/bar.js b/test/configCases/records/issue-7339/dependencies/bar.js
@@ -0,0 +1 @@
+module.exports = "Bar"
diff --git a/test/configCases/records/issue-7339/dependencies/foo.js b/test/configCases/records/issue-7339/dependencies/foo.js
@@ -0,0 +1 @@
+module.exports = "Foo"
diff --git a/test/configCases/records/issue-7339/test.js b/test/configCases/records/issue-7339/test.js
@@ -0,0 +1,10 @@
+function loadDependency(dep) {
+	require("./dependencies/" + dep);
+}
+
+it("should write relative dynamic-require paths to records", function() {
+	var fs = require("fs");
+	var path = require("path");
+	var content = fs.readFileSync(path.join(__dirname, "records.json"), "utf-8");
+	expect(content).toMatchSnapshot();
+});
diff --git a/test/configCases/records/issue-7339/webpack.config.js b/test/configCases/records/issue-7339/webpack.config.js
@@ -0,0 +1,13 @@
+var path = require("path");
+
+module.exports = {
+	entry: "./test",
+	recordsOutputPath: path.resolve(
+		__dirname,
+		"../../../js/config/records/issue-7339/records.json"
+	),
+	target: "node",
+	node: {
+		__dirname: false
+	}
+};
