Merge branch 'master' into jest

sokra · sokra · commit 995893009247 · 2018-04-30T17:45:33.000+02:00
# Conflicts:
#	test/WatchTestCases.test.js
diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js
@@ -576,9 +576,12 @@ class ConcatenatedModule extends Module {
 				moduleToInfoMap
 			)
 		);
+
+		// Must use full identifier in our cache here to ensure that the source
+		// is updated should our dependencies list change.
 		innerDependencyTemplates.set(
 			"hash",
-			innerDependencyTemplates.get("hash") + this.rootModule.identifier()
+			innerDependencyTemplates.get("hash") + this.identifier()
 		);
 
 		// Generate source code and analyse scopes
diff --git a/test/WatchTestCases.test.js b/test/WatchTestCases.test.js
@@ -11,20 +11,30 @@ const { remove } = require("./helpers/remove");
 const Stats = require("../lib/Stats");
 const webpack = require("../lib/webpack");
 
-function copyDiff(src, dest) {
+function copyDiff(src, dest, initial) {
 	if (!fs.existsSync(dest)) fs.mkdirSync(dest);
 	const files = fs.readdirSync(src);
 	files.forEach(filename => {
 		const srcFile = path.join(src, filename);
 		const destFile = path.join(dest, filename);
 		const directory = fs.statSync(srcFile).isDirectory();
 		if (directory) {
-			copyDiff(srcFile, destFile);
+			copyDiff(srcFile, destFile, initial);
 		} else {
 			var content = fs.readFileSync(srcFile);
-			if (/^DELETE\s*$/.test(content.toString("utf-8")))
+			if (/^DELETE\s*$/.test(content.toString("utf-8"))) {
 				fs.unlinkSync(destFile);
-			else fs.writeFileSync(destFile, content);
+			} else {
+				fs.writeFileSync(destFile, content);
+				if (initial) {
+					const longTimeAgo = Date.now() - 1000 * 60 * 60 * 24;
+					fs.utimesSync(
+						destFile,
+						Date.now() - longTimeAgo,
+						Date.now() - longTimeAgo
+					);
+				}
+			}
 		}
 	});
 }
@@ -121,7 +131,7 @@ describe("WatchTestCases", () => {
 							let lastHash = "";
 							const currentWatchStepModule = require("./helpers/currentWatchStep");
 							currentWatchStepModule.step = run.name;
-							copyDiff(path.join(testDirectory, run.name), tempDirectory);
+							copyDiff(path.join(testDirectory, run.name), tempDirectory, true);
 
 							setTimeout(() => {
 								const compiler = webpack(options);
@@ -292,7 +302,8 @@ describe("WatchTestCases", () => {
 												currentWatchStepModule.step = run.name;
 												copyDiff(
 													path.join(testDirectory, run.name),
-													tempDirectory
+													tempDirectory,
+													false
 												);
 											}, 1500);
 										} else {
diff --git a/test/watchCases/scope-hoisting/caching-inner-source/0/index.js b/test/watchCases/scope-hoisting/caching-inner-source/0/index.js
@@ -0,0 +1,3 @@
+it("should not crash when scope-hoisted modules change", function() {
+	require("./module").default.should.be.eql(WATCH_STEP);
+})
diff --git a/test/watchCases/scope-hoisting/caching-inner-source/0/inner.js b/test/watchCases/scope-hoisting/caching-inner-source/0/inner.js
@@ -0,0 +1 @@
+export { x } from "./inner1";
diff --git a/test/watchCases/scope-hoisting/caching-inner-source/0/inner1.js b/test/watchCases/scope-hoisting/caching-inner-source/0/inner1.js
@@ -0,0 +1 @@
+export { x } from "./inner2";
diff --git a/test/watchCases/scope-hoisting/caching-inner-source/0/inner2.js b/test/watchCases/scope-hoisting/caching-inner-source/0/inner2.js
@@ -0,0 +1 @@
+export var x = "0";
diff --git a/test/watchCases/scope-hoisting/caching-inner-source/0/module.js b/test/watchCases/scope-hoisting/caching-inner-source/0/module.js
@@ -0,0 +1,3 @@
+import { x } from "./inner";
+
+export default x;
diff --git a/test/watchCases/scope-hoisting/caching-inner-source/1/inner1.js b/test/watchCases/scope-hoisting/caching-inner-source/1/inner1.js
@@ -0,0 +1 @@
+export var x = "1";
diff --git a/test/watchCases/scope-hoisting/caching-inner-source/webpack.config.js b/test/watchCases/scope-hoisting/caching-inner-source/webpack.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	optimization: {
+		concatenateModules: true
+	}
+};

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+it("should not crash when scope-hoisted modules change", function() {`
	`2`	`+ require("./module").default.should.be.eql(WATCH_STEP);`
	`3`	`+})`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { x } from "./inner";`
	`2`	`+`
	`3`	`+export default x;`