Skip to content

Commit e42fc82

Browse files
authored
Merge branch 'master' into greenkeeper/initial
2 parents acd4397 + 4a8c802 commit e42fc82

2 files changed

Lines changed: 59 additions & 104 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
"chalk": "^2.0.1",
3030
"compression": "^1.6.2",
3131
"express": "^4.13.3",
32-
"fastboot": "^1.0.0-rc.0",
33-
"fastboot-express-middleware": "^1.0.0-rc.4",
32+
"fastboot": "^1.0.0",
33+
"fastboot-express-middleware": "^1.0.0",
3434
"fs-promise": "^2.0.3",
3535
"request": "^2.81.0"
3636
},

yarn.lock

Lines changed: 57 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@ ansi-styles@^2.1.0, ansi-styles@^2.2.1:
6262
version "2.2.1"
6363
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
6464

65+
ansi-styles@^3.1.0:
66+
version "3.1.0"
67+
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.1.0.tgz#09c202d5c917ec23188caa5c9cb9179cd9547750"
68+
dependencies:
69+
color-convert "^1.0.0"
70+
6571
ansicolors@~0.2.1:
6672
version "0.2.1"
6773
resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
@@ -178,20 +184,6 @@ asynckit@^0.4.0:
178184
version "0.4.0"
179185
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
180186

181-
aws-sdk@^2.3.4:
182-
version "2.73.0"
183-
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.73.0.tgz#15e0bb31436ebe433aebb6751dd6c36447beebba"
184-
dependencies:
185-
buffer "5.0.6"
186-
crypto-browserify "1.0.9"
187-
jmespath "0.15.0"
188-
querystring "0.2.0"
189-
sax "1.2.1"
190-
url "0.10.3"
191-
uuid "3.0.1"
192-
xml2js "0.4.17"
193-
xmlbuilder "4.2.1"
194-
195187
aws-sign2@~0.6.0:
196188
version "0.6.0"
197189
resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -616,10 +608,6 @@ [email protected]:
616608
version "0.1.5"
617609
resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
618610

619-
base64-js@^1.0.2:
620-
version "1.2.0"
621-
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
622-
623611
624612
version "0.1.0"
625613
resolved "https://registry.yarnpkg.com/base64id/-/base64id-0.1.0.tgz#02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"
@@ -928,13 +916,6 @@ bser@^2.0.0:
928916
dependencies:
929917
node-int64 "^0.4.0"
930918

931-
932-
version "5.0.6"
933-
resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.0.6.tgz#2ea669f7eec0b6eda05b08f8b5ff661b28573588"
934-
dependencies:
935-
base64-js "^1.0.2"
936-
ieee754 "^1.1.4"
937-
938919
builtins@^1.0.3:
939920
version "1.0.3"
940921
resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
@@ -1019,6 +1000,14 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
10191000
strip-ansi "^3.0.0"
10201001
supports-color "^2.0.0"
10211002

1003+
chalk@^2.0.1:
1004+
version "2.0.1"
1005+
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.0.1.tgz#dbec49436d2ae15f536114e76d14656cdbc0f44d"
1006+
dependencies:
1007+
ansi-styles "^3.1.0"
1008+
escape-string-regexp "^1.0.5"
1009+
supports-color "^4.0.0"
1010+
10221011
charm@^1.0.0:
10231012
version "1.0.2"
10241013
resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35"
@@ -1093,6 +1082,16 @@ code-point-at@^1.0.0:
10931082
version "1.1.0"
10941083
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
10951084

1085+
color-convert@^1.0.0:
1086+
version "1.9.0"
1087+
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
1088+
dependencies:
1089+
color-name "^1.1.1"
1090+
1091+
color-name@^1.1.1:
1092+
version "1.1.3"
1093+
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
1094+
10961095
10971096
version "1.0.3"
10981097
resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
@@ -1222,14 +1221,10 @@ [email protected]:
12221221
version "1.0.6"
12231222
resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
12241223

1225-
1224+
[email protected], cookie@^0.3.1:
12261225
version "0.3.1"
12271226
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
12281227

1229-
cookie@^0.2.3:
1230-
version "0.2.4"
1231-
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.2.4.tgz#a8c155aa7b9b2cf2c4d32ebc7b9a0aa288ccc6bd"
1232-
12331228
core-js@^2.4.0:
12341229
version "2.4.1"
12351230
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
@@ -1262,10 +1257,6 @@ [email protected]:
12621257
dependencies:
12631258
boom "2.x.x"
12641259

1265-
1266-
version "1.0.9"
1267-
resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-1.0.9.tgz#cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0"
1268-
12691260
crypto-random-string@^1.0.0:
12701261
version "1.0.0"
12711262
resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
@@ -1276,7 +1267,7 @@ dashdash@^1.12.0:
12761267
dependencies:
12771268
assert-plus "^1.0.0"
12781269

1279-
[email protected], debug@^2.1.0, debug@~2.2.0:
1270+
[email protected], debug@~2.2.0:
12801271
version "2.2.0"
12811272
resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
12821273
dependencies:
@@ -1288,7 +1279,7 @@ [email protected]:
12881279
dependencies:
12891280
ms "0.7.2"
12901281

1291-
[email protected], debug@^2.1.1, debug@^2.2.0, debug@^2.4.0:
1282+
[email protected], debug@^2.1.0, debug@^2.1.1, debug@^2.2.0, debug@^2.4.0:
12921283
version "2.6.7"
12931284
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.7.tgz#92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"
12941285
dependencies:
@@ -1733,10 +1724,6 @@ expand-tilde@^1.2.2:
17331724
dependencies:
17341725
os-homedir "^1.0.1"
17351726

1736-
1737-
version "0.0.4"
1738-
resolved "https://registry.yarnpkg.com/express-cluster/-/express-cluster-0.0.4.tgz#7aa5c39779bbc7550a30525d02b4c022e40b8798"
1739-
17401727
express@^4.10.7, express@^4.12.3, express@^4.13.3:
17411728
version "4.15.3"
17421729
resolved "https://registry.yarnpkg.com/express/-/express-4.15.3.tgz#bab65d0f03aa80c358408972fc700f916944b662"
@@ -1811,27 +1798,25 @@ fast-sourcemap-concat@^1.0.1:
18111798
source-map "^0.4.2"
18121799
source-map-url "^0.3.0"
18131800

1814-
fastboot-express-middleware@^1.0.0-rc.4:
1815-
version "1.0.0-rc.8"
1816-
resolved "https://registry.yarnpkg.com/fastboot-express-middleware/-/fastboot-express-middleware-1.0.0-rc.8.tgz#449c4c5c6cc0ee5016a9f6399bc108fa707d39b2"
1801+
fastboot-express-middleware@^1.0.0:
1802+
version "1.0.0"
1803+
resolved "https://registry.yarnpkg.com/fastboot-express-middleware/-/fastboot-express-middleware-1.0.0.tgz#c68fe27c037117ad3a95d849e418dae208e0b503"
18171804
dependencies:
1818-
chalk "^1.1.3"
1819-
fastboot "^1.0.0-rc.5"
1805+
chalk "^2.0.1"
1806+
fastboot "^1.0.0"
1807+
request "^2.81.0"
18201808

1821-
fastboot@^1.0.0-rc.0, fastboot@^1.0.0-rc.5:
1822-
version "1.0.0-rc.7"
1823-
resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-1.0.0-rc.7.tgz#9c7e9e5f14b95aa74e5556b55e2ecce692ae2a00"
1809+
fastboot@^1.0.0:
1810+
version "1.0.0"
1811+
resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-1.0.0.tgz#478b610235fd3400fb32400cb292b700d36cfd96"
18241812
dependencies:
1825-
chalk "^0.5.1"
1826-
cookie "^0.2.3"
1813+
chalk "^2.0.1"
1814+
cookie "^0.3.1"
18271815
debug "^2.1.0"
1828-
exists-sync "0.0.3"
1829-
express "^4.13.3"
1830-
express-cluster "0.0.4"
1831-
minimist "^1.2.0"
1816+
exists-sync "0.0.4"
18321817
najax "^1.0.2"
18331818
rsvp "^3.0.16"
1834-
simple-dom "^0.3.0"
1819+
simple-dom "^1.0.0"
18351820
source-map-support "^0.4.0"
18361821

18371822
faye-websocket@~0.10.0:
@@ -2170,6 +2155,10 @@ [email protected]:
21702155
version "1.1.0"
21712156
resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
21722157

2158+
has-flag@^2.0.0:
2159+
version "2.0.0"
2160+
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
2161+
21732162
has-unicode@^2.0.0:
21742163
version "2.0.1"
21752164
resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -2265,10 +2254,6 @@ iconv-lite@~0.4.13:
22652254
version "0.4.18"
22662255
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
22672256

2268-
ieee754@^1.1.4:
2269-
version "1.1.8"
2270-
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
2271-
22722257
imurmurhash@^0.1.4:
22732258
version "0.1.4"
22742259
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -2466,10 +2451,6 @@ [email protected]:
24662451
commander "0.6.1"
24672452
mkdirp "0.3.0"
24682453

2469-
2470-
version "0.15.0"
2471-
resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
2472-
24732454
jquery-deferred@^0.3.0:
24742455
version "0.3.1"
24752456
resolved "https://registry.yarnpkg.com/jquery-deferred/-/jquery-deferred-0.3.1.tgz#596eca1caaff54f61b110962b23cafea74c35355"
@@ -2777,7 +2758,7 @@ lodash@^3.10.1:
27772758
version "3.10.1"
27782759
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
27792760

2780-
lodash@^4.0.0, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.6.1:
2761+
lodash@^4.2.0, lodash@^4.3.0, lodash@^4.6.1:
27812762
version "4.17.4"
27822763
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
27832764

@@ -2950,7 +2931,7 @@ [email protected], minimist@~0.0.1:
29502931
version "0.0.8"
29512932
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
29522933

2953-
minimist@^1.1.1, minimist@^1.2.0:
2934+
minimist@^1.1.1:
29542935
version "1.2.0"
29552936
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
29562937

@@ -3311,10 +3292,6 @@ pseudomap@^1.0.2:
33113292
version "1.0.2"
33123293
resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
33133294

3314-
3315-
version "1.3.2"
3316-
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
3317-
33183295
punycode@^1.4.1:
33193296
version "1.4.1"
33203297
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
@@ -3323,10 +3300,6 @@ [email protected], qs@^6.2.0, qs@^6.4.0, qs@~6.4.0:
33233300
version "6.4.0"
33243301
resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
33253302

3326-
3327-
version "0.2.0"
3328-
resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
3329-
33303303
quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
33313304
version "0.1.8"
33323305
resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.8.tgz#bab02a242ab8fb0dd758a3c9776b32f9a5d94408"
@@ -3456,7 +3429,7 @@ request-promise@^3.0.0:
34563429
lodash "^4.6.1"
34573430
request "^2.34"
34583431

3459-
request@^2.34:
3432+
request@^2.34, request@^2.81.0:
34603433
version "2.81.0"
34613434
resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
34623435
dependencies:
@@ -3565,10 +3538,6 @@ sane@^1.1.1, sane@^1.6.0:
35653538
walker "~1.0.5"
35663539
watch "~0.10.0"
35673540

3568-
[email protected], sax@>=0.6.0:
3569-
version "1.2.1"
3570-
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
3571-
35723541
semver@^5.1.0, semver@^5.1.1, semver@^5.3.0:
35733542
version "5.3.0"
35743543
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -3636,9 +3605,9 @@ silent-error@^1.0.0, silent-error@^1.0.1:
36363605
dependencies:
36373606
debug "^2.2.0"
36383607

3639-
simple-dom@^0.3.0:
3640-
version "0.3.2"
3641-
resolved "https://registry.yarnpkg.com/simple-dom/-/simple-dom-0.3.2.tgz#0663d10f1556f1500551d518f56e3aba0871371d"
3608+
simple-dom@^1.0.0:
3609+
version "1.0.0"
3610+
resolved "https://registry.yarnpkg.com/simple-dom/-/simple-dom-1.0.0.tgz#6349e429d7eeb665a4f67ab1c93a95a66e3d53c9"
36423611

36433612
slash@^1.0.0:
36443613
version "1.0.0"
@@ -3825,6 +3794,12 @@ supports-color@^2.0.0:
38253794
version "2.0.0"
38263795
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
38273796

3797+
supports-color@^4.0.0:
3798+
version "4.2.0"
3799+
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.0.tgz#ad986dc7eb2315d009b4d77c8169c2231a684037"
3800+
dependencies:
3801+
has-flag "^2.0.0"
3802+
38283803
symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8:
38293804
version "1.1.8"
38303805
resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.1.8.tgz#cabe61e0010c1c023c173b25ee5108b37f4b4aa3"
@@ -4020,13 +3995,6 @@ untildify@^2.1.0:
40203995
dependencies:
40213996
os-homedir "^1.0.0"
40223997

4023-
4024-
version "0.10.3"
4025-
resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64"
4026-
dependencies:
4027-
punycode "1.3.2"
4028-
querystring "0.2.0"
4029-
40303998
40313999
version "1.0.1"
40324000
resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.1.tgz#1cde87eefcf94b8822984d938ba2b797426dae1f"
@@ -4039,7 +4007,7 @@ [email protected]:
40394007
version "1.0.0"
40404008
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
40414009

4042-
uuid@3.0.1, uuid@^3.0.0:
4010+
uuid@^3.0.0:
40434011
version "3.0.1"
40444012
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
40454013

@@ -4144,19 +4112,6 @@ xdg-basedir@^3.0.0:
41444112
version "3.0.0"
41454113
resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
41464114

4147-
4148-
version "0.4.17"
4149-
resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.17.tgz#17be93eaae3f3b779359c795b419705a8817e868"
4150-
dependencies:
4151-
sax ">=0.6.0"
4152-
xmlbuilder "^4.1.0"
4153-
4154-
[email protected], xmlbuilder@^4.1.0:
4155-
version "4.2.1"
4156-
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.2.1.tgz#aa58a3041a066f90eaa16c2f5389ff19f3f461a5"
4157-
dependencies:
4158-
lodash "^4.0.0"
4159-
41604115
xmldom@^0.1.19:
41614116
version "0.1.27"
41624117
resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"

0 commit comments

Comments
 (0)