Skip to content

Commit f35ca47

Browse files
authored
Merge pull request #870 from Turbo87/cli-update
Update "ember-cli" to v2.14.0
2 parents f0e1de8 + 1dcc970 commit f35ca47

File tree

3 files changed

+73
-108
lines changed

3 files changed

+73
-108
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
/coverage/*
1616
/libpeerconnection.log
1717
npm-debug.log
18+
yarn-error.log
1819
testem.log
1920
.env

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"babel-plugin-transform-object-rest-spread": "^6.23.0",
2929
"broccoli-asset-rev": "2.5.0",
3030
"ember-ajax": "^3.0.0",
31-
"ember-cli": "^2.13.3",
31+
"ember-cli": "~2.14.0",
3232
"ember-cli-app-version": "^3.0.0",
3333
"ember-cli-babel": "^6.4.1",
3434
"ember-cli-clipboard": "^0.7.0",

yarn.lock

+71-107
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,16 @@ ansi-styles@^1.1.0:
198198
version "1.1.0"
199199
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
200200

201-
ansi-styles@^2.1.0, ansi-styles@^2.2.1:
201+
ansi-styles@^2.2.1:
202202
version "2.2.1"
203203
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
204204

205+
ansi-styles@^3.0.0:
206+
version "3.1.0"
207+
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.1.0.tgz#09c202d5c917ec23188caa5c9cb9179cd9547750"
208+
dependencies:
209+
color-convert "^1.0.0"
210+
205211
ansicolors@~0.2.1:
206212
version "0.2.1"
207213
resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
@@ -230,7 +236,7 @@ are-we-there-yet@~1.1.2:
230236
delegates "^1.0.0"
231237
readable-stream "^2.0.6"
232238

233-
argparse@^1.0.7, argparse@~1.0.2:
239+
argparse@^1.0.7:
234240
version "1.0.9"
235241
resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
236242
dependencies:
@@ -1597,12 +1603,12 @@ capture-exit@^1.1.0:
15971603
dependencies:
15981604
rsvp "^3.3.3"
15991605

1600-
cardinal@^0.5.0:
1601-
version "0.5.0"
1602-
resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-0.5.0.tgz#00d5f661dbd4aabfdf7d41ce48a5a59bca35a291"
1606+
cardinal@^1.0.0:
1607+
version "1.0.0"
1608+
resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9"
16031609
dependencies:
16041610
ansicolors "~0.2.1"
1605-
redeyed "~0.5.0"
1611+
redeyed "~1.0.0"
16061612

16071613
caseless@~0.12.0:
16081614
version "0.12.0"
@@ -1778,6 +1784,16 @@ code-point-at@^1.0.0:
17781784
version "1.1.0"
17791785
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
17801786

1787+
color-convert@^1.0.0:
1788+
version "1.9.0"
1789+
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
1790+
dependencies:
1791+
color-name "^1.1.1"
1792+
1793+
color-name@^1.1.1:
1794+
version "1.1.2"
1795+
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
1796+
17811797
17821798
version "1.0.3"
17831799
resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
@@ -2523,9 +2539,9 @@ ember-cli-version-checker@^2.0.0:
25232539
resolve "^1.3.3"
25242540
semver "^5.3.0"
25252541

2526-
ember-cli@^2.13.3:
2527-
version "2.13.3"
2528-
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.13.3.tgz#1918500e6280a68be017aca9b69937f6782a24b8"
2542+
ember-cli@~2.14.0:
2543+
version "2.14.0"
2544+
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.14.0.tgz#9aff1414168883183e8677fa32626d1e3228ccbc"
25292545
dependencies:
25302546
amd-name-resolver "0.0.6"
25312547
babel-plugin-transform-es2015-modules-amd "^6.24.0"
@@ -2570,7 +2586,7 @@ ember-cli@^2.13.3:
25702586
express "^4.12.3"
25712587
filesize "^3.1.3"
25722588
find-up "^2.1.0"
2573-
fs-extra "2.0.0"
2589+
fs-extra "^3.0.0"
25742590
fs-tree-diff "^0.5.2"
25752591
get-caller-file "^1.0.0"
25762592
git-repo-info "^1.4.1"
@@ -2588,7 +2604,7 @@ ember-cli@^2.13.3:
25882604
leek "0.0.24"
25892605
lodash.template "^4.2.5"
25902606
markdown-it "^8.3.0"
2591-
markdown-it-terminal "0.0.4"
2607+
markdown-it-terminal "0.1.0"
25922608
minimatch "^3.0.0"
25932609
morgan "^1.8.1"
25942610
node-modules-path "^1.0.0"
@@ -3030,10 +3046,6 @@ espree@^3.4.3:
30303046
acorn "^5.0.1"
30313047
acorn-jsx "^3.0.0"
30323048

3033-
esprima-fb@~12001.1.0-dev-harmony-fb:
3034-
version "12001.1.0-dev-harmony-fb"
3035-
resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-12001.1.0-dev-harmony-fb.tgz#d84400384ba95ce2678c617ad24a7f40808da915"
3036-
30373049
esprima-fb@~15001.1001.0-dev-harmony-fb:
30383050
version "15001.1001.0-dev-harmony-fb"
30393051
resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz#43beb57ec26e8cf237d3dd8b33e42533577f2659"
@@ -3046,6 +3058,10 @@ esprima@^3.1.1, esprima@~3.1.0:
30463058
version "3.1.3"
30473059
resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
30483060

3061+
esprima@~3.0.0:
3062+
version "3.0.0"
3063+
resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
3064+
30493065
esquery@^1.0.0:
30503066
version "1.0.0"
30513067
resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
@@ -3374,13 +3390,6 @@ fs-exists-sync@^0.1.0:
33743390
version "0.1.0"
33753391
resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
33763392

3377-
[email protected], fs-extra@^2.0.0:
3378-
version "2.0.0"
3379-
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.0.0.tgz#337352bded4a0b714f3eb84de8cea765e9d37600"
3380-
dependencies:
3381-
graceful-fs "^4.1.2"
3382-
jsonfile "^2.1.0"
3383-
33843393
fs-extra@^0.24.0:
33853394
version "0.24.0"
33863395
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952"
@@ -3418,6 +3427,21 @@ fs-extra@^1.0.0:
34183427
jsonfile "^2.1.0"
34193428
klaw "^1.0.0"
34203429

3430+
fs-extra@^2.0.0:
3431+
version "2.0.0"
3432+
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.0.0.tgz#337352bded4a0b714f3eb84de8cea765e9d37600"
3433+
dependencies:
3434+
graceful-fs "^4.1.2"
3435+
jsonfile "^2.1.0"
3436+
3437+
fs-extra@^3.0.0:
3438+
version "3.0.1"
3439+
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
3440+
dependencies:
3441+
graceful-fs "^4.1.2"
3442+
jsonfile "^3.0.0"
3443+
universalify "^0.1.0"
3444+
34213445
fs-readdir-recursive@^0.1.0:
34223446
version "0.1.2"
34233447
resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz#315b4fb8c1ca5b8c47defef319d073dad3568059"
@@ -4206,6 +4230,12 @@ jsonfile@^2.1.0:
42064230
optionalDependencies:
42074231
graceful-fs "^4.1.6"
42084232

4233+
jsonfile@^3.0.0:
4234+
version "3.0.1"
4235+
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
4236+
optionalDependencies:
4237+
graceful-fs "^4.1.6"
4238+
42094239
jsonify@~0.0.0:
42104240
version "0.0.0"
42114241
resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -4276,12 +4306,6 @@ linkify-it@^2.0.0:
42764306
dependencies:
42774307
uc.micro "^1.0.1"
42784308

4279-
linkify-it@~1.2.0:
4280-
version "1.2.4"
4281-
resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-1.2.4.tgz#0773526c317c8fd13bd534ee1d180ff88abf881a"
4282-
dependencies:
4283-
uc.micro "^1.0.1"
4284-
42854309
livereload-js@^2.2.2:
42864310
version "2.2.2"
42874311
resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.2.2.tgz#6c87257e648ab475bc24ea257457edcc1f8d0bc2"
@@ -4311,14 +4335,6 @@ lodash-es@^4.17.4:
43114335
version "4.17.4"
43124336
resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7"
43134337

4314-
lodash._arraycopy@^3.0.0:
4315-
version "3.0.0"
4316-
resolved "https://registry.yarnpkg.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1"
4317-
4318-
lodash._arrayeach@^3.0.0:
4319-
version "3.0.0"
4320-
resolved "https://registry.yarnpkg.com/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz#bab156b2a90d3f1bbd5c653403349e5e5933ef9e"
4321-
43224338
lodash._baseassign@^3.0.0:
43234339
version "3.2.0"
43244340
resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
@@ -4337,10 +4353,6 @@ lodash._baseflatten@^3.0.0:
43374353
lodash.isarguments "^3.0.0"
43384354
lodash.isarray "^3.0.0"
43394355

4340-
lodash._basefor@^3.0.0:
4341-
version "3.0.3"
4342-
resolved "https://registry.yarnpkg.com/lodash._basefor/-/lodash._basefor-3.0.3.tgz#7550b4e9218ef09fad24343b612021c79b4c20c2"
4343-
43444356
lodash._bindcallback@^3.0.0:
43454357
version "3.0.1"
43464358
resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
@@ -4418,18 +4430,6 @@ lodash.isarray@^3.0.0:
44184430
version "3.0.4"
44194431
resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
44204432

4421-
lodash.isplainobject@^3.0.0:
4422-
version "3.2.0"
4423-
resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz#9a8238ae16b200432960cd7346512d0123fbf4c5"
4424-
dependencies:
4425-
lodash._basefor "^3.0.0"
4426-
lodash.isarguments "^3.0.0"
4427-
lodash.keysin "^3.0.0"
4428-
4429-
lodash.istypedarray@^3.0.0:
4430-
version "3.0.6"
4431-
resolved "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz#c9a477498607501d8e8494d283b87c39281cef62"
4432-
44334433
lodash.keys@^3.0.0:
44344434
version "3.1.2"
44354435
resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
@@ -4438,30 +4438,7 @@ lodash.keys@^3.0.0:
44384438
lodash.isarguments "^3.0.0"
44394439
lodash.isarray "^3.0.0"
44404440

4441-
lodash.keysin@^3.0.0:
4442-
version "3.0.8"
4443-
resolved "https://registry.yarnpkg.com/lodash.keysin/-/lodash.keysin-3.0.8.tgz#22c4493ebbedb1427962a54b445b2c8a767fb47f"
4444-
dependencies:
4445-
lodash.isarguments "^3.0.0"
4446-
lodash.isarray "^3.0.0"
4447-
4448-
lodash.merge@^3.3.2:
4449-
version "3.3.2"
4450-
resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-3.3.2.tgz#0d90d93ed637b1878437bb3e21601260d7afe994"
4451-
dependencies:
4452-
lodash._arraycopy "^3.0.0"
4453-
lodash._arrayeach "^3.0.0"
4454-
lodash._createassigner "^3.0.0"
4455-
lodash._getnative "^3.0.0"
4456-
lodash.isarguments "^3.0.0"
4457-
lodash.isarray "^3.0.0"
4458-
lodash.isplainobject "^3.0.0"
4459-
lodash.istypedarray "^3.0.0"
4460-
lodash.keys "^3.0.0"
4461-
lodash.keysin "^3.0.0"
4462-
lodash.toplainobject "^3.0.0"
4463-
4464-
lodash.merge@^4.3.0, lodash.merge@^4.4.0, lodash.merge@^4.5.1:
4441+
lodash.merge@^4.3.0, lodash.merge@^4.4.0, lodash.merge@^4.5.1, lodash.merge@^4.6.0:
44654442
version "4.6.0"
44664443
resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
44674444

@@ -4490,13 +4467,6 @@ lodash.templatesettings@^4.0.0:
44904467
dependencies:
44914468
lodash._reinterpolate "~3.0.0"
44924469

4493-
lodash.toplainobject@^3.0.0:
4494-
version "3.0.0"
4495-
resolved "https://registry.yarnpkg.com/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz#28790ad942d293d78aa663a07ecf7f52ca04198d"
4496-
dependencies:
4497-
lodash._basecopy "^3.0.0"
4498-
lodash.keysin "^3.0.0"
4499-
45004470
lodash.uniq@^4.2.0:
45014471
version "4.5.0"
45024472
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -4553,27 +4523,17 @@ map-obj@^1.0.0, map-obj@^1.0.1:
45534523
version "1.0.1"
45544524
resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
45554525

4556-
markdown-it-terminal@0.0.4:
4557-
version "0.0.4"
4558-
resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.0.4.tgz#3f2ce624ba2ca964a78b8b388d605ee330de9ced"
4526+
markdown-it-terminal@0.1.0:
4527+
version "0.1.0"
4528+
resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.1.0.tgz#545abd8dd01c3d62353bfcea71db580b51d22bd9"
45594529
dependencies:
4560-
ansi-styles "^2.1.0"
4561-
cardinal "^0.5.0"
4530+
ansi-styles "^3.0.0"
4531+
cardinal "^1.0.0"
45624532
cli-table "^0.3.1"
4563-
lodash.merge "^3.3.2"
4564-
markdown-it "^4.4.0"
4565-
4566-
markdown-it@^4.4.0:
4567-
version "4.4.0"
4568-
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-4.4.0.tgz#3df373dbea587a9a7fef3e56311b68908f75c414"
4569-
dependencies:
4570-
argparse "~1.0.2"
4571-
entities "~1.1.1"
4572-
linkify-it "~1.2.0"
4573-
mdurl "~1.0.0"
4574-
uc.micro "^1.0.0"
4533+
lodash.merge "^4.6.0"
4534+
markdown-it "^8.3.1"
45754535

4576-
markdown-it@^8.3.0:
4536+
markdown-it@^8.3.0, markdown-it@^8.3.1:
45774537
version "8.3.1"
45784538
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.3.1.tgz#2f4b622948ccdc193d66f3ca2d43125ac4ac7323"
45794539
dependencies:
@@ -4599,7 +4559,7 @@ md5-o-matic@^0.1.1:
45994559
version "0.1.1"
46004560
resolved "https://registry.yarnpkg.com/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3"
46014561

4602-
mdurl@^1.0.1, mdurl@~1.0.0:
4562+
mdurl@^1.0.1:
46034563
version "1.0.1"
46044564
resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
46054565

@@ -5392,11 +5352,11 @@ redent@^1.0.0:
53925352
indent-string "^2.1.0"
53935353
strip-indent "^1.0.1"
53945354

5395-
redeyed@~0.5.0:
5396-
version "0.5.0"
5397-
resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-0.5.0.tgz#7ab000e60ee3875ac115d29edb32c1403c6c25d1"
5355+
redeyed@~1.0.0:
5356+
version "1.0.1"
5357+
resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-1.0.1.tgz#e96c193b40c0816b00aec842698e61185e55498a"
53985358
dependencies:
5399-
esprima-fb "~12001.1.0-dev-harmony-fb"
5359+
esprima "~3.0.0"
54005360

54015361
regenerate@^1.2.1:
54025362
version "1.3.2"
@@ -6249,7 +6209,7 @@ typedarray@^0.0.6:
62496209
version "0.0.6"
62506210
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
62516211

6252-
uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.3:
6212+
uc.micro@^1.0.1, uc.micro@^1.0.3:
62536213
version "1.0.3"
62546214
resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
62556215

@@ -6291,6 +6251,10 @@ unique-string@^1.0.0:
62916251
dependencies:
62926252
crypto-random-string "^1.0.0"
62936253

6254+
universalify@^0.1.0:
6255+
version "0.1.0"
6256+
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.0.tgz#9eb1c4651debcc670cc94f1a75762332bb967778"
6257+
62946258
unpipe@~1.0.0:
62956259
version "1.0.0"
62966260
resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"

0 commit comments

Comments
 (0)