Merge pull request #13708 from webpack/bugfix/crash-unsafe-cache

fixes #13691

lib/NormalModuleFactory.js

@@ -766,6 +766,7 @@ class NormalModuleFactory extends ModuleFactory {
 					if (!unsafeCacheData.has(module)) {
 						unsafeCacheData.set(module, module.getUnsafeCacheData());
 					}
+					this._restoredUnsafeCacheEntries.add(module);
 				}
 
 				callback(null, factoryResult);

lib/asset/AssetGenerator.js

@@ -265,7 +265,7 @@ class AssetGenerator extends Generator {
 	 * @returns {Set<string>} available types (do not mutate)
 	 */
 	getTypes(module) {
-		if (module.buildInfo.dataUrl || this.emit === false) {
+		if ((module.buildInfo && module.buildInfo.dataUrl) || this.emit === false) {
 			return JS_TYPES;
 		} else {
 			return JS_AND_ASSET_TYPES;
@@ -289,7 +289,7 @@ class AssetGenerator extends Generator {
 				return originalSource.size();
 			}
 			default:
-				if (module.buildInfo.dataUrl) {
+				if (module.buildInfo && module.buildInfo.dataUrl) {
 					const originalSource = module.originalSource();
 
 					if (!originalSource) {

lib/json/JsonGenerator.js

@@ -116,7 +116,7 @@ class JsonGenerator extends Generator {
 	 * @returns {number} estimate size of the module
 	 */
 	getSize(module, type) {
-		let data = module.buildInfo.jsonData;
+		let data = module.buildInfo && module.buildInfo.jsonData;
 		if (!data) return 0;
 		return stringifySafe(data).length + 10;
 	}
@@ -145,7 +145,7 @@ class JsonGenerator extends Generator {
 			concatenationScope
 		}
 	) {
-		const data = module.buildInfo.jsonData;
+		const data = module.buildInfo && module.buildInfo.jsonData;
 		if (data === undefined) {
 			return new RawSource(
 				runtimeTemplate.missingModuleStatement({

test/watchCases/cache/unsafe-cache/0/changing-module.js

@@ -0,0 +1,5 @@
+import "./unchanged-module.js";
+import "./unchanged-module.json";
+new URL("./unchanged-module.svg", import.meta.url);
+
+export default "0";

test/watchCases/cache/unsafe-cache/0/index.js

@@ -0,0 +1,5 @@
+import value from "./changing-module";
+
+it("should compile and cleanup correctly", () => {
+	expect(value).toBe(WATCH_STEP);
+});

test/watchCases/cache/unsafe-cache/0/proxy-module.js

@@ -0,0 +1,3 @@
+import "./unchanged-module.js";
+import "./unchanged-module.json";
+new URL("./unchanged-module.svg", import.meta.url);

test/watchCases/cache/unsafe-cache/0/unchanged-module.js

@@ -0,0 +1 @@
+export default 42;

test/watchCases/cache/unsafe-cache/0/unchanged-module.json

@@ -0,0 +1 @@
+{}

test/watchCases/cache/unsafe-cache/0/unchanged-module.svg

@@ -0,0 +1 @@
+<svg></svg>

test/watchCases/cache/unsafe-cache/1/changing-module.js

@@ -0,0 +1,5 @@
+import "./unchanged-module.js";
+import "./unchanged-module.json";
+new URL("./unchanged-module.svg", import.meta.url);
+
+export default "1";

test/watchCases/cache/unsafe-cache/2/changing-module.js

@@ -0,0 +1,5 @@
+import "./unchanged-module.js";
+import "./unchanged-module.json";
+new URL("./unchanged-module.svg", import.meta.url);
+
+export default "2";

test/watchCases/cache/unsafe-cache/webpack.config.js

@@ -0,0 +1,10 @@
+/** @type {import("../../../../").Configuration} */
+module.exports = {
+	mode: "development",
+	cache: {
+		type: "memory"
+	},
+	module: {
+		unsafeCache: true
+	}
+};