Merge pull request #15282 from webpack/feature/__webpack_module__

add __webpack_module__ and __webpack_module_id__ to the api

lib/APIPlugin.js

@@ -201,6 +201,39 @@ class APIPlugin {
 								)
 								.setRange(expr.range)
 						);
+
+					parser.hooks.expression
+						.for("__webpack_module_id__")
+						.tap("APIPlugin", expr => {
+							parser.state.module.buildInfo.moduleConcatenationBailout =
+								"__webpack_module_id__";
+							const dep = new ConstDependency(
+								parser.state.module.moduleArgument + ".id",
+								expr.range,
+								[RuntimeGlobals.moduleId]
+							);
+							dep.loc = expr.loc;
+							parser.state.module.addPresentationalDependency(dep);
+							return true;
+						});
+
+					parser.hooks.expression
+						.for("__webpack_module__")
+						.tap("APIPlugin", expr => {
+							parser.state.module.buildInfo.moduleConcatenationBailout =
+								"__webpack_module__";
+							const dep = new ConstDependency(
+								parser.state.module.moduleArgument,
+								expr.range,
+								[RuntimeGlobals.module]
+							);
+							dep.loc = expr.loc;
+							parser.state.module.addPresentationalDependency(dep);
+							return true;
+						});
+					parser.hooks.evaluateTypeof
+						.for("__webpack_module__")
+						.tap("APIPlugin", evaluateToString("object"));
 				};
 
 				normalModuleFactory.hooks.parser

lib/Module.js

@@ -400,15 +400,13 @@ class Module extends DependenciesBlock {
 	// BACKWARD-COMPAT END
 
 	/**
-	 * @deprecated moved to .buildInfo.exportsArgument
 	 * @returns {string} name of the exports argument
 	 */
 	get exportsArgument() {
 		return (this.buildInfo && this.buildInfo.exportsArgument) || "exports";
 	}
 
 	/**
-	 * @deprecated moved to .buildInfo.moduleArgument
 	 * @returns {string} name of the module argument
 	 */
 	get moduleArgument() {

test/cases/parsing/api/id.js

@@ -0,0 +1 @@
+export default __webpack_module_id__;

test/cases/parsing/api/index.js

@@ -0,0 +1,18 @@
+import id from "./id";
+import mod from "./module";
+import modType from "./typeof-module";
+
+it("should support __webpack_module_id__", () => {
+	expect(typeof id).toMatch(/^(string|number)$/);
+	expect(id).not.toBe(__webpack_module_id__);
+});
+
+it("should support __webpack_module__", () => {
+	expect(mod.exports).toBeTypeOf("object");
+	expect(typeof mod.id).toMatch(/^(string|number)$/);
+	expect(mod).not.toBe(__webpack_module__);
+});
+
+it("should support typeof __webpack_module__", () => {
+	expect(modType).toBe("object");
+});

test/cases/parsing/api/module.js

@@ -0,0 +1 @@
+export default __webpack_module__;

test/cases/parsing/api/typeof-module.js

@@ -0,0 +1 @@
+export default typeof __webpack_module__;