Merge pull request webpack#13775 from webpack/bugfix/azure

fix azure pipeline

Author: sokra

.github/workflows/test.yml

@@ -94,11 +94,14 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         node-version: [10.x, 16.x]
+        part: [a, b]
         include:
           - os: ubuntu-latest
             node-version: 14.x
+            part: a
           - os: ubuntu-latest
             node-version: 12.x
+            part: a
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -121,7 +124,7 @@ jobs:
           path: .jest-cache
           key: jest-integration-${{ env.GITHUB_SHA }}
           restore-keys: jest-integration-
-      - run: yarn cover:integration --ci --cacheDirectory .jest-cache
+      - run: yarn cover:integration:${{ matrix.part }} --ci --cacheDirectory .jest-cache
       - run: yarn cover:merge
       - uses: codecov/codecov-action@v1
         with:

azure-pipelines.yml

@@ -39,7 +39,7 @@ jobs:
           export JEST_JUNIT_OUTPUT_NAME=unit-junit.xml
           yarn test:unit --ci --reporters=default --reporters=jest-junit
         env:
-          CI: true
+          CI: "true"
         displayName: "Run basic tests"
       - task: PublishTestResults@2
         inputs:
@@ -93,7 +93,7 @@ jobs:
           yarn pretty-lint
           yarn spellcheck
         env:
-          CI: true
+          CI: "true"
         displayName: "Run linting"
       - task: PublishTestResults@2
         inputs:
@@ -109,14 +109,26 @@ jobs:
     pool:
       vmImage: windows-latest
     strategy:
-      maxParallel: 3
+      maxParallel: 6
       matrix:
-        node-10:
+        node-10-a:
           node_version: ^10.13.0
-        node-12:
+          part: a
+        node-10-b:
+          node_version: ^10.13.0
+          part: b
+        node-12-a:
+          node_version: ^12.4.0
+          part: a
+        node-12-b:
           node_version: ^12.4.0
-        node-16:
+          part: b
+        node-16-a:
+          node_version: ^16.0.0
+          part: a
+        node-16-b:
           node_version: ^16.0.0
+          part: b
     steps:
       - task: NodeTool@0
         inputs:
@@ -142,10 +154,10 @@ jobs:
       - script: yarn link webpack --frozen-lockfile
         displayName: "Link webpack into node_modules"
       - script: |
-          yarn cover:integration --ci --maxWorkers=2 --reporters=default --reporters=jest-junit
+          yarn cover:integration:$(part) --ci --maxWorkers=2 --reporters=default --reporters=jest-junit
           yarn cover:merge
         env:
-          CI: true
+          CI: "true"
         displayName: "Run tests with coverage"
       - task: PublishTestResults@2
         inputs:
@@ -161,16 +173,26 @@ jobs:
     pool:
       vmImage: ubuntu-latest
     strategy:
-      maxParallel: 4
+      maxParallel: 6
       matrix:
-        node-10:
+        node-10-a:
+          node_version: ^10.13.0
+          part: a
+        node-10-b:
           node_version: ^10.13.0
-        node-12:
+          part: b
+        node-12-a:
           node_version: ^12.4.0
-        node-14:
+          part: a
+        node-14-a:
           node_version: ^14.0.0
-        node-16:
+          part: a
+        node-16-a:
           node_version: ^16.0.0
+          part: a
+        node-16-b:
+          node_version: ^16.0.0
+          part: b
     steps:
       - task: NodeTool@0
         inputs:
@@ -200,10 +222,10 @@ jobs:
       - script: |
           set -e
           export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
-          yarn cover:integration --ci --maxWorkers=2 --reporters=default --reporters=jest-junit
+          yarn cover:integration:$(part) --ci --maxWorkers=2 --reporters=default --reporters=jest-junit
           yarn cover:merge
         env:
-          CI: true
+          CI: "true"
         displayName: "Run tests with coverage"
       - task: PublishTestResults@2
         inputs:
@@ -219,12 +241,20 @@ jobs:
     pool:
       vmImage: macOS-latest
     strategy:
-      maxParallel: 2
+      maxParallel: 4
       matrix:
-        node-12:
+        node-12-a:
           node_version: ^12.4.0
-        node-16:
+          part: a
+        node-12-b:
+          node_version: ^12.4.0
+          part: b
+        node-16-a:
+          node_version: ^16.0.0
+          part: a
+        node-16-b:
           node_version: ^16.0.0
+          part: b
     steps:
       - task: NodeTool@0
         inputs:
@@ -254,10 +284,10 @@ jobs:
       - script: |
           set -e
           export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
-          yarn cover:integration --ci --reporters=default --reporters=jest-junit
+          yarn cover:integration:$(part) --ci --reporters=default --reporters=jest-junit
           yarn cover:merge
         env:
-          CI: true
+          CI: "true"
         displayName: "Run tests with coverage"
       - task: PublishTestResults@2
         inputs:

lib/MultiCompiler.js

@@ -313,12 +313,12 @@ module.exports = class MultiCompiler {
 	/**
 	 * @template SetupResult
 	 * @param {function(Compiler, number, Callback<Stats>, function(): boolean, function(): void, function(): void): SetupResult} setup setup a single compiler
-	 * @param {function(Compiler, Callback<Stats>): void} run run/continue a single compiler
+	 * @param {function(Compiler, SetupResult, Callback<Stats>): void} run run/continue a single compiler
 	 * @param {Callback<MultiStats>} callback callback when all compilers are done, result includes Stats of all changed compilers
 	 * @returns {SetupResult[]} result of setup
 	 */
 	_runGraph(setup, run, callback) {
-		/** @typedef {{ compiler: Compiler, result: Stats, state: "pending" | "blocked" | "queued" | "starting" | "running" | "running-outdated" | "done", children: Node[], parents: Node[] }} Node */
+		/** @typedef {{ compiler: Compiler, setupResult: SetupResult, result: Stats, state: "pending" | "blocked" | "queued" | "starting" | "running" | "running-outdated" | "done", children: Node[], parents: Node[] }} Node */
 
 		// State transitions for nodes:
 		// -> blocked (initial)
@@ -335,6 +335,7 @@ module.exports = class MultiCompiler {
 		/** @type {Node[]} */
 		const nodes = this.compilers.map(compiler => ({
 			compiler,
+			setupResult: undefined,
 			result: undefined,
 			state: "blocked",
 			children: [],
@@ -444,14 +445,14 @@ module.exports = class MultiCompiler {
 		const setupResults = [];
 		nodes.forEach((node, i) => {
 			setupResults.push(
-				setup(
+				(node.setupResult = setup(
 					node.compiler,
 					i,
 					nodeDone.bind(null, node),
 					() => node.state !== "starting" && node.state !== "running",
 					() => nodeChange(node),
 					() => nodeInvalid(node)
-				)
+				))
 			);
 		});
 		let processing = true;
@@ -470,7 +471,7 @@ module.exports = class MultiCompiler {
 				) {
 					running++;
 					node.state = "starting";
-					run(node.compiler, nodeDone.bind(null, node));
+					run(node.compiler, node.setupResult, nodeDone.bind(null, node));
 					node.state = "running";
 				}
 			}
@@ -522,8 +523,9 @@ module.exports = class MultiCompiler {
 					}
 					return watching;
 				},
-				(compiler, initial, callback) => {
-					if (!compiler.watching.running) compiler.watching.invalidate();
+				(compiler, watching, callback) => {
+					if (compiler.watching !== watching) return;
+					if (!watching.running) watching.invalidate();
 				},
 				handler
 			);
@@ -546,7 +548,7 @@ module.exports = class MultiCompiler {
 		if (this.validateDependencies(callback)) {
 			this._runGraph(
 				() => {},
-				(compiler, callback) => compiler.run(callback),
+				(compiler, setupResult, callback) => compiler.run(callback),
 				(err, stats) => {
 					this.running = false;
 

package.json

@@ -135,8 +135,8 @@
     "jest": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation node_modules/jest-cli/bin/jest --logHeapUsage",
     "test": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation node_modules/jest-cli/bin/jest --logHeapUsage",
     "test:update-snapshots": "yarn jest -u",
-    "test:integration": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/test/*.test.js\"",
-    "test:basic": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/te{st/TestCasesNormal,st/StatsTestCases,st/ConfigTestCases}.test.js\"",
+    "test:integration": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/test/*.{basictest,longtest,test}.js\"",
+    "test:basic": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/test/*.basictest.js\"",
     "test:unit": "node --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.unittest.js\"",
     "travis:integration": "yarn cover:integration --ci $JEST",
     "travis:basic": "yarn cover:basic --ci $JEST",
@@ -168,11 +168,13 @@
     "cover": "yarn cover:all && yarn cover:report",
     "cover:clean": "rimraf .nyc_output coverage",
     "cover:all": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules node_modules/jest-cli/bin/jest --logHeapUsage --coverage",
-    "cover:basic": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/te{st/TestCasesNormal,st/StatsTestCases,st/ConfigTestCases}.test.js\" --coverage",
-    "cover:integration": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/test/*.test.js\" --coverage",
+    "cover:basic": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/test/*.basictest.js\" --coverage",
+    "cover:integration": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/test/*.{basictest,longtest,test}.js\" --coverage",
+    "cover:integration:a": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/test/*.{basictest,test}.js\" --coverage",
+    "cover:integration:b": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/test/*.longtest.js\" --coverage",
     "cover:unit": "node --max-old-space-size=4096 --experimental-vm-modules node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.unittest.js\" --coverage",
     "cover:types": "node node_modules/tooling/type-coverage",
-    "cover:merge": "nyc merge .nyc_output coverage/coverage-nyc.json && rimraf .nyc_output",
+    "cover:merge": "yarn mkdirp .nyc_output && nyc merge .nyc_output coverage/coverage-nyc.json && rimraf .nyc_output",
     "cover:report": "nyc report -t coverage"
   },
   "lint-staged": {
@@ -193,6 +195,8 @@
     ],
     "testMatch": [
       "<rootDir>/test/*.test.js",
+      "<rootDir>/test/*.basictest.js",
+      "<rootDir>/test/*.longtest.js",
       "<rootDir>/test/*.unittest.js"
     ],
     "watchPathIgnorePatterns": [

test/BuildDependencies.test.js

@@ -9,11 +9,11 @@ const cacheDirectory = path.resolve(__dirname, "js/buildDepsCache");
 const outputDirectory = path.resolve(__dirname, "js/buildDeps");
 const inputDirectory = path.resolve(__dirname, "js/buildDepsInput");
 
-const webpack = require("../");
-const coverageEnabled = webpack.toString().includes("++");
-
 const exec = (n, options = {}) => {
 	return new Promise((resolve, reject) => {
+		const webpack = require("../");
+		const coverageEnabled = webpack.toString().includes("++");
+
 		const p = child_process.execFile(
 			process.execPath,
 			[

test/ChangesAndRemovals.test.js

@@ -1,12 +1,14 @@
 "use strict";
 
+require("./helpers/warmup-webpack");
+
 const path = require("path");
 const { createFsFromVolume, Volume } = require("memfs");
-const webpack = require("..");
 const fs = require("graceful-fs");
 const rimraf = require("rimraf");
 
 const createCompiler = config => {
+	const webpack = require("..");
 	const compiler = webpack(config);
 	compiler.outputFileSystem = createFsFromVolume(new Volume());
 	return compiler;

test/Compiler-caching.test.js

@@ -1,16 +1,18 @@
 "use strict";
 
+require("./helpers/warmup-webpack");
+
 const path = require("path");
 const fs = require("graceful-fs");
 const rimraf = require("rimraf");
 
-const webpack = require("..");
 let fixtureCount = 0;
 
 describe("Compiler (caching)", () => {
 	jest.setTimeout(15000);
 
 	function compile(entry, options, callback) {
+		const webpack = require("..");
 		options = webpack.config.getNormalizedWebpackOptions(options);
 		options.mode = "none";
 		options.cache = true;