From ccef213a4a0ae27d27b8566fa3d62bd5a6539045 Mon Sep 17 00:00:00 2001 From: Chris Thielen Date: Sun, 7 May 2017 10:36:47 -0700 Subject: [PATCH 1/8] chore(artifacts): Use target angular-hybrid version in tag name --- scripts/artifact_tagging.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/artifact_tagging.js b/scripts/artifact_tagging.js index 5aa069e87..abf3a4a1b 100755 --- a/scripts/artifact_tagging.js +++ b/scripts/artifact_tagging.js @@ -3,15 +3,16 @@ let pkg = require('../package.json'); let version = pkg.version; +let hybridVersion = require('../../angular-hybrid/package.json').version; -require('shelljs/global'); +let shx = require('shelljs'); let readlineSync = require('readline-sync'); let fs = require('fs'); let path = require('path'); let util = require('./util'); let _exec = util._exec; -cd(path.join(__dirname, '..')); +shx.cd(path.join(__dirname, '..')); var widen = false; var coreDep = pkg.dependencies['@uirouter/core']; @@ -22,14 +23,17 @@ if (isNarrow && readlineSync.keyInYN('Widen @uirouter/core dependency from ' + c widen = false; } -if (!readlineSync.keyInYN('Ready to publish to ' + version + '-artifacts tag?')) { +let tagname = `${version}+hybrid-${hybridVersion}`; +tagname += readlineSync.question(`Suffix for tag ${tagname} (optional)?`); + +if (!readlineSync.keyInYN(`Ready to publish ${tagname} tag?`)) { process.exit(1); } util.ensureCleanMaster('master'); // then tag and push tag -_exec(`git checkout -b ${version}-artifacts-prep`); +_exec(`git checkout -b ${tagname}-prep`); pkg.dependencies['@uirouter/core'] = widenedDep; fs.writeFileSync("package.json", JSON.stringify(pkg, undefined, 2)); @@ -39,7 +43,7 @@ _exec('npm run package'); _exec(`git add --force lib lib-esm release package.json`); _exec(`git commit -m 'chore(*): commiting build files'`); -_exec(`git tag ${version}-artifacts`); -_exec(`git push -u origin ${version}-artifacts`); +_exec(`git tag ${tagname}`); +_exec(`git push -u origin ${tagname}`); _exec(`git checkout master`); -_exec(`git branch -D ${version}-artifacts-prep`); +_exec(`git branch -D ${tagname}-prep`); From befb50a2421df48a5830f17f8243ab0b13aebbf2 Mon Sep 17 00:00:00 2001 From: Chris Thielen Date: Mon, 8 May 2017 11:42:01 -0700 Subject: [PATCH 2/8] fix(bundle): work around rollup bug https://github.com/rollup/rollup/issues/1322 --- src/index.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/index.ts b/src/index.ts index c65d207ba..a56f0ec14 100644 --- a/src/index.ts +++ b/src/index.ts @@ -3,10 +3,6 @@ * @module ng1 */ /** */ -import * as core from "@uirouter/core"; -export { core }; -export * from "@uirouter/core"; - export * from "./interface"; export * from "./services"; export * from "./statebuilders/views"; @@ -20,3 +16,8 @@ import "./directives/viewDirective"; import "./viewScroll"; export default "ui.router"; + +import * as core from "@uirouter/core"; +export { core }; +export * from "@uirouter/core"; + From 675c44186fb4a914b15ebce15d5bcf5dde098e49 Mon Sep 17 00:00:00 2001 From: William Ngo Date: Wed, 10 May 2017 14:47:12 -0700 Subject: [PATCH 3/8] docs(CONTRIBUTING.md): fix missing label images (#3435) --- CONTRIBUTING.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c13efd24d..f4896914b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -22,11 +22,11 @@ Issues only! | -------------| Please keep in mind that the issue tracker is for *issues*. Please do *not* post an issue if you need help or support. Instead, see one of the above-mentioned forums or [IRC](irc://irc.freenode.net/#angularjs). | -####Purple Labels +#### Purple Labels A purple label means that **you** need to take some further action. - - ![Not Actionable - Need Info](ngdoc_assets/incomplete.png): Your issue is not specific enough, or there is no clear action that we can take. Please clarify and refine your issue. - - ![Plunkr Please](ngdoc_assets/example.png): Please [create a plunkr](http://bit.ly/UIR-Plunk) - - ![StackOverflow](ngdoc_assets/so.png): We suspect your issue is really a help request, or could be answered by the community. Please ask your question on [StackOverflow](http://stackoverflow.com/questions/ask?tags=angularjs,angular-ui-router). If you determine that is an actual issue, please explain why. + - ![Not Actionable - Need Info](https://angular-ui.github.io/ui-router/ngdoc_assets/incomplete.png): Your issue is not specific enough, or there is no clear action that we can take. Please clarify and refine your issue. + - ![Plunkr Please](https://angular-ui.github.io/ui-router/ngdoc_assets/example.png): Please [create a plunkr](http://bit.ly/UIR-Plunk) + - ![StackOverflow](https://angular-ui.github.io/ui-router/ngdoc_assets/so.png): We suspect your issue is really a help request, or could be answered by the community. Please ask your question on [StackOverflow](http://stackoverflow.com/questions/ask?tags=angularjs,angular-ui-router). If you determine that is an actual issue, please explain why. If your issue gets labeled with purple label, no further action will be taken until you respond to the label appropriately. From f122d788f24f4e2281c8e50b2bd4db5c66138b73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roger=20Pedr=C3=B3s=20Villorbina?= Date: Wed, 17 May 2017 22:09:40 +0200 Subject: [PATCH 4/8] Added ')' on uiCanExit example (#3442) --- src/interface.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/interface.ts b/src/interface.ts index d3ad65a49..a0e9786c4 100644 --- a/src/interface.ts +++ b/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?"); From e02262dce6c284df86ee75d8eba5269996cc80db Mon Sep 17 00:00:00 2001 From: Chris Thielen Date: Sat, 13 May 2017 09:15:32 -0700 Subject: [PATCH 5/8] chore(build): Update artifact package with +hybrid matching the tag --- scripts/artifact_tagging.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/artifact_tagging.js b/scripts/artifact_tagging.js index abf3a4a1b..39b7067c9 100755 --- a/scripts/artifact_tagging.js +++ b/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}`); From 5c09e2816b07c00202211caecd8c9d8837a0eb2e Mon Sep 17 00:00:00 2001 From: Chris Thielen Date: Fri, 9 Jun 2017 16:21:50 -0700 Subject: [PATCH 6/8] fix(uiSrefActive): Avoid "Possibly unhandled rejection" in console - Added a .catch() clause to the promise handler Closes https://github.com/angular-ui/ui-router/issues/3404 Closes https://github.com/angular-ui/ui-router/issues/3309 --- src/directives/stateDirectives.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/directives/stateDirectives.ts b/src/directives/stateDirectives.ts index e2b3e9a10..a8803ba94 100644 --- a/src/directives/stateDirectives.ts +++ b/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); From 91e9c7ee8772cb99a528b60ca87ea58637b5f5eb Mon Sep 17 00:00:00 2001 From: Chris Thielen Date: Fri, 9 Jun 2017 16:24:07 -0700 Subject: [PATCH 7/8] Prep for 1.0.4 release --- CHANGELOG.md | 28 ++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9778fc91c..d1d96c1cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,31 @@ + +## [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)) + + + ## [1.0.3](https://github.com/angular-ui/ui-router/compare/1.0.1...1.0.3) (2017-05-07) diff --git a/package.json b/package.json index a2b42e99e..40f9dcb70 100644 --- a/package.json +++ b/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", From 0ac932a285a7a99ef195b44c2a50c026c36bb338 Mon Sep 17 00:00:00 2001 From: Chris Thielen Date: Fri, 9 Jun 2017 16:26:36 -0700 Subject: [PATCH 8/8] Release 1.0.4 --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index c35fe24f8..ee46290a6 100644 --- a/bower.json +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file