Always make "module" available for SystemJS and AMD formats if `impor…

…t.meta` is accessed directly (#3282)

src/ast/nodes/MetaProperty.ts

@@ -35,16 +35,15 @@ export default class MetaProperty extends NodeBase {
 				parent instanceof MemberExpression && typeof parent.propertyKey === 'string'
 					? parent.propertyKey
 					: null);
-			if (metaProperty) {
-				if (
-					metaProperty.startsWith(FILE_PREFIX) ||
+			if (
+				metaProperty &&
+				(metaProperty.startsWith(FILE_PREFIX) ||
 					metaProperty.startsWith(ASSET_PREFIX) ||
-					metaProperty.startsWith(CHUNK_PREFIX)
-				) {
-					this.scope.addAccessedGlobalsByFormat(accessedFileUrlGlobals);
-				} else {
-					this.scope.addAccessedGlobalsByFormat(accessedMetaUrlGlobals);
-				}
+					metaProperty.startsWith(CHUNK_PREFIX))
+			) {
+				this.scope.addAccessedGlobalsByFormat(accessedFileUrlGlobals);
+			} else {
+				this.scope.addAccessedGlobalsByFormat(accessedMetaUrlGlobals);
 			}
 		}
 	}

test/form/samples/import-meta/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'supports directly accessing import.meta'
+};

test/form/samples/import-meta/_expected/amd.js

@@ -0,0 +1,5 @@
+define(['module'], function (module) { 'use strict';
+
+	console.log(({ url: new URL(module.uri, document.baseURI).href }));
+
+});

test/form/samples/import-meta/_expected/cjs.js

@@ -0,0 +1,3 @@
+'use strict';
+
+console.log(({ url: (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('cjs.js', document.baseURI).href)) }));

test/form/samples/import-meta/_expected/es.js

@@ -0,0 +1 @@
+console.log(import.meta);

test/form/samples/import-meta/_expected/iife.js

@@ -0,0 +1,6 @@
+(function () {
+	'use strict';
+
+	console.log(({ url: (document.currentScript && document.currentScript.src || new URL('iife.js', document.baseURI).href) }));
+
+}());

test/form/samples/import-meta/_expected/system.js

@@ -0,0 +1,10 @@
+System.register([], function (exports, module) {
+	'use strict';
+	return {
+		execute: function () {
+
+			console.log(module.meta);
+
+		}
+	};
+});

test/form/samples/import-meta/_expected/umd.js

@@ -0,0 +1,8 @@
+(function (factory) {
+	typeof define === 'function' && define.amd ? define(factory) :
+	factory();
+}((function () { 'use strict';
+
+	console.log(({ url: (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('umd.js', document.baseURI).href)) }));
+
+})));

test/form/samples/import-meta/main.js

@@ -0,0 +1 @@
+console.log(import.meta);