Merge pull request #744 from webpack/fix/737-and-739

fix: close compiler, own sh script and output clearing
webpack · Feb 5, 2019 · bed0c80 · bed0c80
2 parents f79cb89 + c95ea35
commit bed0c80
Show file tree

Hide file tree

Showing 14 changed files with 1,134 additions and 1,183 deletions.
diff --git a/azure-pipelines-template.yml b/azure-pipelines-template.yml
@@ -0,0 +1,38 @@
+jobs:
+  - job: ${{ parameters.name }}
+    pool:
+      vmImage: ${{ parameters.vmImage }}
+    strategy:
+      maxParallel: 3
+      matrix:
+        node-10:
+          node_version: ^10.10.0
+        node-8:
+          node_version: ^8.12.0
+        node-6:
+          node_version: ^6.14.4
+    steps:
+      - task: NodeTool@0
+        displayName: "Install Node.js"
+        inputs:
+          versionSpec: $(node_version)
+      - script: |
+          npm install -g npm@latest
+        displayName: "Install npm"
+      - script: |
+          npm install
+          npm run bootstrap
+        displayName: "Lerna bootstrap"
+      - script: |
+          npm run test
+        displayName: "Run tests"
+      - task: PublishTestResults@2
+        displayName: 'Publish Test Results'
+        inputs:
+          testResultsFiles: '**junit*.xml'
+          testRunTitle: TestRun $ {{ parameters.name }} $(node_version)
+      - task: PublishCodeCoverageResults@1
+        displayName: 'Publish code coverage results'
+        inputs: 
+          codeCoverageTool: 'cobertura'
+          summaryFileLocation: '**/coverage/cobertura-coverage.xml'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,117 +1,19 @@
 jobs:
-  - job: linux
-    pool:
-      vmImage: ubuntu-16.04
-    strategy:
-      maxParallel: 3
-      matrix:
-        node-10:
-          node_version: ^10.10.0
-        node-8:
-          node_version: ^8.12.0
-        node-6:
-          node_version: ^6.14.4
-    steps:
-      - task: NodeTool@0
-        displayName: "Install Node.js"
-        inputs:
-          versionSpec: $(node_version)
-      - script: |
-          npm install -g npm@latest
-        displayName: "Install npm"
-      - script: |
-          npm ci
-        displayName: "Install dependencies"
-      - script: |
-          ./node_modules/.bin/lerna bootstrap
-        displayName: "Lerna bootstrap"
-      - script: |
-          npm test
-        displayName: "Run tests"
-      - task: PublishTestResults@2
-        displayName: 'Publish Test Results'
-        inputs:
-          testResultsFiles: '**junit*.xml'
-          testRunTitle: TestRun ${{ parameters.name }} $(node_version)
-      - task: PublishCodeCoverageResults@1
-        displayName: 'Publish code coverage results'
-        inputs: 
-          codeCoverageTool: 'cobertura'
-          summaryFileLocation: '**/coverage/cobertura-coverage.xml'
-  - job: macos
-    pool:
-      vmImage: "macOS 10.13"
-    strategy:
-      maxParallel: 3
-      matrix:
-        node-10:
-          node_version: ^10.10.0
-        node-8:
-          node_version: ^8.12.0
-    steps:
-      - task: NodeTool@0
-        displayName: "Install Node.js"
-        inputs:
-          versionSpec: $(node_version)
-      - script: |
-          npm install -g npm@latest
-        displayName: "Install npm"
-      - script: |
-          npm ci
-        displayName: "Install dependencies"
-      - script: |
-          ./node_modules/.bin/lerna bootstrap
-        displayName: "Lerna bootstrap"
-      - script: |
-          npm test
-        displayName: "Run tests"
-      - task: PublishTestResults@2
-        displayName: 'Publish Test Results'
-        inputs:
-          testResultsFiles: '**junit*.xml'
-          testRunTitle: TestRun ${{ parameters.name }} $(node_version)
-      - task: PublishCodeCoverageResults@1
-        displayName: 'Publish code coverage results'
-        inputs: 
-          codeCoverageTool: 'cobertura'
-          summaryFileLocation: '**/coverage/cobertura-coverage.xml'
-  - job: windows
-    pool:
-      vmImage: vs2017-win2016
-    strategy:
-      maxParallel: 3
-      matrix:
-        node-8:
-          node_version: ^8.12.0
-        node-6:
-          node_version: ^6.14.4
-    steps:
-      - task: NodeTool@0
-        displayName: "Install Node.js"
-        inputs:
-          versionSpec: $(node_version)
-      - script: |
-          npm install -g npm@latest
-        displayName: "Install npm"
-      - script: |
-          npm ci
-        displayName: "Install dependencies"
-      - script: |
-          ./node_modules/.bin/lerna.cmd bootstrap
-        displayName: "Lerna bootstrap"
-      - script: |
-          npm test
-        displayName: "Run tests"
-      - task: PublishTestResults@2
-        displayName: 'Publish Test Results'
-        inputs:
-          testResultsFiles: '**junit*.xml'
-          testRunTitle: TestRun ${{ parameters.name }} $(node_version)
-      - task: PublishCodeCoverageResults@1
-        displayName: 'Publish code coverage results'
-        inputs: 
-          codeCoverageTool: 'cobertura'
-          summaryFileLocation: '**coverage/cobertura-coverage.xml'
+- template: azure-pipelines-template.yml
+  parameters:
+    name: macOS
+    vmImage: macOS-10.13
+
+- template: azure-pipelines-template.yml
+  parameters:
+    name: Linux
+    vmImage: ubuntu-16.04
+
+# TODO: enable when windows symlinks in monorepos work...
+# - template: azure-pipelines-template.yml
+#  parameters:
+#   name: Windows
+#   vmImage: vs2017-win2016
 
 variables:
-  nproc: 4
+  nproc: 3
diff --git a/bin/cli.js b/bin/cli.js
@@ -23,10 +23,6 @@
 		"migrate",
 		"add",
 		"remove",
-		/*
-		"update",
-		"make",
-		*/
 		"serve",
 		"generate-loader",
 		"generate-plugin",
@@ -436,17 +432,17 @@ For more information, see https://webpack.js.org/api/cli/.`);
 				if (argv.w) {
 					compiler.hooks.watchRun.tap("WebpackInfo", compilation => {
 						const compilationName = compilation.name ? compilation.name : "";
-						console.log("\nCompilation " + compilationName + " starting…\n");
+						console.error("\nCompilation " + compilationName + " starting…\n");
 					});
 				} else {
 					compiler.hooks.beforeRun.tap("WebpackInfo", compilation => {
 						const compilationName = compilation.name ? compilation.name : "";
-						console.log("\nCompilation " + compilationName + " starting…\n");
+						console.error("\nCompilation " + compilationName + " starting…\n");
 					});
 				}
 				compiler.hooks.done.tap("WebpackInfo", compilation => {
 					const compilationName = compilation.name ? compilation.name : "";
-					console.log("\nCompilation " + compilationName + " finished\n");
+					console.error("\nCompilation " + compilationName + " finished\n");
 				});
 			}
 
@@ -491,8 +487,12 @@ For more information, see https://webpack.js.org/api/cli/.`);
 					process.stdin.resume();
 				}
 				compiler.watch(watchOptions, compilerCallback);
-				if (outputOptions.infoVerbosity !== "none") console.log("\nwebpack is watching the files…\n");
-			} else compiler.run(compilerCallback);
+				if (outputOptions.infoVerbosity !== "none") console.error("\nwebpack is watching the files…\n");
+				if (compiler.close) compiler.close(compilerCallback);
+			} else {
+				compiler.run(compilerCallback);
+				if (compiler.close) compiler.close(compilerCallback);
+			}
 		}
 
 		processOptions(options);

diff --git a/bin/convert-argv.js b/bin/convert-argv.js
@@ -79,7 +79,7 @@ module.exports = function(...args) {
 			const ext = actualConfigFileName.replace(new RegExp(defaultConfigFileNames), "");
 			configFiles.push({
 				path: resolvedPath,
-				ext,
+				ext
 			});
 		}
 	}