Skip to content

Commit

Permalink
Update to Babel 7 beta
Browse files Browse the repository at this point in the history
  • Loading branch information
@t-sauer @rwjblue
t-sauer authored and rwjblue committed Nov 5, 2017
1 parent 3fd54ca commit e99a294
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 47 deletions.
9 changes: 3 additions & 6 deletions index.js
View file
Expand Up @@ -113,11 +113,9 @@ module.exports = {
if (!targets) { return true; }

const isPluginRequired = require('babel-preset-env').isPluginRequired;
const getTargets = require('babel-preset-env/lib/targets-parser').default;
const pluginList = require('babel-preset-env/data/plugins');

let parsedTargets = getTargets(targets);
return isPluginRequired(parsedTargets, pluginList[pluginName]);
return isPluginRequired(targets, pluginList[pluginName]);
},

_getAddonOptions: function() {
Expand Down Expand Up @@ -254,8 +252,7 @@ module.exports = {
_getPresetEnvPlugins(config) {
let options = config.options;

let targets = this._getTargets();
let browsers = targets && targets.browsers;
let targets = this.project && this.project.targets;
let presetOptions = Object.assign({}, options, {
modules: false,
targets
Expand All @@ -278,7 +275,7 @@ module.exports = {
},

_getTargets() {
let targets = this.project && this.project.targets && this.project.targets;
let targets = this.project && this.project.targets;

let parser = require('babel-preset-env/lib/targets-parser').default;
if (typeof targets === 'object' && targets !== null) {
Expand Down
16 changes: 8 additions & 8 deletions node-tests/addon-test.js
View file
Expand Up @@ -90,7 +90,7 @@ describe('ember-cli-babel', function() {
expect(
output.read()
).to.deep.equal({
"foo.js": `define('foo', ['@ember/component'], function (_component) {\n 'use strict';\n});`
"foo.js": `define("foo", ["@ember/component"], function (_component) {\n "use strict";\n});`
});
}));

Expand All @@ -108,8 +108,8 @@ describe('ember-cli-babel', function() {
expect(
output.read()
).to.deep.equal({
"foo.js": `define('foo', [], function () {\n 'use strict';\n\n var Component = Ember.Component;\n});`,
"app.js": `define('app', [], function () {\n 'use strict';\n\n var Application = Ember.Application;\n});`
"foo.js": `define("foo", [], function () {\n "use strict";\n\n var Component = Ember.Component;\n});`,
"app.js": `define("app", [], function () {\n "use strict";\n\n var Application = Ember.Application;\n});`
});
}));

Expand Down Expand Up @@ -181,7 +181,7 @@ describe('ember-cli-babel', function() {
expect(
output.read()
).to.deep.equal({
"foo.js": `define('foo', ['@glimmer/env'], function (_env) {\n 'use strict';\n\n if (_env.DEBUG) {\n console.log('debug mode!');\n }\n});`
"foo.js": `define("foo", ["@glimmer/env"], function (_env) {\n "use strict";\n\n if (_env.DEBUG) {\n console.log('debug mode!');\n }\n});`
});
}));

Expand All @@ -204,7 +204,7 @@ describe('ember-cli-babel', function() {
expect(
output.read()
).to.deep.equal({
"foo.js": `define('foo', [], function () {\n 'use strict';\n\n if (true) {\n console.log('debug mode!');\n }\n});`
"foo.js": `define("foo", [], function () {\n "use strict";\n\n if (true) {\n console.log('debug mode!');\n }\n});`
});
}));

Expand All @@ -226,7 +226,7 @@ describe('ember-cli-babel', function() {
expect(
output.read()
).to.deep.equal({
"foo.js": `define('foo', [], function () {\n 'use strict';\n\n (true && !(isNotBad()) && Ember.assert('stuff here', isNotBad()));\n});`
"foo.js": `define("foo", [], function () {\n "use strict";\n\n (true && !(isNotBad()) && Ember.assert('stuff here', isNotBad()));\n});`
});
}));
});
Expand All @@ -250,7 +250,7 @@ describe('ember-cli-babel', function() {
expect(
output.read()
).to.deep.equal({
"foo.js": `define('foo', [], function () {\n 'use strict';\n\n if (false) {\n console.log('debug mode!');\n }\n});`
"foo.js": `define("foo", [], function () {\n "use strict";\n\n if (false) {\n console.log('debug mode!');\n }\n});`
});
}));

Expand All @@ -272,7 +272,7 @@ describe('ember-cli-babel', function() {
expect(
output.read()
).to.deep.equal({
"foo.js": `define('foo', [], function () {\n 'use strict';\n\n (false && !(isNotBad()) && Ember.assert('stuff here', isNotBad()));\n});`
"foo.js": `define("foo", [], function () {\n "use strict";\n\n (false && !(isNotBad()) && Ember.assert('stuff here', isNotBad()));\n});`
});
}));
});
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Expand Up @@ -38,10 +38,10 @@
"amd-name-resolver": "0.0.7",
"babel-plugin-debug-macros": "^0.1.11",
"babel-plugin-ember-modules-api-polyfill": "^2.0.1",
"babel-plugin-transform-es2015-modules-amd": "^6.24.0",
"babel-polyfill": "^6.16.0",
"babel-preset-env": "^2.0.0-alpha.7",
"broccoli-babel-transpiler": "7.0.0-alpha.1",
"babel-plugin-transform-es2015-modules-amd": "^7.0.0-beta.0",
"babel-polyfill": "^7.0.0-beta.0",
"babel-preset-env": "^2.0.0-beta.0",
"broccoli-babel-transpiler": "^7.0.0-beta.1",
"broccoli-debug": "^0.6.2",
"broccoli-funnel": "^1.0.0",
"broccoli-source": "^1.1.0",
Expand Down
82 changes: 53 additions & 29 deletions yarn.lock
View file
Expand Up @@ -402,7 +402,7 @@ babel-core@^6.14.0, babel-core@^6.24.1:
slash "^1.0.0"
source-map "^0.5.0"

babel-core@^7.0.0-alpha.9:
babel-core@^7.0.0-beta.0:
version "7.0.0-beta.3"
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-beta.3.tgz#3777e45c802e7f6c13c5c3a01c618a388fb0e252"
dependencies:
Expand Down Expand Up @@ -574,6 +574,13 @@ babel-helper-hoist-variables@^6.24.1:
babel-runtime "^6.22.0"
babel-types "^6.24.1"

babel-helper-module-imports@7.0.0-beta.3:
version "7.0.0-beta.3"
resolved "https://registry.yarnpkg.com/babel-helper-module-imports/-/babel-helper-module-imports-7.0.0-beta.3.tgz#e15764e3af9c8e11810c09f78f498a2bdc71585a"
dependencies:
babel-types "7.0.0-beta.3"
lodash "^4.2.0"

babel-helper-module-transforms@7.0.0-beta.2:
version "7.0.0-beta.2"
resolved "https://registry.yarnpkg.com/babel-helper-module-transforms/-/babel-helper-module-transforms-7.0.0-beta.2.tgz#35ea803c290ef91deb12eab79c01dc6317ac8d1a"
Expand All @@ -582,6 +589,16 @@ babel-helper-module-transforms@7.0.0-beta.2:
babel-types "7.0.0-beta.2"
lodash "^4.2.0"

babel-helper-module-transforms@7.0.0-beta.3:
version "7.0.0-beta.3"
resolved "https://registry.yarnpkg.com/babel-helper-module-transforms/-/babel-helper-module-transforms-7.0.0-beta.3.tgz#42ccfa323e2d3aaaf0f743e66c2e7a292dc064f7"
dependencies:
babel-helper-module-imports "7.0.0-beta.3"
babel-helper-simple-access "7.0.0-beta.3"
babel-template "7.0.0-beta.3"
babel-types "7.0.0-beta.3"
lodash "^4.2.0"

babel-helper-optimise-call-expression@7.0.0-beta.2:
version "7.0.0-beta.2"
resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-7.0.0-beta.2.tgz#486b19aedcf62aba892f3599b2c5393cc711c814"
Expand Down Expand Up @@ -657,6 +674,14 @@ babel-helper-replace-supers@^6.24.1:
babel-traverse "^6.24.1"
babel-types "^6.24.1"

babel-helper-simple-access@7.0.0-beta.3:
version "7.0.0-beta.3"
resolved "https://registry.yarnpkg.com/babel-helper-simple-access/-/babel-helper-simple-access-7.0.0-beta.3.tgz#dee94c31289fca79076f7ced2d751a06e430756c"
dependencies:
babel-template "7.0.0-beta.3"
babel-types "7.0.0-beta.3"
lodash "^4.2.0"

babel-helper-wrap-function@7.0.0-beta.2:
version "7.0.0-beta.2"
resolved "https://registry.yarnpkg.com/babel-helper-wrap-function/-/babel-helper-wrap-function-7.0.0-beta.2.tgz#255b31b11a9e312836cdc30ad99a8133c141a696"
Expand Down Expand Up @@ -946,6 +971,13 @@ babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015
babel-runtime "^6.22.0"
babel-template "^6.24.1"

babel-plugin-transform-es2015-modules-amd@^7.0.0-beta.0:
version "7.0.0-beta.3"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-7.0.0-beta.3.tgz#ae2e560f707bde99fb9c919380cab16e5a968948"
dependencies:
babel-helper-module-transforms "7.0.0-beta.3"
babel-template "7.0.0-beta.3"

babel-plugin-transform-es2015-modules-commonjs@7.0.0-beta.2:
version "7.0.0-beta.2"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-7.0.0-beta.2.tgz#2e9ecbadadeaf40bb19109baee586aac9a97aed4"
Expand Down Expand Up @@ -1164,6 +1196,13 @@ babel-polyfill@^6.16.0:
core-js "^2.4.0"
regenerator-runtime "^0.10.0"

babel-polyfill@^7.0.0-beta.0:
version "7.0.0-beta.3"
resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-7.0.0-beta.3.tgz#053f0943cdf498910cc037de2ffc7b1f2e36223a"
dependencies:
core-js "^2.4.0"
regenerator-runtime "^0.11.0"

babel-preset-env@^1.5.1:
version "1.6.0"
resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.0.tgz#2de1c782a780a0a5d605d199c957596da43c44e4"
Expand Down Expand Up @@ -1199,7 +1238,7 @@ babel-preset-env@^1.5.1:
invariant "^2.2.2"
semver "^5.3.0"

babel-preset-env@^2.0.0-alpha.7:
babel-preset-env@^2.0.0-beta.0:
version "2.0.0-beta.2"
resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-2.0.0-beta.2.tgz#2ec7b9d7c3ede4008f830c194e75cc22a6b86b8e"
dependencies:
Expand Down Expand Up @@ -1496,23 +1535,26 @@ braces@^1.8.2:
preserve "^0.2.0"
repeat-element "^1.1.2"

broccoli-babel-transpiler@7.0.0-alpha.1:
version "7.0.0-alpha.1"
resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.0.0-alpha.1.tgz#8b0ce6c7841328bc1c096be07a0b649f15f1588f"
broccoli-babel-transpiler@^6.0.0:
version "6.1.1"
resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.1.1.tgz#938f470e1ddb47047a77ef5e38f34c21de0e85a8"
dependencies:
babel-core "^7.0.0-alpha.9"
babel-core "^6.14.0"
broccoli-funnel "^1.0.0"
broccoli-merge-trees "^1.0.0"
broccoli-persistent-filter "^1.0.1"
broccoli-persistent-filter "^1.4.0"
clone "^2.0.0"
hash-for-dep "^1.0.2"
heimdalljs-logger "^0.1.7"
json-stable-stringify "^1.0.0"
rsvp "^3.5.0"
workerpool "^2.2.1"

broccoli-babel-transpiler@^6.0.0:
version "6.1.1"
resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.1.1.tgz#938f470e1ddb47047a77ef5e38f34c21de0e85a8"
broccoli-babel-transpiler@^7.0.0-beta.1:
version "7.0.0-beta.1"
resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.0.0-beta.1.tgz#6d52775a60c46e13d3578eaa2b5803279a8ca394"
dependencies:
babel-core "^6.14.0"
babel-core "^7.0.0-beta.0"
broccoli-funnel "^1.0.0"
broccoli-merge-trees "^1.0.0"
broccoli-persistent-filter "^1.4.0"
Expand Down Expand Up @@ -1677,24 +1719,6 @@ broccoli-node-info@1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-1.1.0.tgz#3aa2e31e07e5bdb516dd25214f7c45ba1c459412"

broccoli-persistent-filter@^1.0.1:
version "1.4.3"
resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.3.tgz#3511bc52fc53740cda51621f58a28152d9911bc1"
dependencies:
async-disk-cache "^1.2.1"
async-promise-queue "^1.0.3"
broccoli-plugin "^1.0.0"
fs-tree-diff "^0.5.2"
hash-for-dep "^1.0.2"
heimdalljs "^0.2.1"
heimdalljs-logger "^0.1.7"
mkdirp "^0.5.1"
promise-map-series "^0.2.1"
rimraf "^2.6.1"
rsvp "^3.0.18"
symlink-or-copy "^1.0.1"
walk-sync "^0.3.1"

broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0, broccoli-persistent-filter@^1.4.0:
version "1.4.2"
resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.2.tgz#17af1278a25ff2556f9d7d23e115accfad3a7ce7"
Expand Down

0 comments on commit e99a294

Please sign in to comment.