add importMeta to JavascriptParserOptions:

- enable/disable import.meta parsing - when disabled insert output.importMetaName
webpack · Jan 27, 2022 · e1f4ad6 · e1f4ad6
1 parent 332fb11
commit e1f4ad6
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 107 deletions.
diff --git a/declarations/WebpackOptions.d.ts b/declarations/WebpackOptions.d.ts
@@ -351,10 +351,6 @@ export type RuleSetRules = ("..." | RuleSetRule)[];
  */
 export type GeneratorOptionsByModuleType = GeneratorOptionsByModuleTypeKnown &
 	GeneratorOptionsByModuleTypeUnknown;
-/**
- * Options object for es6 import.meta features.
- */
-export type ImportMeta = false | ImportMetaOptions;
 /**
  * Don't parse files matching. It's matched against the full resolved request.
  */
@@ -1246,10 +1242,6 @@ export interface ModuleOptions {
 	 * Specify options for each generator.
 	 */
 	generator?: GeneratorOptionsByModuleType;
-	/**
-	 * Options object for es6 import.meta features.
-	 */
-	importMeta?: ImportMeta;
 	/**
 	 * Don't parse files matching. It's matched against the full resolved request.
 	 */
@@ -1592,15 +1584,6 @@ export interface ResolvePluginInstance {
 	apply: (resolver: import("enhanced-resolve").Resolver) => void;
 	[k: string]: any;
 }
-/**
- * Options object for es6 import.meta features.
- */
-export interface ImportMetaOptions {
-	/**
-	 * Include a polyfill for the 'import.meta.url' variable.
-	 */
-	url?: false | true;
-}
 /**
  * Options object for node compatibility features.
  */
@@ -2914,6 +2897,15 @@ export interface HttpUriOptions {
 	 */
 	upgrade?: boolean;
 }
+/**
+ * Options object for es6 import.meta features.
+ */
+export interface ImportMetaOptions {
+	/**
+	 * Include a polyfill for the 'import.meta.url' variable.
+	 */
+	url?: false | true;
+}
 /**
  * Parser options for javascript modules.
  */
@@ -2926,9 +2918,6 @@ export interface JavascriptParserOptions {
 	 * Enable/disable special handling for browserify bundles.
 	 */
 	browserify?: boolean;
-	/**
-	 * Enable/disable parsing of CommonJs syntax.
-	 */
 	commonjs?: boolean;
 	/**
 	 * Enable/disable parsing of magic comments in CommonJs syntax.
@@ -2966,6 +2955,10 @@ export interface JavascriptParserOptions {
 	 * Specifies the behavior of invalid export names in "import ... from ...".
 	 */
 	importExportsPresence?: "error" | "warn" | "auto" | false;
+	/**
+	 * Enable/disable evaluating import.meta.
+	 */
+	importMeta?: boolean;
 	/**
 	 * Include polyfills or mocks for various node stuff.
 	 */
@@ -3112,10 +3105,6 @@ export interface ModuleOptionsNormalized {
 	 * Specify options for each generator.
 	 */
 	generator: GeneratorOptionsByModuleType;
-	/**
-	 * Options object for es6 import.meta features.
-	 */
-	importMeta?: ImportMeta;
 	/**
 	 * Don't parse files matching. It's matched against the full resolved request.
 	 */

diff --git a/lib/config/defaults.js b/lib/config/defaults.js
@@ -23,7 +23,6 @@ const {
 /** @typedef {import("../../declarations/WebpackOptions").ExperimentsNormalized} ExperimentsNormalized */
 /** @typedef {import("../../declarations/WebpackOptions").ExternalsPresets} ExternalsPresets */
 /** @typedef {import("../../declarations/WebpackOptions").ExternalsType} ExternalsType */
-/** @typedef {import("../../declarations/WebpackOptions").ImportMeta} ImportMeta */
 /** @typedef {import("../../declarations/WebpackOptions").InfrastructureLogging} InfrastructureLogging */
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../../declarations/WebpackOptions").Library} Library */
@@ -496,16 +495,15 @@ const applyModuleDefaults = (
 		D(module, "unsafeCache", false);
 	}
 
-	D(module.parser, "importMeta", {});
-	applyMetaDefaults(module.parser.importMeta);
-
 	F(module.parser, "asset", () => ({}));
 	F(module.parser.asset, "dataUrlCondition", () => ({}));
 	if (typeof module.parser.asset.dataUrlCondition === "object") {
 		D(module.parser.asset.dataUrlCondition, "maxSize", 8096);
 	}
 
-	F(module.parser, "javascript", () => ({}));
+	F(module.parser, "javascript", () => ({
+		importMeta: true
+	}));
 	applyJavascriptParserOptionsDefaults(module.parser.javascript, {
 		futureDefaults
 	});
@@ -1086,15 +1084,6 @@ const applyNodeDefaults = (node, { futureDefaults, targetProperties }) => {
 	});
 };
 
-/**
- * @param {ImportMeta} meta options
- * @returns {void}
- */
-const applyMetaDefaults = meta => {
-	if (meta === false) return;
-	D(meta, "url", true);
-};
-
 /**
  * @param {Performance} performance options
  * @param {Object} options options

diff --git a/lib/config/normalization.js b/lib/config/normalization.js
@@ -219,7 +219,6 @@ const getNormalizedWebpackOptions = config => {
 		module: nestedConfig(config.module, module => ({
 			noParse: module.noParse,
 			unsafeCache: module.unsafeCache,
-			importMeta: nestedConfig(module.importMeta, importMeta => importMeta),
 			parser: keyedNestedConfig(module.parser, cloneObject, {
 				javascript: parserOptions => ({
 					unknownContextRequest: module.unknownContextRequest,

diff --git a/lib/dependencies/ImportMetaPlugin.js b/lib/dependencies/ImportMetaPlugin.js
@@ -23,24 +23,17 @@ const ConstDependency = require("./ConstDependency");
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../NormalModule")} NormalModule */
 /** @typedef {import("../javascript/JavascriptParser")} Parser */
+/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 
 const getCriticalDependencyWarning = memoize(() =>
 	require("./CriticalDependencyWarning")
 );
 
 class ImportMetaPlugin {
-	/**
-	 * @param {import("../../declarations/WebpackOptions").ImportMeta} options options
-	 */
-	constructor(options) {
-		this.options = options;
-	}
-
 	/**
 	 * @param {Compiler} compiler compiler
 	 */
 	apply(compiler) {
-		const options = this.options;
 		compiler.hooks.compilation.tap(
 			"ImportMetaPlugin",
 			(compilation, { normalModuleFactory }) => {
@@ -52,12 +45,38 @@ class ImportMetaPlugin {
 					return pathToFileURL(module.resource).toString();
 				};
 				/**
-				 * @param {Parser} parser parser
-				 * @param {Object} parserOptions parserOptions
+				 * @param {Parser} parser parser parser
+				 * @param {JavascriptParserOptions} parserOptions parserOptions
 				 * @returns {void}
 				 */
-				const parserHandler = (parser, parserOptions) => {
-					if (options === false) return;
+				const parserHandler = (parser, { importMeta }) => {
+					if (importMeta === false) {
+						const { importMetaName } = compilation.outputOptions;
+
+						parser.hooks.expression
+							.for("import.meta")
+							.tap("ImportMetaPlugin", metaProperty => {
+								const dep = new ConstDependency(
+									importMetaName,
+									metaProperty.range
+								);
+								dep.loc = metaProperty.loc;
+								parser.state.module.addPresentationalDependency(dep);
+								return true;
+							});
+						parser.hooks.unhandledExpressionMemberChain
+							.for("import.meta")
+							.tap("ImportMetaPlugin", (expr, members) => {
+								const dep = new ConstDependency(
+									`${importMetaName}${propertyAccess(members, 0)}`,
+									expr.range
+								);
+								dep.loc = expr.loc;
+								parser.state.module.addPresentationalDependency(dep);
+								return true;
+							});
+						return;
+					}
 
 					/// import.meta direct ///
 					parser.hooks.typeof
@@ -105,27 +124,25 @@ class ImportMetaPlugin {
 					parser.hooks.expression
 						.for("import.meta.url")
 						.tap("ImportMetaPlugin", expr => {
-							if (options.url) {
-								const dep = new ConstDependency(
-									JSON.stringify(getUrl(parser.state.module)),
-									expr.range
-								);
-								dep.loc = expr.loc;
-								parser.state.module.addPresentationalDependency(dep);
-							}
+							const dep = new ConstDependency(
+								JSON.stringify(getUrl(parser.state.module)),
+								expr.range
+							);
+							dep.loc = expr.loc;
+							parser.state.module.addPresentationalDependency(dep);
 							return true;
 						});
 					parser.hooks.evaluateTypeof
 						.for("import.meta.url")
 						.tap("ImportMetaPlugin", evaluateToString("string"));
-
 					parser.hooks.evaluateIdentifier
 						.for("import.meta.url")
 						.tap("ImportMetaPlugin", expr => {
 							return new BasicEvaluatedExpression()
 								.setString(getUrl(parser.state.module))
 								.setRange(expr.range);
 						});
+
 					/// import.meta.webpack ///
 					const webpackVersion = parseInt(
 						require("../../package.json").version,

diff --git a/schemas/WebpackOptions.check.js b/schemas/WebpackOptions.check.js
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -1505,17 +1505,6 @@
       "description": "The name of the native import() function (can be exchanged for a polyfill).",
       "type": "string"
     },
-    "ImportMeta": {
-      "description": "Options object for es6 import.meta features.",
-      "anyOf": [
-        {
-          "enum": [false]
-        },
-        {
-          "$ref": "#/definitions/ImportMetaOptions"
-        }
-      ]
-    },
     "ImportMetaName": {
       "description": "The name of the native import.meta object (can be exchanged for a polyfill).",
       "type": "string"
@@ -1583,7 +1572,6 @@
           "type": "boolean"
         },
         "commonjs": {
-          "description": "Enable/disable parsing of CommonJs syntax.",
           "type": "boolean"
         },
         "commonjsMagicComments": {
@@ -1630,6 +1618,10 @@
           "description": "Specifies the behavior of invalid export names in \"import ... from ...\".",
           "enum": ["error", "warn", "auto", false]
         },
+        "importMeta": {
+          "description": "Enable/disable evaluating import.meta.",
+          "type": "boolean"
+        },
         "node": {
           "$ref": "#/definitions/Node"
         },
@@ -2125,9 +2117,6 @@
         "generator": {
           "$ref": "#/definitions/GeneratorOptionsByModuleType"
         },
-        "importMeta": {
-          "$ref": "#/definitions/ImportMeta"
-        },
         "noParse": {
           "$ref": "#/definitions/NoParse"
         },
@@ -2220,9 +2209,6 @@
         "generator": {
           "$ref": "#/definitions/GeneratorOptionsByModuleType"
         },
-        "importMeta": {
-          "$ref": "#/definitions/ImportMeta"
-        },
         "noParse": {
           "$ref": "#/definitions/NoParse"
         },

diff --git a/test/configCases/module/externals/index.js b/test/configCases/module/externals/index.js
@@ -8,6 +8,6 @@ it("should allow to use externals in concatenated modules", () => {
 	expect(value).toBe(40);
 });
 
-it("all bundled files should have same url, when module.importMeta.url === false", () => {
+it("all bundled files should have same url, when parser.javascript.importMeta === false", () => {
 	expect(localMetaUrl).toBe(metaUrl)
 });
diff --git a/test/configCases/module/externals/webpack.config.js b/test/configCases/module/externals/webpack.config.js
@@ -1,8 +1,10 @@
 /** @type {import("../../../../").Configuration} */
 module.exports = {
 	module: {
-		importMeta: {
-			url: false
+		parser: {
+			javascript: {
+				importMeta: false
+			}
 		}
 	},
 	entry: {

diff --git a/types.d.ts b/types.d.ts
@@ -4628,16 +4628,6 @@ type IgnorePluginOptions =
 			 */
 			checkResource: (resource: string, context: string) => boolean;
 	  };
-
-/**
- * Options object for es6 import.meta features.
- */
-declare interface ImportMetaOptions {
-	/**
-	 * Include a polyfill for the 'import.meta.url' variable.
-	 */
-	url?: boolean;
-}
 declare interface ImportModuleOptions {
 	/**
 	 * the target layer
@@ -5431,10 +5421,6 @@ declare interface JavascriptParserOptions {
 	 * Enable/disable special handling for browserify bundles.
 	 */
 	browserify?: boolean;
-
-	/**
-	 * Enable/disable parsing of CommonJs syntax.
-	 */
 	commonjs?: boolean;
 
 	/**
@@ -5482,6 +5468,11 @@ declare interface JavascriptParserOptions {
 	 */
 	importExportsPresence?: false | "auto" | "error" | "warn";
 
+	/**
+	 * Enable/disable evaluating import.meta.
+	 */
+	importMeta?: boolean;
+
 	/**
 	 * Include polyfills or mocks for various node stuff.
 	 */
@@ -6402,7 +6393,6 @@ declare interface LoaderRunnerLoaderContext<OptionsType> {
 	/**
 	 * An array of all the loaders. It is writeable in the pitch phase.
 	 * loaders = [{request: string, path: string, query: string, module: function}]
-	 *
 	 * In the example:
 	 * [
 	 *   { request: "/abc/loader1.js?xyz",
@@ -7064,11 +7054,6 @@ declare interface ModuleOptions {
 	 */
 	generator?: GeneratorOptionsByModuleType;
 
-	/**
-	 * Options object for es6 import.meta features.
-	 */
-	importMeta?: false | ImportMetaOptions;
-
 	/**
 	 * Don't parse files matching. It's matched against the full resolved request.
 	 */
@@ -7149,11 +7134,6 @@ declare interface ModuleOptionsNormalized {
 	 */
 	generator: GeneratorOptionsByModuleType;
 
-	/**
-	 * Options object for es6 import.meta features.
-	 */
-	importMeta?: false | ImportMetaOptions;
-
 	/**
 	 * Don't parse files matching. It's matched against the full resolved request.
 	 */