Skip to content

Commit 1926fc2

Browse files
committed
Update to Babel 6
1 parent 18e3f5d commit 1926fc2

File tree

4 files changed

+60
-22
lines changed

4 files changed

+60
-22
lines changed

config/targets.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/* eslint-env node */
2+
module.exports = {
3+
browsers: [
4+
'ie 9',
5+
'last 1 Chrome versions',
6+
'last 1 Firefox versions',
7+
'last 1 Safari versions'
8+
]
9+
};

ember-cli-build.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ const EmberApp = require('ember-cli/lib/broccoli/ember-app');
44

55
module.exports = function(defaults) {
66
var app = new EmberApp(defaults, {
7-
// Add options here
7+
babel6: {
8+
plugins: ['transform-object-rest-spread'],
9+
},
810
});
911

1012
// Use `app.import` to add additional libraries to the generated

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,16 @@
2222
"author": "",
2323
"license": "MIT",
2424
"devDependencies": {
25+
"babel-plugin-transform-object-rest-spread": "^6.23.0",
2526
"bower": "1.8.0",
2627
"broccoli-asset-rev": "2.5.0",
2728
"ember-ajax": "^3.0.0",
2829
"ember-cli": "2.12.0",
2930
"ember-cli-app-version": "^3.0.0",
30-
"ember-cli-babel": "5.2.4",
31+
"ember-cli-babel": "^6.4.1",
3132
"ember-cli-dependency-checker": "^2.0.0",
32-
"ember-cli-htmlbars": "1.2.0",
33-
"ember-cli-htmlbars-inline-precompile": "0.3.6",
33+
"ember-cli-htmlbars": "^2.0.2",
34+
"ember-cli-htmlbars-inline-precompile": "^0.4.3",
3435
"ember-cli-ic-ajax": "1.0.0",
3536
"ember-cli-inject-live-reload": "1.6.1",
3637
"ember-cli-jshint": "2.0.1",

yarn.lock

Lines changed: 44 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -459,9 +459,9 @@ babel-plugin-filter-imports@^0.2.0:
459459
dependencies:
460460
json-stable-stringify "^1.0.1"
461461

462-
babel-plugin-htmlbars-inline-precompile@^0.1.0:
463-
version "0.1.0"
464-
resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-0.1.0.tgz#b784723bd1f108796b56faf9f1c05eb5ca442983"
462+
babel-plugin-htmlbars-inline-precompile@^0.2.3:
463+
version "0.2.3"
464+
resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-0.2.3.tgz#cd365e278af409bfa6be7704c4354beee742446b"
465465

466466
babel-plugin-inline-environment-variables@^1.0.1:
467467
version "1.0.1"
@@ -513,6 +513,10 @@ babel-plugin-syntax-exponentiation-operator@^6.8.0:
513513
version "6.13.0"
514514
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
515515

516+
babel-plugin-syntax-object-rest-spread@^6.8.0:
517+
version "6.13.0"
518+
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
519+
516520
babel-plugin-syntax-trailing-function-commas@^6.22.0:
517521
version "6.22.0"
518522
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
@@ -701,6 +705,13 @@ babel-plugin-transform-exponentiation-operator@^6.22.0:
701705
babel-plugin-syntax-exponentiation-operator "^6.8.0"
702706
babel-runtime "^6.22.0"
703707

708+
babel-plugin-transform-object-rest-spread@^6.23.0:
709+
version "6.23.0"
710+
resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz#875d6bc9be761c58a2ae3feee5dc4895d8c7f921"
711+
dependencies:
712+
babel-plugin-syntax-object-rest-spread "^6.8.0"
713+
babel-runtime "^6.22.0"
714+
704715
babel-plugin-transform-regenerator@^6.22.0:
705716
version "6.24.1"
706717
resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz#b8da305ad43c3c99b4848e4fe4037b770d23c418"
@@ -831,14 +842,10 @@ babylon@^5.8.38:
831842
version "5.8.38"
832843
resolved "https://registry.yarnpkg.com/babylon/-/babylon-5.8.38.tgz#ec9b120b11bf6ccd4173a18bf217e60b79859ffd"
833844

834-
babylon@^6.17.2:
845+
babylon@^6.17.2, babylon@^6.8.1:
835846
version "6.17.3"
836847
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.3.tgz#1327d709950b558f204e5352587fd0290f8d8e48"
837848

838-
babylon@^6.8.1:
839-
version "6.14.1"
840-
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.14.1.tgz#956275fab72753ad9b3435d7afe58f8bf0a29815"
841-
842849
backbone@^1.1.2:
843850
version "1.3.3"
844851
resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.3.3.tgz#4cc80ea7cb1631ac474889ce40f2f8bc683b2999"
@@ -1942,7 +1949,7 @@ ember-cli-app-version@^3.0.0:
19421949
ember-cli-htmlbars "^1.0.0"
19431950
git-repo-version "0.4.1"
19441951

1945-
ember-cli-babel@5.2.4, ember-cli-babel@^5.1.3, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7, ember-cli-babel@^5.1.9:
1952+
ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7, ember-cli-babel@^5.1.9:
19461953
version "5.2.4"
19471954
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.4.tgz#5ce4f46b08ed6f6d21e878619fb689719d6e8e13"
19481955
dependencies:
@@ -1952,7 +1959,7 @@ [email protected], ember-cli-babel@^5.1.3, ember-cli-babel@^5.1.5, ember-cli
19521959
ember-cli-version-checker "^1.0.2"
19531960
resolve "^1.1.2"
19541961

1955-
ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.7:
1962+
ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.4.1:
19561963
version "6.4.1"
19571964
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.4.1.tgz#785a1c24fe3250eb0776b1ab3cee857863b44542"
19581965
dependencies:
@@ -2014,16 +2021,16 @@ ember-cli-head@^0.1.2:
20142021
ember-cli-version-checker "^1.1.6"
20152022
fastboot-filter-initializers "0.0.1"
20162023

2017-
ember-cli-htmlbars-inline-precompile@0.3.6:
2018-
version "0.3.6"
2019-
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-0.3.6.tgz#4095fe423f93102724c0725e4dd1a31f25e24de5"
2024+
ember-cli-htmlbars-inline-precompile@^0.4.3:
2025+
version "0.4.3"
2026+
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-0.4.3.tgz#4123f507fea6c59ba4c272ef7e713a6d55ba06c9"
20202027
dependencies:
2021-
babel-plugin-htmlbars-inline-precompile "^0.1.0"
2022-
ember-cli-babel "^5.1.3"
2023-
ember-cli-htmlbars "^1.0.0"
2028+
babel-plugin-htmlbars-inline-precompile "^0.2.3"
2029+
ember-cli-version-checker "^2.0.0"
20242030
hash-for-dep "^1.0.2"
2031+
silent-error "^1.1.0"
20252032

2026-
ember-cli-htmlbars@1.2.0, ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1, ember-cli-htmlbars@^1.0.10, ember-cli-htmlbars@^1.1.0, ember-cli-htmlbars@^1.1.1:
2033+
ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1, ember-cli-htmlbars@^1.0.10, ember-cli-htmlbars@^1.1.0, ember-cli-htmlbars@^1.1.1:
20272034
version "1.2.0"
20282035
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.2.0.tgz#327e1a5dda1c85c6fcf8be888f7894b32c3f393b"
20292036
dependencies:
@@ -2033,6 +2040,15 @@ [email protected], ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1,
20332040
json-stable-stringify "^1.0.0"
20342041
strip-bom "^2.0.0"
20352042

2043+
ember-cli-htmlbars@^2.0.2:
2044+
version "2.0.2"
2045+
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-2.0.2.tgz#230a9ace7c3454b3acff2768a50f963813a90c38"
2046+
dependencies:
2047+
broccoli-persistent-filter "^1.0.3"
2048+
hash-for-dep "^1.0.2"
2049+
json-stable-stringify "^1.0.0"
2050+
strip-bom "^3.0.0"
2051+
20362052
20372053
version "1.0.0"
20382054
resolved "https://registry.yarnpkg.com/ember-cli-ic-ajax/-/ember-cli-ic-ajax-1.0.0.tgz#359e885316924e3db8bedf07d77803dd39b26491"
@@ -5147,12 +5163,18 @@ signal-exit@^3.0.0:
51475163
version "3.0.2"
51485164
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
51495165

5150-
silent-error@^1.0.0, silent-error@^1.0.1:
5166+
silent-error@^1.0.0:
51515167
version "1.0.1"
51525168
resolved "https://registry.yarnpkg.com/silent-error/-/silent-error-1.0.1.tgz#71b7d503d1c6f94882b51b56be879b113cb4822c"
51535169
dependencies:
51545170
debug "^2.2.0"
51555171

5172+
silent-error@^1.0.1, silent-error@^1.1.0:
5173+
version "1.1.0"
5174+
resolved "https://registry.yarnpkg.com/silent-error/-/silent-error-1.1.0.tgz#2209706f1c850a9f1d10d0d840918b46f26e1bc9"
5175+
dependencies:
5176+
debug "^2.2.0"
5177+
51565178
simple-dom@^0.3.0:
51575179
version "0.3.2"
51585180
resolved "https://registry.yarnpkg.com/simple-dom/-/simple-dom-0.3.2.tgz#0663d10f1556f1500551d518f56e3aba0871371d"
@@ -5381,6 +5403,10 @@ strip-bom@^2.0.0:
53815403
dependencies:
53825404
is-utf8 "^0.2.0"
53835405

5406+
strip-bom@^3.0.0:
5407+
version "3.0.0"
5408+
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
5409+
53845410
strip-eof@^1.0.0:
53855411
version "1.0.0"
53865412
resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"

0 commit comments

Comments
 (0)