chore(core): Switch from ui-router-core to @uirouter/core

Author: christopherthielen

.travis.yml

@@ -21,16 +21,16 @@ before_script:
 
 script:
   - echo "CORE_BRANCH = x${CORE_BRANCH}x";
-  # Fetch and build the ui-router-core branch from github, then install it
+  # Fetch and build the @uirouter/core branch from github, then install it
   - >
     if [ "x${CORE_BRANCH}x" != "xx" ] ; then
-      echo "Installing ui-router-core from ${CORE_BRANCH}" && \
-      git clone --depth=10 --branch="${CORE_BRANCH}" https://github.com/ui-router/core.git ui-router-core && \
-      pushd ui-router-core && \
+      echo "Installing @uirouter/core from ${CORE_BRANCH}" && \
+      git clone --depth=10 --branch="${CORE_BRANCH}" https://github.com/ui-router/core.git @uirouter/core && \
+      pushd @uirouter/core && \
       yarn > /dev/null && \
       yarn build && \
       popd && \
-      npm install ./ui-router-core ;
+      npm install ./@uirouter/core ;
     fi
   - tsc && npm test
 
@@ -40,11 +40,11 @@ matrix:
 
 env:
   matrix:
-    # CORE_BRANCH env variable specifies the branch of ui-router-core to use during build/test
+    # CORE_BRANCH env variable specifies the branch of @uirouter/core to use during build/test
     # Each CORE_BRANCH listed here will trigger a SEPARATE job in travis
     - CORE_BRANCH=master
 
-    # If CORE_BRANCH is empty, it will use the ui-router-core from npm dependencies
+    # If CORE_BRANCH is empty, it will use the @uirouter/core from npm dependencies
     # (as specified in package.json)
     - CORE_BRANCH=
 

CONTRIBUTING.md

@@ -49,63 +49,65 @@ If your issue gets labeled with purple label, no further action will be taken un
 
 # Developing
 
-UI-Router uses <code>npm</code> and <code>webpack</code>.
+UI-Router uses <code>npm</code> and <code>Rollup</code>.
 
 ## Fetch the source code
 
 The code for Angular UI-Router is split into two source repositories:
 
-* [UI-Router Core](https://github.com/ui-router/core) (`ui-router-core` on npm)
-* [UI-Router for Angular 1](https://github.com/angular-ui/ui-router) (`angular-ui-router` on npm)
+* [UI-Router Core](https://github.com/ui-router/core) (`@uirouter/core` on npm)
+* [UI-Router for Angular 1](https://github.com/angular-ui/ui-router) (`@ui-router/angularjs` on npm)
 
 Clone both repositories into directories next to each other.
 
 ```
-git clone https://github.com/angular-ui/ui-router.git angular-ui-router
-git clone https://github.com/ui-router/core.git ui-router-core
+mkdir uirouter
+cd uirouter
+git clone https://github.com/angular-ui/ui-router.git angularjs
+git clone https://github.com/ui-router/core.git core
 ```
 
 ## Install dependencies
 
-Use `npm` to install the development dependencies for each repositor.
+Use `npm` to install the development dependencies for each repository.
 
 ```
-cd ui-router-core
+cd core
 npm install
-cd ../angular-ui-router
+cd ../angularjs
 npm install
 cd ..
 ```
 
 ## Link the directories
 
-This step is necessary if you need to modify any code in `ui-router-core`.
-Using `npm`, link `ui-router-core` into `angular-ui-router` 
+This step is necessary if you need to modify any code in `@uirouter/core`.
+Using `npm`, link `@uirouter/core` into `angular-ui-router`
 
 ```
-cd ui-router-core
+cd core
 npm link
-cd ../angular-ui-router
-npm link ui-router-core
+cd ../angularjs
+npm link '@uirouter/core'
 ```
 
-After executing these steps, `angular-ui-router` will be built using your local copy of `ui-router-core`.
+After executing these steps, `@uirouter/angularjs` will be depend on your local copy of `@uirouter/core` instead of the version listed in `package.json`.
 
 ## Develop
 
-These scripts may be run in `angular-ui-router`:
+These scripts may be run in the `angularjs` directory:
 
 * `npm run build`: Compiles TypeScript source
-* `npm run package`: Compiles TypeScript source and creates webpack bundles.
-* `npm test`: Runs the `angular-ui-router` test suite (against Angular 1.2 through 1.5).
-* `npm run watch`: Continuously compiles the source and runs the `angular-ui-router` tests (when source or tests change).
+* `npm run package`: Compiles TypeScript source and creates the Rollup bundles.
+* `npm test`: Runs the test suite (against Angular 1.2 through 1.5).
+* `npm run watch`: Continuously compiles the source and runs the test suite (when either source or tests change).
 
-Scripts of the same name (in `ui-router-core`) can be used.
+Scripts of the same name (in the `core` directory) can be used.
 
-* `npm run build`: Compiles `ui-router-core` TypeScript source
-* `npm test`: Runs the `ui-router-core` test suite
-* `npm run watch`: Continuously compiles the source and runs the `ui-router-core` test suite (when core source or tests change).
+* `npm run build`: Compiles `@uirouter/core` TypeScript source
+* `npm test`: Runs the `@uirouter/core` test suite
+* `npm run watch`: Continuously compiles the source and runs the `@uirouter/core` test suite (when core source or tests change).
 
 If you've followed the [linking instructions](#link-the-directories), it's useful to run both
-`npm run watch` tasks (each task from `ui-router-core` *and* `angular-ui-router`).
-This ensures that changes to either `ui-router-core` and `angular-ui-router` compile successfully and are run against the test suite.
+`npm run watch` tasks (each task from `@uirouter/core` *and* `@uirouter/angularjs`).
+This ensures that changes to either `@uirouter/core` and `@uirouter/angularjs` compile successfully and are run against their test suites.

DOCS.md

@@ -37,11 +37,11 @@ The documentation reflects the Typescript classes, interfaces, and parameter typ
 
 #### Contributing
 
-Angular UI-Router depends on the framework agnostic `ui-router-core`.
+Angular UI-Router depends on the framework agnostic `@uirouter/core`.
 To contribute to the documentation, please submit a PR to either 
-[angular-ui-router](http://github.com/angular-ui/ui-router)
+[@uirouter/angularjs](http://github.com/angular-ui/ui-router)
 or
-[ui-router-core](http://github.com/ui-router/core).
+[@uirouter/core](http://github.com/ui-router/core).
 To find where a specific piece of documentation is written, follow the links that say:
  > _Defined in ui-router/somedir/somefile.ts_
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "angular-ui-router",
   "description": "State-based routing for AngularJS 1.x",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0",
   "scripts": {
     "clean": "shx rm -rf lib lib-esm _doc build release *.log",
     "build": "tsc && tsc -m es6 --outDir lib-esm && npm run fixdts",
@@ -11,6 +11,7 @@
     "bundle_router": "rollup -c --environment ROUTER  && rollup -c --environment ROUTER,MINIFY",
     "bundle_events": "rollup -c --environment EVENTS  && rollup -c --environment EVENTS,MINIFY",
     "bundle_resolve": "rollup -c --environment RESOLVE && rollup -c --environment RESOLVE,MINIFY",
+    "prepare": "npm run package",
     "noimplicitany": "tsc --noEmit --noImplicitAny --moduleResolution node --target es6 test/noimplicitany.ts",
     "test": "npm run test:integrate",
     "test:ng12": "karma start --ngversion 1.2",
@@ -65,7 +66,7 @@
   "jsnext:main": "lib-esm/index.js",
   "typings": "lib/index.d.ts",
   "dependencies": {
-    "ui-router-core": "^5.0.0"
+    "@uirouter/core": "5.0.0"
   },
   "peerDependencies": {
     "angular": ">=1.2.0"
@@ -106,7 +107,7 @@
     "shelljs": "^0.7.0",
     "shx": "^0.1.4",
     "systemjs": "^0.18.4",
-    "tslint": "=2.5.0",
+    "tslint": "^5.1.0",
     "typedoc": "~0.5.0",
     "typedoc-plugin-external-module-name": "^1.0.2",
     "typedoc-plugin-internal-external": "^1.0.0",

rollup.config.js

@@ -54,16 +54,16 @@ const EVENTS_CONFIG = Object.assign({}, BASE_CONFIG, {
   moduleName: 'angular-ui-router-state-events',
   entry: 'lib-esm/legacy/stateEvents.js',
   dest: 'release/stateEvents' + extension,
-  globals: { angular: 'angular', 'ui-router-core': 'ui-router-core' },
-  external: ['angular', 'ui-router-core'],
+  globals: { angular: 'angular', '@uirouter/core': '@uirouter/core' },
+  external: ['angular', '@uirouter/core'],
 });
 
 const RESOLVE_CONFIG = Object.assign({}, BASE_CONFIG, {
   moduleName: 'angular-ui-router-resolve-service',
   entry: 'lib-esm/legacy/resolveService.js',
   dest: 'release/resolveService' + extension,
-  globals: { angular: 'angular', 'ui-router-core': 'ui-router-core' },
-  external: ['angular', 'ui-router-core'],
+  globals: { angular: 'angular', '@uirouter/core': '@uirouter/core' },
+  external: ['angular', '@uirouter/core'],
 });
 
 const CONFIG =

scripts/docs.js

@@ -16,7 +16,6 @@ let typedocCmd = [
 ].join(" ");
 
 let PROJECTDIR = path.join(__dirname, '..');
-let PROJ2 = 'ui-router-core';
 
 shelljs.pushd(PROJECTDIR);
 
@@ -25,25 +24,25 @@ shelljs.mv('src', 'src.bak');
 shelljs.cp('-r', 'src.bak', 'src');
 
 let arr = [];
-// This replaces "ui-router-core" with "../../../ui-router-core"
+// This replaces "@uirouter/core" with "../../../core"
 // while accounting for how many "../../" should be prepended
 for (var i = 0; i < 5; i++) {
   arr.push(arr.length);
 
   let dots = arr.map((val) => '..').join('/');
   let stars = arr.map((val) => '*').join('/');
 
-  // Replace references to "ui-router-core/lib" with "../ui-router-core/lib" for typedoc
+  // Replace references to "@uirouter/core/lib" with "../core/lib" for typedoc
   replaceInFiles.sync({
-    replace: / (['"])ui-router-core\/lib/g,
-    with: ' $1' + dots + '/../ui-router-core/src',
+    from: / (['"])\@uirouter\/core\/lib/g,
+    to: ' $1' + dots + '/../core/src',
     files: 'src/' + stars + '.ts'
   });
 
-  // Replace references to "ui-router-core" with "../ui-router-core" for typedoc
+  // Replace references to "@uirouter/core" with "../core" for typedoc
   replaceInFiles.sync({
-    replace: / (['"])ui-router-core/g,
-    with: ' $1' + dots + '/../ui-router-core/src',
+    from: / (['"])\@uirouter\/core/g,
+    to: ' $1' + dots + '/../core/src',
     files: 'src/' + stars + '.ts'
   });
 }

scripts/show_core_changelog.js

@@ -1,16 +1,19 @@
 #!env node
 "use strict";
+
 var gitSemverTags = require('git-semver-tags');
 var shelljs = require('shelljs');
 var path = require('path');
 var fs = require('fs');
 
-var CORE_PKG = 'ui-router-core';
-var CORE_DIR = path.join(__dirname, "..", "..", CORE_PKG);
+var CORE_PKG = `@uirouter/core`;
+var ALT_CORE_PKG = `ui-router-core`;
+var CORE_DIR = path.join(__dirname, "..", "..", 'core');
 var SHOWCHANGELOG_SCRIPT = path.join(CORE_DIR, "scripts", "show_changelog.js");
 
 var currentPackage = require('../package.json');
-if (!currentPackage.dependencies || !currentPackage.dependencies[CORE_PKG]) {
+if (!currentPackage.dependencies || (!currentPackage.dependencies[CORE_PKG] && !currentPackage[ALT_CORE_PKG])) {
+  console.error(stringify(currentPackage.dependencies));
   throw new Error("No dependency on " + CORE_PKG + " found in package.json.")
 }
 
@@ -33,23 +36,34 @@ gitSemverTags(function (err, val) {
     try {
       prevPackage = JSON.parse(prevRaw);
     } catch (error) {
-      console.error("Unable to parse previous package.json");
+      console.error("Unable to parse previous package.json in ${val[0]}");
       console.error(prevRaw);
       throw error;
     }
 
     if (!prevPackage.dependencies) {
-      throw new Error("previous package.json has no `dependencies` key.");
-    } else if (!prevPackage.dependencies[CORE_PKG]) {
-      throw new Error("previous package.json has no `dependencies['ui-router-core']` key.");
+      console.error(stringify(prevPackage));
+      throw new Error(`previous package.json in ${val[0]} has no "dependencies" key.`);
+    } else if (!prevPackage.dependencies[CORE_PKG] && !prevPackage.dependencies[ALT_CORE_PKG]) {
+      console.error(stringify(prevPackage.dependencies));
+      throw new Error(`previous package.json in ${val[0]} has no "dependencies['${CORE_PKG}']" key.`);
     }
 
-    fromTag = prevPackage.dependencies[CORE_PKG].replace(/[=~^]/, "");
+    var prevDep = prevPackage.dependencies[CORE_PKG] || prevPackage.dependencies[ALT_CORE_PKG];
+    fromTag = prevDep.replace(/[=~^]/, "");
   }
 
-  var toTag = require("../package.json").dependencies[CORE_PKG].replace(/[=~^]/g, "");
+  let pkg = require("../package.json");
+  let currentDep = pkg.dependencies[CORE_PKG] || pkg.dependencies[ALT_CORE_PKG];
+  var toTag = currentDep.replace(/[=~^]/g, "");
+
   shelljs.pushd(CORE_DIR);
   // console.log("node " + SHOWCHANGELOG_SCRIPT + " " + fromTag + " " + toTag)
   shelljs.config.silent = false;
   shelljs.exec("node " + SHOWCHANGELOG_SCRIPT + " " + fromTag + " " + toTag)
 });
+
+
+function stringify(object) {
+  return JSON.stringify(object, null, 2);
+}

src/directives/stateDirectives.ts

@@ -14,7 +14,7 @@ import { IAugmentedJQuery, ITimeoutService, IScope, IInterpolateService } from "
 import {
     Obj, extend, forEach, tail, isString, isObject, isArray, parse, noop, unnestR, identity, uniqR, inArray, removeFrom,
     RawParams, PathNode, StateOrName, StateService, StateDeclaration, UIRouter
-} from "ui-router-core";
+} from "@uirouter/core";
 import { UIViewData } from "./viewDirective";
 
 /** @hidden Used for typedoc */

src/directives/viewDirective.ts

@@ -12,7 +12,7 @@ import {
     extend, unnestR, filter, tail, isDefined, isFunction, isString, trace, parse,
     ActiveUIView, TransitionService, ResolveContext, Transition, PathNode, StateDeclaration,
     Param, kebobString, HookRegOptions, ViewService, $QLike, Obj, TypedMap
-} from "ui-router-core";
+} from "@uirouter/core";
 import {Ng1ViewConfig} from "../statebuilders/views";
 import {Ng1Controller, Ng1StateDeclaration} from "../interface";
 import {getLocals} from "../services";

src/index.ts

@@ -3,9 +3,9 @@
  * @module ng1
  */ /** */
 
-import * as core from "ui-router-core";
+import * as core from "@uirouter/core";
 export { core };
-export * from "ui-router-core";
+export * from "@uirouter/core";
 
 export * from "./interface";
 export * from "./services";

src/injectables.ts

@@ -55,7 +55,7 @@ import { StateProvider } from "./stateProvider";
 import {
     StateService, TransitionService, Transition, UrlRouter, UrlMatcherFactory,
     StateParams, StateRegistry, UIRouterGlobals, UIRouter, Trace, UrlService
-} from "ui-router-core";
+} from "@uirouter/core";
 import { UIViewScrollProvider } from "./viewScroll";
 import { UrlRouterProvider } from "./urlRouterProvider";
 

src/interface.ts

@@ -2,7 +2,7 @@
  * @ng1api
  * @module ng1
  */ /** */
-import { StateDeclaration, _ViewDeclaration, IInjectable, Transition, HookResult } from "ui-router-core";
+import { StateDeclaration, _ViewDeclaration, IInjectable, Transition, HookResult } from "@uirouter/core";
 
 
 /**
@@ -45,7 +45,7 @@ import { StateDeclaration, _ViewDeclaration, IInjectable, Transition, HookResult
  * @returns an optional [[HookResult]] which may alter the transition
  */
 export interface Ng1StateTransitionHook {
-  (...injectables: any[]) : HookResult
+  (...injectables: any[]) : HookResult;
 }
 
 /**
@@ -741,8 +741,8 @@ export interface TemplateFactoryProvider {
   useHttpService(useUnsafeHttpService: boolean);
 }
 
-declare module "ui-router-core/lib/state/stateRegistry" {
+declare module "@uirouter/core/lib/state/stateRegistry" {
   interface StateRegistry {
-    register(state: Ng1StateDeclaration)
+    register(state: Ng1StateDeclaration);
   }
 }

src/legacy/resolveService.ts

@@ -1,5 +1,5 @@
 /** @module ng1 */ /** */
-import { StateObject, PathNode, ResolveContext, Obj, mapObj, resolvablesBuilder } from "ui-router-core";
+import { StateObject, PathNode, ResolveContext, Obj, mapObj, resolvablesBuilder } from "@uirouter/core";
 import * as angular from "angular";
 
 /**

src/legacy/stateEvents.ts

@@ -22,7 +22,7 @@ import { ng as angular } from "../angular";
 import { IScope, IAngularEvent, IServiceProviderFactory } from "angular";
 import {
     Obj, TargetState, StateService, Transition, TransitionService, UrlRouter, HookResult, UIInjector
-} from "ui-router-core";
+} from "@uirouter/core";
 import { StateProvider } from "../stateProvider";
 
 /**

src/locationServices.ts

@@ -2,8 +2,8 @@
  * @internalapi
  * @module ng1
  */ /** */
-import { LocationConfig, LocationServices, UIRouter, ParamType } from "ui-router-core";
-import { val, createProxyFunctions, removeFrom, isObject } from "ui-router-core";
+import { LocationConfig, LocationServices, UIRouter, ParamType } from "@uirouter/core";
+import { val, createProxyFunctions, removeFrom, isObject } from "@uirouter/core";
 import { ILocationService, ILocationProvider } from "angular";
 
 /**