Update to uirouter/core

Author: wawyed

config/_karma.base.js

@@ -39,7 +39,7 @@ var config = {
     configFile: 'config/system.config.js',
     files: [
         'src/**/*.ts',
-        'node_modules/ui-router-core/lib/**/*'
+        'node_modules/@uirouter/core/lib/**/*'
     ]
   },
   exclude: []

config/system.config.js

@@ -13,12 +13,12 @@ System.config({
         'ui-router-ng2': 'src/index.ts'
     },
     map: {
-        'ui-router-core': 'node_modules/ui-router-core/lib',
+        '@uirouter/core': 'node_modules/@uirouter/core/lib',
     },
     packages: {
         'src': { defaultExtension: 'ts' },
 
-        'ui-router-core':       { main: 'index.js', defaultExtension: 'js' },
+        '@uirouter/core':       { main: 'index.js', defaultExtension: 'js' },
         '@angular/core':        { main: 'index.js', defaultExtension: 'js' },
         '@angular/compiler':    { main: 'index.js', defaultExtension: 'js' },
         '@angular/common':      { main: 'index.js', defaultExtension: 'js' },

package.json

@@ -46,7 +46,7 @@
   "module": "lib/index.js",
   "typings": "lib/index.d.ts",
   "dependencies": {
-    "ui-router-core": "=5.0.0-pre.1",
+    "@uirouter/core": "5.0.0",
     "ui-router-rx": "=0.2.1"
   },
   "peerDependencies": {
@@ -97,7 +97,7 @@
     "typedoc-plugin-external-module-name": "^1.0.2",
     "typedoc-plugin-internal-external": "^1.0.0",
     "typedoc-plugin-ui-router": "^1.0.0",
-    "typescript": "~2.0.3",
+    "typescript": "^2.1.4",
     "ui-router-typedoc-themes": "^1.0.0",
     "webpack": "^2.2.0",
     "webpack-dev-server": "2.2.0",

rollup.config.js

@@ -41,11 +41,12 @@ function onwarn(warning) {
 }
 
 function isExternal(id) {
-  // ui-router-core and ui-router-rx should be external
+  // @uirouter/core and ui-router-rx should be external
   // All rxjs and @angular/* should be external
   // except for @angular/router/src/router_config_loader
   let externals = [
-    /^ui-router-(core|rx)/,
+    /^ui-router-rx/,
+    /^@uirouter\/core/,
     /^rxjs/,
     /^@angular\/(?!router\/src\/router_config_loader)/,
   ];
@@ -94,7 +95,7 @@ const CONFIG = {
     'rxjs/operator/filter': 'Rx.Observable.prototype',
     'rxjs/operator/concatMap': 'Rx.Observable.prototype',
 
-    'ui-router-core': 'ui-router-core',
+    '@uirouter/core': '@uirouter/core',
     'ui-router-rx': 'ui-router-rx',
     '@angular/core': 'ng.core',
     '@angular/common': 'ng.common',

src/directives/uiSref.ts

@@ -1,6 +1,6 @@
 /** @ng2api @module directives */
 /** */
-import { UIRouter, UIRouterGlobals, extend, Obj, TransitionOptions, TargetState } from "ui-router-core";
+import { UIRouter, UIRouterGlobals, extend, Obj, TransitionOptions, TargetState } from "@uirouter/core";
 import { Directive, Inject, Input, Optional, ElementRef, Renderer } from "@angular/core";
 import { UIView, ParentUIViewInject } from "./uiView";
 import { ReplaySubject } from "rxjs/ReplaySubject";

src/directives/uiSrefStatus.ts

@@ -3,8 +3,8 @@
 import { Directive, Output, EventEmitter, ContentChildren, QueryList } from '@angular/core';
 import { UISref } from './uiSref';
 import {
-  PathNode, Transition, TargetState, StateObject, anyTrueR, tail, unnestR, Predicate, UIRouterGlobals, Param, PathFactory
-} from 'ui-router-core';
+  PathNode, Transition, TargetState, StateObject, anyTrueR, tail, unnestR, Predicate, UIRouterGlobals, Param, PathUtils
+} from '@uirouter/core';
 
 import { Subscription } from 'rxjs/Subscription';
 import { Observable } from 'rxjs/Observable';
@@ -55,15 +55,15 @@ const pathMatches = (target: TargetState): Predicate<PathNode[]> => {
   if (!target.exists()) return () => false;
   let state: StateObject = target.$state();
   let targetParamVals = target.params();
-  let targetPath: PathNode[] = PathFactory.buildPath(target);
+  let targetPath: PathNode[] = PathUtils.buildPath(target);
   let paramSchema: Param[] = targetPath.map(node => node.paramSchema)
       .reduce(unnestR, [])
       .filter((param: Param) => targetParamVals.hasOwnProperty(param.id));
 
   return (path: PathNode[]) => {
     let tailNode = tail(path);
     if (!tailNode || tailNode.state !== state) return false;
-    let paramValues = PathFactory.paramValues(path);
+    let paramValues = PathUtils.paramValues(path);
     return Param.equals(paramSchema, paramValues, targetParamVals);
   };
 };
@@ -76,7 +76,7 @@ const pathMatches = (target: TargetState): Predicate<PathNode[]> => {
  * @internalapi
  */
 function spreadToSubPaths(basePath: PathNode[], appendPath: PathNode[]): PathNode[][] {
-  return appendPath.map(node => basePath.concat(PathFactory.subPath(appendPath, n => n.state === node.state)));
+  return appendPath.map(node => basePath.concat(PathUtils.subPath(appendPath, n => n.state === node.state)));
 }
 
 /**

src/directives/uiView.ts

@@ -8,7 +8,7 @@ import { reflector } from '../private_import_core';
 import {
   UIRouter, isFunction, Transition, parse, TransitionHookFn, StateDeclaration, inArray, trace, ViewContext, ViewConfig,
   ActiveUIView, ResolveContext, NATIVE_INJECTOR_TOKEN, flattenR
-} from 'ui-router-core';
+} from '@uirouter/core';
 import { Ng2ViewConfig } from '../statebuilders/views';
 import { MergeInjector } from '../mergeInjector';
 

src/index.ts

@@ -10,4 +10,4 @@ export * from "./statebuilders/views";
 export * from "./statebuilders/lazyLoad";
 export * from "./lazyLoad/lazyLoadNgModule";
 
-export * from "ui-router-core";
+export * from "@uirouter/core";

src/interface.ts

@@ -1,7 +1,7 @@
 /** @ng2api @module state */
 /** */
 
-import { StateDeclaration, _ViewDeclaration, Transition, HookResult } from "ui-router-core";
+import { StateDeclaration, _ViewDeclaration, Transition, HookResult } from "@uirouter/core";
 import { Type, Component } from "@angular/core";
 import { NgModuleToLoad } from "./lazyLoad/lazyLoadNgModule";
 

src/lazyLoad/lazyLoadNgModule.ts

@@ -4,7 +4,7 @@ import { NgModuleRef, Injector, NgModuleFactory, Type, Compiler, NgModuleFactory
 import {
   Transition, LazyLoadResult, UIRouter, Resolvable, NATIVE_INJECTOR_TOKEN, isString, unnestR, inArray, StateObject,
   uniqR
-} from "ui-router-core";
+} from "@uirouter/core";
 import { RootModule, UIROUTER_ROOT_MODULE, UIROUTER_MODULE_TOKEN, StatesModule } from "../uiRouterNgModule";
 import { applyModuleConfig } from "../uiRouterConfig";
 

src/location/locationConfig.ts

@@ -1,7 +1,7 @@
 /** @module ng2 */
 /** */
 
-import { UIRouter, is, BrowserLocationConfig } from "ui-router-core";
+import { UIRouter, is, BrowserLocationConfig } from "@uirouter/core";
 import { LocationStrategy, PathLocationStrategy } from "@angular/common";
 
 export class Ng2LocationConfig extends BrowserLocationConfig {

src/location/locationService.ts

@@ -1,6 +1,6 @@
 /** @module ng2 */
 /** */
-import { BaseLocationServices, parseUrl, UIRouter } from 'ui-router-core';
+import { BaseLocationServices, parseUrl, UIRouter } from '@uirouter/core';
 import { LocationStrategy } from '@angular/common';
 
 /** A `LocationServices` that delegates to the Angular LocationStrategy */

src/providers.ts

@@ -89,13 +89,13 @@ import { Injector, Provider } from "@angular/core";
 import {
   UIRouter, PathNode, StateRegistry, StateService, TransitionService, UrlMatcherFactory, UrlRouter, ViewService,
   UrlService, UIRouterGlobals, services, Resolvable, NATIVE_INJECTOR_TOKEN
-} from "ui-router-core";
+} from "@uirouter/core";
 import { UIView, ParentUIViewInject } from "./directives/uiView";
 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, ServicesPlugin } from "ui-router-core";
+import { servicesPlugin, ServicesPlugin } from "@uirouter/core";
 import { ng2LazyLoadBuilder } from "./statebuilders/lazyLoad";
 import { UIRouterRx } from "ui-router-rx";
 import { LocationStrategy } from "@angular/common";

src/statebuilders/lazyLoad.ts

@@ -1,7 +1,7 @@
 /** @module ng2 */
 /** */
-import { LazyLoadResult, Transition, StateDeclaration } from "ui-router-core"; // has or is using
-import { BuilderFunction, StateObject } from "ui-router-core";
+import { LazyLoadResult, Transition, StateDeclaration } from "@uirouter/core"; // has or is using
+import { BuilderFunction, StateObject } from "@uirouter/core";
 import { loadNgModule } from "../lazyLoad/lazyLoadNgModule";
 
 /**

src/statebuilders/views.ts

@@ -1,11 +1,11 @@
 /** @module ng2 */ /** */
-import {StateObject} from "ui-router-core";
-import {PathNode} from "ui-router-core";
-import {pick, forEach} from "ui-router-core";
-import {ViewConfig} from "ui-router-core";
+import {StateObject} from "@uirouter/core";
+import {PathNode} from "@uirouter/core";
+import {pick, forEach} from "@uirouter/core";
+import {ViewConfig} from "@uirouter/core";
 import {Ng2ViewDeclaration} from "../interface";
-import {services} from "ui-router-core";
-import {ViewService} from "ui-router-core";
+import {services} from "@uirouter/core";
+import {ViewService} from "@uirouter/core";
 
 /**
  * This is a [[StateBuilder.builder]] function for Angular `views`.

src/uiRouterConfig.ts

@@ -1,8 +1,8 @@
 /** @module ng2 */ /** */
-import { UIRouter, isFunction, StateObject } from "ui-router-core";
+import { UIRouter, isFunction, StateObject } from "@uirouter/core";
 import {StatesModule, RootModule} from "./uiRouterNgModule";
 import {Injector} from "@angular/core";
-import {isDefined} from "ui-router-core";
+import {isDefined} from "@uirouter/core";
 
 export function applyModuleConfig(uiRouter: UIRouter, injector: Injector, module: StatesModule = {}): StateObject[] {
   if (isFunction(module.config)) {

src/uiRouterNgModule.ts

@@ -7,7 +7,7 @@ import {
 import { CommonModule, LocationStrategy, HashLocationStrategy, PathLocationStrategy } from "@angular/common";
 import { _UIROUTER_DIRECTIVES } from "./directives/directives";
 import { UIView } from "./directives/uiView";
-import { UrlRuleHandlerFn, TargetState, TargetStateDef, UIRouter } from "ui-router-core";
+import { UrlRuleHandlerFn, TargetState, TargetStateDef, UIRouter } from "@uirouter/core";
 import { _UIROUTER_INSTANCE_PROVIDERS, _UIROUTER_SERVICE_PROVIDERS } from "./providers";
 
 import { ROUTES } from "@angular/router/src/router_config_loader";

test/matchers.ts

@@ -1,5 +1,5 @@
 /// <reference path='../typings/jasmine/jasmine.d.ts' />
-import {equals} from "ui-router-core";
+import {equals} from "@uirouter/core";
 declare var testablePromise;
 
 beforeEach(function() {

test/ngModule/lazyModule.spec.ts

@@ -1,7 +1,7 @@
 import { async, inject, TestBed } from '@angular/core/testing';
 import { UIRouterModule } from '../../src/uiRouterNgModule';
 import { UIView } from '../../src/directives/uiView';
-import { memoryLocationPlugin, UIRouter } from 'ui-router-core';
+import { memoryLocationPlugin, UIRouter } from '@uirouter/core';
 import { NgModuleFactoryLoader, SystemJsNgModuleLoader } from '@angular/core';
 
 declare var System;

test/testUtils.ts

@@ -1,4 +1,4 @@
-import { forEach, map, omit, pick } from 'ui-router-core';
+import { forEach, map, omit, pick } from '@uirouter/core';
 import { TestBed } from '@angular/core/testing';
 let stateProps = ["resolve", "resolvePolicy", "data", "template", "templateUrl", "url", "name", "params"];