Skip to content

Commit

Permalink
fix(http): update to TypeScript v2.4, change HTTPSource interface
Browse files Browse the repository at this point in the history 
BREAKING CHANGE:
If you are a JavaScript user, there are zero breaking changes. If you use TypeScript, the
HTTPSource's filter() method has a slightly different type signature, upgrade manually and
carefully.

ISSUES CLOSED: #640
  • Loading branch information
@staltz
staltz committed Jul 20, 2017
1 parent 2c2583e commit 56cdf62
Show file tree
Hide file tree
Showing 6 changed files with 131 additions and 77 deletions.
13 changes: 6 additions & 7 deletions http/package.json
View file
Expand Up @@ -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": {
Expand Down
4 changes: 1 addition & 3 deletions http/src/interfaces.ts
View file
Expand Up @@ -47,9 +47,7 @@ export interface Response extends SuperagentResponse {
}

export interface HTTPSource {
filter<S extends HTTPSource>(
predicate: (request: RequestOptions) => boolean,
): S;
filter(predicate: (request: RequestOptions) => boolean): HTTPSource;
select(category?: string): Stream<MemoryStream<Response> & ResponseStream>;
isolateSource(source: HTTPSource, scope: string): HTTPSource;
isolateSink(sink: Stream<RequestInput>, scope: string): Stream<RequestInput>;
Expand Down
2 changes: 1 addition & 1 deletion http/test/browser/src/common.ts
View file
Expand Up @@ -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<any>();
function main(sources: {HTTP: HTTPSource}) {
return {
HTTP: proxyRequest$,
Expand Down
111 changes: 67 additions & 44 deletions http/yarn.lock
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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" "*"

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -878,35 +890,35 @@ 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"

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"
https-proxy-agent "~1.0.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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Expand Up @@ -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",
Expand Down

0 comments on commit 56cdf62

Please sign in to comment.