CHANGELOG.md

@@ -1,3 +1,31 @@
+<a name="1.0.4"></a>
+## [1.0.4](https://github.com/angular-ui/ui-router/compare/1.0.3...1.0.4) (2017-06-09)
+
+
+### Bug Fixes
+
+* **bundle:** work around rollup bug https://github.com/rollup/rollup/issues/1322 ([befb50a](https://github.com/angular-ui/ui-router/commit/befb50a))
+* **uiSrefActive:** Avoid "Possibly unhandled rejection" in console ([5c09e28](https://github.com/angular-ui/ui-router/commit/5c09e28))
+
+
+
+### @uirouter/core changes
+## [5.0.4](https://github.com/ui-router/core/compare/5.0.3...5.0.4) (2017-06-09)
+
+
+### Bug Fixes
+
+* **future:** Allow future states to specify a `parent:` ([828fe1b](https://github.com/ui-router/core/commit/828fe1b))
+* **view:** only sync views which are of the same name *and type* ([c48da4a](https://github.com/ui-router/core/commit/c48da4a))
+
+
+### Features
+
+* **invalidTransition:** Better error messaging when param values are invalid ([2a15d1a](https://github.com/ui-router/core/commit/2a15d1a))
+* **trace:** Trace view synchronization. Allow trace.enable(...string) ([284392d](https://github.com/ui-router/core/commit/284392d))
+
+
+
 <a name="1.0.3"></a>
 ## [1.0.3](https://github.com/angular-ui/ui-router/compare/1.0.1...1.0.3) (2017-05-07)
 

bower.json

@@ -1 +1 @@
-{"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.3"}
+{"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.4"}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uirouter/angularjs",
   "description": "State-based routing for AngularJS 1.x",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "scripts": {
     "clean": "shx rm -rf lib lib-esm _doc build release *.log",
     "build": "tsc && tsc -m es6 --outDir lib-esm && npm run fixdts",

scripts/artifact_tagging.js

@@ -23,7 +23,7 @@ if (isNarrow && readlineSync.keyInYN('Widen @uirouter/core dependency from ' + c
   widen = false;
 }
 
-let tagname = `${version}+hybrid-${hybridVersion}`;
+let tagname = `${version}-hybrid-${hybridVersion}`;
 tagname += readlineSync.question(`Suffix for tag ${tagname} (optional)?`);
 
 if (!readlineSync.keyInYN(`Ready to publish ${tagname} tag?`)) {
@@ -36,12 +36,16 @@ util.ensureCleanMaster('master');
 _exec(`git checkout -b ${tagname}-prep`);
 
 pkg.dependencies['@uirouter/core'] = widenedDep;
+pkg.version = tagname;
+
 fs.writeFileSync("package.json", JSON.stringify(pkg, undefined, 2));
 _exec('git commit -m "Widening @uirouter/core dependency range to ' + widenedDep + '" package.json');
 
 _exec('npm run package');
 
 _exec(`git add --force lib lib-esm release package.json`);
+_exec(`git rm yarn.lock`);
+
 _exec(`git commit -m 'chore(*): commiting build files'`);
 _exec(`git tag ${tagname}`);
 _exec(`git push -u origin ${tagname}`);

src/directives/stateDirectives.ts

@@ -564,7 +564,7 @@ uiSrefActive = ['$state', '$stateParams', '$interpolate', '$uiRouter',
           };
 
           function updateAfterTransition(trans) {
-            trans.promise.then(update);
+            trans.promise.then(update, noop);
           }
 
           $scope.$on('$stateChangeSuccess', update);

src/interface.ts

@@ -695,7 +695,7 @@ export interface Ng1Controller {
    *     this.originalData = angular.copy(this.data);
    *
    *     this.uiCanExit = function() {
-   *       if (!angular.equals(this.data, this.originalData) {
+   *       if (!angular.equals(this.data, this.originalData)) {
    *         // Note: This could also return a Promise and request async
    *         // confirmation using something like ui-bootstrap $modal
    *         return window.confirm("Data has changed.  Exit anyway and lose changes?");