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

fix(dynamic-import-vars): allow ./${var}.suffix.js #834

Merged
merged 1 commit into from
Jul 15, 2021
Merged

fix(dynamic-import-vars): allow ./${var}.suffix.js #834

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions packages/dynamic-import-vars/src/dynamic-import-to-glob.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,14 @@ export function dynamicImportToGlob(node, sourceString) {
);
}

if (glob.startsWith('./*.')) {
// Disallow ./*.ext
const ownDirectoryStarExtension = /^\.\/\*\.[\w]+$/;
if (ownDirectoryStarExtension.test(glob)) {
throw new VariableDynamicImportError(
`${`invalid import "${sourceString}". Variable imports cannot import their own directory, ` +
'place imports in a separate directory or make the import filename more specific. '}${example}`
`${
`invalid import "${sourceString}". Variable imports cannot import their own directory, ` +
'place imports in a separate directory or make the import filename more specific. '
}${example}`
);
}

Expand Down
9 changes: 9 additions & 0 deletions packages/dynamic-import-vars/test/src/dynamic-import-to-glob.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ test('template literal with variable filename', (t) => {
t.is(glob, './foo/*.js');
});

test('template literal with dot-prefixed suffix', (t) => {
const ast = CustomParser.parse('import(`./${bar}.entry.js`);', {
sourceType: 'module'
});

const glob = dynamicImportToGlob(ast.body[0].expression.arguments[0]);
t.is(glob, './*.entry.js');
});

test('template literal with variable directory', (t) => {
const ast = CustomParser.parse('import(`./foo/${bar}/x.js`);', {
sourceType: 'module'
Expand Down