Merge pull request #15389 from webpack/refactor/use-infrastructure-lo…

…g-file refactoring: use infrastructure-log file
webpack · Feb 22, 2022 · 8d509e3 · 8d509e3
2 parents 378d8c8 + 500c74a
commit 8d509e3
Show file tree

Hide file tree

Showing 16 changed files with 150 additions and 181 deletions.
diff --git a/test/ConfigCacheTestCases.longtest.js b/test/ConfigCacheTestCases.longtest.js
@@ -2,25 +2,6 @@ const { describeCases } = require("./ConfigTestCases.template");
 
 describeCases({
 	name: "ConfigCacheTestCases",
-	infrastructureLogErrors: {
-		wasm: {
-			// Can not compile wasm module
-			["missing-wasm-experiment"]:
-				/^Pack got invalid because of write to: Compilation\/modules.+wasm.wasm$/
-		},
-		parsing: {
-			// Module parse failed
-			context:
-				/^Pack got invalid because of write to: Compilation\/modules|.+dump-file\.txt/
-		},
-		loaders: {
-			// Error in loader
-			options: [
-				/^Pack got invalid because of write to: Compilation\/modules.+loaders[/\\]options[/\\]error1\.js$/,
-				/^Pack got invalid because of write to: Compilation\/modules.+loaders[/\\]options[/\\]error2\.js$/
-			]
-		}
-	},
 	cache: {
 		type: "filesystem",
 		buildDependencies: {

diff --git a/test/ConfigTestCases.template.js b/test/ConfigTestCases.template.js
@@ -17,7 +17,7 @@ const prepareOptions = require("./helpers/prepareOptions");
 const { parseResource } = require("../lib/util/identifier");
 const captureStdio = require("./helpers/captureStdio");
 const asModule = require("./helpers/asModule");
-const createInfrastructureLogErrorsChecker = require("./helpers/infrastructureLogErrors");
+const filterInfraStructureErrors = require("./helpers/infrastructureLogErrors");
 
 const casesPath = path.join(__dirname, "configCases");
 const categories = fs.readdirSync(casesPath).map(cat => {
@@ -64,11 +64,6 @@ const describeCases = config => {
 			// eslint-disable-next-line no-loop-func
 			describe(category.name, () => {
 				for (const testName of category.tests) {
-					const infrastructureLogChecker = config.infrastructureLogErrors
-						? createInfrastructureLogErrorsChecker(
-								config.infrastructureLogErrors
-						  )
-						: undefined;
 					// eslint-disable-next-line no-loop-func
 					describe(testName, function () {
 						const testDirectory = path.join(casesPath, category.name, testName);
@@ -211,17 +206,25 @@ const describeCases = config => {
 											)
 										);
 									}
-									if (infrastructureLogChecker) {
-										const error = infrastructureLogChecker.check(
-											category.name,
-											testName,
-											infraStructureLog,
-											{
-												run: 1,
-												options
-											}
-										);
-										if (error) return done(error);
+									const infrastructureLogErrors = filterInfraStructureErrors(
+										infraStructureLog,
+										{
+											run: 1,
+											options
+										}
+									);
+									if (
+										infrastructureLogErrors.length &&
+										checkArrayExpectation(
+											testDirectory,
+											{ infrastructureLogs: infrastructureLogErrors },
+											"infrastructureLog",
+											"infrastructure-log",
+											"InfrastructureLog",
+											done
+										)
+									) {
+										return;
 									}
 									if (err) return handleFatalError(err, done);
 									done();
@@ -272,17 +275,25 @@ const describeCases = config => {
 											);
 										}
 									}
-									if (infrastructureLogChecker) {
-										const error = infrastructureLogChecker.check(
-											category.name,
-											testName,
-											infraStructureLog,
-											{
-												run: 2,
-												options
-											}
-										);
-										if (error) return done(error);
+									const infrastructureLogErrors = filterInfraStructureErrors(
+										infraStructureLog,
+										{
+											run: 2,
+											options
+										}
+									);
+									if (
+										infrastructureLogErrors.length &&
+										checkArrayExpectation(
+											testDirectory,
+											{ infrastructureLogs: infrastructureLogErrors },
+											"infrastructureLog",
+											"infrastructure-log",
+											"InfrastructureLog",
+											done
+										)
+									) {
+										return;
 									}
 									done();
 								});
@@ -355,17 +366,25 @@ const describeCases = config => {
 								) {
 									return;
 								}
-								if (infrastructureLogChecker) {
-									const error = infrastructureLogChecker.check(
-										category.name,
-										testName,
-										infraStructureLog,
-										{
-											run: 1,
-											options
-										}
-									);
-									if (error) return done(error);
+								const infrastructureLogErrors = filterInfraStructureErrors(
+									infraStructureLog,
+									{
+										run: 3,
+										options
+									}
+								);
+								if (
+									infrastructureLogErrors.length &&
+									checkArrayExpectation(
+										testDirectory,
+										{ infrastructureLogs: infrastructureLogErrors },
+										"infrastructureLog",
+										"infrastructure-log",
+										"InfrastructureLog",
+										done
+									)
+								) {
+									return;
 								}
 
 								let filesCount = 0;

diff --git a/test/TestCases.template.js b/test/TestCases.template.js
@@ -11,7 +11,7 @@ const createLazyTestEnv = require("./helpers/createLazyTestEnv");
 const deprecationTracking = require("./helpers/deprecationTracking");
 const captureStdio = require("./helpers/captureStdio");
 const asModule = require("./helpers/asModule");
-const createInfrastructureLogErrorsChecker = require("./helpers/infrastructureLogErrors");
+const filterInfraStructureErrors = require("./helpers/infrastructureLogErrors");
 
 const casesPath = path.join(__dirname, "cases");
 let categories = fs.readdirSync(casesPath);
@@ -70,11 +70,6 @@ const describeCases = config => {
 					})
 					.forEach(testName => {
 						let infraStructureLog = [];
-						const infrastructureLogChecker = config.infrastructureLogErrors
-							? createInfrastructureLogErrorsChecker(
-									config.infrastructureLogErrors
-							  )
-							: undefined;
 
 						describe(testName, () => {
 							const testDirectory = path.join(
@@ -245,17 +240,23 @@ const describeCases = config => {
 											deprecationTracker();
 											options.output.path = oldPath;
 											if (err) return done(err);
-											if (infrastructureLogChecker) {
-												const error = infrastructureLogChecker.check(
-													category.name,
-													testName,
-													infraStructureLog,
-													{
-														run: 1,
-														options
-													}
-												);
-												if (error) return done(error);
+											const infrastructureLogErrors =
+												filterInfraStructureErrors(infraStructureLog, {
+													run: 1,
+													options
+												});
+											if (
+												infrastructureLogErrors.length &&
+												checkArrayExpectation(
+													testDirectory,
+													{ infrastructureLogs: infrastructureLogErrors },
+													"infrastructureLog",
+													"infrastructure-log",
+													"InfrastructureLog",
+													done
+												)
+											) {
+												return;
 											}
 											done();
 										});
@@ -277,17 +278,23 @@ const describeCases = config => {
 											deprecationTracker();
 											options.output.path = oldPath;
 											if (err) return done(err);
-											if (infrastructureLogChecker) {
-												const error = infrastructureLogChecker.check(
-													category.name,
-													testName,
-													infraStructureLog,
-													{
-														run: 2,
-														options
-													}
-												);
-												if (error) return done(error);
+											const infrastructureLogErrors =
+												filterInfraStructureErrors(infraStructureLog, {
+													run: 2,
+													options
+												});
+											if (
+												infrastructureLogErrors.length &&
+												checkArrayExpectation(
+													testDirectory,
+													{ infrastructureLogs: infrastructureLogErrors },
+													"infrastructureLog",
+													"infrastructure-log",
+													"InfrastructureLog",
+													done
+												)
+											) {
+												return;
 											}
 											done();
 										});
@@ -306,17 +313,23 @@ const describeCases = config => {
 										compiler.run((err, stats) => {
 											const deprecations = deprecationTracker();
 											if (err) return done(err);
-											if (infrastructureLogChecker) {
-												const error = infrastructureLogChecker.check(
-													category.name,
-													testName,
-													infraStructureLog,
-													{
-														run: 3,
-														options
-													}
-												);
-												if (error) return done(error);
+											const infrastructureLogErrors =
+												filterInfraStructureErrors(infraStructureLog, {
+													run: 3,
+													options
+												});
+											if (
+												infrastructureLogErrors.length &&
+												checkArrayExpectation(
+													testDirectory,
+													{ infrastructureLogs: infrastructureLogErrors },
+													"infrastructureLog",
+													"infrastructure-log",
+													"InfrastructureLog",
+													done
+												)
+											) {
+												return;
 											}
 											compiler.close(err => {
 												if (err) return done(err);

diff --git a/test/TestCasesCachePack.longtest.js b/test/TestCasesCachePack.longtest.js
@@ -4,33 +4,6 @@ const { describeCases } = require("./TestCases.template");
 describe("TestCases", () => {
 	describeCases({
 		name: "cache pack",
-		infrastructureLogErrors: {
-			compile: {
-				// Module build failed
-				["error-hide-stack"]:
-					/^Pack got invalid because of write to: Compilation\/modules.+loader\.js!$/
-			},
-			errors: {
-				// load module failed, error in loader
-				["load-module-error"]:
-					/^Pack got invalid because of write to: Compilation\/modules|json.+error-loader\.js!/
-			},
-			json: {
-				// Module build failed, not a valid JSON
-				["import-assertions-type-json"]:
-					/^Pack got invalid because of write to: Compilation\/modules|json.+json\/data\/poison$/
-			},
-			loaders: {
-				// Module build failed
-				["no-string"]:
-					/^Pack got invalid because of write to: Compilation\/modules.+no-string[/\\]loader\.js!.+no-string[/\\]file\.js$/
-			},
-			parsing: {
-				// Module parse failed
-				context:
-					/^Pack got invalid because of write to: Compilation\/modules|.+dump-file\.txt/
-			}
-		},
 		cache: {
 			type: "filesystem",
 			buildDependencies: {

diff --git a/test/cases/compile/error-hide-stack/infrastructure-log.js b/test/cases/compile/error-hide-stack/infrastructure-log.js
@@ -0,0 +1,3 @@
+module.exports = [
+	/^Pack got invalid because of write to: Compilation\/modules.+loader\.js!$/
+];
diff --git a/test/cases/errors/load-module-error/infrastructure-log.js b/test/cases/errors/load-module-error/infrastructure-log.js
@@ -0,0 +1,3 @@
+module.exports = [
+	/^Pack got invalid because of write to: Compilation\/modules|json.+error-loader\.js!/
+];
diff --git a/test/cases/json/import-assertions-type-json/infrastructure-log.js b/test/cases/json/import-assertions-type-json/infrastructure-log.js
@@ -0,0 +1,3 @@
+module.exports = [
+	/^Pack got invalid because of write to: Compilation\/modules|json.+json\/data\/poison$/
+];
diff --git a/test/cases/large/big-assets/infrastructure-log.js b/test/cases/large/big-assets/infrastructure-log.js
@@ -0,0 +1,3 @@
+module.exports = [
+	/^Pack got invalid because of write to: ResolverCachePlugin|normal|dependencyType=|esm|path=|.+|request=|\.\/large\/big-assets\/$/
+];
diff --git a/test/cases/loaders/no-string/infrastructure-log.js b/test/cases/loaders/no-string/infrastructure-log.js
@@ -0,0 +1,3 @@
+module.exports = [
+	/^Pack got invalid because of write to: Compilation\/modules.+no-string[/\\]loader\.js!.+no-string[/\\]file\.js$/
+];
diff --git a/test/cases/parsing/context/infrastructure-log.js b/test/cases/parsing/context/infrastructure-log.js
@@ -0,0 +1,3 @@
+module.exports = [
+	/^Pack got invalid because of write to: Compilation\/modules|.+dump-file\.txt/
+];
diff --git a/test/configCases/assets/delete-asset/infrastructure-log.js b/test/configCases/assets/delete-asset/infrastructure-log.js
@@ -0,0 +1,3 @@
+module.exports = [
+	/^Pack got invalid because of write to: TerserWebpackPlugin|bundle0\.js$/
+];
diff --git a/test/configCases/loaders/options/infrastructure-log.js b/test/configCases/loaders/options/infrastructure-log.js
@@ -0,0 +1,3 @@
+module.exports = [
+	/^Pack got invalid because of write to: Compilation\/modules.+loaders[/\\]options[/\\]error1\.js$/
+];
diff --git a/test/configCases/parsing/context/infrastructure-log.js b/test/configCases/parsing/context/infrastructure-log.js
@@ -0,0 +1,3 @@
+module.exports = [
+	/^Pack got invalid because of write to: Compilation\/modules|.+dump-file\.txt/
+];
diff --git a/test/configCases/process-assets/html-plugin/infrastructure-log.js b/test/configCases/process-assets/html-plugin/infrastructure-log.js
@@ -0,0 +1,3 @@
+module.exports = [
+	/^Pack got invalid because of write to: RealContentHashPlugin|analyse|index\.html$/
+];
diff --git a/test/configCases/wasm/missing-wasm-experiment/infrastructure-log.js b/test/configCases/wasm/missing-wasm-experiment/infrastructure-log.js
@@ -0,0 +1,3 @@
+module.exports = [
+	/^Pack got invalid because of write to: Compilation\/modules.+wasm.wasm$/
+];