Skip to content

Commit

Permalink
Merge pull request #4937 from rwjblue/update-deps
Browse files Browse the repository at this point in the history
[BUGFIX beta] Update dependencies to use Babel 6.
  • Loading branch information
bmac committed Apr 23, 2017
2 parents ddff674 + 8868360 commit 18360bc
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 22 deletions.
6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -34,8 +34,8 @@
"ember-cli-string-utils": "^1.0.0",
"ember-cli-test-info": "^1.0.0",
"ember-cli-version-checker": "^1.1.4",
"ember-inflector": "^1.9.4",
"ember-runtime-enumerable-includes-polyfill": "^1.0.0",
"ember-inflector": "^2.0.0",
"ember-runtime-enumerable-includes-polyfill": "^2.0.0",
"exists-sync": "0.0.3",
"git-repo-info": "^1.1.2",
"heimdalljs": "^0.3.0",
Expand Down Expand Up @@ -106,7 +106,7 @@
"rsvp": "3.2.1"
},
"peerDependencies": {
"ember-inflector": "^1.9.4"
"ember-inflector": "^2.0.0"
},
"engines": {
"node": ">= 0.12.0"
Expand Down
52 changes: 33 additions & 19 deletions yarn.lock
Expand Up @@ -1106,29 +1106,29 @@ broccoli-builder@^0.18.3:
rsvp "^3.0.17"
silent-error "^1.0.1"

broccoli-caching-writer@^2.0.4, broccoli-caching-writer@^2.2.0, broccoli-caching-writer@^2.3.1:
version "2.3.1"
resolved "https://registry.npmjs.org/broccoli-caching-writer/-/broccoli-caching-writer-2.3.1.tgz#b93cf58f9264f003075868db05774f4e7f25bd07"
broccoli-caching-writer@^2.0.4, broccoli-caching-writer@~2.0.1:
version "2.0.4"
resolved "https://registry.npmjs.org/broccoli-caching-writer/-/broccoli-caching-writer-2.0.4.tgz#d995d7d1977292e498f78df05887230fcb4a5e2c"
dependencies:
broccoli-kitchen-sink-helpers "^0.2.5"
broccoli-plugin "1.1.0"
debug "^2.1.1"
lodash-node "^3.2.0"
rimraf "^2.2.8"
rsvp "^3.0.17"
walk-sync "^0.2.5"
symlink-or-copy "^1.0.0"
walk-sync "^0.2.0"

broccoli-caching-writer@~2.0.1:
version "2.0.4"
resolved "https://registry.npmjs.org/broccoli-caching-writer/-/broccoli-caching-writer-2.0.4.tgz#d995d7d1977292e498f78df05887230fcb4a5e2c"
broccoli-caching-writer@^2.2.0, broccoli-caching-writer@^2.3.1:
version "2.3.1"
resolved "https://registry.npmjs.org/broccoli-caching-writer/-/broccoli-caching-writer-2.3.1.tgz#b93cf58f9264f003075868db05774f4e7f25bd07"
dependencies:
broccoli-kitchen-sink-helpers "^0.2.5"
broccoli-plugin "1.1.0"
debug "^2.1.1"
lodash-node "^3.2.0"
rimraf "^2.2.8"
rsvp "^3.0.17"
symlink-or-copy "^1.0.0"
walk-sync "^0.2.0"
walk-sync "^0.2.5"

broccoli-clean-css@^1.1.0:
version "1.1.0"
Expand Down Expand Up @@ -2050,7 +2050,7 @@ ember-cli-app-version@^2.0.0:
ember-cli-htmlbars "^1.0.0"
git-repo-version "0.4.1"

ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, 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.2.1:
ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.2.1:
version "5.2.4"
resolved "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-5.2.4.tgz#5ce4f46b08ed6f6d21e878619fb689719d6e8e13"
dependencies:
Expand All @@ -2060,6 +2060,20 @@ ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-c
ember-cli-version-checker "^1.0.2"
resolve "^1.1.2"

ember-cli-babel@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.0.0.tgz#caab075780dca3759982c9f54ea70a9adb1f3550"
dependencies:
amd-name-resolver "0.0.6"
babel-plugin-transform-es2015-modules-amd "^6.24.0"
babel-polyfill "^6.16.0"
babel-preset-env "^1.2.0"
broccoli-babel-transpiler "^6.0.0"
broccoli-funnel "^1.0.0"
broccoli-source "^1.1.0"
clone "^2.0.0"
ember-cli-version-checker "^1.2.0"

ember-cli-babel@^6.0.0-beta.7:
version "6.0.0-beta.10"
resolved "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-6.0.0-beta.10.tgz#71cc6bef05be99c6e7ea4637c444392014a6b775"
Expand Down Expand Up @@ -2414,11 +2428,11 @@ ember-export-application-global@^1.0.5:
dependencies:
ember-cli-babel "^5.1.10"

ember-inflector@^1.9.4:
version "1.12.1"
resolved "https://registry.npmjs.org/ember-inflector/-/ember-inflector-1.12.1.tgz#d8bd2ca2f327b439720f89923fe614d46b5da1ca"
ember-inflector@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-2.0.0.tgz#ac0870e87c0724bd42cf5ed7ef166c49a296ecfb"
dependencies:
ember-cli-babel "^5.1.7"
ember-cli-babel "^6.0.0"

ember-load-initializers@^0.6.0:
version "0.6.3"
Expand Down Expand Up @@ -2451,11 +2465,11 @@ ember-router-generator@^1.0.0:
dependencies:
recast "^0.11.3"

ember-runtime-enumerable-includes-polyfill@^1.0.0:
version "1.0.4"
resolved "https://registry.npmjs.org/ember-runtime-enumerable-includes-polyfill/-/ember-runtime-enumerable-includes-polyfill-1.0.4.tgz#16a7612e347a2edf07da8b2f2f09dbfee70deba0"
ember-runtime-enumerable-includes-polyfill@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ember-runtime-enumerable-includes-polyfill/-/ember-runtime-enumerable-includes-polyfill-2.0.0.tgz#6e9ba118bc909d1d7762de1b03a550d8955308a9"
dependencies:
ember-cli-babel "^5.1.6"
ember-cli-babel "^6.0.0"
ember-cli-version-checker "^1.1.6"

ember-source@~2.11.0:
Expand Down

0 comments on commit 18360bc

Please sign in to comment.