webpack
diff --git a/‎.appveyor.yml‎
Lines changed: 1 addition & 0 deletions b/‎.appveyor.yml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.eslintrc.js‎
Lines changed: 30 additions & 2 deletions b/‎.eslintrc.js‎
Lines changed: 30 additions & 2 deletions
diff --git a/‎.gitignore‎
Lines changed: 9 additions & 3 deletions b/‎.gitignore‎
Lines changed: 9 additions & 3 deletions
diff --git a/‎.travis.yml‎
Lines changed: 5 additions & 1 deletion b/‎.travis.yml‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎INIT.md‎
Lines changed: 1 addition & 9 deletions b/‎INIT.md‎
Lines changed: 1 addition & 9 deletions
diff --git a/‎README.md‎
Lines changed: 1 addition & 1 deletion b/‎README.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎SCAFFOLDING.md‎
Lines changed: 6 additions & 6 deletions b/‎SCAFFOLDING.md‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎bin/webpack.js‎ ‎bin/cli.js‎bin/webpack.js renamed to bin/cli.js
Lines changed: 34 additions & 9 deletions b/‎bin/webpack.js‎ ‎bin/cli.js‎bin/webpack.js renamed to bin/cli.js
Lines changed: 34 additions & 9 deletions
diff --git a/‎bin/config-yargs.js‎
Lines changed: 1 addition & 1 deletion b/‎bin/config-yargs.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎bin/convert-argv.js‎
Lines changed: 15 additions & 14 deletions b/‎bin/convert-argv.js‎
Lines changed: 15 additions & 14 deletions
@@ -13,6 +13,7 @@ build: off
 install:
   - ps: Install-Product node $env:nodejs_version $env:platform
   - npm i -g npm
+  - npm i
   - npm ci
   - npm install --global codecov
   - npm install eslint-plugin-node@latest --save-dev
 
@@ -60,8 +60,16 @@ module.exports = {
 		"node/no-missing-require": [
 			"error",
 			{
+				"resolvePaths": ["./packages"],
 				"allowModules": [
-					"webpack"
+					"webpack",
+					"@webpack-cli/generators",
+					"@webpack-cli/init",
+					"@webpack-cli/migrate",
+					"@webpack-cli/utils",
+					"@webpack-cli/generate-loader",
+					"@webpack-cli/generate-plugin",
+					"@webpack-cli/webpack-scaffold"
 				]
 			}
 		],
@@ -71,7 +79,27 @@ 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",
+					"@webpack-cli/webpack-scaffold"
+				]
+			}
+		],
+		"node/no-extraneous-require": [
+			"error",
+			{
+				"allowModules": [					
+					"@webpack-cli/migrate",
+					"@webpack-cli/generators",
+					"@webpack-cli/utils",
+					"@webpack-cli/generate-loader",
+					"@webpack-cli/generate-plugin",
+					"@webpack-cli/webpack-scaffold"
 				]
 			}
 		],
 
@@ -19,11 +19,17 @@ npm-debug.*
 yarn-error.log
 
 # Jest Coverage
-/coverage
-/.nyc_output
+coverage
+.nyc_output
 
 # Test Compilation
 test/js/*
 
+# lerna log
+lerna-debug.log
+
 # Yeoman file
-.yo-rc.json
+.yo-rc.json
+
+# Yarn lock file
+yarn.lock
@@ -3,6 +3,7 @@ notifications:
   email: false
 language: node_js
 node_js:
+  - "10"
   - "8"
   - "7"
   - "6"
@@ -49,6 +50,7 @@ install:
   - npm install -g codecov
   - npm install -g eslint
   - npm install -g greenkeeper-lockfile@1
+  - lerna bootstrap
 
 before_script: greenkeeper-lockfile-update
 after_script: greenkeeper-lockfile-upload
@@ -60,4 +62,6 @@ jobs:
     - stage: NPM release
       if: branch = master
       node_js: "lts/*"
-      script: npm run travis-deploy-once "npm run semantic-release"
+      script: 
+        - npm run changelog
+        - npm run travis-deploy-once "npm run semantic-release"
@@ -14,10 +14,6 @@ What we are meaning here, is if you want to provide your bundle a single or mult
 
 This answers to the output directory of your application. The output directory is where servers or your `index.html` will read the generated bundle from.
 
-3. `Are you going to use this in production? (Y/n)`
-
-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)`
 
 If you answer `Yes` to this question, we will add [`ES2015`](https://babeljs.io/learn-es2015/) to your webpack configuration, which will allow you to use modern JavaScript in your project.
@@ -29,8 +25,4 @@ If you use any sort of style in your project, such as [`.less`](http://lesscss.o
 6. `If you want to bundle your CSS files, what will you name the bundle? (press 
 enter to skip)`
 
-If you answered `Yes` to `Question 3`, this will be enabled. The default value for your generated CSS file is `style.[contentHash].css`, which will collect all your `.less`, `.scss` or `.css` into one file. This will make your build faster in production.
-
-7. `Name your 'webpack.[name].js?' [default: 'prod/config']`
-
-If you answered `Yes` to `Question 3`, the default name of your configuration will be `webpack.prod.js`, otherwise it will be `webpack.config.js` if you don't answer. Other good options to answer to this question is: `dev`, `base`, `production` or `development`.
+If you indicate based on previous questions that you are using production, this will be enabled. The default value for your generated CSS file is `style.[contentHash].css`, which will collect all your `.less`, `.scss` or `.css` into one file. This will make your build faster in production.
@@ -29,7 +29,7 @@ The `migrate` feature eases the transition from [version 1](http://webpack.githu
 
 The `init` feature allows users to get started with webpack, fast. Through scaffolding, people can create their own configuration in order to faster initialize new projects for various of use cases.
 
-`webpack-cli init webpack-addons-<package>`
+`webpack-cli init webpack-scaffold-<package>`
 
 [Read more about scaffolding](SCAFFOLDING.md)
 
 
@@ -8,16 +8,16 @@ Before writing a `webpack-cli` scaffold, think about what you're trying to achie
 
 `webpack-cli` offers an experience that is interactive and you can prompt users for questions (like, "What is your entry point?") to help customize the output accordingly.
 
-## webpack-addons
+## webpack-scaffold
 
-[`webpack-addons`](https://github.com/webpack-contrib/webpack-addons) is a utility suite for creating addons. It contains functions that could be of use for creating an addon yourself.
+`webpack-scaffold` is a utility suite for creating addons. It contains functions that could be of use for creating an addon yourself.
 
-## webpack-addons-yourpackage
+## webpack-scaffold-yourpackage
 
-In order for `webpack-cli` to compile your package, it must be available on npm or on your local filesystem. If you are curious about how you can create your very own `addon`, please read [How do I compose a
-webpack-addon?](https://github.com/ev1stensberg/webpack-addons-demo).
+In order for `webpack-cli` to compile your package, it must be available on npm or on your local filesystem. If you are curious about how you can create your very own `scaffold`, please read [How do I compose a
+webpack-addon?](https://github.com/ev1stensberg/webpack-scaffold-demo).
 
-If the package is on npm, its name must have a prefix of `webpack-addons`.
+If the package is on npm, its name must have a prefix of `webpack-scaffold`.
 
 If the package is on your local filesystem, it can be named whatever you want. Pass the path to the package.
 
 
@@ -15,13 +15,24 @@
 	}
 
 	require("v8-compile-cache");
+
+	// try local module, fallback to global
+	try {
+		require.resolve("webpack");
+		process.webpackModule = require("webpack");
+	} catch (err) {
+		const globalPathToWebpack = require("global-modules-path").getPath(
+			"webpack"
+		);
+		process.webpackModule = require(globalPathToWebpack);
+	}
 	const ErrorHelpers = require("./errorHelpers");
 
 	const NON_COMPILATION_ARGS = [
 		"init",
 		"migrate",
-		/*
 		"add",
+		/*
 		"remove",
 		"update",
 		"make",
@@ -41,9 +52,7 @@
 	});
 
 	if (NON_COMPILATION_CMD) {
-		// eslint-disable-next-line
-		require("../lib/index")(NON_COMPILATION_CMD, process.argv);
-		return;
+		return require("./prompt-command")(NON_COMPILATION_CMD, ...process.argv);
 	}
 
 	const yargs = require("yargs").usage(`webpack-cli ${
@@ -81,7 +90,9 @@ For more information, see https://webpack.js.org/api/cli/.`);
 			type: "boolean",
 			alias: "colors",
 			default: function supportsColor() {
-				return require("supports-color").supportsColor;
+				if (process.stdout.isTTY === true) {
+					return require("supports-color").supportsColor;
+				}
 			},
 			group: DISPLAY_GROUP,
 			describe: "Enables/Disables colors on the console"
@@ -287,7 +298,7 @@ For more information, see https://webpack.js.org/api/cli/.`);
 			}
 
 			const firstOptions = [].concat(options)[0];
-			const statsPresetToOptions = require("webpack").Stats.presetToOptions;
+			const statsPresetToOptions = process.webpackModule.Stats.presetToOptions;
 
 			let outputOptions = options.stats;
 			if (
@@ -323,7 +334,10 @@ For more information, see https://webpack.js.org/api/cli/.`);
 				}
 			});
 
-			if (typeof outputOptions.colors === "undefined")
+			if (
+				typeof outputOptions.colors === "undefined" &&
+				process.stdout.isTTY === true
+			)
 				outputOptions.colors = require("supports-color").stdout;
 
 			ifArg("sort-modules-by", function(value) {
@@ -429,7 +443,7 @@ For more information, see https://webpack.js.org/api/cli/.`);
 				outputOptions.buildDelimiter = value;
 			});
 
-			const webpack = require("webpack");
+			const webpack = process.webpackModule;
 
 			let lastHash = null;
 			let compiler;
@@ -450,7 +464,7 @@ For more information, see https://webpack.js.org/api/cli/.`);
 			}
 
 			if (argv.progress) {
-				const ProgressPlugin = require("webpack").ProgressPlugin;
+				const ProgressPlugin = process.webpackModule.ProgressPlugin;
 				new ProgressPlugin({
 					profile: argv.profile
 				}).apply(compiler);
@@ -482,6 +496,17 @@ For more information, see https://webpack.js.org/api/cli/.`);
 					);
 				} else if (stats.hash !== lastHash) {
 					lastHash = stats.hash;
+					if (stats.compilation && stats.compilation.errors.length !== 0) {
+						const errors = stats.compilation.errors;
+						if (errors[0].name === "EntryModuleNotFoundError") {
+							console.error(
+								"\n\u001b[1m\u001b[31mInsufficient number of arguments or no entry found."
+							);
+							console.error(
+								"\u001b[1m\u001b[31mAlternatively, run 'webpack(-cli) --help' for usage info.\u001b[39m\u001b[22m\n"
+							);
+						}
+					}
 					const statsString = stats.toString(outputOptions);
 					const delimiter = outputOptions.buildDelimiter
 						? `${outputOptions.buildDelimiter}\n`
 
@@ -1,4 +1,4 @@
-const optionsSchema = require("webpack/schemas/WebpackOptions.json");
+const optionsSchema = require("./optionsSchema.json");
 const CONFIG_GROUP = "Config options:";
 const BASIC_GROUP = "Basic options:";
 const MODULE_GROUP = "Module options:";
 
@@ -3,10 +3,10 @@ const fs = require("fs");
 fs.existsSync = fs.existsSync || path.existsSync;
 const interpret = require("interpret");
 const prepareOptions = require("./prepareOptions");
-const webpackConfigurationSchema = require("../schemas/webpackConfigurationSchema.json");
-const validateSchema = require("webpack").validateSchema;
-const WebpackOptionsValidationError = require("webpack")
-	.WebpackOptionsValidationError;
+const webpackConfigurationSchema = require("./webpackConfigurationSchema.json");
+const validateSchema = process.webpackModule.validateSchema;
+const WebpackOptionsValidationError =
+	process.webpackModule.WebpackOptionsValidationError;
 
 module.exports = function(...args) {
 	const argv = args[1] || args[0];
@@ -398,7 +398,7 @@ module.exports = function(...args) {
 				defineObject = {};
 			},
 			function() {
-				const DefinePlugin = require("webpack").DefinePlugin;
+				const DefinePlugin = process.webpackModule.DefinePlugin;
 				addPlugin(options, new DefinePlugin(defineObject));
 			}
 		);
@@ -468,13 +468,13 @@ module.exports = function(...args) {
 		mapArgToBoolean("cache");
 
 		ifBooleanArg("hot", function() {
-			const HotModuleReplacementPlugin = require("webpack")
-				.HotModuleReplacementPlugin;
+			const HotModuleReplacementPlugin =
+				process.webpackModule.HotModuleReplacementPlugin;
 			addPlugin(options, new HotModuleReplacementPlugin());
 		});
 
 		ifBooleanArg("debug", function() {
-			const LoaderOptionsPlugin = require("webpack").LoaderOptionsPlugin;
+			const LoaderOptionsPlugin = process.webpackModule.LoaderOptionsPlugin;
 			addPlugin(
 				options,
 				new LoaderOptionsPlugin({
@@ -510,8 +510,8 @@ module.exports = function(...args) {
 		});
 
 		ifArg("optimize-max-chunks", function(value) {
-			const LimitChunkCountPlugin = require("webpack").optimize
-				.LimitChunkCountPlugin;
+			const LimitChunkCountPlugin =
+				process.webpackModule.optimize.LimitChunkCountPlugin;
 			addPlugin(
 				options,
 				new LimitChunkCountPlugin({
@@ -521,7 +521,8 @@ module.exports = function(...args) {
 		});
 
 		ifArg("optimize-min-chunk-size", function(value) {
-			const MinChunkSizePlugin = require("webpack").optimize.MinChunkSizePlugin;
+			const MinChunkSizePlugin =
+				process.webpackModule.optimize.MinChunkSizePlugin;
 			addPlugin(
 				options,
 				new MinChunkSizePlugin({
@@ -531,7 +532,7 @@ module.exports = function(...args) {
 		});
 
 		ifBooleanArg("optimize-minimize", function() {
-			const LoaderOptionsPlugin = require("webpack").LoaderOptionsPlugin;
+			const LoaderOptionsPlugin = process.webpackModule.LoaderOptionsPlugin;
 			addPlugin(
 				options,
 				new LoaderOptionsPlugin({
@@ -541,7 +542,7 @@ module.exports = function(...args) {
 		});
 
 		ifArg("prefetch", function(request) {
-			const PrefetchPlugin = require("webpack").PrefetchPlugin;
+			const PrefetchPlugin = process.webpackModule.PrefetchPlugin;
 			addPlugin(options, new PrefetchPlugin(request));
 		});
 
@@ -554,7 +555,7 @@ module.exports = function(...args) {
 			} else {
 				name = value;
 			}
-			const ProvidePlugin = require("webpack").ProvidePlugin;
+			const ProvidePlugin = process.webpackModule.ProvidePlugin;
 			addPlugin(options, new ProvidePlugin(name, value));
 		});
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const optionsSchema = require("webpack/schemas/WebpackOptions.json");`
	`1`	`+const optionsSchema = require("./optionsSchema.json");`
`2`	`2`	`const CONFIG_GROUP = "Config options:";`
`3`	`3`	`const BASIC_GROUP = "Basic options:";`
`4`	`4`	`const MODULE_GROUP = "Module options:";`