Skip to content

Commit 1f0c682

Browse files
rwjblueGaurav0
authored andcommitted
Migrate to using babel-preset-env. (#627)
* Drop transpilation for IE. `last 2 versions` will target IE10 and IE11, which we don't support... * Migrate to using babel-preset-env. This will lead to less transpilation (e.g. we can use native async/await now, instead of transpiling).
1 parent d13b09f commit 1f0c682

File tree

5 files changed

+114
-3
lines changed

5 files changed

+114
-3
lines changed

app/services/ember-cli.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,16 @@ export default Ember.Service.extend({
511511
*/
512512
function babelOpts(moduleName) {
513513
return {
514-
presets: ['es2017'],
514+
presets: [['env', {
515+
targets: {
516+
browsers: [
517+
'last 2 chrome versions',
518+
'last 2 firefox versions',
519+
'last 2 safari versions',
520+
'last 2 edge versions'
521+
]
522+
}
523+
}]],
515524
moduleIds: true,
516525
moduleId: moduleName,
517526
plugins: [

config/targets.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
module.exports = {
44
browsers: [
5-
'last 2 versions'
5+
'last 2 chrome versions',
6+
'last 2 firefox versions',
7+
'last 2 safari versions',
8+
'last 2 edge versions'
69
]
710
};

ember-cli-build.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ module.exports = function(defaults) {
5757
},
5858
'babel-standalone': {
5959
import: ['babel.js']
60+
},
61+
'babel-preset-env-standalone': {
62+
import: ['babel-preset-env.js']
6063
}
6164
},
6265
sourcemaps: {
@@ -143,7 +146,7 @@ function buildQUnitTree(app) {
143146
const Rollup = require('broccoli-rollup');
144147
const path = require('path');
145148
const babelOpts = require('./lib/babel-opts');
146-
149+
147150
let preprocessJs = app.registry.registry.js[0].toTree;
148151

149152
let buildPreprocessedAddon = function(addonName) {

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"devDependencies": {
2020
"@ember/test-helpers": "~0.7.18",
2121
"babel-plugin-ember-modules-api-polyfill": "^2.3.0",
22+
"babel-preset-env-standalone": "^1.6.2",
2223
"babel-preset-es2017": "^6.24.1",
2324
"babel-standalone": "^6.26.0",
2425
"broccoli-asset-rev": "^2.4.5",

yarn.lock

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,13 @@ babel-plugin-debug-macros@^0.1.10, babel-plugin-debug-macros@^0.1.11:
722722
dependencies:
723723
semver "^5.3.0"
724724

725+
babel-plugin-dynamic-import-webpack@^1.0.1:
726+
version "1.0.2"
727+
resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-webpack/-/babel-plugin-dynamic-import-webpack-1.0.2.tgz#cb83435833e073f1600c0188a95edacfdc07c256"
728+
dependencies:
729+
babel-plugin-syntax-dynamic-import "^6.18.0"
730+
babel-template "^6.26.0"
731+
725732
babel-plugin-ember-modules-api-polyfill@^1.4.2:
726733
version "1.6.0"
727734
resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-1.6.0.tgz#abd1afa4237b3121cb51222f9bf3283cad8990aa"
@@ -796,6 +803,10 @@ babel-plugin-syntax-async-functions@^6.8.0:
796803
version "6.13.0"
797804
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
798805

806+
babel-plugin-syntax-dynamic-import@^6.18.0:
807+
version "6.18.0"
808+
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
809+
799810
babel-plugin-syntax-exponentiation-operator@^6.8.0:
800811
version "6.13.0"
801812
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
@@ -1019,6 +1030,75 @@ babel-polyfill@^6.26.0:
10191030
core-js "^2.5.0"
10201031
regenerator-runtime "^0.10.5"
10211032

1033+
babel-preset-env-standalone@^1.6.2:
1034+
version "1.6.2"
1035+
resolved "https://registry.yarnpkg.com/babel-preset-env-standalone/-/babel-preset-env-standalone-1.6.2.tgz#c3a386027c5215f7fb1790226c27de5b0eb98212"
1036+
dependencies:
1037+
babel-plugin-check-es2015-constants "^6.22.0"
1038+
babel-plugin-dynamic-import-webpack "^1.0.1"
1039+
babel-plugin-syntax-trailing-function-commas "^6.22.0"
1040+
babel-plugin-transform-async-to-generator "^6.22.0"
1041+
babel-plugin-transform-es2015-arrow-functions "^6.22.0"
1042+
babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
1043+
babel-plugin-transform-es2015-block-scoping "^6.23.0"
1044+
babel-plugin-transform-es2015-classes "^6.23.0"
1045+
babel-plugin-transform-es2015-computed-properties "^6.22.0"
1046+
babel-plugin-transform-es2015-destructuring "^6.23.0"
1047+
babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
1048+
babel-plugin-transform-es2015-for-of "^6.23.0"
1049+
babel-plugin-transform-es2015-function-name "^6.22.0"
1050+
babel-plugin-transform-es2015-literals "^6.22.0"
1051+
babel-plugin-transform-es2015-modules-amd "^6.22.0"
1052+
babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
1053+
babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
1054+
babel-plugin-transform-es2015-modules-umd "^6.23.0"
1055+
babel-plugin-transform-es2015-object-super "^6.22.0"
1056+
babel-plugin-transform-es2015-parameters "^6.23.0"
1057+
babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
1058+
babel-plugin-transform-es2015-spread "^6.22.0"
1059+
babel-plugin-transform-es2015-sticky-regex "^6.22.0"
1060+
babel-plugin-transform-es2015-template-literals "^6.22.0"
1061+
babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
1062+
babel-plugin-transform-es2015-unicode-regex "^6.22.0"
1063+
babel-plugin-transform-exponentiation-operator "^6.22.0"
1064+
babel-plugin-transform-regenerator "^6.22.0"
1065+
babel-preset-env "1.6.0"
1066+
1067+
1068+
version "1.6.0"
1069+
resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.0.tgz#2de1c782a780a0a5d605d199c957596da43c44e4"
1070+
dependencies:
1071+
babel-plugin-check-es2015-constants "^6.22.0"
1072+
babel-plugin-syntax-trailing-function-commas "^6.22.0"
1073+
babel-plugin-transform-async-to-generator "^6.22.0"
1074+
babel-plugin-transform-es2015-arrow-functions "^6.22.0"
1075+
babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
1076+
babel-plugin-transform-es2015-block-scoping "^6.23.0"
1077+
babel-plugin-transform-es2015-classes "^6.23.0"
1078+
babel-plugin-transform-es2015-computed-properties "^6.22.0"
1079+
babel-plugin-transform-es2015-destructuring "^6.23.0"
1080+
babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
1081+
babel-plugin-transform-es2015-for-of "^6.23.0"
1082+
babel-plugin-transform-es2015-function-name "^6.22.0"
1083+
babel-plugin-transform-es2015-literals "^6.22.0"
1084+
babel-plugin-transform-es2015-modules-amd "^6.22.0"
1085+
babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
1086+
babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
1087+
babel-plugin-transform-es2015-modules-umd "^6.23.0"
1088+
babel-plugin-transform-es2015-object-super "^6.22.0"
1089+
babel-plugin-transform-es2015-parameters "^6.23.0"
1090+
babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
1091+
babel-plugin-transform-es2015-spread "^6.22.0"
1092+
babel-plugin-transform-es2015-sticky-regex "^6.22.0"
1093+
babel-plugin-transform-es2015-template-literals "^6.22.0"
1094+
babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
1095+
babel-plugin-transform-es2015-unicode-regex "^6.22.0"
1096+
babel-plugin-transform-exponentiation-operator "^6.22.0"
1097+
babel-plugin-transform-regenerator "^6.22.0"
1098+
browserslist "^2.1.2"
1099+
invariant "^2.2.2"
1100+
semver "^5.3.0"
1101+
10221102
babel-preset-env@^1.7.0:
10231103
version "1.7.0"
10241104
resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
@@ -1905,6 +1985,13 @@ browserify@^16.2.0:
19051985
vm-browserify "^1.0.0"
19061986
xtend "^4.0.0"
19071987

1988+
browserslist@^2.1.2:
1989+
version "2.11.3"
1990+
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
1991+
dependencies:
1992+
caniuse-lite "^1.0.30000792"
1993+
electron-to-chromium "^1.3.30"
1994+
19081995
browserslist@^3.1.1, browserslist@^3.2.6:
19091996
version "3.2.8"
19101997
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6"
@@ -2036,6 +2123,10 @@ can-symlink@^1.0.0:
20362123
dependencies:
20372124
tmp "0.0.28"
20382125

2126+
caniuse-lite@^1.0.30000792:
2127+
version "1.0.30000856"
2128+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000856.tgz#ecc16978135a6f219b138991eb62009d25ee8daa"
2129+
20392130
caniuse-lite@^1.0.30000844:
20402131
version "1.0.30000850"
20412132
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000850.tgz#e68a88db4ea598b4c33b8419f7385473e4802495"
@@ -2895,6 +2986,10 @@ [email protected]:
28952986
version "1.1.1"
28962987
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
28972988

2989+
electron-to-chromium@^1.3.30:
2990+
version "1.3.50"
2991+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.50.tgz#7438b76f92b41b919f3fbdd350fbd0757dacddf7"
2992+
28982993
electron-to-chromium@^1.3.47:
28992994
version "1.3.48"
29002995
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz#d3b0d8593814044e092ece2108fc3ac9aea4b900"

0 commit comments

Comments
 (0)