Skip to content

Commit f814c92

Browse files
authored
Merge pull request #78 from ember-fastboot/update-deps
Update deps to FastBoot 1.0 compatibility
2 parents 54299cd + c5dabf8 commit f814c92

2 files changed

Lines changed: 102 additions & 54 deletions

File tree

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"ember-cli-deploy-build": "0.1.1",
3434
"ember-cli-deploy-gzip": "0.2.4",
3535
"ember-cli-eslint": "^3.0.0",
36-
"ember-cli-fastboot": "1.0.0-beta.19",
37-
"ember-cli-head": "0.1.4",
36+
"ember-cli-fastboot": "^1.0.0",
37+
"ember-cli-head": "^0.3.1",
3838
"ember-cli-htmlbars": "^1.1.1",
3939
"ember-cli-htmlbars-inline-precompile": "^0.4.0",
4040
"ember-cli-inject-live-reload": "^1.6.1",
@@ -46,14 +46,14 @@
4646
"ember-disable-proxy-controllers": "^1.0.1",
4747
"ember-export-application-global": "^2.0.0",
4848
"ember-fr-markdown-file": "0.0.0",
49-
"ember-href-to": "^1.11.1",
49+
"ember-href-to": "^1.13.0",
5050
"ember-load-initializers": "^1.0.0",
5151
"ember-markedjs": "^0.1.2",
5252
"ember-metrics": "0.6.2",
5353
"ember-resolver": "^4.0.0",
5454
"ember-source": "~2.13.0",
5555
"highlight.js": "^9.10.0",
56-
"liquid-fire": "0.27.0",
56+
"liquid-fire": "^0.27.0",
5757
"loader.js": "^4.2.3",
5858
"marked": "^0.3.6",
5959
"normalize.css": "^4.0.0",

yarn.lock

Lines changed: 98 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,12 @@ ansi-styles@^2.1.0, ansi-styles@^2.2.1:
185185
version "2.2.1"
186186
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
187187

188+
ansi-styles@^3.1.0:
189+
version "3.1.0"
190+
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.1.0.tgz#09c202d5c917ec23188caa5c9cb9179cd9547750"
191+
dependencies:
192+
color-convert "^1.0.0"
193+
188194
ansicolors@~0.2.1:
189195
version "0.2.1"
190196
resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
@@ -1374,7 +1380,7 @@ [email protected]:
13741380
symlink-or-copy "^1.0.0"
13751381
walk-sync "^0.3.1"
13761382

1377-
broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.6, broccoli-funnel@^1.1.0:
1383+
broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.6, broccoli-funnel@^1.1.0, broccoli-funnel@^1.2.0:
13781384
version "1.2.0"
13791385
resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296"
13801386
dependencies:
@@ -1539,7 +1545,7 @@ broccoli-sri-hash@^2.1.0:
15391545
sri-toolbox "^0.2.0"
15401546
symlink-or-copy "^1.0.1"
15411547

1542-
broccoli-stew@^1.2.0, broccoli-stew@^1.3.3:
1548+
broccoli-stew@^1.2.0, broccoli-stew@^1.3.3, broccoli-stew@^1.4.2:
15431549
version "1.5.0"
15441550
resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-1.5.0.tgz#d7af8c18511dce510e49d308a62e5977f461883c"
15451551
dependencies:
@@ -1852,6 +1858,14 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
18521858
strip-ansi "^3.0.0"
18531859
supports-color "^2.0.0"
18541860

1861+
chalk@^2.0.1:
1862+
version "2.0.1"
1863+
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.0.1.tgz#dbec49436d2ae15f536114e76d14656cdbc0f44d"
1864+
dependencies:
1865+
ansi-styles "^3.1.0"
1866+
escape-string-regexp "^1.0.5"
1867+
supports-color "^4.0.0"
1868+
18551869
charm@^1.0.0:
18561870
version "1.0.2"
18571871
resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35"
@@ -1967,6 +1981,16 @@ code-point-at@^1.0.0:
19671981
version "1.1.0"
19681982
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
19691983

1984+
color-convert@^1.0.0:
1985+
version "1.9.0"
1986+
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
1987+
dependencies:
1988+
color-name "^1.1.1"
1989+
1990+
color-name@^1.1.1:
1991+
version "1.1.3"
1992+
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
1993+
19701994
19711995
version "1.0.3"
19721996
resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
@@ -2125,7 +2149,7 @@ [email protected]:
21252149
version "1.0.6"
21262150
resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
21272151

2128-
2152+
[email protected], cookie@^0.3.1:
21292153
version "0.3.1"
21302154
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
21312155

@@ -2518,7 +2542,7 @@ ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cl
25182542
ember-cli-version-checker "^1.0.2"
25192543
resolve "^1.1.2"
25202544

2521-
ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.7:
2545+
ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.1.0:
25222546
version "6.1.0"
25232547
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.1.0.tgz#d9c83a7d0c67cc8a3ccb9bd082971c3593e54fad"
25242548
dependencies:
@@ -2605,11 +2629,12 @@ ember-cli-eslint@^3.0.0:
26052629
rsvp "^3.2.1"
26062630
walk-sync "^0.3.0"
26072631

2608-
2609-
version "1.0.0-beta.19"
2610-
resolved "https://registry.yarnpkg.com/ember-cli-fastboot/-/ember-cli-fastboot-1.0.0-beta.19.tgz#c737a9d15f02572b28f06b16514c5819ddbe5d13"
2632+
ember-cli-fastboot@^1.0.0:
2633+
version "1.0.0"
2634+
resolved "https://registry.yarnpkg.com/ember-cli-fastboot/-/ember-cli-fastboot-1.0.0.tgz#251f0aaa16034b29911002671c8899bb5c1e45f3"
26112635
dependencies:
2612-
broccoli-funnel "^1.0.0"
2636+
broccoli-concat "^3.2.2"
2637+
broccoli-funnel "^1.2.0"
26132638
broccoli-merge-trees "^1.1.1"
26142639
broccoli-plugin "^1.2.1"
26152640
broccoli-stew "^1.2.0"
@@ -2619,14 +2644,14 @@ [email protected]:
26192644
debug "^2.2.0"
26202645
ember-cli-babel "^5.1.7"
26212646
ember-cli-version-checker "^1.3.1"
2647+
exists-sync "0.0.4"
26222648
express "^4.8.5"
2623-
fastboot "1.0.0-rc.6"
2624-
fastboot-express-middleware "1.0.0-rc.7"
2625-
fastboot-filter-initializers "0.0.2"
2649+
fastboot "^1.0.0"
2650+
fastboot-express-middleware "^1.0.0"
2651+
json-stable-stringify "^1.0.1"
26262652
lodash.defaults "^4.0.1"
26272653
lodash.uniq "^4.2.0"
26282654
md5-hex "^1.3.0"
2629-
portfinder "^1.0.3"
26302655
rsvp "^3.0.16"
26312656
silent-error "^1.0.0"
26322657

@@ -2638,15 +2663,12 @@ ember-cli-get-dependency-depth@^1.0.0:
26382663
version "1.0.0"
26392664
resolved "https://registry.yarnpkg.com/ember-cli-get-dependency-depth/-/ember-cli-get-dependency-depth-1.0.0.tgz#e0afecf82a2d52f00f28ab468295281aec368d11"
26402665

2641-
ember-cli-head@0.1.4:
2642-
version "0.1.4"
2643-
resolved "https://registry.yarnpkg.com/ember-cli-head/-/ember-cli-head-0.1.4.tgz#13ae95db3f94ddf4ad0d3e80d07964957e760c1b"
2666+
ember-cli-head@^0.3.1:
2667+
version "0.3.1"
2668+
resolved "https://registry.yarnpkg.com/ember-cli-head/-/ember-cli-head-0.3.1.tgz#a407df4880f235280371c437bb5b0b5cbdaea646"
26442669
dependencies:
2645-
broccoli-merge-trees "^1.1.4"
2646-
ember-cli-babel "^5.1.5"
2647-
ember-cli-htmlbars "^1.0.1"
2648-
ember-cli-version-checker "^1.1.6"
2649-
fastboot-filter-initializers "0.0.1"
2670+
ember-cli-babel "^6.1.0"
2671+
ember-cli-htmlbars "^2.0.1"
26502672

26512673
ember-cli-htmlbars-inline-precompile@^0.4.0:
26522674
version "0.4.3"
@@ -2657,7 +2679,7 @@ ember-cli-htmlbars-inline-precompile@^0.4.0:
26572679
hash-for-dep "^1.0.2"
26582680
silent-error "^1.1.0"
26592681

2660-
ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1, ember-cli-htmlbars@^1.0.10, ember-cli-htmlbars@^1.1.1:
2682+
ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1, ember-cli-htmlbars@^1.1.1:
26612683
version "1.3.3"
26622684
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.3.3.tgz#06815262c1577736235bd42ce99db559ce5ebfd1"
26632685
dependencies:
@@ -2667,6 +2689,15 @@ ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1, ember-cli-htmlbars@^1.0.10
26672689
json-stable-stringify "^1.0.0"
26682690
strip-bom "^2.0.0"
26692691

2692+
ember-cli-htmlbars@^2.0.1:
2693+
version "2.0.2"
2694+
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-2.0.2.tgz#230a9ace7c3454b3acff2768a50f963813a90c38"
2695+
dependencies:
2696+
broccoli-persistent-filter "^1.0.3"
2697+
hash-for-dep "^1.0.2"
2698+
json-stable-stringify "^1.0.0"
2699+
strip-bom "^3.0.0"
2700+
26702701
ember-cli-inject-live-reload@^1.6.1:
26712702
version "1.6.1"
26722703
resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-1.6.1.tgz#82b8f5be454815a75e7f6d42c9ce0bc883a914a3"
@@ -2916,7 +2947,7 @@ [email protected]:
29162947
ember-cli-babel "^5.1.5"
29172948
ember-cli-htmlbars "^1.0.1"
29182949

2919-
ember-getowner-polyfill@1.1.1, ember-getowner-polyfill@^1.0.0:
2950+
ember-getowner-polyfill@^1.0.0, ember-getowner-polyfill@^1.1.1:
29202951
version "1.1.1"
29212952
resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-1.1.1.tgz#6bb6603827dd2f8f33be2434570a86cc9e5273ff"
29222953
dependencies:
@@ -2930,9 +2961,9 @@ ember-hash-helper-polyfill@^0.1.2:
29302961
ember-cli-babel "^5.1.7"
29312962
ember-cli-version-checker "^1.2.0"
29322963

2933-
ember-href-to@^1.11.1:
2934-
version "1.12.1"
2935-
resolved "https://registry.yarnpkg.com/ember-href-to/-/ember-href-to-1.12.1.tgz#8aa5fc20e29d619120808ff2fc25a087fea5ade3"
2964+
ember-href-to@^1.13.0:
2965+
version "1.13.0"
2966+
resolved "https://registry.yarnpkg.com/ember-href-to/-/ember-href-to-1.13.0.tgz#308ab4803d9d08e30a92af888cc67412a800468d"
29362967
dependencies:
29372968
ember-cli-babel "^5.1.6"
29382969

@@ -3468,12 +3499,13 @@ fast-sourcemap-concat@^1.0.1:
34683499
source-map "^0.4.2"
34693500
source-map-url "^0.3.0"
34703501

3471-
3472-
version "1.0.0-rc.7"
3473-
resolved "https://registry.yarnpkg.com/fastboot-express-middleware/-/fastboot-express-middleware-1.0.0-rc.7.tgz#285dee01734d40bafe983cefb63e7df0c680f282"
3502+
fastboot-express-middleware@^1.0.0:
3503+
version "1.0.0"
3504+
resolved "https://registry.yarnpkg.com/fastboot-express-middleware/-/fastboot-express-middleware-1.0.0.tgz#c68fe27c037117ad3a95d849e418dae208e0b503"
34743505
dependencies:
3475-
chalk "^1.1.3"
3476-
fastboot "^1.0.0-rc.3"
3506+
chalk "^2.0.1"
3507+
fastboot "^1.0.0"
3508+
request "^2.81.0"
34773509

34783510
fastboot-express-middleware@^1.0.0-rc.7:
34793511
version "1.0.0-rc.8"
@@ -3482,19 +3514,20 @@ fastboot-express-middleware@^1.0.0-rc.7:
34823514
chalk "^1.1.3"
34833515
fastboot "^1.0.0-rc.5"
34843516

3485-
3486-
version "0.0.1"
3487-
resolved "https://registry.yarnpkg.com/fastboot-filter-initializers/-/fastboot-filter-initializers-0.0.1.tgz#171b2165c872763cc9541c12d305e3cf84a360f3"
3488-
dependencies:
3489-
broccoli-funnel "^1.0.1"
3490-
3491-
3492-
version "0.0.2"
3493-
resolved "https://registry.yarnpkg.com/fastboot-filter-initializers/-/fastboot-filter-initializers-0.0.2.tgz#67aa9e8b22ca4b0e6a244f2450fd1cc6befa45e7"
3517+
fastboot@^1.0.0:
3518+
version "1.0.0"
3519+
resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-1.0.0.tgz#478b610235fd3400fb32400cb292b700d36cfd96"
34943520
dependencies:
3495-
broccoli-funnel "^1.0.1"
3521+
chalk "^2.0.1"
3522+
cookie "^0.3.1"
3523+
debug "^2.1.0"
3524+
exists-sync "0.0.4"
3525+
najax "^1.0.2"
3526+
rsvp "^3.0.16"
3527+
simple-dom "^1.0.0"
3528+
source-map-support "^0.4.0"
34963529

3497-
fastboot@1.0.0-rc.6, fastboot@^1.0.0-rc.3, fastboot@^1.0.0-rc.5:
3530+
fastboot@^1.0.0-rc.5:
34983531
version "1.0.0-rc.6"
34993532
resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-1.0.0-rc.6.tgz#09af88b41d1b31fda96be425c857e34b2323115b"
35003533
dependencies:
@@ -3966,6 +3999,10 @@ has-flag@^1.0.0:
39663999
version "1.0.0"
39674000
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
39684001

4002+
has-flag@^2.0.0:
4003+
version "2.0.0"
4004+
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
4005+
39694006
has-unicode@^2.0.0:
39704007
version "2.0.1"
39714008
resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -4693,16 +4730,17 @@ linkify-it@~1.2.0:
46934730
dependencies:
46944731
uc.micro "^1.0.1"
46954732

4696-
4697-
version "0.27.0"
4698-
resolved "https://registry.yarnpkg.com/liquid-fire/-/liquid-fire-0.27.0.tgz#17eac44de48638fca74fb734adf6cb9834764b1a"
4733+
liquid-fire@^0.27.0:
4734+
version "0.27.3"
4735+
resolved "https://registry.yarnpkg.com/liquid-fire/-/liquid-fire-0.27.3.tgz#483e2d4b9492c5ee6dd2c9fda5fe33a85cf0305b"
46994736
dependencies:
47004737
broccoli-funnel "^1.0.1"
47014738
broccoli-merge-trees "^1.0.0"
4702-
ember-cli-babel "^5.1.7"
4703-
ember-cli-htmlbars "^1.0.10"
4704-
ember-cli-version-checker "^1.1.6"
4705-
ember-getowner-polyfill "1.1.1"
4739+
broccoli-stew "^1.4.2"
4740+
ember-cli-babel "^6.1.0"
4741+
ember-cli-htmlbars "^1.1.1"
4742+
ember-cli-version-checker "^1.2.0"
4743+
ember-getowner-polyfill "^1.1.1"
47064744
ember-hash-helper-polyfill "^0.1.2"
47074745
match-media "^0.2.0"
47084746
velocity-animate ">= 0.11.8"
@@ -5223,7 +5261,7 @@ [email protected]:
52235261
version "0.0.6"
52245262
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db"
52255263

5226-
najax@^1.0.1:
5264+
najax@^1.0.1, najax@^1.0.2:
52275265
version "1.0.3"
52285266
resolved "https://registry.yarnpkg.com/najax/-/najax-1.0.3.tgz#11145f4d910446ea661d8ab7fcef53f6ad164ae5"
52295267
dependencies:
@@ -5652,7 +5690,7 @@ pluralize@^1.2.1:
56525690
version "1.2.1"
56535691
resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
56545692

5655-
portfinder@^1.0.3, portfinder@^1.0.7:
5693+
portfinder@^1.0.7:
56565694
version "1.0.13"
56575695
resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
56585696
dependencies:
@@ -6340,6 +6378,10 @@ simple-dom@^0.3.0:
63406378
version "0.3.2"
63416379
resolved "https://registry.yarnpkg.com/simple-dom/-/simple-dom-0.3.2.tgz#0663d10f1556f1500551d518f56e3aba0871371d"
63426380

6381+
simple-dom@^1.0.0:
6382+
version "1.1.0"
6383+
resolved "https://registry.yarnpkg.com/simple-dom/-/simple-dom-1.1.0.tgz#85d0ce0143a439810be189229ebf9203e20b2857"
6384+
63436385
simple-fmt@~0.1.0:
63446386
version "0.1.0"
63456387
resolved "https://registry.yarnpkg.com/simple-fmt/-/simple-fmt-0.1.0.tgz#191bf566a59e6530482cb25ab53b4a8dc85c3a6b"
@@ -6648,6 +6690,12 @@ supports-color@^3.1.2, supports-color@^3.2.3:
66486690
dependencies:
66496691
has-flag "^1.0.0"
66506692

6693+
supports-color@^4.0.0:
6694+
version "4.2.0"
6695+
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.0.tgz#ad986dc7eb2315d009b4d77c8169c2231a684037"
6696+
dependencies:
6697+
has-flag "^2.0.0"
6698+
66516699
symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8:
66526700
version "1.1.8"
66536701
resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.1.8.tgz#cabe61e0010c1c023c173b25ee5108b37f4b4aa3"

0 commit comments

Comments
 (0)