chore: merge master

webpack · Jun 5, 2019 · cf8e3c9 · cf8e3c9
2 parents 8b88980 + 6b50c96
commit cf8e3c9
Show file tree

Hide file tree

Showing 365 changed files with 63,646 additions and 32,552 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -122,7 +122,7 @@ In case you are suggesting a new feature, we will match your idea with our curre
     npm run test:packages
     ```
 
--   Test a single CLI test case:
+-   Test a single CLI test case (must run from root of the poject):
 
     ```bash
     npx jest path/to/my-test.js
@@ -161,7 +161,7 @@ In case you are suggesting a new feature, we will match your idea with our curre
     yarn test:packages
     ```
 
--   Test a single CLI test case:
+-   Test a single CLI test case (must run from root of the poject):
 
     ```bash
     yarn jest path/to/my-test.js

diff --git a/README.md b/README.md
@@ -63,7 +63,7 @@ The project also has several utility packages which are used by other commands
 
 -   [`utils`](./packages/utils/README.md) - Several utilities used across webpack-cli.
 -   [`generators`](./packages/generators/README.md) - Contains all webpack-cli related yeoman generators.
--   [`webpack-scaffold`](./packages/info/README.md#webpack-cli-info) - Utilities to create a webpack scaffold.
+-   [`webpack-scaffold`](./packages/webpack-scaffold/README.md) - Utilities to create a webpack scaffold.
 
 ## Getting started
 

diff --git a/bin/cli.js b/bin/cli.js
@@ -70,6 +70,21 @@ For more information, see https://webpack.js.org/api/cli/.`);
 		try {
 			options = require("./utils/convert-argv")(argv);
 		} catch (err) {
+			if (err.code === "MODULE_NOT_FOUND") {
+				let errorMessage =
+					"\n\u001b[31mwebpack not installed, consider installing it using \n\u001b[32mnpm install --save-dev webpack\n";
+
+				if (process.env.npm_execpath !== undefined && process.env.npm_execpath.includes("yarn")) {
+					errorMessage =
+						"\n\u001b[31mwebpack not installed, consider installing it using \n\u001b[32myarn add webpack --dev\n";
+				}
+
+				console.error(errorMessage);
+				Error.stackTraceLimit = 1;
+				process.exitCode = 1;
+				return;
+			}
+
 			if (err.name !== "ValidationError") {
 				throw err;
 			}

diff --git a/bin/utils/convert-argv.js b/bin/utils/convert-argv.js
@@ -110,9 +110,9 @@ module.exports = function(...args) {
 					argv.configRegister.forEach(dep => {
 						require(dep);
 					});
-					return require(configPath);
+					return require(path.resolve(process.cwd(), configPath));
 				} else {
-					return require(configPath);
+					return require(path.resolve(process.cwd(), configPath));
 				}
 			})();
 			options = prepareOptions(options, argv);

diff --git a/docs/assets/js/search.js b/docs/assets/js/search.js
diff --git a/docs/classes/_add_node_modules__webpack_cli_generators_add_generator_.addgenerator.html b/docs/classes/_add_node_modules__webpack_cli_generators_add_generator_.addgenerator.html
diff --git a/...lasses/_add_node_modules__webpack_cli_generators_add_generator_.addgenerator.storage.html b/...lasses/_add_node_modules__webpack_cli_generators_add_generator_.addgenerator.storage.html
diff --git a/...asses/_add_node_modules__webpack_cli_generators_utils_entry_.customgenerator.storage.html b/...asses/_add_node_modules__webpack_cli_generators_utils_entry_.customgenerator.storage.html
diff --git a/docs/classes/_generators_add_generator_.addgenerator.html b/docs/classes/_generators_add_generator_.addgenerator.html
diff --git a/docs/classes/_log_index_.logger.html → ..._add_generator_.addgenerator.storage.html b/docs/classes/_log_index_.logger.html → ..._add_generator_.addgenerator.storage.html
diff --git a/docs/classes/_generators_init_generator_.initgenerator.html b/docs/classes/_generators_init_generator_.initgenerator.html
diff --git a/docs/classes/_generators_init_generator_.initgenerator.storage.html b/docs/classes/_generators_init_generator_.initgenerator.storage.html
diff --git a/docs/classes/_generators_remove_generator_.removegenerator.html b/docs/classes/_generators_remove_generator_.removegenerator.html
diff --git a/docs/classes/_generators_remove_generator_.removegenerator.storage.html b/docs/classes/_generators_remove_generator_.removegenerator.storage.html
diff --git a/docs/classes/_generators_update_generator_.updategenerator.html b/docs/classes/_generators_update_generator_.updategenerator.html
diff --git a/docs/classes/_generators_update_generator_.updategenerator.storage.html b/docs/classes/_generators_update_generator_.updategenerator.storage.html
diff --git a/docs/classes/_generators_utils_entry_.customgenerator.storage.html b/docs/classes/_generators_utils_entry_.customgenerator.storage.html
diff --git a/docs/classes/_init_node_modules__webpack_cli_generators_init_generator_.initgenerator.html b/docs/classes/_init_node_modules__webpack_cli_generators_init_generator_.initgenerator.html
diff --git a/...ses/_init_node_modules__webpack_cli_generators_init_generator_.initgenerator.storage.html b/...ses/_init_node_modules__webpack_cli_generators_init_generator_.initgenerator.storage.html
diff --git a/...sses/_init_node_modules__webpack_cli_generators_utils_entry_.customgenerator.storage.html b/...sses/_init_node_modules__webpack_cli_generators_utils_entry_.customgenerator.storage.html
diff --git a/...asses/_remove_node_modules__webpack_cli_generators_remove_generator_.removegenerator.html b/...asses/_remove_node_modules__webpack_cli_generators_remove_generator_.removegenerator.html
diff --git a/...emove_node_modules__webpack_cli_generators_remove_generator_.removegenerator.storage.html b/...emove_node_modules__webpack_cli_generators_remove_generator_.removegenerator.storage.html
diff --git a/...asses/_update_node_modules__webpack_cli_generators_update_generator_.updategenerator.html b/...asses/_update_node_modules__webpack_cli_generators_update_generator_.updategenerator.html
diff --git a/...pdate_node_modules__webpack_cli_generators_update_generator_.updategenerator.storage.html b/...pdate_node_modules__webpack_cli_generators_update_generator_.updategenerator.storage.html
diff --git a/docs/enums/_generators_utils_languagesupport_.langtype.html b/docs/enums/_generators_utils_languagesupport_.langtype.html
@@ -0,0 +1,235 @@
+<!doctype html>
+<html class="default no-js">
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<title>LangType | webpack-cli</title>
+	<meta name="description" content="">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="stylesheet" href="../assets/css/main.css">
+</head>
+<body>
+<header>
+	<div class="tsd-page-toolbar">
+		<div class="container">
+			<div class="table-wrap">
+				<div class="table-cell" id="tsd-search" data-index="../assets/js/search.js" data-base="..">
+					<div class="field">
+						<label for="tsd-search-field" class="tsd-widget search no-caption">Search</label>
+						<input id="tsd-search-field" type="text" />
+					</div>
+					<ul class="results">
+						<li class="state loading">Preparing search index...</li>
+						<li class="state failure">The search index is not available</li>
+					</ul>
+					<a href="../index.html" class="title">webpack-cli</a>
+				</div>
+				<div class="table-cell" id="tsd-widgets">
+					<div id="tsd-filter">
+						<a href="#" class="tsd-widget options no-caption" data-toggle="options">Options</a>
+						<div class="tsd-filter-group">
+							<div class="tsd-select" id="tsd-filter-visibility">
+								<span class="tsd-select-label">All</span>
+								<ul class="tsd-select-list">
+									<li data-value="public">Public</li>
+									<li data-value="protected">Public/Protected</li>
+									<li data-value="private" class="selected">All</li>
+								</ul>
+							</div>
+							<input type="checkbox" id="tsd-filter-inherited" checked />
+							<label class="tsd-widget" for="tsd-filter-inherited">Inherited</label>
+							<input type="checkbox" id="tsd-filter-externals" checked />
+							<label class="tsd-widget" for="tsd-filter-externals">Externals</label>
+							<input type="checkbox" id="tsd-filter-only-exported" />
+							<label class="tsd-widget" for="tsd-filter-only-exported">Only exported</label>
+						</div>
+					</div>
+					<a href="#" class="tsd-widget menu no-caption" data-toggle="menu">Menu</a>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="tsd-page-title">
+		<div class="container">
+			<ul class="tsd-breadcrumb">
+				<li>
+					<a href="../globals.html">Globals</a>
+				</li>
+				<li>
+					<a href="../modules/_generators_utils_languagesupport_.html">&quot;generators/utils/languageSupport&quot;</a>
+				</li>
+				<li>
+					<a href="_generators_utils_languagesupport_.langtype.html">LangType</a>
+				</li>
+			</ul>
+			<h1>Enumeration LangType</h1>
+		</div>
+	</div>
+</header>
+<div class="container container-main">
+	<div class="row">
+		<div class="col-8 col-content">
+			<section class="tsd-panel-group tsd-index-group">
+				<h2>Index</h2>
+				<section class="tsd-panel tsd-index-panel">
+					<div class="tsd-index-content">
+						<section class="tsd-index-section ">
+							<h3>Enumeration members</h3>
+							<ul class="tsd-index-list">
+								<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a href="_generators_utils_languagesupport_.langtype.html#es6" class="tsd-kind-icon">ES6</a></li>
+								<li class="tsd-kind-enum-member tsd-parent-kind-enum"><a href="_generators_utils_languagesupport_.langtype.html#typescript" class="tsd-kind-icon">Typescript</a></li>
+							</ul>
+						</section>
+					</div>
+				</section>
+			</section>
+			<section class="tsd-panel-group tsd-member-group ">
+				<h2>Enumeration members</h2>
+				<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
+					<a name="es6" class="tsd-anchor"></a>
+					<h3>ES6</h3>
+					<div class="tsd-signature tsd-kind-icon">ES6<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol"> =&nbsp;&quot;ES6&quot;</span></div>
+					<aside class="tsd-sources">
+						<ul>
+							<li>Defined in <a href="https://github.com/pranshuchittora/webpack-cli/blob/65c08e25/packages/generators/utils/languageSupport.ts#L4">generators/utils/languageSupport.ts:4</a></li>
+						</ul>
+					</aside>
+				</section>
+				<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
+					<a name="typescript" class="tsd-anchor"></a>
+					<h3>Typescript</h3>
+					<div class="tsd-signature tsd-kind-icon">Typescript<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol"> =&nbsp;&quot;Typescript&quot;</span></div>
+					<aside class="tsd-sources">
+						<ul>
+							<li>Defined in <a href="https://github.com/pranshuchittora/webpack-cli/blob/65c08e25/packages/generators/utils/languageSupport.ts#L5">generators/utils/languageSupport.ts:5</a></li>
+						</ul>
+					</aside>
+				</section>
+			</section>
+		</div>
+		<div class="col-4 col-menu menu-sticky-wrap menu-highlight">
+			<nav class="tsd-navigation primary">
+				<ul>
+					<li class="globals  ">
+						<a href="../globals.html"><em>Globals</em></a>
+					</li>
+					<li class="current tsd-kind-external-module">
+						<a href="../modules/_generators_utils_languagesupport_.html">"generators/utils/language<wbr>Support"</a>
+					</li>
+				</ul>
+			</nav>
+			<nav class="tsd-navigation secondary menu-sticky">
+				<ul class="before-current">
+				</ul>
+				<ul class="current">
+					<li class="current tsd-kind-external-module">
+						<a href="../modules/_generators_utils_languagesupport_.html" class="tsd-kind-icon">"generators/utils/language<wbr>Support"</a>
+						<ul>
+							<li class="current tsd-kind-enum tsd-parent-kind-external-module">
+								<a href="_generators_utils_languagesupport_.langtype.html" class="tsd-kind-icon">Lang<wbr>Type</a>
+								<ul>
+									<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
+										<a href="_generators_utils_languagesupport_.langtype.html#es6" class="tsd-kind-icon">ES6</a>
+									</li>
+									<li class=" tsd-kind-enum-member tsd-parent-kind-enum">
+										<a href="_generators_utils_languagesupport_.langtype.html#typescript" class="tsd-kind-icon">Typescript</a>
+									</li>
+								</ul>
+							</li>
+							<li class=" tsd-kind-function tsd-parent-kind-external-module">
+								<a href="../modules/_generators_utils_languagesupport_.html#getbabelloader" class="tsd-kind-icon">get<wbr>Babel<wbr>Loader</a>
+							</li>
+							<li class=" tsd-kind-function tsd-parent-kind-external-module tsd-is-not-exported">
+								<a href="../modules/_generators_utils_languagesupport_.html#getentryfolders" class="tsd-kind-icon">get<wbr>Entry<wbr>Folders</a>
+							</li>
+							<li class=" tsd-kind-function tsd-parent-kind-external-module tsd-is-not-exported">
+								<a href="../modules/_generators_utils_languagesupport_.html#getfolder" class="tsd-kind-icon">get<wbr>Folder</a>
+							</li>
+							<li class=" tsd-kind-function tsd-parent-kind-external-module">
+								<a href="../modules/_generators_utils_languagesupport_.html#gettypescriptloader" class="tsd-kind-icon">get<wbr>Typescript<wbr>Loader</a>
+							</li>
+							<li class=" tsd-kind-function tsd-parent-kind-external-module">
+								<a href="../modules/_generators_utils_languagesupport_.html#language" class="tsd-kind-icon">language</a>
+							</li>
+							<li class=" tsd-kind-function tsd-parent-kind-external-module tsd-is-not-exported">
+								<a href="../modules/_generators_utils_languagesupport_.html#replaceext" class="tsd-kind-icon">replace<wbr>Ext</a>
+							</li>
+							<li class=" tsd-kind-function tsd-parent-kind-external-module tsd-is-not-exported">
+								<a href="../modules/_generators_utils_languagesupport_.html#updateentryext" class="tsd-kind-icon">update<wbr>Entry<wbr>Ext</a>
+							</li>
+						</ul>
+					</li>
+				</ul>
+				<ul class="after-current">
+				</ul>
+			</nav>
+		</div>
+	</div>
+</div>
+<footer class="with-border-bottom">
+	<div class="container">
+		<h2>Legend</h2>
+		<div class="tsd-legend-group">
+			<ul class="tsd-legend">
+				<li class="tsd-kind-module"><span class="tsd-kind-icon">Module</span></li>
+				<li class="tsd-kind-object-literal"><span class="tsd-kind-icon">Object literal</span></li>
+				<li class="tsd-kind-variable"><span class="tsd-kind-icon">Variable</span></li>
+				<li class="tsd-kind-function"><span class="tsd-kind-icon">Function</span></li>
+				<li class="tsd-kind-function tsd-has-type-parameter"><span class="tsd-kind-icon">Function with type parameter</span></li>
+				<li class="tsd-kind-index-signature"><span class="tsd-kind-icon">Index signature</span></li>
+				<li class="tsd-kind-type-alias"><span class="tsd-kind-icon">Type alias</span></li>
+			</ul>
+			<ul class="tsd-legend">
+				<li class="tsd-kind-enum"><span class="tsd-kind-icon">Enumeration</span></li>
+				<li class="tsd-kind-enum-member"><span class="tsd-kind-icon">Enumeration member</span></li>
+				<li class="tsd-kind-property tsd-parent-kind-enum"><span class="tsd-kind-icon">Property</span></li>
+				<li class="tsd-kind-method tsd-parent-kind-enum"><span class="tsd-kind-icon">Method</span></li>
+			</ul>
+			<ul class="tsd-legend">
+				<li class="tsd-kind-interface"><span class="tsd-kind-icon">Interface</span></li>
+				<li class="tsd-kind-interface tsd-has-type-parameter"><span class="tsd-kind-icon">Interface with type parameter</span></li>
+				<li class="tsd-kind-constructor tsd-parent-kind-interface"><span class="tsd-kind-icon">Constructor</span></li>
+				<li class="tsd-kind-property tsd-parent-kind-interface"><span class="tsd-kind-icon">Property</span></li>
+				<li class="tsd-kind-method tsd-parent-kind-interface"><span class="tsd-kind-icon">Method</span></li>
+				<li class="tsd-kind-index-signature tsd-parent-kind-interface"><span class="tsd-kind-icon">Index signature</span></li>
+			</ul>
+			<ul class="tsd-legend">
+				<li class="tsd-kind-class"><span class="tsd-kind-icon">Class</span></li>
+				<li class="tsd-kind-class tsd-has-type-parameter"><span class="tsd-kind-icon">Class with type parameter</span></li>
+				<li class="tsd-kind-constructor tsd-parent-kind-class"><span class="tsd-kind-icon">Constructor</span></li>
+				<li class="tsd-kind-property tsd-parent-kind-class"><span class="tsd-kind-icon">Property</span></li>
+				<li class="tsd-kind-method tsd-parent-kind-class"><span class="tsd-kind-icon">Method</span></li>
+				<li class="tsd-kind-accessor tsd-parent-kind-class"><span class="tsd-kind-icon">Accessor</span></li>
+				<li class="tsd-kind-index-signature tsd-parent-kind-class"><span class="tsd-kind-icon">Index signature</span></li>
+			</ul>
+			<ul class="tsd-legend">
+				<li class="tsd-kind-constructor tsd-parent-kind-class tsd-is-inherited"><span class="tsd-kind-icon">Inherited constructor</span></li>
+				<li class="tsd-kind-property tsd-parent-kind-class tsd-is-inherited"><span class="tsd-kind-icon">Inherited property</span></li>
+				<li class="tsd-kind-method tsd-parent-kind-class tsd-is-inherited"><span class="tsd-kind-icon">Inherited method</span></li>
+				<li class="tsd-kind-accessor tsd-parent-kind-class tsd-is-inherited"><span class="tsd-kind-icon">Inherited accessor</span></li>
+			</ul>
+			<ul class="tsd-legend">
+				<li class="tsd-kind-property tsd-parent-kind-class tsd-is-protected"><span class="tsd-kind-icon">Protected property</span></li>
+				<li class="tsd-kind-method tsd-parent-kind-class tsd-is-protected"><span class="tsd-kind-icon">Protected method</span></li>
+				<li class="tsd-kind-accessor tsd-parent-kind-class tsd-is-protected"><span class="tsd-kind-icon">Protected accessor</span></li>
+			</ul>
+			<ul class="tsd-legend">
+				<li class="tsd-kind-property tsd-parent-kind-class tsd-is-private"><span class="tsd-kind-icon">Private property</span></li>
+				<li class="tsd-kind-method tsd-parent-kind-class tsd-is-private"><span class="tsd-kind-icon">Private method</span></li>
+				<li class="tsd-kind-accessor tsd-parent-kind-class tsd-is-private"><span class="tsd-kind-icon">Private accessor</span></li>
+			</ul>
+			<ul class="tsd-legend">
+				<li class="tsd-kind-property tsd-parent-kind-class tsd-is-static"><span class="tsd-kind-icon">Static property</span></li>
+				<li class="tsd-kind-call-signature tsd-parent-kind-class tsd-is-static"><span class="tsd-kind-icon">Static method</span></li>
+			</ul>
+		</div>
+	</div>
+</footer>
+<div class="container tsd-generator">
+	<p>Generated using <a href="http://typedoc.org/" target="_blank">TypeDoc</a></p>
+</div>
+<div class="overlay"></div>
+<script src="../assets/js/main.js"></script>
+<script>if (location.protocol == 'file:') document.write('<script src="../assets/js/search.js"><' + '/script>');</script>
+</body>
+</html>