.gitignore

@@ -1,6 +1,7 @@
 # common
 node_modules
 bower_components
+
 .DS_Store
 *~
 **/.*
@@ -13,8 +14,6 @@ idea-out
 
 # generated files
 _doc
-.testlib
 lib
 lib-esm
 release
-stats.html

.travis.yml

@@ -1,58 +1,40 @@
 language: node_js
-node_js:
-- 8.9.1
+node_js: '8.9.1'
 
-before_install:
-- time npm i -g yarn
-- yarn global add greenkeeper-lockfile@1
-
-install:
-- time yarn > /dev/null
-
-before_script:
-- export DISPLAY=:99.0
-- sh -e /etc/init.d/xvfb start
-- "./nodeserver.sh > /dev/null &"
-- greenkeeper-lockfile-update
+before_install: yarn global add greenkeeper-lockfile@1 yalc
+install: yarn --check-files
 
+before_script: greenkeeper-lockfile-update && greenkeeper-lockfile-upload
 script:
-- echo "CORE_BRANCH = x${CORE_BRANCH}x";
-  # Fetch and build the @uirouter/core branch from github, then install it
-- >
-  if [ "x${CORE_BRANCH}x" != "xx" ] ; then
-    echo "Installing @uirouter/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 && \
-    yarn && \
-    yarn build && \
-    CORE_PACK_FILENAME=`npm pack` && \
-    popd && \
-    yarn add ./ui-router-core/${CORE_PACK_FILENAME} ;
-  fi
-- tsc && npm test
-
-after_script: greenkeeper-lockfile-upload
-
-matrix:
-  allow_failures:
-  - env: CORE_BRANCH=
+# If CORE_BRANCH is set, fetch and build the @uirouter/core branch from github, then install it
+- if [ "x${CORE_BRANCH}x" != "xx" ] ; then ./node_modules/.bin/publish_yalc_package .downstream_cache/core https://github.com/ui-router/core.git && yalc add @uirouter/core ; fi
+# If DOWNSTREAM or DOWNSTREAM_PKGS is set, run downstream packages' tests instead
+- if [ "x${DOWNSTREAM_PKGS}${DOWNSTREAM}x" != "xx" ] ; then npm run test:downstream ; else tsc && npm test ; fi
 
 env:
-  matrix:
-    # 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 @uirouter/core from npm dependencies
-    # (as specified in package.json)
-  - CORE_BRANCH=
   global:
     secure: TanWbkSRljYf0ENPiF3LDM+6RDYyUZoVIIQjUk9UDZ1MBvzEiqISB/zKSXSoYY1JNZpNcXgje2Sl08yGhAugRVodH+FJa/khSkXwRsZAlJuG8qPFAevW4gffvJvPAE7O0uy4jLyyu+Fi9dptdi1zDGsOps/Q+WURH9jWPGmQpj8=
-sudo: false
+  matrix:
+  - CORE_BRANCH=
+  - CORE_BRANCH=master
+  - CORE_BRANCH=master UPSTREAM_PKGS=@uirouter/core DOWNSTREAM=true
+  - DOWNSTREAM=true
 
-git:
-  depth: 3
+matrix:
+  fast_finish: true
+  allow_failures:
+  - env: CORE_BRANCH=
+  - env: DOWNSTREAM=true
+  - env: CORE_BRANCH=master UPSTREAM_PKGS=@uirouter/core DOWNSTREAM=true
 
 notifications:
   slack:
     secure: LqlW9u5Lyh7eHffLqfrIEyIdpqJmPg29NQHqjM6ij2BUFOs9se+NgpRagfICukCEMimOdzEiIE6S4DXNhCcy6hoA24cpswb84vHRuZ4pFz8USq13rX72AgygR1tPKB9sbXLp+XIjRaLPO5z8asECCr7jxSCpMvHRylPAGL4DduI=
+
+sudo: false
+
+cache:
+  yarn: true
+  directories:
+  - .downstream_cache
+  - node_modules

CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.0.13 (2018-01-10)
+[Compare `@uirouter/angularjs` versions 1.0.12 and 1.0.13](https://github.com/angular-ui/ui-router/compare/1.0.12...1.0.13)
+
+
+### Updated `@uirouter/core` from 5.0.13 to 5.0.14
+[Compare `@uirouter/core` versions 5.0.13 and 5.0.14](https://github.com/ui-router/core/compare/5.0.13...5.0.14)
+
+### Bug Fixes
+
+* **trace:** Fix null reference in uiview name sort function ([59cb067](https://github.com/ui-router/core/commit/59cb067))
+* **treeChanges:** apply toParams to 'retained' path ([#72](https://github.com/ui-router/core/issues/72)) ([cf63d11](https://github.com/ui-router/core/commit/cf63d11))
+
 ## 1.0.12 (2017-12-22)
 [Compare `@uirouter/angularjs` versions 1.0.11 and 1.0.12](https://github.com/angular-ui/ui-router/compare/1.0.11...1.0.12)
 

ISSUE_TEMPLATE.md

@@ -1,36 +1,40 @@
 This issue tracker is for Bug Reports and Feature Requests only.
-Please direct requests for help to StackOverflow.  See http://bit.ly/UIR-SOF for details.
 
-This is a:
+Please direct requests for help to StackOverflow.
+See http://bit.ly/UIR-SOF for details.
+
+This is a (check one box):
 
 - [ ] Bug Report
 - [ ] Feature Request
 - [ ] General Query 
 
-My version of UI-Router is: (version)
+My version of UI-Router is: (type version)
 
 
 
 # Bug Report
 
 #### Current Behavior:
 
-(current behavior here)
+(type current behavior here)
 
 #### Expected Behavior:
 
-(expected behavior here)
+(type expected behavior here)
 
-#### Link to Plunker that reproduces the issue:
+#### Link to Plunker or stackblitz that reproduces the issue:
 
-http://bit.ly/UIR-Plunk
+( if you want a response to your issue, provide a way to reproduce it )
+( http://bit.ly/UIR-Plunk1 )
+( https://stackblitz.com/edit/ui-router-angularjs )
 
 
 
 
 # Feature Request
 
-(feature request here)
+(type feature request here)
 
 
 
@@ -41,7 +45,7 @@ Please direct general implementation questions to StackOverflow:
 http://stackoverflow.com/questions/ask?tags=angularjs,angular-ui-router
 
 Please review the Sample Application which highlights common approaches:
-https://github.com/ui-router/sample-app-ng1
+https://github.com/ui-router/sample-app-angularjs
 
 - [ ] I have already asked my question on StackOverflow and nobody could answer the question
 
@@ -50,4 +54,4 @@ https://github.com/ui-router/sample-app-ng1
 - [ ] I believe my question can only be answered by the UI-Router maintainers
 
 
-(general query here)
+(type general query here)

bower.json

@@ -1 +1,21 @@
-{"name":"angular-ui-router","description":"State-based routing for AngularJS","license":"MIT","main":"./release/angular-ui-router.js","dependencies":{"angular":">= 1.2.0"},"ignore":["**/.*","**/tsconfig.json","**/tsconfig.typedoc.json","**/webpack.config.js","**/node_modules","package.json","scripts","test","src"],"version":"1.0.8"}
+{
+  "name": "angular-ui-router",
+  "description": "State-based routing for AngularJS",
+  "license": "MIT",
+  "main": "./release/angular-ui-router.js",
+  "dependencies": {
+    "angular": ">= 1.2.0"
+  },
+  "ignore": [
+    "**/.*",
+    "**/tsconfig.json",
+    "**/tsconfig.typedoc.json",
+    "**/webpack.config.js",
+    "**/node_modules",
+    "package.json",
+    "scripts",
+    "test",
+    "src"
+  ],
+  "version": "1.0.12"
+}

downstream_projects.json

@@ -0,0 +1,8 @@
+{
+  "sample-app-angularjs": "https://github.com/ui-router/sample-app-angularjs.git",
+  "typescript2.2": "./test/typescript2.2",
+  "typescript2.3": "./test/typescript2.3",
+  "typescript2.4": "./test/typescript2.4",
+  "typescript2.5": "./test/typescript2.5",
+  "typescript2.6": "./test/typescript2.6"
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uirouter/angularjs",
   "description": "State-based routing for AngularJS 1.x",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "scripts": {
     "clean": "shx rm -rf lib lib-esm _doc build release *.log",
     "compile": "tsc && tsc -m es6 --outDir lib-esm && npm run fixdts",
@@ -16,13 +16,13 @@
     "bundle_events": "rollup -c --environment EVENTS  && rollup -c --environment EVENTS,MINIFY",
     "bundle_resolve": "rollup -c --environment RESOLVE && rollup -c --environment RESOLVE,MINIFY",
     "noimplicitany": "tsc --noEmit --noImplicitAny --moduleResolution node --target es6 test/noimplicitany.ts",
-    "test": "npm run test:integrate",
+    "test": "tsc && npm run noimplicitany && npm run test:ng16 && npm run test:ng15 && npm run test:ng14 && npm run test:ng13 && npm run test:ng12",
     "test:ng12": "karma start --ngversion 1.2",
     "test:ng13": "karma start --ngversion 1.3",
     "test:ng14": "karma start --ngversion 1.4",
     "test:ng15": "karma start --ngversion 1.5",
     "test:ng16": "karma start --ngversion 1.6",
-    "test:integrate": "tsc && npm run noimplicitany && npm run test:ng16 && npm run test:ng15 && npm run test:ng14 && npm run test:ng13 && npm run test:ng12",
+    "test:downstream": "npm run build && test_downstream_projects",
     "watch": "karma start --singleRun=false --autoWatch=true --autoWatchInterval=1",
     "debug": "karma start --singleRun=false --autoWatch=true --autoWatchInterval=1 --browsers=Chrome",
     "docs": "./scripts/docs.js",
@@ -72,7 +72,7 @@
   "jsnext:main": "lib-esm/index.js",
   "typings": "lib/index.d.ts",
   "dependencies": {
-    "@uirouter/core": "5.0.13"
+    "@uirouter/core": "5.0.14"
   },
   "peerDependencies": {
     "angular": ">=1.2.0"
@@ -81,30 +81,31 @@
     "@types/angular": "^1.5.14",
     "@types/angular-animate": "^1.5.5",
     "@types/angular-mocks": "1.5.11",
-    "@types/jasmine": "2.8.2",
+    "@types/jasmine": "2.8.3",
     "@types/jquery": "^3.2.17",
-    "@uirouter/publish-scripts": "2.0.8",
+    "@uirouter/publish-scripts": "2.2.4",
     "conventional-changelog": "1.1.7",
     "conventional-changelog-cli": "1.3.5",
     "dts-downlevel": "^0.3.0",
     "fork-ts-checker-webpack-plugin": "^0.2.8",
     "jasmine-core": "2.8.0",
     "karma": "2.0.0",
     "karma-chrome-launcher": "2.2.0",
-    "karma-jasmine": "^1.0.2",
+    "karma-jasmine": "1.1.1",
     "karma-phantomjs-launcher": "^1.0.2",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "2.0.9",
     "lodash": "^4.5.1",
     "replace-in-file": "3.1.0",
-    "rollup": "0.52.3",
+    "rollup": "0.53.3",
     "rollup-plugin-node-resolve": "3.0.0",
     "rollup-plugin-sourcemaps": "^0.4.1",
     "rollup-plugin-uglify": "2.0.1",
     "shelljs": "^0.7.0",
     "shx": "0.2.2",
     "ts-loader": "3.2.0",
-    "tslint": "5.8.0",
+    "tslint": "5.9.0",
+    "tslint-eslint-rules": "^4.1.1",
     "typedoc": "^0.9.0",
     "typedoc-plugin-external-module-name": "1.0.10",
     "typedoc-plugin-internal-external": "1.0.10",

rollup.config.js

@@ -51,56 +51,56 @@ if (MINIFY) plugins.push(uglify(uglifyOpts));
 const extension = MINIFY ? ".min.js" : ".js";
 
 const BASE_CONFIG = {
-  sourcemap: true,
-  exports: 'named',
-  plugins: plugins,
-  banner: banner,
   onwarn: onwarn,
+  plugins: plugins,
 };
 
+const BASE_OUTPUT = {
+  banner: banner,
+  exports: 'named',
+  format: 'umd',
+  sourcemap: true,
+}
+
 const ROUTER_CONFIG = Object.assign({
   input: 'lib-esm/index.js',
   external: ['angular', '@uirouter/core'],
-  output: {
+  output: Object.assign({
     file: 'release/ui-router-angularjs' + extension,
-    format: 'umd',
     name: '@uirouter/angularjs',
     globals: { angular: 'angular', '@uirouter/core': '@uirouter/core' },
-  },
+  }, BASE_OUTPUT),
 }, BASE_CONFIG);
 
 // Also bundles the code from @uirouter/core into the same bundle
 const MONOLITHIC_ROUTER_CONFIG = Object.assign({
   input: 'lib-esm/index.js',
   external: 'angular',
-  output: {
+  output: Object.assign({
     file: 'release/angular-ui-router' + extension,
-    format: 'umd',
     name: '@uirouter/angularjs',
     globals: { angular: 'angular' },
-  },
+  }, BASE_OUTPUT),
 }, BASE_CONFIG);
 
 const EVENTS_CONFIG = Object.assign({}, BASE_CONFIG, {
   input: 'lib-esm/legacy/stateEvents.js',
   external: ['angular', '@uirouter/core'],
-  output: {
+  output: Object.assign({
     file: 'release/stateEvents' + extension,
-    format: 'umd',
     name: '@uirouter/angularjs-state-events',
     globals: { angular: 'angular', '@uirouter/core': '@uirouter/core' },
-  },
+  }, BASE_OUTPUT),
 });
 
 const RESOLVE_CONFIG = Object.assign({}, BASE_CONFIG, {
   input: 'lib-esm/legacy/resolveService.js',
   external: ['angular', '@uirouter/core'],
-  output: {
+  output: Object.assign({
     file: 'release/resolveService' + extension,
-    format: 'umd',
     name: '@uirouter/angularjs-resolve-service',
     globals: { angular: 'angular', '@uirouter/core': '@uirouter/core' },
-  },
+  }, BASE_OUTPUT),
 });
 
 const CONFIG =

src/angular.ts

@@ -3,7 +3,7 @@
  * @module ng1
  */ /** */
 declare var angular;
-import * as ng_from_import from "angular";
-let ng_from_global = angular;
+import * as ng_from_import from 'angular';
+const ng_from_global = angular;
 
 export const ng = (ng_from_import && ng_from_import.module) ? ng_from_import : ng_from_global;