Merge pull request #17 from e-schultz/chore-update-deps-for-redux-observable

chore(*) update depedencies

Author: e-schultz

CHANGELOG.MD

@@ -1,5 +1,9 @@
 # Change Log
 
+# 1.2.0-0
+
+* Update dependencies to support redux-observable 0.15+
+
 # 1.1.0
 
 * Update dependencies to work with redux-observable 0.14.*

package.json

@@ -3,9 +3,7 @@
   "version": "1.1.0",
   "description": "Decorators for Redux Observable",
   "main": "./release/index.js",
-  "files": [
-    "release"
-  ],
+  "files": ["release"],
   "typings": "./release/index.d.ts",
   "scripts": {
     "test": "karma start --single-run",
@@ -26,7 +24,7 @@
   "homepage": "https://github.com/angular-redux/redux-observable-decorator#readme",
   "peerDependencies": {
     "redux": "3.*",
-    "redux-observable": "^0.13.0 || ^0.14.0"
+    "redux-observable": "^0.13.0 || ^0.14.0 || ^0.15.0 || ^0.16.0"
   },
   "devDependencies": {
     "@angular/common": "4.0.0",
@@ -51,14 +49,14 @@
     "karma-typescript-preprocessor": "^0.3.1",
     "karma-webpack": "^2.0.2",
     "redux": "^3.6.0",
-    "redux-observable": "^0.14.0",
+    "redux-observable": "^0.16.0",
     "reflect-metadata": "^0.1.8",
     "rimraf": "^2.5.4",
     "rxjs": "^5.0.1",
-    "ts-loader": "^1.3.3",
+    "ts-loader": "^2.2.7",
     "tslint": "^4.1.1",
     "tslint-loader": "^3.3.0",
-    "typescript": "~2.2.0",
+    "typescript": "^2.4.0",
     "uglifyjs": "^2.4.10",
     "webpack": "^2.2.1",
     "zone.js": "^0.8.4"

src/epic-decorator.ts

@@ -1,17 +1,24 @@
-import { EpicMiddleware, combineEpics, createEpicMiddleware } from 'redux-observable';
+import { Action } from 'redux';
+import {
+  EpicMiddleware,
+  combineEpics,
+  createEpicMiddleware
+} from 'redux-observable';
 const METADATA_KEY = 'redux-observable-decorator-metadata';
 
 export interface EpicMetadata {
   propertyName: string;
 }
 export function Epic(): PropertyDecorator {
-  return function (target: any, propertyName: string) {
-
+  return function(target: any, propertyName: string) {
     if (!(Reflect as any).hasOwnMetadata(METADATA_KEY, target)) {
       (Reflect as any).defineMetadata(METADATA_KEY, [], target);
     }
 
-    const epics: EpicMetadata[] = (Reflect as any).getOwnMetadata(METADATA_KEY, target);
+    const epics: EpicMetadata[] = (Reflect as any).getOwnMetadata(
+      METADATA_KEY,
+      target
+    );
     const metadata: EpicMetadata = { propertyName };
     (Reflect as any).defineMetadata(METADATA_KEY, [...epics, metadata], target);
   };
@@ -23,32 +30,32 @@ export function getEpicsMetadata(instance: any): EpicMetadata[] {
     return [];
   }
   return (Reflect as any).getOwnMetadata(METADATA_KEY, target);
-
 }
 
 function isOptions(...instanceOrOptions) {
-
   let option = instanceOrOptions[instanceOrOptions.length - 1];
   let keys = option ? Object.keys(option) : [];
   return keys.indexOf('dependencies') >= 0 || keys.indexOf('adapter') >= 0;
-
-
 }
-export function createEpics<T, S>(epic, ...epicsOrOptions): EpicMiddleware<T, S> {
+export function createEpics<T extends Action, S>(
+  epic,
+  ...epicsOrOptions
+): EpicMiddleware<T, S> {
   let instances;
   let options;
   if (isOptions(...epicsOrOptions)) {
-    options = epicsOrOptions.slice(epicsOrOptions.length - 1, epicsOrOptions.length)[0];
-
+    options = epicsOrOptions.slice(
+      epicsOrOptions.length - 1,
+      epicsOrOptions.length
+    )[0];
   }
   instances = [epic, ...epicsOrOptions];
 
-  const epicsMetaData = instances
-    .map(instance => getEpicsMetadata(instance)
-      .map(({ propertyName }) => instance[propertyName]));
+  const epicsMetaData = instances.map(instance =>
+    getEpicsMetadata(instance).map(({ propertyName }) => instance[propertyName])
+  );
 
   const epics = [].concat(...epicsMetaData);
   const rootEpic = combineEpics<T, S>(...epics);
   return createEpicMiddleware<T, S>(rootEpic, options);
-
 }

tsconfig.json

@@ -11,29 +11,17 @@
     "moduleResolution": "node",
     "declaration": true,
     "module": "commonjs",
-    "lib": [
-      "es5",
-      "dom",
-      "es2015"
-    ],
-    "types": [
-      "jasmine",
-      "node"
-    ],
+    "lib": ["es5", "dom", "es2015"],
+    "types": ["jasmine", "node"],
     "baseUrl": ".",
     "rootDir": ".",
     "paths": {
-      "@redux-observable-decorator": [
-        "./"
-      ]
+      "@redux-observable-decorator": ["./"]
     }
   },
-  "exclude": [
-    "node_modules",
-    "release",
-    "tests.bundle.ts"
-  ],
+  "exclude": ["node_modules", "release", "tests.bundle.ts"],
   "angularCompilerOptions": {
     "genDir": ".ngc"
-  }
-}
+  },
+  "types": ["jasmine", "node"]
+}

yarn.lock

@@ -113,6 +113,12 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
+ansi-styles@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
+  dependencies:
+    color-convert "^1.9.0"
+
 anymatch@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
@@ -553,6 +559,14 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
+  dependencies:
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+
 chokidar@^1.4.1, chokidar@^1.4.3:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.6.1.tgz#2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2"
@@ -602,7 +616,17 @@ 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"
 
-colors@^1.0.3, colors@^1.1.0, colors@^1.1.2:
+color-convert@^1.9.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.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+
+colors@^1.1.0, colors@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
@@ -974,7 +998,7 @@ escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
 
-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"
 
@@ -1300,6 +1324,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-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -1793,7 +1821,7 @@ loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
-loader-utils@^0.2.16, loader-utils@^0.2.5, loader-utils@^0.2.6, loader-utils@^0.2.7:
+loader-utils@^0.2.16, loader-utils@^0.2.5, loader-utils@^0.2.7:
   version "0.2.16"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
   dependencies:
@@ -1802,6 +1830,14 @@ loader-utils@^0.2.16, loader-utils@^0.2.5, loader-utils@^0.2.6, loader-utils@^0.
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
+loader-utils@^1.0.2:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+
 lodash-es@^4.2.1:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7"
@@ -2409,9 +2445,9 @@ redent@^1.0.0:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
-redux-observable@^0.14.0:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/redux-observable/-/redux-observable-0.14.1.tgz#9f3d870c69388fdc427ded6770a3e326f3b69693"
+redux-observable@^0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/redux-observable/-/redux-observable-0.16.0.tgz#dc431d0f47a9c3af232639d6bdd70d80c1b620d9"
 
 redux@^3.6.0:
   version "3.6.0"
@@ -2776,6 +2812,12 @@ supports-color@^3.1.0:
   dependencies:
     has-flag "^1.0.0"
 
+supports-color@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.1.tgz#65a4bb2631e90e02420dba5554c375a4754bb836"
+  dependencies:
+    has-flag "^2.0.0"
+
 symbol-observable@^1.0.1, symbol-observable@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
@@ -2843,14 +2885,13 @@ trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
 
-ts-loader@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-1.3.3.tgz#30c6203e1e66b841a88701ed8858f1725d94b026"
+ts-loader@^2.2.7:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-2.3.3.tgz#bdf1e4f7e3acd3545e110a1d635f14753a63f6c3"
   dependencies:
-    colors "^1.0.3"
+    chalk "^2.0.1"
     enhanced-resolve "^3.0.0"
-    loader-utils "^0.2.6"
-    object-assign "^4.1.0"
+    loader-utils "^1.0.2"
     semver "^5.0.1"
 
 tsickle@^0.21.0:
@@ -2909,10 +2950,14 @@ type-is@~1.6.14:
     media-typer "0.3.0"
     mime-types "~2.1.13"
 
-typescript@^2.1.4, typescript@~2.2.0:
+typescript@^2.1.4:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.2.1.tgz#4862b662b988a4c8ff691cc7969622d24db76ae9"
 
+typescript@^2.4.0:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.1.tgz#ce7cc93ada3de19475cc9d17e3adea7aee1832aa"
+
 uglify-js@^2.6, uglify-js@^2.7.5:
   version "2.7.5"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"