Skip to content

Commit 0c3de75

Browse files
committed
Upgrade ember-data to 2.18
1 parent afb075f commit 0c3de75

2 files changed

Lines changed: 83 additions & 21 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"ember-cli-test-loader": "^1.1.1",
6060
"ember-cli-uglify": "^2.1.0",
6161
"ember-concurrency": "~0.8.17",
62-
"ember-data": "~2.13.2",
62+
"ember-data": "^2.18.0",
6363
"ember-disable-proxy-controllers": "^1.0.1",
6464
"ember-export-application-global": "^2.0.0",
6565
"ember-git-version": "~0.1.2",

yarn.lock

Lines changed: 82 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,6 @@ alter@~0.2.0:
191191
dependencies:
192192
stable "~0.1.3"
193193

194-
amd-name-resolver@0.0.5:
195-
version "0.0.5"
196-
resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-0.0.5.tgz#76962dac876ed3311b05d29c6a58c14e1ef3304b"
197-
dependencies:
198-
ensure-posix-path "^1.0.1"
199-
200194
amd-name-resolver@0.0.6:
201195
version "0.0.6"
202196
resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-0.0.6.tgz#d3e4ba2dfcaab1d820c1be9de947c67828cfe595"
@@ -765,6 +759,12 @@ babel-plugin-debug-macros@^0.1.10, babel-plugin-debug-macros@^0.1.11:
765759
dependencies:
766760
semver "^5.3.0"
767761

762+
babel-plugin-ember-modules-api-polyfill@^1.4.2:
763+
version "1.6.0"
764+
resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-1.6.0.tgz#abd1afa4237b3121cb51222f9bf3283cad8990aa"
765+
dependencies:
766+
ember-rfc176-data "^0.2.0"
767+
768768
babel-plugin-ember-modules-api-polyfill@^2.3.0:
769769
version "2.3.0"
770770
resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.3.0.tgz#0c01f359658cfb9c797f705af6b09f6220205ae0"
@@ -861,7 +861,7 @@ babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
861861
dependencies:
862862
babel-runtime "^6.22.0"
863863

864-
babel-plugin-transform-es2015-block-scoping@^6.23.0:
864+
babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es2015-block-scoping@^6.24.1:
865865
version "6.26.0"
866866
resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
867867
dependencies:
@@ -1681,6 +1681,22 @@ broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli
16811681
rimraf "^2.3.4"
16821682
symlink-or-copy "^1.1.8"
16831683

1684+
broccoli-rollup@^1.2.0:
1685+
version "1.3.0"
1686+
resolved "https://registry.yarnpkg.com/broccoli-rollup/-/broccoli-rollup-1.3.0.tgz#43a0a7798555bab54217009eb470a4ff5a056df0"
1687+
dependencies:
1688+
broccoli-plugin "^1.2.1"
1689+
es6-map "^0.1.4"
1690+
fs-extra "^0.30.0"
1691+
fs-tree-diff "^0.5.2"
1692+
heimdalljs "^0.2.1"
1693+
heimdalljs-logger "^0.1.7"
1694+
md5-hex "^1.3.0"
1695+
node-modules-path "^1.0.1"
1696+
rollup "^0.41.4"
1697+
symlink-or-copy "^1.1.8"
1698+
walk-sync "^0.3.1"
1699+
16841700
broccoli-sass-source-maps@^2.0.0:
16851701
version "2.2.0"
16861702
resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-2.2.0.tgz#1f1a0794136152b096188638b59b42b17a4bdc68"
@@ -1978,7 +1994,7 @@ cached-path-relative@^1.0.0:
19781994
version "1.0.1"
19791995
resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7"
19801996

1981-
calculate-cache-key-for-tree@^1.0.0:
1997+
calculate-cache-key-for-tree@^1.0.0, calculate-cache-key-for-tree@^1.1.0:
19821998
version "1.1.0"
19831999
resolved "https://registry.yarnpkg.com/calculate-cache-key-for-tree/-/calculate-cache-key-for-tree-1.1.0.tgz#0c3e42c9c134f3c9de5358c0f16793627ea976d6"
19842000
dependencies:
@@ -3561,24 +3577,30 @@ ember-concurrency@~0.8.17:
35613577
ember-cli-babel "^6.8.2"
35623578
ember-maybe-import-regenerator "^0.1.5"
35633579

3564-
ember-data@~2.13.2:
3565-
version "2.13.2"
3566-
resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-2.13.2.tgz#151c93ad5152885d4ca50b1942d7c66e15865c74"
3580+
ember-data@^2.18.0:
3581+
version "2.18.2"
3582+
resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-2.18.2.tgz#3c6e99c9aed77ef8945451c39f39865f370f3db4"
35673583
dependencies:
3568-
amd-name-resolver "0.0.5"
3584+
amd-name-resolver "0.0.7"
3585+
babel-plugin-ember-modules-api-polyfill "^1.4.2"
35693586
babel-plugin-feature-flags "^0.3.1"
35703587
babel-plugin-filter-imports "^0.3.1"
3588+
babel-plugin-transform-es2015-block-scoping "^6.24.1"
35713589
babel6-plugin-strip-class-callcheck "^6.0.0"
35723590
babel6-plugin-strip-heimdall "^6.0.1"
35733591
broccoli-babel-transpiler "^6.0.0"
3592+
broccoli-debug "^0.6.2"
35743593
broccoli-file-creator "^1.0.0"
3575-
broccoli-merge-trees "^1.0.0"
3594+
broccoli-funnel "^1.2.0"
3595+
broccoli-merge-trees "^2.0.0"
3596+
broccoli-rollup "^1.2.0"
3597+
calculate-cache-key-for-tree "^1.1.0"
35763598
chalk "^1.1.1"
3577-
ember-cli-babel "^6.0.0-beta.7"
3599+
ember-cli-babel "^6.8.2"
35783600
ember-cli-path-utils "^1.0.0"
35793601
ember-cli-string-utils "^1.0.0"
35803602
ember-cli-test-info "^1.0.0"
3581-
ember-cli-version-checker "^1.1.4"
3603+
ember-cli-version-checker "^2.1.0"
35823604
ember-inflector "^2.0.0"
35833605
ember-runtime-enumerable-includes-polyfill "^2.0.0"
35843606
exists-sync "0.0.3"
@@ -3722,7 +3744,7 @@ ember-responsive@^2.0.8:
37223744
dependencies:
37233745
ember-cli-babel "^6.6.0"
37243746

3725-
ember-rfc176-data@^0.2.7:
3747+
ember-rfc176-data@^0.2.0, ember-rfc176-data@^0.2.7:
37263748
version "0.2.7"
37273749
resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.2.7.tgz#bd355bc9b473e08096b518784170a23388bc973b"
37283750

@@ -3899,14 +3921,25 @@ es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
38993921
es6-symbol "~3.1.1"
39003922
next-tick "1"
39013923

3902-
es6-iterator@~2.0.3:
3924+
es6-iterator@~2.0.1, es6-iterator@~2.0.3:
39033925
version "2.0.3"
39043926
resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
39053927
dependencies:
39063928
d "1"
39073929
es5-ext "^0.10.35"
39083930
es6-symbol "^3.1.1"
39093931

3932+
es6-map@^0.1.4:
3933+
version "0.1.5"
3934+
resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
3935+
dependencies:
3936+
d "1"
3937+
es5-ext "~0.10.14"
3938+
es6-iterator "~2.0.1"
3939+
es6-set "~0.1.5"
3940+
es6-symbol "~3.1.1"
3941+
event-emitter "~0.3.5"
3942+
39103943
es6-promise@^4.0.3:
39113944
version "4.2.4"
39123945
resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
@@ -3917,7 +3950,17 @@ es6-promisify@^5.0.0:
39173950
dependencies:
39183951
es6-promise "^4.0.3"
39193952

3920-
es6-symbol@^3.0.2, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
3953+
es6-set@~0.1.5:
3954+
version "0.1.5"
3955+
resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
3956+
dependencies:
3957+
d "1"
3958+
es5-ext "~0.10.14"
3959+
es6-iterator "~2.0.1"
3960+
es6-symbol "3.1.1"
3961+
event-emitter "~0.3.5"
3962+
3963+
es6-symbol@3.1.1, es6-symbol@^3.0.2, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
39213964
version "3.1.1"
39223965
resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
39233966
dependencies:
@@ -4075,6 +4118,13 @@ etag@~1.8.1:
40754118
version "1.8.1"
40764119
resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
40774120

4121+
event-emitter@~0.3.5:
4122+
version "0.3.5"
4123+
resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
4124+
dependencies:
4125+
d "1"
4126+
es5-ext "~0.10.14"
4127+
40784128
eventemitter3@1.x.x:
40794129
version "1.2.0"
40804130
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
@@ -6564,6 +6614,12 @@ matcher-collection@^1.0.0, matcher-collection@^1.0.5:
65646614
dependencies:
65656615
minimatch "^3.0.2"
65666616

6617+
md5-hex@^1.3.0:
6618+
version "1.3.0"
6619+
resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4"
6620+
dependencies:
6621+
md5-o-matic "^0.1.1"
6622+
65676623
md5-hex@^2.0.0:
65686624
version "2.0.0"
65696625
resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-2.0.0.tgz#d0588e9f1c74954492ecd24ac0ac6ce997d92e33"
@@ -6956,7 +7012,7 @@ node-int64@^0.4.0:
69567012
version "0.4.0"
69577013
resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
69587014

6959-
node-modules-path@^1.0.0:
7015+
node-modules-path@^1.0.0, node-modules-path@^1.0.1:
69607016
version "1.0.1"
69617017
resolved "https://registry.yarnpkg.com/node-modules-path/-/node-modules-path-1.0.1.tgz#40096b08ce7ad0ea14680863af449c7c75a5d1c8"
69627018

@@ -8361,6 +8417,12 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
83618417
hash-base "^2.0.0"
83628418
inherits "^2.0.1"
83638419

8420+
rollup@^0.41.4:
8421+
version "0.41.6"
8422+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.41.6.tgz#e0d05497877a398c104d816d2733a718a7a94e2a"
8423+
dependencies:
8424+
source-map-support "^0.4.0"
8425+
83648426
route-recognizer@^0.2.3:
83658427
version "0.2.10"
83668428
resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.2.10.tgz#024b2283c2e68d13a7c7f5173a5924645e8902df"
@@ -8785,7 +8847,7 @@ source-map-support@^0.2.10:
87858847
dependencies:
87868848
source-map "0.1.32"
87878849

8788-
source-map-support@^0.4.15:
8850+
source-map-support@^0.4.0, source-map-support@^0.4.15:
87898851
version "0.4.18"
87908852
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
87918853
dependencies:

0 commit comments

Comments
 (0)