Merge remote-tracking branch 'upstream/master'

README.md

@@ -11,7 +11,7 @@
 [![npm](https://img.shields.io/npm/v/webpack-cli.svg)](https://www.npmjs.com/package/webpack-cli)
 [![Build Status](https://travis-ci.org/webpack/webpack-cli.svg)](https://travis-ci.org/webpack/webpack-cli)
 [![Build2 Status](https://dev.azure.com/webpack/webpack/_apis/build/status/webpack.webpack-cli)](https://dev.azure.com/webpack/webpack/_build/latest?definitionId=4)
-[![Dependency Status](https://david-dm.org/webpack/webpack-cli.svg)](https://david-dm.org/webpack/webpack-cli)
+[![deps][deps]][deps-url]
 [![Code Climate](https://codeclimate.com/github/webpack/webpack-cli/badges/gpa.svg)](https://codeclimate.com/github/webpack/webpack-cli)
 [![chat on gitter](https://badges.gitter.im/webpack/webpack.svg)](https://gitter.im/webpack/webpack)
 [![Install Size](https://packagephobia.now.sh/badge?p=webpack-cli)](https://packagephobia.now.sh/result?p=webpack-cli)
@@ -70,3 +70,5 @@ You can read more about [Scaffolding](./SCAFFOLDING.md) or check out the example
 
 The webpack family welcomes any contributor, small or big. We are happy to elaborate, guide you through the source code and find issues you might want to work on! To get started have a look at our [documentation on contributing](CONTRIBUTING.md).
 
+[deps]: https://img.shields.io/david/webpack/webpack.svg
+[deps-url]: https://david-dm.org/webpack/webpack-cli

SCAFFOLDING.md

@@ -60,11 +60,17 @@ As with a regular webpack configuration, this property behaves the same. Inside
 ```js
 this.options.env.configuration.dev.webpackOptions = {
 entry: '\'app.js\'',
-output: {....},
-merge: 'myConfig'
+output: {....}
 };
 ```
-If you want to use `webpack-merge`, you can supply `webpackOptions` with the merge property, and the configuration you want to merge it with. 
+
+### `myObj.merge` (optional)
+
+If you want to use `webpack-merge`, you can supply `merge` with the merge property, and the configuration you want to merge it with. 
+
+```js
+this.options.env.configuration.dev.merge = 'myConfig';
+```
 
 ### `myObj.topScope`(optional)
 

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'

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

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);

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
 			});
 		}
 	}