fix(location): Do not deep import vanilla.* from ui-router-core

 - This stops rollup from double-bundling the `ui-router-core` code.

refactor(UISref): change constructor args order

Author: christopherthielen

src/directives/uiSref.ts

@@ -100,18 +100,19 @@ export class UISref {
   /** @internalapi */ private _emit: boolean = false;
   /** @internalapi */ private _statesSub: Subscription;
   /** @internalapi */ private _router: UIRouter;
-  /** @internalapi */ public parent: ParentUIViewInject;
   /** @internalapi */ private _anchorUISref: AnchorUISref;
+  /** @internalapi */ public parent: ParentUIViewInject;
 
   constructor(
       _router: UIRouter,
+      @Optional() _anchorUISref: AnchorUISref,
       @Inject(UIView.PARENT_INJECT) parent: ParentUIViewInject,
-      @Optional() _anchorUISref: AnchorUISref
   ) {
     this._router = _router;
-    this.parent = parent;
     this._anchorUISref = _anchorUISref;
-    this._statesSub = _router.globals.states$.subscribe(() => this.update())
+    this.parent = parent;
+
+    this._statesSub = _router.globals.states$.subscribe(() => this.update());
   }
 
   /** @internalapi */

src/location/locationService.ts

@@ -1,8 +1,6 @@
 /** @module ng2 */
 /** */
-import { UIRouter } from "ui-router-core";
-import { BaseLocationServices } from "ui-router-core/lib/vanilla/baseLocationService";
-import { parseUrl } from "ui-router-core/lib/vanilla/utils";
+import { UIRouter, BaseLocationServices, parseUrl } from "ui-router-core";
 import { PlatformLocation, LocationStrategy } from "@angular/common";
 
 /** A `LocationServices` that uses the browser hash "#" to get/set the current location */

src/providers.ts

@@ -95,8 +95,7 @@ import { ng2ViewsBuilder, Ng2ViewConfig } from "./statebuilders/views";
 import { Ng2ViewDeclaration } from "./interface";
 import { applyRootModuleConfig, applyModuleConfig } from "./uiRouterConfig";
 import { RootModule, StatesModule, UIROUTER_ROOT_MODULE, UIROUTER_MODULE_TOKEN } from "./uiRouterNgModule";
-import { servicesPlugin } from "ui-router-core/lib/vanilla";
-import { ServicesPlugin } from "ui-router-core/lib/vanilla/interface";
+import { servicesPlugin, ServicesPlugin } from "ui-router-core";
 import { ng2LazyLoadBuilder } from "./statebuilders/lazyLoad";
 import { UIRouterRx } from "ui-router-rx";
 import { LocationStrategy, PlatformLocation } from "@angular/common";