refactor(Globals): Switch from Globals to UIRouterGlobals for compat with ui-router-core 4.x

Author: christopherthielen

package.json

@@ -3,7 +3,7 @@
   "description": "State-based routing for Angular 2",
   "version": "1.0.0-beta.4",
   "scripts": {
-    "clean": "shx rm -rf lib lib-esm _bundles _doc",
+    "clean": "shx rm -rf lib lib-esm _bundles _dec",
     "compile": "npm run clean && ngc",
     "build": "npm run compile && webpack",
     "test": "karma start config/karma.ng2.js",
@@ -51,7 +51,7 @@
   "module": "lib/index.js",
   "typings": "lib/index.d.ts",
   "dependencies": {
-    "ui-router-core": "=3.1.1",
+    "ui-router-core": "=4.0.0",
     "ui-router-rx": "=0.2.0"
   },
   "peerDependencies": {

src/directives/uiSref.ts

@@ -1,6 +1,6 @@
 /** @ng2api @module directives */
 /** */
-import { UIRouter, UIRouterGlobals, extend, Obj, TransitionOptions, Globals, TargetState } from "ui-router-core";
+import { UIRouter, UIRouterGlobals, extend, Obj, TransitionOptions, TargetState } from "ui-router-core";
 import { Directive, Inject, Input, Optional, ElementRef, Renderer } from "@angular/core";
 import { UIView, ParentUIViewInject } from "./uiView";
 import { ReplaySubject } from "rxjs/ReplaySubject";
@@ -97,18 +97,21 @@ export class UISref {
    */
   public targetState$ = new ReplaySubject<TargetState>(1);
 
-  /** @internalapi */
-  private _emit: boolean = false;
-  /** @internalapi */
-  private _statesSub: Subscription;
+  /** @internalapi */ private _emit: boolean = false;
+  /** @internalapi */ private _statesSub: Subscription;
+  /** @internalapi */ private _router: UIRouter;
+  /** @internalapi */ public parent: ParentUIViewInject;
+  /** @internalapi */ private _anchorUISref: AnchorUISref;
 
   constructor(
-      /** @internalapi */ private _router: UIRouter,
-      /** @internalapi */ @Inject(UIView.PARENT_INJECT) public parent: ParentUIViewInject,
-      /** @internalapi */ @Optional() private _anchorUISref: AnchorUISref,
-      @Inject(Globals) _globals: UIRouterGlobals
+      _router: UIRouter,
+      @Inject(UIView.PARENT_INJECT) parent: ParentUIViewInject,
+      @Optional() _anchorUISref: AnchorUISref
   ) {
-    this._statesSub = _globals.states$.subscribe(() => this.update())
+    this._router = _router;
+    this.parent = parent;
+    this._anchorUISref = _anchorUISref;
+    this._statesSub = _router.globals.states$.subscribe(() => this.update())
   }
 
   /** @internalapi */

src/directives/uiSrefStatus.ts

@@ -6,7 +6,7 @@ import {Transition} from "ui-router-core";
 import {TargetState} from "ui-router-core";
 import {State} from "ui-router-core";
 import {anyTrueR, tail, unnestR, Predicate} from "ui-router-core";
-import {Globals, UIRouterGlobals} from "ui-router-core";
+import {UIRouterGlobals} from "ui-router-core";
 import {Param} from "ui-router-core";
 import {PathFactory} from "ui-router-core";
 import {Subscription} from "rxjs/Subscription";
@@ -184,11 +184,12 @@ export class UISrefStatus {
   /** The current status */
   status: SrefStatus;
 
-  private _subscription: Subscription;
-  private _srefChangesSub: Subscription;
-  private _srefs$: BehaviorSubject<UISref[]>;
-
-  constructor(@Inject(Globals) private _globals: UIRouterGlobals) {
+  /** @internalapi */ private _subscription: Subscription;
+  /** @internalapi */ private _srefChangesSub: Subscription;
+  /** @internalapi */ private _srefs$: BehaviorSubject<UISref[]>;
+  /** @internalapi */ private _globals: UIRouterGlobals;
+  constructor(_globals: UIRouterGlobals) {
+    this._globals = _globals;
     this.status = Object.assign({}, inactiveStatus);
   }
 

src/providers.ts

@@ -88,7 +88,7 @@
 import { Injector, Provider } from "@angular/core";
 import {
   UIRouter, PathNode, StateRegistry, StateService, TransitionService, UrlMatcherFactory, UrlRouter, ViewService,
-  UrlService, Globals, services, Resolvable, NATIVE_INJECTOR_TOKEN
+  UrlService, UIRouterGlobals, services, Resolvable, NATIVE_INJECTOR_TOKEN
 } from "ui-router-core";
 import { UIView, ParentUIViewInject } from "./directives/uiView";
 import { ng2ViewsBuilder, Ng2ViewConfig } from "./statebuilders/views";
@@ -192,7 +192,7 @@ export const _UIROUTER_SERVICE_PROVIDERS: Provider[] = [
   { provide: UrlService,        useFactory: fnUrlService,         deps: [UIRouter]},
   { provide: ViewService,       useFactory: fnViewService,        deps: [UIRouter]},
   { provide: StateRegistry,     useFactory: fnStateRegistry,      deps: [UIRouter]},
-  { provide: Globals,           useFactory: fnGlobals,            deps: [UIRouter]},
+  { provide: UIRouterGlobals,   useFactory: fnGlobals,            deps: [UIRouter]},
 ];
 
 /**