Skip to content

Commit 396f0fb

Browse files
committed
Upgrades ember-data to v2.13
1 parent 2b950b6 commit 396f0fb

File tree

2 files changed

+94
-43
lines changed

2 files changed

+94
-43
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"ember-cli-shims": "^1.1.0",
4747
"ember-cli-sri": "2.1.1",
4848
"ember-cli-uglify": "1.2.0",
49-
"ember-data": "2.12.1",
49+
"ember-data": "^2.14.3",
5050
"ember-export-application-global": "^2.0.0",
5151
"ember-load-initializers": "^1.0.0",
5252
"ember-maybe-import-regenerator": "^0.1.6",

yarn.lock

Lines changed: 93 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -549,17 +549,13 @@ babel-plugin-eval@^1.0.1:
549549
version "1.0.1"
550550
resolved "https://registry.yarnpkg.com/babel-plugin-eval/-/babel-plugin-eval-1.0.1.tgz#a2faed25ce6be69ade4bfec263f70169195950da"
551551

552-
babel-plugin-feature-flags@^0.2.1:
553-
version "0.2.3"
554-
resolved "https://registry.yarnpkg.com/babel-plugin-feature-flags/-/babel-plugin-feature-flags-0.2.3.tgz#81d81ed77bda2014098fa8243abcf03a551cbd4d"
555-
dependencies:
556-
json-stable-stringify "^1.0.1"
552+
babel-plugin-feature-flags@^0.3.1:
553+
version "0.3.1"
554+
resolved "https://registry.yarnpkg.com/babel-plugin-feature-flags/-/babel-plugin-feature-flags-0.3.1.tgz#9c827cf9a4eb9a19f725ccb239e85cab02036fc1"
557555

558-
babel-plugin-filter-imports@^0.2.0:
559-
version "0.2.1"
560-
resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-0.2.1.tgz#784f96a892f2f7ed2ccf0955688bd8916cd2e212"
561-
dependencies:
562-
json-stable-stringify "^1.0.1"
556+
babel-plugin-filter-imports@^0.3.1:
557+
version "0.3.1"
558+
resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-0.3.1.tgz#e7859b56886b175dd2616425d277b219e209ea8b"
563559

564560
babel-plugin-htmlbars-inline-precompile@^0.2.3:
565561
version "0.2.3"
@@ -932,13 +928,13 @@ babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.25.0:
932928
lodash "^4.2.0"
933929
to-fast-properties "^1.0.1"
934930

935-
babel5-plugin-strip-class-callcheck@^5.1.0:
936-
version "5.1.0"
937-
resolved "https://registry.yarnpkg.com/babel5-plugin-strip-class-callcheck/-/babel5-plugin-strip-class-callcheck-5.1.0.tgz#77d4a40c8614d367b8a21a53908159806dba5f91"
931+
babel6-plugin-strip-class-callcheck@^6.0.0:
932+
version "6.0.0"
933+
resolved "https://registry.yarnpkg.com/babel6-plugin-strip-class-callcheck/-/babel6-plugin-strip-class-callcheck-6.0.0.tgz#de841c1abebbd39f78de0affb2c9a52ee228fddf"
938934

939-
babel5-plugin-strip-heimdall@^5.0.2:
940-
version "5.0.2"
941-
resolved "https://registry.yarnpkg.com/babel5-plugin-strip-heimdall/-/babel5-plugin-strip-heimdall-5.0.2.tgz#e1fe191c34de79686564d50a86f4217b8df629c1"
935+
babel6-plugin-strip-heimdall@^6.0.1:
936+
version "6.0.1"
937+
resolved "https://registry.yarnpkg.com/babel6-plugin-strip-heimdall/-/babel6-plugin-strip-heimdall-6.0.1.tgz#35f80eddec1f7fffdc009811dfbd46d9965072b6"
942938

943939
babylon@^5.8.38:
944940
version "5.8.38"
@@ -1084,7 +1080,7 @@ broccoli-asset-rewrite@^1.1.0:
10841080
dependencies:
10851081
broccoli-filter "^1.2.3"
10861082

1087-
broccoli-babel-transpiler@^5.5.0, broccoli-babel-transpiler@^5.6.2:
1083+
broccoli-babel-transpiler@^5.6.2:
10881084
version "5.6.2"
10891085
resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-5.6.2.tgz#958c72e43575b2f0a862a5096dba1ce1ebc7d74d"
10901086
dependencies:
@@ -1229,7 +1225,7 @@ broccoli-funnel-reducer@^1.0.0:
12291225
version "1.0.0"
12301226
resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea"
12311227

1232-
broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli-funnel@^1.0.6, broccoli-funnel@^1.1.0:
1228+
broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli-funnel@^1.0.6, broccoli-funnel@^1.1.0, broccoli-funnel@^1.2.0:
12331229
version "1.2.0"
12341230
resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296"
12351231
dependencies:
@@ -1337,6 +1333,22 @@ broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli
13371333
rimraf "^2.3.4"
13381334
symlink-or-copy "^1.1.8"
13391335

1336+
broccoli-rollup@^1.2.0:
1337+
version "1.3.0"
1338+
resolved "https://registry.yarnpkg.com/broccoli-rollup/-/broccoli-rollup-1.3.0.tgz#43a0a7798555bab54217009eb470a4ff5a056df0"
1339+
dependencies:
1340+
broccoli-plugin "^1.2.1"
1341+
es6-map "^0.1.4"
1342+
fs-extra "^0.30.0"
1343+
fs-tree-diff "^0.5.2"
1344+
heimdalljs "^0.2.1"
1345+
heimdalljs-logger "^0.1.7"
1346+
md5-hex "^1.3.0"
1347+
node-modules-path "^1.0.1"
1348+
rollup "^0.41.4"
1349+
symlink-or-copy "^1.1.8"
1350+
walk-sync "^0.3.1"
1351+
13401352
broccoli-sass-source-maps@^2.0.0:
13411353
version "2.0.0"
13421354
resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-2.0.0.tgz#7f25f9f4b296918cec6e00672c63e75abce33d45"
@@ -1824,7 +1836,7 @@ cross-spawn@^3.0.0:
18241836
lru-cache "^4.0.1"
18251837
which "^1.2.9"
18261838

1827-
cross-spawn@^5.0.1, cross-spawn@^5.1.0:
1839+
cross-spawn@^5.0.0, cross-spawn@^5.0.1, cross-spawn@^5.1.0:
18281840
version "5.1.0"
18291841
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
18301842
dependencies:
@@ -2429,33 +2441,37 @@ ember-cli@^2.13.2:
24292441
walk-sync "^0.3.0"
24302442
yam "0.0.22"
24312443

2432-
ember-data@2.12.1:
2433-
version "2.12.1"
2434-
resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-2.12.1.tgz#c06d47b14ff4956e6579b04960f62060b8ce7a70"
2444+
ember-data@^2.14.3:
2445+
version "2.14.3"
2446+
resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-2.14.3.tgz#f4f7a51d84a551215895d58be67cf991c4fe3cc5"
24352447
dependencies:
24362448
amd-name-resolver "0.0.5"
2437-
babel-plugin-feature-flags "^0.2.1"
2438-
babel-plugin-filter-imports "^0.2.0"
2439-
babel5-plugin-strip-class-callcheck "^5.1.0"
2440-
babel5-plugin-strip-heimdall "^5.0.2"
2441-
broccoli-babel-transpiler "^5.5.0"
2449+
babel-plugin-feature-flags "^0.3.1"
2450+
babel-plugin-filter-imports "^0.3.1"
2451+
babel6-plugin-strip-class-callcheck "^6.0.0"
2452+
babel6-plugin-strip-heimdall "^6.0.1"
2453+
broccoli-babel-transpiler "^6.0.0"
2454+
broccoli-debug "^0.6.2"
24422455
broccoli-file-creator "^1.0.0"
2456+
broccoli-funnel "^1.2.0"
24432457
broccoli-merge-trees "^1.0.0"
2458+
broccoli-rollup "^1.2.0"
24442459
chalk "^1.1.1"
2445-
ember-cli-babel "^5.1.6"
2460+
ember-cli-babel "^6.4.1"
24462461
ember-cli-path-utils "^1.0.0"
24472462
ember-cli-string-utils "^1.0.0"
24482463
ember-cli-test-info "^1.0.0"
24492464
ember-cli-version-checker "^1.1.4"
2450-
ember-inflector "^1.9.4"
2451-
ember-runtime-enumerable-includes-polyfill "^1.0.0"
2465+
ember-inflector "^2.0.0"
2466+
ember-runtime-enumerable-includes-polyfill "^2.0.0"
24522467
exists-sync "0.0.3"
24532468
git-repo-info "^1.1.2"
24542469
heimdalljs "^0.3.0"
24552470
inflection "^1.8.0"
24562471
npm-git-info "^1.0.0"
24572472
semver "^5.1.0"
24582473
silent-error "^1.0.0"
2474+
testem "1.15.0"
24592475

24602476
ember-export-application-global@^2.0.0:
24612477
version "2.0.0"
@@ -2478,12 +2494,18 @@ ember-getowner-polyfill@^1.2.2:
24782494
ember-cli-version-checker "^1.2.0"
24792495
ember-factory-for-polyfill "^1.1.0"
24802496

2481-
ember-inflector@^1.9.2, ember-inflector@^1.9.4:
2497+
ember-inflector@^1.9.2:
24822498
version "1.12.1"
24832499
resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-1.12.1.tgz#d8bd2ca2f327b439720f89923fe614d46b5da1ca"
24842500
dependencies:
24852501
ember-cli-babel "^5.1.7"
24862502

2503+
ember-inflector@^2.0.0:
2504+
version "2.0.1"
2505+
resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-2.0.1.tgz#e9ac469ffa17992a43276bb1c9b8d87992b10d37"
2506+
dependencies:
2507+
ember-cli-babel "^6.0.0"
2508+
24872509
ember-load-initializers@^1.0.0:
24882510
version "1.0.0"
24892511
resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-1.0.0.tgz#4919eaf06f6dfeca7e134633d8c05a6c9921e6e7"
@@ -2560,13 +2582,6 @@ [email protected]:
25602582
ember-cli-babel "^5.1.6"
25612583
ember-getowner-polyfill "^1.2.2"
25622584

2563-
ember-runtime-enumerable-includes-polyfill@^1.0.0:
2564-
version "1.0.4"
2565-
resolved "https://registry.yarnpkg.com/ember-runtime-enumerable-includes-polyfill/-/ember-runtime-enumerable-includes-polyfill-1.0.4.tgz#16a7612e347a2edf07da8b2f2f09dbfee70deba0"
2566-
dependencies:
2567-
ember-cli-babel "^5.1.6"
2568-
ember-cli-version-checker "^1.1.6"
2569-
25702585
ember-runtime-enumerable-includes-polyfill@^2.0.0:
25712586
version "2.0.0"
25722587
resolved "https://registry.yarnpkg.com/ember-runtime-enumerable-includes-polyfill/-/ember-runtime-enumerable-includes-polyfill-2.0.0.tgz#6e9ba118bc909d1d7762de1b03a550d8955308a9"
@@ -2730,7 +2745,7 @@ es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
27302745
es5-ext "^0.10.14"
27312746
es6-symbol "^3.1"
27322747

2733-
es6-map@^0.1.3:
2748+
es6-map@^0.1.3, es6-map@^0.1.4:
27342749
version "0.1.5"
27352750
resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
27362751
dependencies:
@@ -4333,7 +4348,7 @@ matcher-collection@^1.0.0, matcher-collection@^1.0.1:
43334348
dependencies:
43344349
minimatch "^3.0.2"
43354350

4336-
md5-hex@^1.0.2:
4351+
md5-hex@^1.0.2, md5-hex@^1.3.0:
43374352
version "1.3.0"
43384353
resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4"
43394354
dependencies:
@@ -4564,7 +4579,7 @@ node-int64@^0.4.0:
45644579
version "0.4.0"
45654580
resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
45664581

4567-
node-modules-path@^1.0.0:
4582+
node-modules-path@^1.0.0, node-modules-path@^1.0.1:
45684583
version "1.0.1"
45694584
resolved "https://registry.yarnpkg.com/node-modules-path/-/node-modules-path-1.0.1.tgz#40096b08ce7ad0ea14680863af449c7c75a5d1c8"
45704585

@@ -5307,6 +5322,12 @@ rimraf@~2.2.6:
53075322
version "2.2.8"
53085323
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
53095324

5325+
rollup@^0.41.4:
5326+
version "0.41.6"
5327+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.41.6.tgz#e0d05497877a398c104d816d2733a718a7a94e2a"
5328+
dependencies:
5329+
source-map-support "^0.4.0"
5330+
53105331
route-recognizer@^0.2.3:
53115332
version "0.2.10"
53125333
resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.2.10.tgz#024b2283c2e68d13a7c7f5173a5924645e8902df"
@@ -5548,7 +5569,7 @@ source-map-support@^0.2.10:
55485569
dependencies:
55495570
source-map "0.1.32"
55505571

5551-
source-map-support@^0.4.2:
5572+
source-map-support@^0.4.0, source-map-support@^0.4.2:
55525573
version "0.4.15"
55535574
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
55545575
dependencies:
@@ -5782,6 +5803,36 @@ [email protected]:
57825803
os-tmpdir "^1.0.0"
57835804
rimraf "~2.2.6"
57845805

5806+
5807+
version "1.15.0"
5808+
resolved "https://registry.yarnpkg.com/testem/-/testem-1.15.0.tgz#2e3a9e7ac29f16a20f718eb0c4b12e7a44900675"
5809+
dependencies:
5810+
backbone "^1.1.2"
5811+
bluebird "^3.4.6"
5812+
charm "^1.0.0"
5813+
commander "^2.6.0"
5814+
consolidate "^0.14.0"
5815+
cross-spawn "^5.0.0"
5816+
express "^4.10.7"
5817+
fireworm "^0.7.0"
5818+
glob "^7.0.4"
5819+
http-proxy "^1.13.1"
5820+
js-yaml "^3.2.5"
5821+
lodash.assignin "^4.1.0"
5822+
lodash.clonedeep "^4.4.1"
5823+
lodash.find "^4.5.1"
5824+
mkdirp "^0.5.1"
5825+
mustache "^2.2.1"
5826+
node-notifier "^5.0.1"
5827+
npmlog "^4.0.0"
5828+
printf "^0.2.3"
5829+
rimraf "^2.4.4"
5830+
socket.io "1.6.0"
5831+
spawn-args "^0.2.0"
5832+
styled_string "0.0.1"
5833+
tap-parser "^5.1.0"
5834+
xmldom "^0.1.19"
5835+
57855836
testem@^1.15.0:
57865837
version "1.17.0"
57875838
resolved "https://registry.yarnpkg.com/testem/-/testem-1.17.0.tgz#2bf5b599dc6e5fd306ea3f2620e1bf63ee29d213"

0 commit comments

Comments
 (0)