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

Fix compatibility with [email protected]+ #362

Merged
merged 3 commits into from
Apr 16, 2021
+16 −7
Merged

Fix compatibility with [email protected]+ #362

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e381b47
Reproduce typescript import issues with [email protected]+.
rwjblue Mar 18, 2021
3d65928
Fix compatiblity with [email protected]+.
rwjblue Mar 18, 2021
8447a73
Merge branch 'master' into fix-with-new-babel
ef4 Mar 23, 2021
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
23 changes: 16 additions & 7 deletions packages/ember-auto-import/ts/package.ts
View file
Original file line number Diff line number Diff line change
@@ -127,17 +127,26 @@ export default class Package {
// is using. We will use these so we can configure our parser to
// match.
let babelAddon = instance.addons.find(addon => addon.name === 'ember-cli-babel') as any;
let babelOptions = babelAddon.buildBabelOptions(options);
let extensions = babelOptions.filterExtensions || ['js'];
let version = parseInt(babelAddon.pkg.version.split('.')[0], 10);
let babelOptions, extensions;

if (typeof babelAddon.getSupportedExtensions === 'function') {
babelOptions = babelAddon.buildBabelOptions('babel', options);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added this new signature so that I could make the default invocation without arguments (or options) passed return the broccoli-babel-transpiler style options.

extensions = babelAddon.getSupportedExtensions();
} else {
babelOptions = babelAddon.buildBabelOptions(options);
extensions = babelOptions.filterExtensions || ['js'];

// https://github.com/babel/ember-cli-babel/issues/227
delete babelOptions.annotation;
delete babelOptions.throwUnlessParallelizable;
delete babelOptions.filterExtensions;
}

// https://github.com/babel/ember-cli-babel/issues/227
delete babelOptions.annotation;
delete babelOptions.throwUnlessParallelizable;
delete babelOptions.filterExtensions;
if (babelOptions.plugins) {
babelOptions.plugins = babelOptions.plugins.filter((p: any) => !p._parallelBabel);
}
let version = parseInt(babelAddon.pkg.version.split('.')[0], 10);

return { babelOptions, extensions, version };
}