diff --git a/http/package.json b/http/package.json index 3836affc2..384f3f497 100644 --- a/http/package.json +++ b/http/package.json @@ -8,25 +8,24 @@ "repository": "https://github.com/cyclejs/cyclejs/tree/master/http", "dependencies": { "@cycle/run": "*", - "@types/superagent": "2.0.36", + "@types/superagent": "3.5.3", "superagent": "3.5.2" }, "peerDependencies": { "xstream": "*" }, "devDependencies": { - "@cycle/rxjs-run": "6.x", - "@types/body-parser": "0.0.x", + "@cycle/rxjs-run": "7.x", + "@types/body-parser": "1.16.x", "@types/cookie-parser": "1.3.x", "@types/express": "4.0.x", "@types/mocha": "2.2.x", "@types/node": "7.0.x", - "@types/sinon": "1.16.x", - "body-parser": "1.16.0", + "body-parser": "1.17.x", "cookie-parser": "1.4.3", "express": "4.14.1", - "rxjs": "5.1.0", - "saucie": "3.1.0", + "rxjs": "5.4.2", + "saucie": "3.2.0", "xstream": "10.x.x" }, "browserify-shim": { diff --git a/http/src/interfaces.ts b/http/src/interfaces.ts index ac4b5687b..19929284b 100644 --- a/http/src/interfaces.ts +++ b/http/src/interfaces.ts @@ -47,9 +47,7 @@ export interface Response extends SuperagentResponse { } export interface HTTPSource { - filter( - predicate: (request: RequestOptions) => boolean, - ): S; + filter(predicate: (request: RequestOptions) => boolean): HTTPSource; select(category?: string): Stream & ResponseStream>; isolateSource(source: HTTPSource, scope: string): HTTPSource; isolateSink(sink: Stream, scope: string): Stream; diff --git a/http/test/browser/src/common.ts b/http/test/browser/src/common.ts index 50df7c989..19aa1ce31 100644 --- a/http/test/browser/src/common.ts +++ b/http/test/browser/src/common.ts @@ -422,7 +422,7 @@ export function run(uri: string) { }); it('should allow null scope to bypass isolation', function(done) { - const proxyRequest$ = new Rx.Subject(); + const proxyRequest$ = new Rx.Subject(); function main(sources: {HTTP: HTTPSource}) { return { HTTP: proxyRequest$, diff --git a/http/yarn.lock b/http/yarn.lock index 86c02fd4f..25ec537a6 100644 --- a/http/yarn.lock +++ b/http/yarn.lock @@ -8,17 +8,18 @@ dependencies: xstream "10.x" -"@cycle/rxjs-run@6.x": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@cycle/rxjs-run/-/rxjs-run-6.1.0.tgz#50e1bea07fa1fe18bf16f2537574cbcaacfff4ef" +"@cycle/rxjs-run@7.x": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@cycle/rxjs-run/-/rxjs-run-7.0.0.tgz#f4c95d9a1b390e3a2e61706284f9e737e7de8aa8" dependencies: "@cycle/run" "3.x" -"@types/body-parser@0.0.x": - version "0.0.34" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-0.0.34.tgz#2cb766935f67416bbec80fc770b79e6eeeda80b5" +"@types/body-parser@1.16.x": + version "1.16.4" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.16.4.tgz#96f3660e6f88a677fee7250f5a5e6d6bda3c76bb" dependencies: "@types/express" "*" + "@types/node" "*" "@types/cookie-parser@1.3.x": version "1.3.30" @@ -58,13 +59,9 @@ "@types/express-serve-static-core" "*" "@types/mime" "*" -"@types/sinon@1.16.x": - version "1.16.36" - resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-1.16.36.tgz#74bb6ed7928597c1b3fb1b009005e94dc6eae357" - -"@types/superagent@2.0.36": - version "2.0.36" - resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-2.0.36.tgz#e8eec10771d9dbc0f7ec47b8f9993476e4a501c1" +"@types/superagent@3.5.3": + version "3.5.3" + resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-3.5.3.tgz#45a23dce949b9c29b48f842ddf87b2fb87cf76af" dependencies: "@types/node" "*" @@ -186,20 +183,20 @@ bluebird@^3.1.1: version "3.5.0" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c" -body-parser@1.16.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.16.0.tgz#924a5e472c6229fb9d69b85a20d5f2532dec788b" +body-parser@1.17.x: + version "1.17.2" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.17.2.tgz#f8892abc8f9e627d42aedafbca66bf5ab99104ee" dependencies: bytes "2.4.0" content-type "~1.0.2" - debug "2.6.0" + debug "2.6.7" depd "~1.1.0" - http-errors "~1.5.1" + http-errors "~1.6.1" iconv-lite "0.4.15" on-finished "~2.3.0" - qs "6.2.1" + qs "6.4.0" raw-body "~2.2.0" - type-is "~1.6.14" + type-is "~1.6.15" boom@2.x.x: version "2.10.1" @@ -331,12 +328,18 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -debug@2, debug@2.6.0, debug@^2.2.0: +debug@2, debug@^2.2.0: version "2.6.0" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b" dependencies: ms "0.7.2" +debug@2.6.7: + version "2.6.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.7.tgz#92bad1f6d05bbb6bba22cca88bcd0ec894c2861e" + dependencies: + ms "2.0.0" + debug@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da" @@ -347,7 +350,7 @@ delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" -depd@~1.1.0: +depd@1.1.0, depd@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3" @@ -546,6 +549,15 @@ http-errors@~1.5.1: setprototypeof "1.0.2" statuses ">= 1.3.1 < 2" +http-errors@~1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.1.tgz#5f8b8ed98aca545656bf572997387f904a722257" + dependencies: + depd "1.1.0" + inherits "2.0.3" + setprototypeof "1.0.3" + statuses ">= 1.3.1 < 2" + http-signature@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" @@ -677,7 +689,7 @@ mime-db@~1.27.0: version "1.27.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1" -mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7: +mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.15, mime-types@~2.1.7: version "2.1.15" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed" dependencies: @@ -711,6 +723,10 @@ ms@0.7.2: version "0.7.2" resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765" +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" @@ -784,11 +800,7 @@ qs@6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b" -qs@6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.1.tgz#ce03c5ff0935bc1d9d69a9f14cbd18e568d67625" - -qs@^6.1.0, qs@~6.4.0: +qs@6.4.0, qs@^6.1.0, qs@~6.4.0: version "6.4.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" @@ -845,7 +857,7 @@ request@2.79.0: tunnel-agent "~0.4.1" uuid "^3.0.0" -request@^2.51.0: +request@^2.81.0: version "2.81.0" resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" dependencies: @@ -878,9 +890,9 @@ rimraf@^2.5.4: dependencies: glob "^7.0.5" -rxjs@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.1.0.tgz#0aa9018b7f440b505fa42bd742b6738be550e720" +rxjs@5.4.2: + version "5.4.2" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.2.tgz#2a3236fcbf03df57bae06fd6972fd99e5c08fcf7" dependencies: symbol-observable "^1.0.1" @@ -888,9 +900,9 @@ safe-buffer@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7" -sauce-connect-launcher@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/sauce-connect-launcher/-/sauce-connect-launcher-1.2.0.tgz#6dc26611ef23428abe8b8f49e0044d7c752b8a6c" +sauce-connect-launcher@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/sauce-connect-launcher/-/sauce-connect-launcher-1.2.2.tgz#7346cc8fbdc443191323439b0733451f5f3521f2" dependencies: adm-zip "~0.4.3" async "^2.1.2" @@ -898,15 +910,15 @@ sauce-connect-launcher@^1.2.0: lodash "^4.16.6" rimraf "^2.5.4" -saucie@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/saucie/-/saucie-3.1.0.tgz#757ea4a740a0e1071877dc5723d03a79ae40c3f4" +saucie@3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/saucie/-/saucie-3.2.0.tgz#f3cb07acc253daeda65f12f56cdf88063359670e" dependencies: bluebird "^3.1.1" commander "^2.9.0" - request "^2.51.0" - sauce-connect-launcher "^1.2.0" - wd "^1.0.0" + request "^2.81.0" + sauce-connect-launcher "^1.2.2" + wd "^1.2.0" semver@~5.0.1: version "5.0.3" @@ -943,6 +955,10 @@ setprototypeof@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08" +setprototypeof@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04" + sntp@1.x.x: version "1.0.9" resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" @@ -1045,6 +1061,13 @@ type-is@~1.6.14: media-typer "0.3.0" mime-types "~2.1.13" +type-is@~1.6.15: + version "1.6.15" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410" + dependencies: + media-typer "0.3.0" + mime-types "~2.1.15" + underscore.string@3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.4.tgz#2c2a3f9f83e64762fdc45e6ceac65142864213db" @@ -1086,9 +1109,9 @@ walkdir@^0.0.11: version "0.0.11" resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.0.11.tgz#a16d025eb931bd03b52f308caed0f40fcebe9532" -wd@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wd/-/wd-1.1.3.tgz#4a09c89047abcd1326ab15f384590f18a9de0e0e" +wd@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/wd/-/wd-1.4.0.tgz#85958787abc32f048d4b3927b2ab3c5fc8c9c9fa" dependencies: archiver "1.3.0" async "2.0.1" diff --git a/package.json b/package.json index d79d506c6..39146bc87 100644 --- a/package.json +++ b/package.json @@ -18,10 +18,10 @@ "google-closure-compiler-js": "^20170521.0.0", "jase": "1.2.0", "karma": "^1.4.1", - "karma-chrome-launcher": "^2.0.0", + "karma-chrome-launcher": "^2.2.0", "karma-mocha": "^1.3.0", "karma-sauce-launcher": "^1.1.0", - "karma-typescript": "3.0.0-beta.1", + "karma-typescript": "3.0.4", "markdox": "0.1.10", "mocha": "3.2.0", "prettier": "^1.4.2", diff --git a/yarn.lock b/yarn.lock index 9ea579317..0a66424f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -554,7 +554,7 @@ browserify-zlib@~0.1.2: dependencies: pako "~0.2.0" -browserify@13.3.0, browserify@^13.1.1: +browserify@13.3.0: version "13.3.0" resolved "https://registry.yarnpkg.com/browserify/-/browserify-13.3.0.tgz#b5a9c9020243f0c70e4675bec8223bc627e415ce" dependencies: @@ -1401,6 +1401,10 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" +date-format@^0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/date-format/-/date-format-0.0.0.tgz#09206863ab070eb459acea5542cbd856b11966b3" + date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" @@ -1434,6 +1438,10 @@ debug@2.3.3: dependencies: ms "0.7.2" +debug@^0.7.2: + version "0.7.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39" + decamelize@^1.0.0, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -1536,7 +1544,7 @@ diff@1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf" -diff@^3.0.1, diff@^3.1.0: +diff@^3.0.1, diff@^3.1.0, diff@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9" @@ -2995,9 +3003,9 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.3.6" -karma-chrome-launcher@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.0.0.tgz#c2790c5a32b15577d0fff5a4d5a2703b3b439c25" +karma-chrome-launcher@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf" dependencies: fs-access "^1.0.0" which "^1.2.1" @@ -3027,33 +3035,38 @@ karma-sauce-launcher@^1.1.0: saucelabs "^1.3.0" wd "^1.0.0" -karma-typescript@3.0.0-beta.1: - version "3.0.0-beta.1" - resolved "https://registry.yarnpkg.com/karma-typescript/-/karma-typescript-3.0.0-beta.1.tgz#c784abe21d27385fb6563e8ea7a4cf25462e2bec" +karma-typescript@3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/karma-typescript/-/karma-typescript-3.0.4.tgz#9cdeeeddd1671693440c34ec62aba2d6ff9e4b05" dependencies: acorn "^4.0.4" amdefine "1.0.0" assert "~1.3.0" async "^2.1.4" + base64-js "^1.0.2" browser-resolve "^1.11.0" - browserify "^13.1.1" browserify-zlib "~0.1.2" buffer "^4.1.0" console-browserify "^1.1.0" constants-browserify "~1.0.0" crypto-browserify "^3.0.0" + diff "^3.2.0" domain-browser "~1.1.0" es6-promise "^4.0.5" events "~1.1.0" glob "^7.1.1" gulp-util "3.0.7" https-browserify "~0.0.0" + ieee754 "^1.1.4" + isarray "^1.0.0" istanbul "0.4.5" karma-coverage "^1.1.1" lodash "^4.17.4" + log4js "^1.1.1" magic-string "^0.19.0" minimatch "^3.0.3" os-browserify "~0.1.1" + pad "^1.1.0" path-browserify "~0.0.0" process "~0.11.0" punycode "^1.3.2" @@ -3374,11 +3387,11 @@ lodash@4.16.2: version "4.16.2" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.2.tgz#3e626db827048a699281a8a125226326cfc0e652" -lodash@4.17.2, lodash@^4.1.0: +lodash@4.17.2, lodash@^4.0.0, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.8.0: version "4.17.2" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42" -lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.8.0: +lodash@^4.17.4: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -3393,6 +3406,14 @@ log4js@^0.6.31: readable-stream "~1.0.2" semver "~4.3.3" +log4js@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/log4js/-/log4js-1.1.1.tgz#c21d29c7604089e4f255833e7f94b3461de1ff43" + dependencies: + debug "^2.2.0" + semver "^5.3.0" + streamroller "^0.4.0" + lolex@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31" @@ -3887,6 +3908,10 @@ pad-right@^0.2.2: dependencies: repeat-string "^1.5.2" +pad@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/pad/-/pad-1.1.0.tgz#7a7d185200ebac32f9f12ee756c3a1d087b3190b" + pako@~0.2.0: version "0.2.9" resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" @@ -4226,6 +4251,15 @@ read@1.0.x: isarray "0.0.1" string_decoder "~0.10.x" +readable-stream@^1.1.7, readable-stream@~1.1.9: + version "1.1.14" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + readable-stream@^2, readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.0, readable-stream@^2.1.4, readable-stream@^2.1.5: version "2.2.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816" @@ -4238,15 +4272,6 @@ readable-stream@^2, readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", string_decoder "~0.10.x" util-deprecate "~1.0.1" -readable-stream@~1.1.9: - version "1.1.14" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - readable-stream@~2.0.0: version "2.0.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" @@ -4909,6 +4934,15 @@ stream-splicer@^2.0.0: inherits "^2.0.1" readable-stream "^2.0.2" +streamroller@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.4.1.tgz#d435bd5974373abd9bd9068359513085106cc05f" + dependencies: + date-format "^0.0.0" + debug "^0.7.2" + mkdirp "^0.5.1" + readable-stream "^1.1.7" + strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"