Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always make "module" available for SystemJS and AMD formats if import.meta is accessed directly #3282

Merged
merged 1 commit into from Dec 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 8 additions & 9 deletions src/ast/nodes/MetaProperty.ts
Expand Up @@ -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);
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions test/form/samples/import-meta/_config.js
@@ -0,0 +1,3 @@
module.exports = {
description: 'supports directly accessing import.meta'
};
5 changes: 5 additions & 0 deletions 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 }));

});
3 changes: 3 additions & 0 deletions 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)) }));
1 change: 1 addition & 0 deletions test/form/samples/import-meta/_expected/es.js
@@ -0,0 +1 @@
console.log(import.meta);
6 changes: 6 additions & 0 deletions 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) }));

}());
10 changes: 10 additions & 0 deletions 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);

}
};
});
8 changes: 8 additions & 0 deletions 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)) }));

})));
1 change: 1 addition & 0 deletions test/form/samples/import-meta/main.js
@@ -0,0 +1 @@
console.log(import.meta);
3 changes: 0 additions & 3 deletions test/form/samples/resolve-import-meta-url-export/resolved.js

This file was deleted.

This file was deleted.