diff --git a/package.json b/package.json index 4edc00a..2392d9b 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "peerDependencies": { "@angular/core": "^2.0.0 || ^4.0.0", "@ngrx/store": "^1.5.0 || ^2.0.0", - "rxjs": "^5.0.0" + "rxjs": "^5.4.0" }, "devDependencies": { "@angular/common": "^2.0.0", @@ -62,13 +62,13 @@ "reflect-metadata": "^0.1.3", "rimraf": "^2.6.1", "rollup": "^0.34.13", - "rxjs": "^5.0.0-beta.12", + "rxjs": "^5.4.0", "source-map-loader": "^0.1.5", "ts-loader": "^0.8.2", - "ts-node": "^1.6.0", + "ts-node": "^3.1.0", "tslint": "^3.15.1", "tslint-loader": "^2.1.5", - "typescript": "^2.0.2", + "typescript": "^2.4.0", "uglifyjs": "^2.4.10", "zone.js": "^0.7.2" }, diff --git a/spec/effects.spec.ts b/spec/effects.spec.ts index 848383e..550610c 100644 --- a/spec/effects.spec.ts +++ b/spec/effects.spec.ts @@ -1,4 +1,5 @@ import 'rxjs/add/observable/of'; +import 'rxjs/add/operator/toArray'; import { Observable } from 'rxjs/Observable'; import { Effect, mergeEffects } from '../src/effects'; @@ -16,7 +17,7 @@ describe('mergeEffects', function() { const expected = ['a', 'b', 'd']; mergeEffects(mock).toArray().subscribe({ - next(actual) { + next(actual: any[]) { expect(actual).toEqual(expected); }, error: done, diff --git a/src/actions.ts b/src/actions.ts index 24029a3..e070577 100644 --- a/src/actions.ts +++ b/src/actions.ts @@ -14,12 +14,6 @@ export class Actions extends Observable { this.source = actionsSubject; } - lift(operator: Operator): Observable { - const observable = new Actions(this); - observable.operator = operator; - return observable; - } - ofType(...keys: string[]): Actions { return filter.call(this, ({ type }: {type: string}) => { const len = keys.length; diff --git a/tsconfig.json b/tsconfig.json index 79f9c75..f66e1eb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,6 +13,9 @@ "declaration": true, "module": "commonjs", "lib": ["es5", "dom", "es2015"], + "typeRoots": [ + "../node_modules" + ], "types": [ "jasmine", "node" diff --git a/yarn.lock b/yarn.lock index 7c7fb1b..61bd0e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -97,9 +97,11 @@ ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" -any-promise@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" +ansi-styles@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.1.0.tgz#09c202d5c917ec23188caa5c9cb9179cd9547750" + dependencies: + color-convert "^1.0.0" append-transform@^0.4.0: version "0.4.0" @@ -324,7 +326,7 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3: +chalk@^1.1.0, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" dependencies: @@ -334,6 +336,14 @@ chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" +chalk@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.0.1.tgz#dbec49436d2ae15f536114e76d14656cdbc0f44d" + dependencies: + ansi-styles "^3.1.0" + escape-string-regexp "^1.0.5" + supports-color "^4.0.0" + cliui@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" @@ -354,6 +364,16 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" +color-convert@^1.0.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a" + dependencies: + color-name "^1.1.1" + +color-name@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d" + colors@^1.0.3, colors@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" @@ -683,7 +703,7 @@ es-to-primitive@^1.1.1: is-date-object "^1.0.1" is-symbol "^1.0.1" -escape-string-regexp@^1.0.2: +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -955,6 +975,10 @@ has-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" +has-flag@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" + has@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28" @@ -1603,7 +1627,7 @@ pinkie-promise@^2.0.0: dependencies: pinkie "^2.0.0" -pinkie@^2.0.0, pinkie@^2.0.4: +pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" @@ -1757,9 +1781,9 @@ rollup@^0.34.13: dependencies: source-map-support "^0.4.0" -rxjs@^5.0.0-beta.12: - version "5.3.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.3.0.tgz#d88ccbdd46af290cbdb97d5d8055e52453fabe2d" +rxjs@^5.4.0: + version "5.4.2" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.2.tgz#2a3236fcbf03df57bae06fd6972fd99e5c08fcf7" dependencies: symbol-observable "^1.0.1" @@ -1921,6 +1945,10 @@ strip-bom@^2.0.0: dependencies: is-utf8 "^0.2.0" +strip-bom@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + strip-indent@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" @@ -1945,6 +1973,12 @@ supports-color@^3.1.0, supports-color@^3.1.2: dependencies: has-flag "^1.0.0" +supports-color@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.1.0.tgz#92cc14bb3dad8928ca5656c33e19a19f20af5c7a" + dependencies: + has-flag "^2.0.0" + symbol-observable@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d" @@ -2016,30 +2050,26 @@ ts-loader@^0.8.2: object-assign "^2.0.0" semver "^5.0.1" -ts-node@^1.6.0: - version "1.7.3" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-1.7.3.tgz#dee7f8a84751732d3c2e497cac5a02fb117dfee7" +ts-node@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-3.2.0.tgz#9814f0c0141784900cf12fef1197ad4b7f4d23d1" dependencies: arrify "^1.0.0" - chalk "^1.1.1" + chalk "^2.0.0" diff "^3.1.0" make-error "^1.1.1" minimist "^1.2.0" mkdirp "^0.5.1" - pinkie "^2.0.4" source-map-support "^0.4.0" - tsconfig "^5.0.2" + tsconfig "^6.0.0" v8flags "^2.0.11" - xtend "^4.0.0" - yn "^1.2.0" + yn "^2.0.0" -tsconfig@^5.0.2: - version "5.0.3" - resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-5.0.3.tgz#5f4278e701800967a8fc383fd19648878f2a6e3a" +tsconfig@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-6.0.0.tgz#6b0e8376003d7af1864f8df8f89dd0059ffcd032" dependencies: - any-promise "^1.3.0" - parse-json "^2.2.0" - strip-bom "^2.0.0" + strip-bom "^3.0.0" strip-json-comments "^2.0.0" tsickle@^0.2: @@ -2079,9 +2109,9 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -typescript@^2.0.2: - version "2.3.0" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.0.tgz#2e63e09284392bc8158a2444c33e2093795c0418" +typescript@^2.4.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.1.tgz#c3ccb16ddaa0b2314de031e7e6fee89e5ba346bc" uglify-js@^2.6: version "2.8.22" @@ -2182,7 +2212,7 @@ write-file-atomic@^1.1.4: imurmurhash "^0.1.4" slide "^1.1.5" -xtend@^4.0.0, xtend@~4.0.1: +xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" @@ -2231,9 +2261,9 @@ yargs@~3.10.0: decamelize "^1.0.0" window-size "0.1.0" -yn@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/yn/-/yn-1.2.0.tgz#d237a4c533f279b2b89d3acac2db4b8c795e4a63" +yn@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a" zone.js@^0.7.2: version "0.7.8"