chore(build): update ui-router-core to 2.0.0

chore(travis): update to node 4.3
chore(docs): better docsgen script

Author: christopherthielen

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "4.1"
+  - "4.3"
 
 #cache:
 #  directories:

package.json

@@ -58,7 +58,7 @@
   "jsnext:main": "lib-esm/index.js",
   "typings": "lib/index.d.ts",
   "dependencies": {
-    "ui-router-core": "=1.0.1"
+    "ui-router-core": "2.0.0"
   },
   "peerDependencies": {
     "angular": ">=1.2.0 <2.0.0"
@@ -88,6 +88,7 @@
     "karma-webpack": "^1.8.0",
     "lodash": "^4.5.1",
     "remap-istanbul": "^0.6.3",
+    "replace-in-file": "^2.0.3",
     "shelljs": "^0.7.0",
     "shx": "^0.1.4",
     "systemjs": "^0.18.4",

scripts/docs.js

@@ -0,0 +1,60 @@
+#!/usr/bin/env node
+
+let path = require('path');
+let shelljs = require('shelljs');
+let replaceInFiles = require('replace-in-file');
+
+let typedocCmd = [
+  "./node_modules/typedoc/bin/typedoc --tsconfig tsconfig.typedoc.json ",
+  " --readme README.md ",
+  " --name 'angular-ui-router' ",
+  " --theme node_modules/ui-router-typedoc-themes/bin/default ",
+  " --out _doc ",
+  " --internal-aliases internal,coreapi,ng1api ",
+  " --external-aliases internalapi,external ",
+  " --navigation-label-globals angular-ui-router",
+].join(" ");
+
+let PROJECTDIR = path.join(__dirname, '..');
+// let DOCGENDIR = '_docsgen';
+let PROJ2 = 'ui-router-core';
+
+shelljs.pushd(PROJECTDIR);
+
+// shelljs.rm('-rf', DOCGENDIR);
+// shelljs.mkdir(DOCGENDIR);
+
+// shelljs.cp('-R', 'src', DOCGENDIR);
+// shelljs.mkdir(path.join(DOCGENDIR, PROJ2));
+// shelljs.cp('-R', path.join('..', PROJ2, '.git'), path.join(DOCGENDIR, PROJ2, '.git'));
+// shelljs.cp('-R', path.join('..', PROJ2, 'src'), path.join(DOCGENDIR, PROJ2, 'src'));
+
+// shelljs.ln('-s', path.join('..', '..', PROJ2), path.join(DOCGENDIR, PROJ2));
+
+shelljs.mv('src', 'src.bak');
+shelljs.cp('-r', 'src.bak', 'src');
+
+let arr = [];
+for (var i = 0; i < 5; i++) {
+  arr.push(arr.length);
+  
+  let dots = arr.map((val) => '..').join('/');
+  let stars = arr.map((val) => '*').join('/');
+
+  replaceInFiles.sync({
+    replace: / (['"])ui-router-core\/lib/,
+    with: ' $1' + dots + '/ui-router-core/src',
+    files: 'src/' + stars + '.ts'
+  });
+
+  replaceInFiles.sync({
+    replace: / (['"])ui-router-core/,
+    with: ' $1' + dots + '/ui-router-core/src',
+    files: 'src/' + stars + '.ts'
+  });
+}
+
+shelljs.exec(typedocCmd);
+
+shelljs.rm('-rf', 'src');
+shelljs.mv('src.bak', 'src');

tsconfig.typedoc.json

@@ -10,33 +10,7 @@
     "sourceMap": false
   },
   "files": [
-    "../ui-router-core/src/index.ts",
-    "../ui-router-core/src/interface.ts",
-    "../ui-router-core/src/globals.ts",
-    "../ui-router-core/src/router.ts",
-    "../ui-router-core/src/common/glob.ts",
-    "../ui-router-core/src/common/trace.ts",
-    "../ui-router-core/src/params/module.ts",
-    "../ui-router-core/src/params/interface.ts",
-    "../ui-router-core/src/resolve/interface.ts",
-    "../ui-router-core/src/resolve/resolvable.ts",
-    "../ui-router-core/src/state/interface.ts",
-    "../ui-router-core/src/state/module.ts",
-    "../ui-router-core/src/state/stateObject.ts",
-    "../ui-router-core/src/state/stateRegistry.ts",
-    "../ui-router-core/src/state/stateService.ts",
-    "../ui-router-core/src/state/targetState.ts",
-    "../ui-router-core/src/transition/module.ts",
-    "../ui-router-core/src/transition/interface.ts",
-    "../ui-router-core/src/transition/transition.ts",
-    "../ui-router-core/src/transition/transitionService.ts",
-    "../ui-router-core/src/url/module.ts",
-    "../ui-router-core/src/url/urlMatcher.ts",
-    "../ui-router-core/src/url/urlMatcherFactory.ts",
-    "../ui-router-core/src/url/urlRouter.ts",
-    "../ui-router-core/src/view/module.ts",
-    "../ui-router-core/src/view/view.ts",
-    "src/ng1.ts",
-    "node_modules/typescript/lib/lib.es6.d.ts"
+    "src/index.ts",
+    "node_modules/typedoc/node_modules/typescript/lib/lib.es6.d.ts"
   ]
 }

yarn.lock

@@ -243,12 +243,6 @@ async@^1.3.0, async@^1.4.0, [email protected]:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.0.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"
-  dependencies:
-    lodash "^4.14.0"
-
 async@~0.2.6:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
@@ -447,12 +441,6 @@ binary-extensions@^1.0.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
 
-bl@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.1.2.tgz#fdca871a99713aa00d19e3bbba41c44787a65398"
-  dependencies:
-    readable-stream "~2.0.5"
-
 [email protected]:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
@@ -1074,7 +1062,7 @@ dot-prop@^3.0.0:
   dependencies:
     is-obj "^1.0.0"
 
-dts-downlevel:
+dts-downlevel@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dts-downlevel/-/dts-downlevel-0.1.0.tgz#15cddc2cf44a34ad426d1975341499a762d077ef"
   dependencies:
@@ -1416,14 +1404,6 @@ forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
-form-data@~1.0.0-rc4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-1.0.1.tgz#ae315db9a4907fa065502304a66d7733475ee37c"
-  dependencies:
-    async "^2.0.1"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.11"
-
 form-data@~2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.2.tgz#89c3534008b97eada4cbb157d58f6f5df025eae4"
@@ -1440,7 +1420,7 @@ [email protected]:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.3.0.tgz#651f838e22424e7566de161d8358caa199f83d4f"
 
-fs-extra@^0.30.0, fs-extra@~0.30.0:
+fs-extra@^0.30.0:
   version "0.30.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
   dependencies:
@@ -1450,6 +1430,14 @@ fs-extra@^0.30.0, fs-extra@~0.30.0:
     path-is-absolute "^1.0.0"
     rimraf "^2.2.8"
 
+fs-extra@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+    klaw "^1.0.0"
+
 fs-readdir-recursive@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz#315b4fb8c1ca5b8c47defef319d073dad3568059"
@@ -1886,8 +1874,8 @@ is-extglob@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
 
 is-extglob@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.0.tgz#33411a482b046bf95e6b0cb27ee2711af4cf15ad"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
 
 is-finite@^1.0.0:
   version "1.0.2"
@@ -2365,7 +2353,7 @@ lodash@^3.10.0, lodash@^3.8.0, lodash@^3.9.3:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.0.1, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.2.1, lodash@^4.5.0, lodash@^4.5.1:
+lodash@^4.0.0, lodash@^4.0.1, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.17.2, lodash@^4.2.1, lodash@^4.5.0, lodash@^4.5.1:
   version "4.17.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42"
 
@@ -2467,7 +2455,7 @@ mime-db@~1.12.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.12.0.tgz#3d0c63180f458eb10d325aaa37d7c58ae312e9d7"
 
-mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7:
+mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7:
   version "2.1.13"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.13.tgz#e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88"
   dependencies:
@@ -2591,10 +2579,6 @@ node-pre-gyp@^0.6.29:
     tar "~2.2.1"
     tar-pack "~3.3.0"
 
-node-uuid@~1.4.7:
-  version "1.4.7"
-  resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.7.tgz#6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"
-
 nopt@~3.0.6, [email protected]:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -2810,16 +2794,16 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
 
 phantomjs-prebuilt@^2.1.7:
-  version "2.1.13"
-  resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.13.tgz#66556ad9e965d893ca5a7dc9e763df7e8697f76d"
+  version "2.1.14"
+  resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz#d53d311fcfb7d1d08ddb24014558f1188c516da0"
   dependencies:
     es6-promise "~4.0.3"
     extract-zip "~1.5.0"
-    fs-extra "~0.30.0"
+    fs-extra "~1.0.0"
     hasha "~2.2.0"
     kew "~0.7.0"
     progress "~1.1.8"
-    request "~2.74.0"
+    request "~2.79.0"
     request-progress "~2.0.1"
     which "~1.2.10"
 
@@ -2888,10 +2872,6 @@ qjobs@^1.1.4:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73"
 
-qs@~6.2.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.1.tgz#ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"
-
 qs@~6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
@@ -2985,7 +2965,7 @@ readable-stream@~1.1.9:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@~2.0.0, readable-stream@~2.0.5:
+readable-stream@~2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
   dependencies:
@@ -3149,7 +3129,7 @@ request-progress@~2.0.1:
   dependencies:
     throttleit "^1.0.0"
 
-request@^2.79.0:
+request@^2.79.0, request@~2.79.0:
   version "2.79.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
   dependencies:
@@ -3174,32 +3154,6 @@ request@^2.79.0:
     tunnel-agent "~0.4.1"
     uuid "^3.0.0"
 
-request@~2.74.0:
-  version "2.74.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.74.0.tgz#7693ca768bbb0ea5c8ce08c084a45efa05b892ab"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    bl "~1.1.2"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~1.0.0-rc4"
-    har-validator "~2.0.6"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    node-uuid "~1.4.7"
-    oauth-sign "~0.8.1"
-    qs "~6.2.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -3822,9 +3776,9 @@ uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
-ui-router-core@=1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ui-router-core/-/ui-router-core-1.0.1.tgz#578a35d0ebbc51f0a33e4380a47c38ffc1b50fe9"
+ui-router-core@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ui-router-core/-/ui-router-core-2.0.0.tgz#1680489418f2751cb03731bae4c07330b9cbe0dd"
 
 ui-router-typedoc-themes@^1.0.0:
   version "1.0.0"