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.

Sign up for GitHub

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

Jump to bottom

Only overwrite content when resolving import.meta properties #2986

Merged
merged 1 commit into from Jul 9, 2019
Merged

Only overwrite content when resolving import.meta properties #2986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/ast/nodes/MetaProperty.ts
View file
Open in desktop
Expand Up @@ -100,7 +100,8 @@ export default class MetaProperty extends NodeBase {
code.overwrite(
(parent as MemberExpression).start,
(parent as MemberExpression).end,
replacement
replacement,
{ contentOnly: true }
);
return;
}
Expand All @@ -115,9 +116,9 @@ export default class MetaProperty extends NodeBase {
]);
if (typeof replacement === 'string') {
if (parent instanceof MemberExpression) {
code.overwrite(parent.start, parent.end, replacement);
code.overwrite(parent.start, parent.end, replacement, { contentOnly: true });
} else {
code.overwrite(this.start, this.end, replacement);
code.overwrite(this.start, this.end, replacement, { contentOnly: true });
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/ast/nodes/VariableDeclaration.ts
View file
Open in desktop
Expand Up @@ -89,7 +89,7 @@ export default class VariableDeclaration extends NodeBase {
private renderDeclarationEnd(
code: MagicString,
separatorString: string,
lastSeparatorPos: number,
lastSeparatorPos: number | null,
actualContentEnd: number,
renderedContentEnd: number,
addSemicolon: boolean,
Expand Down
4 changes: 2 additions & 2 deletions test/chunking-form/samples/configure-file-url/_expected/amd/nested/chunk2.js
View file
Open in desktop
@@ -1,7 +1,7 @@
define(['require', 'exports'], function (require, exports) { 'use strict';

const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=amd:relativePath=../assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null'
const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=amd:relativePath=chunk.js:assetReferenceId=null:chunkReferenceId=f6c25ae7'
const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=amd:relativePath=../assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null';
const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=amd:relativePath=chunk.js:assetReferenceId=null:chunkReferenceId=f6c25ae7';

exports.asset = asset;
exports.chunk = chunk;
Expand Down
4 changes: 2 additions & 2 deletions test/chunking-form/samples/configure-file-url/_expected/cjs/nested/chunk2.js
View file
Open in desktop
@@ -1,7 +1,7 @@
'use strict';

const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=cjs:relativePath=../assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null'
const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=cjs:relativePath=chunk.js:assetReferenceId=null:chunkReferenceId=f6c25ae7'
const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=cjs:relativePath=../assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null';
const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=cjs:relativePath=chunk.js:assetReferenceId=null:chunkReferenceId=f6c25ae7';

exports.asset = asset;
exports.chunk = chunk;
4 changes: 2 additions & 2 deletions test/chunking-form/samples/configure-file-url/_expected/es/nested/chunk2.js
View file
Open in desktop
@@ -1,4 +1,4 @@
const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=es:relativePath=../assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null'
const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=es:relativePath=chunk.js:assetReferenceId=null:chunkReferenceId=f6c25ae7'
const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=es:relativePath=../assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null';
const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=es:relativePath=chunk.js:assetReferenceId=null:chunkReferenceId=f6c25ae7';

export { asset, chunk };
4 changes: 2 additions & 2 deletions test/chunking-form/samples/configure-file-url/_expected/system/nested/chunk2.js
View file
Open in desktop
Expand Up @@ -3,8 +3,8 @@ System.register([], function (exports, module) {
return {
execute: function () {

const asset = exports('asset', 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=system:relativePath=../assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null'
const chunk = exports('chunk', 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=system:relativePath=chunk.js:assetReferenceId=null:chunkReferenceId=f6c25ae7'
const asset = exports('asset', 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=system:relativePath=../assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null');
const chunk = exports('chunk', 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=system:relativePath=chunk.js:assetReferenceId=null:chunkReferenceId=f6c25ae7');

}
};
Expand Down
11 changes: 0 additions & 11 deletions test/form/samples/configure-import-meta-url/_expected/es.js
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions test/form/samples/resolve-import-meta-url-export/_config.js
View file
Open in desktop
@@ -0,0 +1,13 @@
module.exports = {
description: 'correctly exports resolved import.meta.url',
options: {
plugins: [
{
resolveImportMeta(prop) {
return prop ? "'url'" : "'meta'";
}
}
],
output: { name: 'bundle' }
}
};
11 changes: 11 additions & 0 deletions test/form/samples/resolve-import-meta-url-export/_expected/amd.js
View file
Open in desktop
@@ -0,0 +1,11 @@
define(['module', 'exports'], function (module, exports) { 'use strict';

const url = 'url';
const meta = 'meta';

exports.meta = meta;
exports.url = url;

Object.defineProperty(exports, '__esModule', { value: true });

});
9 changes: 9 additions & 0 deletions test/form/samples/resolve-import-meta-url-export/_expected/cjs.js
View file
Open in desktop
@@ -0,0 +1,9 @@
'use strict';

Object.defineProperty(exports, '__esModule', { value: true });

const url = 'url';
const meta = 'meta';

exports.meta = meta;
exports.url = url;
4 changes: 4 additions & 0 deletions test/form/samples/resolve-import-meta-url-export/_expected/es.js
View file
Open in desktop
@@ -0,0 +1,4 @@
const url = 'url';
const meta = 'meta';

export { meta, url };
12 changes: 12 additions & 0 deletions test/form/samples/resolve-import-meta-url-export/_expected/iife.js
View file
Open in desktop
@@ -0,0 +1,12 @@
var bundle = (function (exports) {
'use strict';

const url = 'url';
const meta = 'meta';

exports.meta = meta;
exports.url = url;

return exports;

}({}));
11 changes: 11 additions & 0 deletions test/form/samples/resolve-import-meta-url-export/_expected/system.js
View file
Open in desktop
@@ -0,0 +1,11 @@
System.register('bundle', [], function (exports, module) {
'use strict';
return {
execute: function () {

const url = exports('url', 'url');
const meta = exports('meta', 'meta');

}
};
});
15 changes: 15 additions & 0 deletions test/form/samples/resolve-import-meta-url-export/_expected/umd.js
View file
Open in desktop
@@ -0,0 +1,15 @@
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
typeof define === 'function' && define.amd ? define(['exports'], factory) :
(global = global || self, factory(global.bundle = {}));
}(this, function (exports) { 'use strict';

const url = 'url';
const meta = 'meta';

exports.meta = meta;
exports.url = url;

Object.defineProperty(exports, '__esModule', { value: true });

}));
2 changes: 2 additions & 0 deletions test/form/samples/resolve-import-meta-url-export/main.js
View file
Open in desktop
@@ -0,0 +1,2 @@
export const url = import.meta.url;
export const meta = import.meta;
0 ...les/configure-import-meta-url/resolved.js → ...esolve-import-meta-url-export/resolved.js
View file
Open in desktop
File renamed without changes.
0 ...s/configure-import-meta-url/unresolved.js → ...olve-import-meta-url-export/unresolved.js
View file
Open in desktop
File renamed without changes.
0 ...ples/configure-import-meta-url/_config.js → ...amples/resolve-import-meta-url/_config.js
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...onfigure-import-meta-url/_expected/amd.js → .../resolve-import-meta-url/_expected/amd.js
View file
Open in desktop
Expand Up @@ -8,8 +8,8 @@ define(['module'], function (module) { 'use strict';
console.log(undefined);
console.log(({ url: new URL(module.uri, document.baseURI).href }));

console.log('url=amd.js:configure-import-meta-url/main.js');
console.log('privateProp=amd.js:configure-import-meta-url/main.js');
console.log('null=amd.js:configure-import-meta-url/main.js');
console.log('url=amd.js:resolve-import-meta-url/main.js');
console.log('privateProp=amd.js:resolve-import-meta-url/main.js');
console.log('null=amd.js:resolve-import-meta-url/main.js');

});
6 changes: 3 additions & 3 deletions ...onfigure-import-meta-url/_expected/cjs.js → .../resolve-import-meta-url/_expected/cjs.js
View file
Open in desktop
Expand Up @@ -8,6 +8,6 @@ console.log((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('fi
console.log(undefined);
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)) }));

console.log('url=cjs.js:configure-import-meta-url/main.js');
console.log('privateProp=cjs.js:configure-import-meta-url/main.js');
console.log('null=cjs.js:configure-import-meta-url/main.js');
console.log('url=cjs.js:resolve-import-meta-url/main.js');
console.log('privateProp=cjs.js:resolve-import-meta-url/main.js');
console.log('null=cjs.js:resolve-import-meta-url/main.js');
11 changes: 11 additions & 0 deletions test/form/samples/resolve-import-meta-url/_expected/es.js
View file
Open in desktop
@@ -0,0 +1,11 @@
console.log('resolved');
console.log('resolved');
console.log('resolved');

console.log(import.meta.url);
console.log(import.meta.privateProp);
console.log(import.meta);

console.log('url=es.js:resolve-import-meta-url/main.js');
console.log('privateProp=es.js:resolve-import-meta-url/main.js');
console.log('null=es.js:resolve-import-meta-url/main.js');
6 changes: 3 additions & 3 deletions ...nfigure-import-meta-url/_expected/iife.js → ...resolve-import-meta-url/_expected/iife.js
View file
Open in desktop
Expand Up @@ -9,8 +9,8 @@
console.log(undefined);
console.log(({ url: (document.currentScript && document.currentScript.src || new URL('iife.js', document.baseURI).href) }));

console.log('url=iife.js:configure-import-meta-url/main.js');
console.log('privateProp=iife.js:configure-import-meta-url/main.js');
console.log('null=iife.js:configure-import-meta-url/main.js');
console.log('url=iife.js:resolve-import-meta-url/main.js');
console.log('privateProp=iife.js:resolve-import-meta-url/main.js');
console.log('null=iife.js:resolve-import-meta-url/main.js');

}());
6 changes: 3 additions & 3 deletions ...igure-import-meta-url/_expected/system.js → ...solve-import-meta-url/_expected/system.js
View file
Open in desktop
Expand Up @@ -11,9 +11,9 @@ System.register([], function (exports, module) {
console.log(module.meta.privateProp);
console.log(module.meta);

console.log('url=system.js:configure-import-meta-url/main.js');
console.log('privateProp=system.js:configure-import-meta-url/main.js');
console.log('null=system.js:configure-import-meta-url/main.js');
console.log('url=system.js:resolve-import-meta-url/main.js');
console.log('privateProp=system.js:resolve-import-meta-url/main.js');
console.log('null=system.js:resolve-import-meta-url/main.js');

}
};
Expand Down
6 changes: 3 additions & 3 deletions ...onfigure-import-meta-url/_expected/umd.js → .../resolve-import-meta-url/_expected/umd.js
View file
Open in desktop
Expand Up @@ -11,8 +11,8 @@
console.log(undefined);
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)) }));

console.log('url=umd.js:configure-import-meta-url/main.js');
console.log('privateProp=umd.js:configure-import-meta-url/main.js');
console.log('null=umd.js:configure-import-meta-url/main.js');
console.log('url=umd.js:resolve-import-meta-url/main.js');
console.log('privateProp=umd.js:resolve-import-meta-url/main.js');
console.log('null=umd.js:resolve-import-meta-url/main.js');

}));
0 ...samples/configure-import-meta-url/main.js → ...m/samples/resolve-import-meta-url/main.js
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions test/form/samples/resolve-import-meta-url/resolved.js
View file
Open in desktop
@@ -0,0 +1,3 @@
console.log(import.meta.url);
console.log(import.meta.privateProp);
console.log(import.meta);
3 changes: 3 additions & 0 deletions test/form/samples/resolve-import-meta-url/unresolved.js
View file
Open in desktop
@@ -0,0 +1,3 @@
console.log(import.meta.url);
console.log(import.meta.privateProp);
console.log(import.meta);