Skip to content

Commit 3697751

Browse files
author
Chris Garrett
committed
bump ember-cli-babel
1 parent b66e57e commit 3697751

File tree

5 files changed

+257
-25
lines changed

5 files changed

+257
-25
lines changed

lib/colocated-babel-plugin.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ module.exports = function (babel) {
2525
state._colocationEnsureImport = (exportName, moduleName) => {
2626
let addedImports = (allAddedImports[moduleName] = allAddedImports[moduleName] || {});
2727

28-
if (addedImports[exportName]) return addedImports[exportName];
28+
if (addedImports[exportName]) return t.identifier(addedImports[exportName].name);
2929

3030
let importDeclarations = path.get('body').filter((n) => n.type === 'ImportDeclaration');
3131

@@ -62,7 +62,7 @@ module.exports = function (babel) {
6262
path.unshiftContainer('body', newImport);
6363
}
6464

65-
return addedImports[exportName];
65+
return t.identifier(addedImports[exportName].name);
6666
};
6767
},
6868

lib/template-compiler-plugin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function rethrowBuildError(error) {
2424
}
2525

2626
class TemplateCompiler extends Filter {
27-
constructor(inputTree, _options, requiresModuleApiPolyfill) {
27+
constructor(inputTree, _options, requiresModuleApiPolyfill = true) {
2828
let options = _options || {};
2929

3030
if (!('persist' in options)) {

lib/utils.js

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -228,18 +228,9 @@ function setup(pluginInfo, options) {
228228
plugins: {
229229
ast: astPlugins,
230230
},
231-
};
232231

233-
for (let option in _options) {
234-
if (option === 'scope') {
235-
// The template compiler expects this option to be named `locals`, but
236-
// we want users to pass it in as `scope`. In the future, we should update
237-
// the template compiler to accept scope as well and remove this.
238-
options.locals = _options.scope;
239-
} else {
240-
options[option] = _options[option];
241-
}
242-
}
232+
..._options,
233+
};
243234

244235
return templatePrecompile(template, options);
245236
};

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
},
3434
"dependencies": {
3535
"@ember/edition-utils": "^1.2.0",
36-
"babel-plugin-htmlbars-inline-precompile": "^4.4.6",
36+
"babel-plugin-htmlbars-inline-precompile": "^5.0.0",
3737
"broccoli-debug": "^0.6.5",
3838
"broccoli-persistent-filter": "^3.1.2",
3939
"broccoli-plugin": "^4.0.3",
@@ -67,7 +67,7 @@
6767
"core-object": "^3.1.5",
6868
"ember-cli": "~3.25.2",
6969
"ember-cli-app-version": "^4.0.0",
70-
"ember-cli-babel": "^7.23.1",
70+
"ember-cli-babel": "^7.25.0",
7171
"ember-cli-dependency-checker": "^3.2.0",
7272
"ember-cli-inject-live-reload": "^2.0.2",
7373
"ember-compatibility-helpers": "^1.2.2",

0 commit comments

Comments
 (0)