Merge branch 'master' into patch-1

Author: christopherthielen

.gitignore

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

.prettierignore

@@ -0,0 +1,6 @@
+package.json
+bower.json
+CHANGELOG.md
+test/**/angular.js
+test/**/angular-mocks.js
+test/**/angular-animate.js

.prettierrc.json

@@ -0,0 +1,5 @@
+{
+  "singleQuote": true,
+  "trailingComma": "es5",
+  "printWidth": 120
+}

.travis.yml

@@ -1,57 +1,28 @@
 language: node_js
-node_js:
-  - "6.9.2"
-
-#cache:
-#  directories:
-#    - $HOME/.npm
-#    - $HOME/.yarn-cache
-#    - node_modules
-
+node_js: 8.9.1
 before_install:
-  - time npm i -g yarn
-
-install:
-  - time yarn > /dev/null
-
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  - ./nodeserver.sh > /dev/null &
-
+- sh -e /etc/init.d/xvfb start
+- export PATH=$HOME/.yarn/bin:$PATH
+- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.5.1
 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 @uirouter/core && \
-      pushd @uirouter/core && \
-      yarn > /dev/null && \
-      yarn build && \
-      popd && \
-      npm install ./@uirouter/core ;
-    fi
-  - tsc && npm test
-
-matrix:
-  allow_failures:
-  - env: CORE_BRANCH=
-
+- if [ "x${CORE_BRANCH}x" != "xx" ]; then npx publish_yalc_package .downstream_cache/core https://github.com/ui-router/core.git && yalc add @uirouter/core ; fi
+- tsc &&
+  yarn test &&
+  yarn docs &&
+  yarn test:downstream
 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=
-
+  - CORE_BRANCH=
+  - CORE_BRANCH=master UPSTREAM_PKGS=@uirouter/core
+notifications:
+  slack:
+    on_success: never
+    rooms:
+      secure: alXA+pERLtF4DNctl+WaISO3uzUA/JzVCzSrDlNsV9Jvx1HdAqRNbrrnNYzCZBIU6OOv5YBGFbq79v5NPKzMPzoR8dp3PahlxRgucxALweoTCXY5DuDHVSI9ULLl2PND7QOfKyUALuAz5nmT7omPVxRKCpBkVsqewLfMeW1MRgE=
 sudo: false
-
 git:
   depth: 3
-
-notifications:
-  slack: angularbuddies:b6leQM9gkBCW0S7MNDsELpqU
+cache:
+  directories:
+  - node_modules
+  - ".downstream_cache"

CHANGELOG.md

@@ -1,3 +1,140 @@
+## 1.0.17 (2018-05-13)
+[Compare `@uirouter/angularjs` versions 1.0.16 and 1.0.17](https://github.com/angular-ui/ui-router/compare/1.0.16...1.0.17)
+
+
+### Updated `@uirouter/core` from 5.0.18 to 5.0.19
+[Compare `@uirouter/core` versions 5.0.18 and 5.0.19](https://github.com/ui-router/core/compare/5.0.18...5.0.19)
+
+### Bug Fixes
+
+* **enums:** Workaround angular compiler export issue https://github.com/angular/angular/issues/23759 ([38d25fa](https://github.com/ui-router/core/commit/38d25fa))
+
+## 1.0.16 (2018-05-03)
+[Compare `@uirouter/angularjs` versions 1.0.15 and 1.0.16](https://github.com/angular-ui/ui-router/compare/1.0.15...1.0.16)
+
+### Bug Fixes
+
+* **docs:** downgrade to [@types](https://github.com/types)/angular[@1](https://github.com/1).6.25 to fix typings error when generating docs ([5850136](https://github.com/angular-ui/ui-router/commit/5850136))
+
+
+### Updated `@uirouter/core` from 5.0.17 to 5.0.18
+[Compare `@uirouter/core` versions 5.0.17 and 5.0.18](https://github.com/ui-router/core/compare/5.0.17...5.0.18)
+
+### Bug Fixes
+
+* **angular:** A hack to force the Angular compiler to import from module index ([d56a2be](https://github.com/ui-router/core/commit/d56a2be))
+* **StateRegistry:** Notify listeners of added states when there are orphans in the state queue ([5a9bac9](https://github.com/ui-router/core/commit/5a9bac9))
+* **transition:** Fix typing of Transition.params() ([ebea30e](https://github.com/ui-router/core/commit/ebea30e))
+* **transition:** Normalize `error()` to always return `Rejection` ([9bcc5db](https://github.com/ui-router/core/commit/9bcc5db))
+
+## 1.0.15 (2018-02-12)
+[Compare `@uirouter/angularjs` versions 1.0.14 and 1.0.15](https://github.com/angular-ui/ui-router/compare/1.0.14...1.0.15)
+
+### Bug Fixes
+
+* **package:** update [@uirouter](https://github.com/uirouter)/core to version 5.0.17 ([1b54264](https://github.com/angular-ui/ui-router/commit/1b54264))
+
+
+### Updated `@uirouter/core` from 5.0.16 to 5.0.17
+[Compare `@uirouter/core` versions 5.0.16 and 5.0.17](https://github.com/ui-router/core/compare/5.0.16...5.0.17)
+
+### Bug Fixes
+
+* **core:** Fix leak of old transitions by mutating pathnode*.resolvables*.data ([0a1f518](https://github.com/ui-router/core/commit/0a1f518))
+
+## 1.0.14 (2018-01-31)
+[Compare `@uirouter/angularjs` versions 1.0.13 and 1.0.14](https://github.com/angular-ui/ui-router/compare/1.0.13...1.0.14)
+
+### Bug Fixes
+
+* **uiSrefActive:** don't match fuzzy on lazy loaded future states ([01430ee](https://github.com/angular-ui/ui-router/commit/01430ee))
+
+
+### Features
+
+* **uiSrefActive:** Support arrays of globs for ng-class style ([b215343](https://github.com/angular-ui/ui-router/commit/b215343))
+
+
+### Updated `@uirouter/core` from 5.0.14 to 5.0.16
+[Compare `@uirouter/core` versions 5.0.14 and 5.0.16](https://github.com/ui-router/core/compare/5.0.14...5.0.16)
+
+### Bug Fixes
+
+* **common:** Fix signature of  for objects (make target optional) ([61d0afc](https://github.com/ui-router/core/commit/61d0afc))
+* **core:** Fix memory leak of resolve data from ALL transitions ever ([7f2aed1](https://github.com/ui-router/core/commit/7f2aed1))
+* **pathNode:** add backwards compat for PathNode.clone(). Add retainedWithToParams to treeChanges interface. ([4833a32](https://github.com/ui-router/core/commit/4833a32))
+
+
+### Features
+
+* **common:** Add map-in-place support to map() ([12bc7d8](https://github.com/ui-router/core/commit/12bc7d8))
+* **common:** Add onEvict() callback registry for queues with max length ([c19d007](https://github.com/ui-router/core/commit/c19d007))
+
+## 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)
+
+### Bug Fixes
+
+* **___location:** allow empty string param: Ng1LocationServices.url('') ([01bbaf0](https://github.com/angular-ui/ui-router/commit/01bbaf0))
+* **onEnter:** Do not inject child-state data into ng1 onEnter hooks ([cdec6a0](https://github.com/angular-ui/ui-router/commit/cdec6a0))
+* **package:** update [@uirouter](https://github.com/uirouter)/core to version 5.0.13 ([6c63f2d](https://github.com/angular-ui/ui-router/commit/6c63f2d))
+* **travis:** regenerate and encrypt secret ([c718ce5](https://github.com/angular-ui/ui-router/commit/c718ce5))
+
+
+### Updated `@uirouter/core` from 5.0.11 to 5.0.13
+[Compare `@uirouter/core` versions 5.0.11 and 5.0.13](https://github.com/ui-router/core/compare/5.0.11...5.0.13)
+
+### Bug Fixes
+
+* **browserLocation:** Use ___location.pathname (not href) or '/' when no base tag found ([db461d6](https://github.com/ui-router/core/commit/db461d6))
+* **browserLocationConfig:** If no base href found, use ___location.href (not empty string) ([0251424](https://github.com/ui-router/core/commit/0251424))
+* **pushStateLocation:** Fix URLs: add slash between base and path when necessary ([bfa5755](https://github.com/ui-router/core/commit/bfa5755))
+* **pushStateLocation:** When url is "" or "/", use baseHref for ___pushState ([042a950](https://github.com/ui-router/core/commit/042a950))
+* **resolve:** Add onFinish hook to resolve any dynamicly added resolvables ([7d1ca54](https://github.com/ui-router/core/commit/7d1ca54))
+* **urlRouter:** Update query params when resetting url via .update() ([7664cd0](https://github.com/ui-router/core/commit/7664cd0))
+
+
+### Features
+
+* **view:** Add onSync callback API to plugin API ([9544ae5](https://github.com/ui-router/core/commit/9544ae5))
+
+## 1.0.11 (2017-11-13)
+[Compare `@uirouter/angularjs` versions 1.0.10 and 1.0.11](https://github.com/angular-ui/ui-router/compare/1.0.10...1.0.11)
+
+### Bug Fixes
+
+* **uiView:** Fix cfg.getTemplate is undefined ([f4d99b0](https://github.com/angular-ui/ui-router/commit/f4d99b0))
+
+## 1.0.10 (2017-10-18)
+[Compare `@uirouter/angularjs` versions 1.0.9 and 1.0.10](https://github.com/angular-ui/ui-router/compare/1.0.9...1.0.10)
+
+### Bug Fixes
+
+* **artifactory:** Add trailing newline to package.json to work around artifactory issue  ([#3551](https://github.com/angular-ui/ui-router/issues/3551)) ([d09a345](https://github.com/angular-ui/ui-router/commit/d09a345)), closes [#3550](https://github.com/angular-ui/ui-router/issues/3550)
+
+## 1.0.9 (2017-10-17)
+[Compare `@uirouter/angularjs` versions 1.0.8 and 1.0.9](https://github.com/angular-ui/ui-router/compare/1.0.8...1.0.9)
+
+
+### Updated `@uirouter/core` from 5.0.10 to 5.0.11
+[Compare `@uirouter/core` versions 5.0.10 and 5.0.11](https://github.com/ui-router/core/compare/5.0.10...5.0.11)
+
+### Bug Fixes
+
+* **ie9:** make console.bind work in ie9 ([#85](https://github.com/ui-router/core/issues/85)) ([318214b](https://github.com/ui-router/core/commit/318214b))
+
 ## 1.0.8 (2017-10-07)
 [Compare `@uirouter/angularjs` versions 1.0.7 and 1.0.8](https://github.com/angular-ui/ui-router/compare/1.0.7...1.0.8)
 

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)

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2013-2015 The AngularUI Team, Karsten Sperling
+Copyright (c) 2013-2018 The AngularUI Team, Karsten Sperling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,5 +1,7 @@
 # AngularUI Router  [![Build Status](https://travis-ci.org/angular-ui/ui-router.svg?branch=master)](https://travis-ci.org/angular-ui/ui-router)
 
+[![Greenkeeper badge](https://badges.greenkeeper.io/angular-ui/ui-router.svg)](https://greenkeeper.io/)
+
 **Note: this is the Angular 1.x source for UI-Router version 1.0.  If you are looking for the source for UI-Router 
 version 0.2.x, it can be found [here](https://github.com/angular-ui/ui-router/tree/legacy)**
 

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.17"
+}

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"
+}