webpack
diff --git a/‎.appveyor.yml
Lines changed: 1 addition & 1 deletion b/‎.appveyor.yml
Lines changed: 1 addition & 1 deletion
diff --git a/‎.cz-config.js
Lines changed: 1 addition & 0 deletions b/‎.cz-config.js
Lines changed: 1 addition & 0 deletions
diff --git a/‎.eslintrc.js
Lines changed: 7 additions & 1 deletion b/‎.eslintrc.js
Lines changed: 7 additions & 1 deletion
diff --git a/‎.github/ISSUE_TEMPLATE/Bug_report.md
Lines changed: 31 additions & 0 deletions b/‎.github/ISSUE_TEMPLATE/Bug_report.md
Lines changed: 31 additions & 0 deletions
diff --git a/‎.github/ISSUE_TEMPLATE/Feature_request.md
Lines changed: 17 additions & 0 deletions b/‎.github/ISSUE_TEMPLATE/Feature_request.md
Lines changed: 17 additions & 0 deletions
diff --git a/‎.npmignore
Lines changed: 23 additions & 0 deletions b/‎.npmignore
Lines changed: 23 additions & 0 deletions
diff --git a/‎.travis.yml
Lines changed: 35 additions & 13 deletions b/‎.travis.yml
Lines changed: 35 additions & 13 deletions
diff --git a/‎CHANGELOG.md
Lines changed: 24 additions & 0 deletions b/‎CHANGELOG.md
Lines changed: 24 additions & 0 deletions
diff --git a/‎CONTRIBUTING.md
Lines changed: 11 additions & 0 deletions b/‎CONTRIBUTING.md
Lines changed: 11 additions & 0 deletions
diff --git a/‎INIT.md
Lines changed: 1 addition & 1 deletion b/‎INIT.md
Lines changed: 1 addition & 1 deletion
diff --git a/‎README.md
Lines changed: 1 addition & 0 deletions b/‎README.md
Lines changed: 1 addition & 0 deletions
diff --git a/‎bin/webpack.js renamed to ‎cli.js
Lines changed: 15 additions & 12 deletions b/‎bin/webpack.js renamed to ‎cli.js
Lines changed: 15 additions & 12 deletions
@@ -5,7 +5,7 @@ version: "{build}"
 environment:
   fast_finish: true
   matrix:
-    - nodejs_version: "6"
+    - nodejs_version: "8"
       platform: x86
 
 build: off
 
@@ -19,6 +19,7 @@ module.exports = {
 	// sort type values in asc
 	types: [
 		{ value: "ast", name: "ast:		init, migrate, add, etc" },
+		{ value: "break", name: "break: changes that break the behaviour of the cli" },
 		{ value: "chore", name: "chore:	Updating deps, docs, linting, etc" },
 		{ value: "cli", name: "cli:		Core CLI things" },
 		{ value: "docs", name: "docs:		Documentation" },
 
@@ -78,7 +78,13 @@ module.exports = {
 			{
 				"allowModules": [
 					"webpack",
-					"webpack-dev-server"
+					"webpack-dev-server",
+					"@webpack-cli/generators",
+					"@webpack-cli/init",
+					"@webpack-cli/migrate",
+					"@webpack-cli/utils",
+					"@webpack-cli/generate-loader",
+					"@webpack-cli/generate-plugin"
 				]
 			}
 		],
 
@@ -0,0 +1,31 @@
+---
+name: "[BUG]: \U0001F41EReport"
+about: "Template for \U0001F98E's you encounter with webpack-cli"
+
+---
+
+**Describe the bug**
+
+A 💯 way to do this is to provide your configuration via a GitHub gist and/or to use markdown when describing which commands you used when the error occurred! Be precise and clear in your description of the bug.
+
+**What is the current behavior?**
+
+This is where you elaborate on the current behavior of the cli, how it behaves normally differing from the previous version/build you did. 
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Please paste the results of `webpack-cli info` here, and mention other relevant information*
+
+**Additional context**
+Add any other context about the problem here like linking to an similar issue you might think is the cause.
@@ -0,0 +1,17 @@
+---
+name: "[FEATURE]: Feature request \U0001F914"
+about: "Suggest ideas you wish webpack-cli had \U0001F680"
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
@@ -0,0 +1,23 @@
+test
+coverage
+lib
+.travis.yml
+.eslintrc*
+.fitcommitjsrc.json
+.vscode
+.editorconfig
+.eslintignore
+__testfixtures__
+*.test.js
+*.input.js
+types.js
+*.spec.js
+docs
+jsdoc.json
+.appveyor.yml
+.codecov.yml
+*.snap
+open-bot.yml
+.nyc_output
+git_deploy_key.enc
+*.md
@@ -1,4 +1,11 @@
+sudo: false
+notifications:
+  email: false
 language: node_js
+node_js:
+  - "8"
+  - "7"
+  - "6"
 
 matrix:
   include:
@@ -8,6 +15,9 @@ matrix:
     - os: linux
       node_js: "stable"
       env: JOB_PART=integration
+    - os: linux
+      node_js: "10"
+      env: JOB_PART=integration
     - os: linux
       node_js: "8"
       env: JOB_PART=integration
@@ -17,23 +27,35 @@ matrix:
     - os: linux
       node_js: "6"
       env: JOB_PART=integration
-sudo: false
-
-notifications:
-  email: false
 
 before_install:
-  - npm i -g npm
+  # Decrypt the git_deploy_key.enc key into /tmp/git_deploy_key
+  - openssl aes-256-cbc -K $encrypted_04be16cef0a7_key -iv $encrypted_04be16cef0a7_iv -in git_deploy_key.enc -out /tmp/git_deploy_key -d
+  # Make sure only the current user can read the private key
+  - chmod 600 /tmp/git_deploy_key
+  # Create a script to return the passphrase environment variable to ssh-add
+  - echo 'echo ${SSH_PASSPHRASE}' > /tmp/askpass && chmod +x /tmp/askpass
+  # Start the authentication agent
+  - eval "$(ssh-agent -s)"
+  # Add the key to the authentication agent
+  - DISPLAY=":0.0" SSH_ASKPASS="/tmp/askpass" setsid ssh-add /tmp/git_deploy_key </dev/null
+
+  - '[[ $(node -v) =~ ^v9.*$ ]] || npm install -g npm@latest' # skipped when using node 9
 
 install:
   - npm ci
-  - npm install --global codecov
-  - npm install --global eslint
+  - npm install -g codecov
+  - npm install -g eslint
+  - npm install -g greenkeeper-lockfile@1
 
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+before_script: greenkeeper-lockfile-update
+after_script: greenkeeper-lockfile-upload
 
-script:
-  - npm run travis:$JOB_PART
-  - commitlint-travis
+jobs:
+  include:
+    - stage: commit lint
+      script: commitlint-travis
+    - stage: NPM release
+      if: branch = master
+      node_js: "lts/*"
+      script: npm run travis-deploy-once "npm run semantic-release"
@@ -1,3 +1,27 @@
+ <a name="2.0.14"></a>
+# 2.0.14 (2018-04-05)
+[Full Changelog](https://github.com/webpack/webpack-cli/compare/2.0.13...2.0.14)
+
+## New Features
+
+* use npm ci for tests (#367) ([#368](https://github.com/webpack/webpack-cli/pull/368))
+* add envinfo as `webpack-cli info` command ([51ab19f](https://github.com/webpack/webpack-cli/commit/51ab19f))
+* --entry should override config.entry (#155) ([#358](https://github.com/webpack/webpack-cli/pull/358))
+
+## Chore
+
+* coverage: added reporters inside package.json ([c7d80fb](https://github.com/webpack/webpack-cli/commit/c7d80fb))
+* upgrade: webpack 4.2 and other dependencies ([#362](https://github.com/webpack/webpack-cli/pull/362))
+* version: v.2.0.13 ([2222f1d](https://github.com/webpack/webpack-cli/commit/2222f1d))
+
+## CLI
+
+* refactor: improve folder structure ([#371](https://github.com/webpack/webpack-cli/pull/371))
+
+## Fix
+
+* loader,plugin: fix generators path bug ([b4bfafb](https://github.com/webpack/webpack-cli/commit/b4bfafb))
+
  <a name="2.0.13"></a>
 # 2.0.13 (2018-03-22)
 [Full Changelog](https://github.com/webpack/webpack-cli/compare/2.0.12...2.0.13)
 
@@ -121,6 +121,17 @@ format that includes a **type** and a **subject**:
 <footer>
 ```
 
+This is the list of *type* of commits that we accept: 
+* ast
+* chore
+* cli
+* docs
+* feat
+* fix
+* misc
+* tests
+* break
+
 The **header** is mandatory.
 
 Any line of the commit message cannot be longer 100 characters. This allows the message to be easier
 
@@ -16,7 +16,7 @@ This answers to the output directory of your application. The output directory i
 
 3. `Are you going to use this in production? (Y/n)`
 
-If you answer `Yes` to this, we add [`ExtractTextPlugin`](https://github.com/webpack-contrib/extract-text-webpack-plugin) to your project. This means that your style files will be separated in production from the bundles where they are used. If you answer `No`, we will not use the plugin, and `Question 6` will be ignored by default.
+If you answer `Yes` to this, we add [`MinCssExtractPlugin`](https://github.com/webpack-contrib/mini-css-extract-plugin) to your project. This means that your style files will be separated in production from the bundles where they are used. If you answer `No`, we will not use the plugin, and `Question 6` will be ignored by default.
 
 4. `Will you be using ES2015? (Y/n)`
 
 
@@ -11,6 +11,7 @@
 [![Dependency Status](https://david-dm.org/webpack/webpack-cli.svg)](https://david-dm.org/webpack/webpack-cli)
 [![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)
+[![Greenkeeper badge](https://badges.greenkeeper.io/webpack/webpack-cli.svg)](https://greenkeeper.io/)
 
 # Webpack CLI
 
 
@@ -8,16 +8,14 @@
 (function() {
 	// wrap in IIFE to be able to use return
 
-	const resolveCwd = require("resolve-cwd");
-	// Local version replace global one
-	const localCLI = resolveCwd.silent("webpack-cli/bin/webpack");
-	if (localCLI && localCLI !== __filename) {
-		require(localCLI);
+	const importLocal = require("import-local");
+	// Prefer the local installation of webpack-cli
+	if (importLocal(__filename)) {
 		return;
 	}
 
 	require("v8-compile-cache");
-	const ErrorHelpers = require("./errorHelpers");
+	const ErrorHelpers = require("./utils/errorHelpers");
 
 	const NON_COMPILATION_ARGS = [
 		"init",
@@ -43,20 +41,23 @@
 	});
 
 	if (NON_COMPILATION_CMD) {
-		// eslint-disable-next-line
-		require("../lib/index")(NON_COMPILATION_CMD, process.argv);
+		// TODO: prompt if package isn't installed, run installed package otherwise.
+		//return require(`./commands/${NON_COMPILATION_CMD}`)(...process.argv);
 		return;
 	}
 
-	const yargs = require("yargs").usage(`webpack-cli ${require("../package.json").version}
+	const yargs = require("yargs").usage(`webpack-cli ${
+		require("./package.json").version
+	}
 
 Usage: webpack-cli [options]
        webpack-cli [options] --entry <entry> --output <output>
        webpack-cli [options] <entries...> --output <output>
+       webpack-cli <command> [options]
 
 For more information, see https://webpack.js.org/api/cli/.`);
 
-	require("./config-yargs")(yargs);
+	require("./utils/config-yargs")(yargs);
 
 	const DISPLAY_GROUP = "Stats options:";
 	const BASIC_GROUP = "Basic options:";
@@ -236,7 +237,7 @@ For more information, see https://webpack.js.org/api/cli/.`);
 
 		let options;
 		try {
-			options = require("./convert-argv")(argv);
+			options = require("./utils/convert-argv")(argv);
 		} catch (err) {
 			if (err.name !== "ValidationError") {
 				throw err;
@@ -482,7 +483,9 @@ For more information, see https://webpack.js.org/api/cli/.`);
 				} else if (stats.hash !== lastHash) {
 					lastHash = stats.hash;
 					const statsString = stats.toString(outputOptions);
-					const delimiter = outputOptions.buildDelimiter ? `${outputOptions.buildDelimiter}\n` : "";
+					const delimiter = outputOptions.buildDelimiter
+						? `${outputOptions.buildDelimiter}\n`
+						: "";
 					if (statsString) stdout.write(`${statsString}\n${delimiter}`);
 				}
 				if (!options.watch && stats.hasErrors()) {
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,13 @@ module.exports = {`
`78`	`78`	`{`
`79`	`79`	`"allowModules": [`
`80`	`80`	`"webpack",`
`81`		`- "webpack-dev-server"`
	`81`	`+ "webpack-dev-server",`
	`82`	`+ "@webpack-cli/generators",`
	`83`	`+ "@webpack-cli/init",`
	`84`	`+ "@webpack-cli/migrate",`
	`85`	`+ "@webpack-cli/utils",`
	`86`	`+ "@webpack-cli/generate-loader",`
	`87`	`+ "@webpack-cli/generate-plugin"`
`82`	`88`	`]`
`83`	`89`	`}`
`84`	`90`	`],`