Merge branch 'master' into feature/hook-into-get-reference

bin/webpack.js

@@ -47,6 +47,7 @@ const isInstalled = packageName => {
  * @typedef {Object} CliOption
  * @property {string} name display name
  * @property {string} package npm package name
+ * @property {string} binName name of the executable file
  * @property {string} alias shortcut for choice
  * @property {boolean} installed currently installed?
  * @property {string} url homepage
@@ -58,6 +59,7 @@ const CLIs = [
 	{
 		name: "webpack-cli",
 		package: "webpack-cli",
+		binName: "webpack-cli",
 		alias: "cli",
 		installed: isInstalled("webpack-cli"),
 		url: "https://github.com/webpack/webpack-cli",
@@ -66,6 +68,7 @@ const CLIs = [
 	{
 		name: "webpack-command",
 		package: "webpack-command",
+		binName: "webpack-command",
 		alias: "command",
 		installed: isInstalled("webpack-command"),
 		url: "https://github.com/webpack-contrib/webpack-command",
@@ -154,7 +157,10 @@ if (installedClis.length === 0) {
 			});
 	});
 } else if (installedClis.length === 1) {
-	require(installedClis[0].package); // eslint-disable-line
+	const path = require("path");
+	const pkgPath = require.resolve(`${installedClis[0].package}/package.json`);
+	const pkg = require(pkgPath); // eslint-disable-line
+	require(path.resolve(path.dirname(pkgPath), pkg.bin[installedClis[0].binName])); // eslint-disable-line
 } else {
 	console.warn(
 		`You have installed ${installedClis

lib/ChunkGroup.js

@@ -70,6 +70,12 @@ class ChunkGroup {
 		this.chunks = [];
 		/** @type {OriginRecord[]} */
 		this.origins = [];
+		/** Indicies in top-down order */
+		/** @private @type {Map<Module, number>} */
+		this._moduleIndicies = new Map();
+		/** Indicies in bottom-up order */
+		/** @private @type {Map<Module, number>} */
+		this._moduleIndicies2 = new Map();
 	}
 
 	/**
@@ -447,6 +453,44 @@ class ChunkGroup {
 		return result;
 	}
 
+	/**
+	 * Sets the top-down index of a module in this ChunkGroup
+	 * @param {Module} module module for which the index should be set
+	 * @param {number} index the index of the module
+	 * @returns {void}
+	 */
+	setModuleIndex(module, index) {
+		this._moduleIndicies.set(module, index);
+	}
+
+	/**
+	 * Gets the top-down index of a module in this ChunkGroup
+	 * @param {Module} module the module
+	 * @returns {number} index
+	 */
+	getModuleIndex(module) {
+		return this._moduleIndicies.get(module);
+	}
+
+	/**
+	 * Sets the bottom-up index of a module in this ChunkGroup
+	 * @param {Module} module module for which the index should be set
+	 * @param {number} index the index of the module
+	 * @returns {void}
+	 */
+	setModuleIndex2(module, index) {
+		this._moduleIndicies2.set(module, index);
+	}
+
+	/**
+	 * Gets the bottom-up index of a module in this ChunkGroup
+	 * @param {Module} module the module
+	 * @returns {number} index
+	 */
+	getModuleIndex2(module) {
+		return this._moduleIndicies2.get(module);
+	}
+
 	checkConstraints() {
 		const chunk = this;
 		for (const child of chunk._children) {