v7 release - Angular v5 Support (#24)

* v7 release - Angular v5 Support

* Update to Angular 5 compiler
* Update RxJS, change to use let-able operators
* Requires @angular-redux/store 7+

**Breaking Change**

* NgReduxRouterModule now needs to be imported with `.forRoot`

**before**

```ts
@NgModule({
          declarations: [AppComponent],
            imports: [
                RouterModule.forRoot(appRoutes),
                /* .... */
                NgReduxRouterModule  ],
                  bootstrap: [AppComponent]
                  })
export class AppModule {}
```

**after**

```ts
@NgModule({
          declarations: [AppComponent],
            imports: [
                RouterModule.forRoot(appRoutes),
                /* .... */
                NgReduxRouterModule.forRoot()
              ],
                bootstrap: [AppComponent]
                })
export class AppModule {}
````

Author: Evan Schultz

packages/router/CHANGELOG.md

@@ -1,3 +1,43 @@
+# 7.0.0 - Angular 5+ only support
+
+* Update to Angular 5 compiler
+* Update RxJS, change to use let-able operators
+* Requires @angular-redux/store 7+
+
+** Breaking Change **
+
+* NgReduxRouterModule now needs to be imported with `.forRoot`
+
+**before**
+
+```ts
+@NgModule({
+  declarations: [AppComponent],
+  imports: [
+    RouterModule.forRoot(appRoutes),
+    /* .... */
+    NgReduxRouterModule
+  ],
+  bootstrap: [AppComponent]
+})
+export class AppModule {}
+```
+
+**after**
+
+```ts
+@NgModule({
+  declarations: [AppComponent],
+  imports: [
+    RouterModule.forRoot(appRoutes),
+    /* .... */
+    NgReduxRouterModule.forRoot()
+  ],
+  bootstrap: [AppComponent]
+})
+export class AppModule {}
+```
+
 # 6.4.0 - Angular 5 Support
 
 Added support for Angular 5.
@@ -28,22 +68,23 @@ support will be removed in the next major version.
 
 # 6.0.0 - The big-rename.
 
-Due to the impending release of Angular4, the name 'ng2-redux' no longer makes
-a ton of sense.  The Angular folks have moved to a model where all versions are
+Due to the impending release of Angular4, the name 'ng2-redux' no longer makes a
+ton of sense. The Angular folks have moved to a model where all versions are
 just called 'Angular', and we should match that.
 
 After discussion with the other maintainers, we decided that since we have to
 rename things anyway, this is a good opportunity to collect ng2-redux and its
-related libraries into a set of scoped packages. This will allow us to grow
-the feature set in a coherent but decoupled way.
+related libraries into a set of scoped packages. This will allow us to grow the
+feature set in a coherent but decoupled way.
 
 As of v6, the following packages are deprecated:
 
 * ng2-redux
 * ng2-redux-router
 * ng2-redux-form
 
-Those packages will still be available on npm for as long as they are being used.
+Those packages will still be available on npm for as long as they are being
+used.
 
 However we have published the same code under a new package naming scheme:
 
@@ -52,13 +93,14 @@ However we have published the same code under a new package naming scheme:
 * @angular-redux/form (formerly ng2-redux-form).
 
 We have also decided that it's easier to reason about things if these packages
-align at least on major versions. So everything has at this point been bumped
-to 6.0.0.
+align at least on major versions. So everything has at this point been bumped to
+6.0.0.
 
 # Breaking changes
 
 Apart from the rename, the following API changes are noted:
 
 * @angular-redux/store: none.
 * @angular-redux/router: none.
-* @angular-redux/form: `NgReduxForms` renamed to `NgReduxFormModule` for consistency.
+* @angular-redux/form: `NgReduxForms` renamed to `NgReduxFormModule` for
+  consistency.

packages/router/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@angular-redux/router",
-  "version": "6.4.1",
+  "version": "7.0.0-2",
   "description": "Keep your Angular 2+ router state in Redux.",
-  "main": "./lib/es5/index.js",
-  "module": "./lib/esm/index.js",
-  "typings": "./lib/es5/index.d.ts",
+  "main": "./lib/es5/src/index.js",
+  "module": "./lib/esm/src/index.js",
+  "typings": "./lib/es5/src/index.d.ts",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/angular-redux/router.git"
@@ -18,25 +18,25 @@
     "build:es5": "ngc -p tsconfig.json && npm run postbuild"
   },
   "peerDependencies": {
-    "@angular/core": "^2.1.2 || ^4.0.0 || ^5.0.0",
-    "@angular/router": "^3.0.0 || ^4.0.0 || ^5.0.0"
+    "@angular/core": "^5.0.0",
+    "@angular/router": "^5.0.0"
   },
   "devDependencies": {
-    "@angular-redux/store": "^6.3.0",
-    "@angular/common": "^4.0.0",
-    "@angular/compiler": "^4.0.0",
-    "@angular/compiler-cli": "^4.0.0",
-    "@angular/core": "^4.0.0",
-    "@angular/platform-browser": "^4.0.0",
-    "@angular/platform-browser-dynamic": "^4.0.0",
-    "@angular/router": "^4.0.0",
+    "@angular-redux/store": "^7.0.0",
+    "@angular/common": "^5.0.0",
+    "@angular/compiler": "^5.0.0",
+    "@angular/compiler-cli": "^5.0.0",
+    "@angular/core": "^5.0.0",
+    "@angular/platform-browser": "^5.0.0",
+    "@angular/platform-browser-dynamic": "^5.0.0",
+    "@angular/router": "^5.0.0",
     "@types/core-js": "^0.9.39",
     "@types/jasmine": "^2.5.37",
     "redux": "^3.6.0",
     "rimraf": "^2.5.4",
-    "rxjs": "^5.0.1",
-    "typescript": "^2.4.1",
-    "zone.js": "^0.8.4"
+    "rxjs": "^5.5.2",
+    "typescript": "2.4.2",
+    "zone.js": "^0.8.18"
   },
   "author": "Dag Stuan",
   "license": "MIT"

packages/router/src/index.ts

@@ -1,16 +1,17 @@
+import { ModuleWithProviders } from '@angular/core';
 import { NgModule } from '@angular/core';
 import { NgReduxRouter } from './router';
 import { RouterAction, routerReducer } from './reducer';
 import { UPDATE_LOCATION } from './actions';
 
-@NgModule({
-  providers: [ NgReduxRouter ]
-})
-export class NgReduxRouterModule { }
+@NgModule()
+export class NgReduxRouterModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: NgReduxRouterModule,
+      providers: [NgReduxRouter]
+    };
+  }
+}
 
-export {
-  NgReduxRouter,
-  RouterAction,
-  routerReducer,
-  UPDATE_LOCATION
-};
+export { NgReduxRouter, RouterAction, routerReducer, UPDATE_LOCATION };

packages/router/src/router.ts

@@ -1,6 +1,6 @@
-import 'rxjs/add/operator/filter';
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/distinctUntilChanged';
+import { map } from 'rxjs/operators/map';
+import { filter } from 'rxjs/operators/filter';
+import { distinctUntilChanged } from 'rxjs/operators/distinctUntilChanged';
 import { Injectable, ApplicationRef } from '@angular/core';
 import { Location } from '@angular/common';
 import {
@@ -87,10 +87,11 @@ export class NgReduxRouter {
   }
 
   private getDefaultUrlStateObservable() {
-    return this.router.events
-      .filter(event => event instanceof NavigationEnd)
-      .map(event => this.location.path())
-      .distinctUntilChanged();
+    return this.router.events.pipe(
+      filter(event => event instanceof NavigationEnd),
+      map(event => this.location.path()),
+      distinctUntilChanged()
+    );
   }
 
   private getLocationFromStore(useInitial: boolean = false) {
@@ -148,7 +149,7 @@ export class NgReduxRouter {
 
     this.reduxSubscription = this.ngRedux
       .select(state => this.selectLocationFromState(state))
-      .distinctUntilChanged()
+      .pipe(distinctUntilChanged())
       .subscribe(handleLocationChange);
   }
 }

packages/router/tsconfig.es6.json

@@ -11,14 +11,14 @@
     "experimentalDecorators": true,
     "removeComments": false,
     "declaration": true,
-    "lib" : ["es2015", "es2015.iterable", "dom"],
+    "lib": ["es2015", "es2015.iterable", "dom"],
     "skipLibCheck": true
   },
-  "exclude": [
-    "lib",
-    "node_modules",
-    "spec",
-    "release",
-    "examples"
-  ]
+  "exclude": ["lib", "node_modules", "spec", "release", "examples"],
+  "angularCompilerOptions": {
+    "generateCodeForLibraries": false,
+    "strictMetadataEmit": true,
+    "genDir": ".compiled",
+    "annotationsAs": "decorators"
+  }
 }

packages/router/tsconfig.esm.json

@@ -11,14 +11,14 @@
     "experimentalDecorators": true,
     "removeComments": false,
     "declaration": true,
-    "lib" : ["es2015", "es2015.iterable", "dom"],
+    "lib": ["es2015", "es2015.iterable", "dom"],
     "skipLibCheck": true
   },
-  "exclude": [
-    "lib",
-    "node_modules",
-    "spec",
-    "release",
-    "examples"
-  ]
+  "exclude": ["lib", "node_modules", "spec", "release", "examples"],
+  "angularCompilerOptions": {
+    "generateCodeForLibraries": false,
+    "strictMetadataEmit": true,
+    "genDir": ".compiled",
+    "annotationsAs": "decorators"
+  }
 }

packages/router/tsconfig.json

@@ -11,15 +11,15 @@
     "experimentalDecorators": true,
     "removeComments": false,
     "declaration": true,
-    "lib" : ["es2015", "es2015.iterable", "dom"],
+    "lib": ["es2015", "es2015.iterable", "dom"],
     "strict": true,
     "skipLibCheck": true
   },
-  "exclude": [
-    "lib",
-    "node_modules",
-    "spec",
-    "release",
-    "examples"
-  ]
+  "exclude": ["lib", "node_modules", "spec", "release", "examples"],
+  "angularCompilerOptions": {
+    "generateCodeForLibraries": true,
+    "strictMetadataEmit": true,
+    "genDir": ".compiled",
+    "annotationsAs": "decorators"
+  }
 }