Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: angular-ui/ui-router
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.0.23
Choose a base ref
...
head repository: angular-ui/ui-router
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.0.24
Choose a head ref
3 contributors

Commits on Oct 2, 2019

  1. chore(bower): Update bower.json

    @christopherthielen
    christopherthielen committed Oct 2, 2019
    Copy the full SHA
    bc137a2 View commit details

Commits on Oct 6, 2019

  1. chore(package): update to @uirouter/publish-scripts@2.3.30

    @christopherthielen
    christopherthielen committed Oct 6, 2019
    Copy the full SHA
    95ed109 View commit details

Commits on Oct 7, 2019

  1. chore(package): Update @uirouter/publish-scripts

    @christopherthielen
    christopherthielen committed Oct 7, 2019
    Copy the full SHA
    f526346 View commit details

  2. chore(package): Update @uirouter/publish-scripts

    @christopherthielen
    christopherthielen committed Oct 7, 2019
    Copy the full SHA
    ec25cc4 View commit details

Commits on Oct 8, 2019

  1. chore(package): Update @uirouter/publish-scripts

    @christopherthielen
    christopherthielen committed Oct 8, 2019
    Copy the full SHA
    c5ca3ac View commit details

  2. chore(test:downstream): do not use yarn workspace

    @christopherthielen
    christopherthielen committed Oct 8, 2019
    Copy the full SHA
    f67cd0f View commit details

Commits on Oct 9, 2019

  1. chore(package): Update @uirouter/publish-scripts

    @christopherthielen
    christopherthielen committed Oct 9, 2019
    Copy the full SHA
    ded1399 View commit details

Commits on Oct 15, 2019

  1. chore(package): Update @uirouter/publish-scripts

    @christopherthielen
    christopherthielen committed Oct 15, 2019
    Copy the full SHA
    4b9cecd View commit details

Commits on Oct 26, 2019

  1. chore(package): Update @uirouter/publish-scripts

    @christopherthielen
    christopherthielen committed Oct 26, 2019
    Copy the full SHA
    6c31807 View commit details

  2. chore(travis): Switch node_js to lts/*

    @christopherthielen
    christopherthielen committed Oct 26, 2019
    Copy the full SHA
    8745c12 View commit details

  3. chore(package): Update @uirouter/publish-scripts

    @christopherthielen
    christopherthielen committed Oct 26, 2019
    Copy the full SHA
    b2bd28f View commit details

  4. chore(package): update @types/angular@1.6.56, @types/jasmine@3.4.4, f… 

    …ork-ts-checker-webpack-plugin@2.0.0, husky@3.0.9, jasmine-core@3.5.0, karma@4.4.1, karma-chrome-launcher@3.1.0, lodash@4.17.15, pretty-quick@2.0.0, rollup@1.25.2, rollup-plugin-node-resolve@5.2.0, rollup-plugin-uglify@6.0.3, ts-loader@6.2.1, tslint@5.20.0, typescript@3.6.4, webpack@4.41.2
    @christopherthielen
    christopherthielen committed Oct 26, 2019
    Copy the full SHA
    099afbb View commit details

Commits on Nov 24, 2019

  1. chore(package): Update @uirouter/publish-scripts

    @christopherthielen
    christopherthielen committed Nov 24, 2019
    Copy the full SHA
    2dd50f8 View commit details

Commits on Nov 25, 2019

  1. chore(package): Update @uirouter/publish-scripts

    @christopherthielen
    christopherthielen committed Nov 25, 2019
    Copy the full SHA
    72af088 View commit details

  2. chore(package): Update @uirouter/publish-scripts

    @christopherthielen
    christopherthielen committed Nov 25, 2019
    Copy the full SHA
    d694555 View commit details

Commits on Dec 8, 2019

  1. chore(package): Update @uirouter/publish-scripts

    @christopherthielen
    christopherthielen committed Dec 8, 2019
    Copy the full SHA
    2be60cb View commit details

Commits on Dec 18, 2019

  1. chore(travis): install yarn via 'npm i -g yarn'. do not cache .downst… 

    …ream_projects
    @christopherthielen
    christopherthielen committed Dec 18, 2019
    Copy the full SHA
    aa7828a View commit details

  2. chore(types): Upgrade @types/angular to 1.6.57 and remove other versi… 

    …ons from inside angular-animate and angular-mocks
    @christopherthielen
    christopherthielen committed Dec 18, 2019
    Copy the full SHA
    3fe3a66 View commit details

Commits on Dec 23, 2019

  1. chore(ci): add github action

    @christopherthielen
    christopherthielen authored Dec 23, 2019
    Copy the full SHA
    ac6bd69 View commit details

  2. chore(ci): add gitub actions workflows for docs and downstream tests

    @christopherthielen
    christopherthielen committed Dec 23, 2019
    Copy the full SHA
    d0f852e View commit details

Commits on Dec 24, 2019

  1. chore(gitignore): whitelist github folder

    @christopherthielen
    christopherthielen committed Dec 24, 2019
    Copy the full SHA
    3f72ea9 View commit details

  2. chore(ci): Do not double build package before running downstream tests

    @christopherthielen
    christopherthielen committed Dec 24, 2019
    Copy the full SHA
    bae05cf View commit details

  3. chore(gha): Create a multi-job CI workflow

    @christopherthielen
    christopherthielen committed Dec 24, 2019
    Copy the full SHA
    e2e41ff View commit details

  4. chore(ci): disable travis

    @christopherthielen
    christopherthielen committed Dec 24, 2019
    Copy the full SHA
    680a848 View commit details

  5. chore(deps): bump mixin-deep from 1.3.1 to 1.3.2 (#3787) 

    Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](jonschlinkert/mixin-deep@1.3.1...1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot @christopherthielen
    dependabot[bot] authored and christopherthielen committed Dec 24, 2019
    Copy the full SHA
    16252dd View commit details

  6. chore(ci): tweak gha job names

    @christopherthielen
    christopherthielen committed Dec 24, 2019
    Copy the full SHA
    894069f View commit details

  7. chore(deps): bump lodash.template from 4.4.0 to 4.5.0 (#3788) 

    Bumps [lodash.template](https://github.com/lodash/lodash) from 4.4.0 to 4.5.0.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.4.0...4.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot @christopherthielen
    dependabot[bot] authored and christopherthielen committed Dec 24, 2019
    Copy the full SHA
    8866802 View commit details

  8. Update README.md

    @christopherthielen
    christopherthielen authored Dec 24, 2019
    Copy the full SHA
    5ed40c9 View commit details

  9. Update README.md

    @christopherthielen
    christopherthielen authored Dec 24, 2019
    Copy the full SHA
    7637a7b View commit details

Commits on Dec 27, 2019

  1. chore(mergify): Configure mergify for github actions.

    @christopherthielen
    christopherthielen committed Dec 27, 2019
    Copy the full SHA
    1a31cd4 View commit details

Commits on Dec 29, 2019

  1. chore(stale): create stalebot config

    @christopherthielen
    christopherthielen committed Dec 29, 2019
    Copy the full SHA
    7065017 View commit details

Commits on Dec 30, 2019

  1. chore(package): update deps (#3792) 

    * chore(package): update to @types/jasmine@3.5.0, @uirouter/publish-scripts@2.3.44, fork-ts-checker-webpack-plugin@3.1.1, husky@3.1.0, prettier@1.19.1, pretty-quick@2.0.1, rollup@1.27.14, rollup-plugin-uglify@6.0.4, tslint@5.20.1, typescript@3.7.4, webpack@4.41.5, @uirouter/core@6.0.2

* chore(package): downgrade typescript

* chore(package): update to uirouter/core 6.0.3
    @christopherthielen
    christopherthielen authored Dec 30, 2019
    Copy the full SHA
    7b44bcf View commit details

  2. 1.0.24

    @christopherthielen
    christopherthielen committed Dec 30, 2019
    Copy the full SHA
    c1fadac View commit details
Showing with 928 additions and 541 deletions.
  1. +21 −0 .github/stale.yml
  2. +39 −0 .github/workflows/ci.yml
  3. +6 −0 .gitignore
  4. +23 −0 .mergify.yml
  5. +1 −0 .npmrc
  6. +0 −30 .travis.yml
  7. +25 −0 CHANGELOG.md
  8. +4 −6 README.md
  9. +1 −1 bower.json
  10. +21 −21 package.json
  11. +787 −483 yarn.lock
21 changes: 21 additions & 0 deletions .github/stale.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 180
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 14
# Issues with these labels will never be considered stale
exemptLabels:
- notstale
- security
# Label to use when marking an issue as stale
staleLabel: stale
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: |
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs.
This does not mean that the issue is invalid. Valid issues
may be reopened.
Thank you for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
39 changes: 39 additions & 0 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: 'CI: UIRouter for AngularJS'

on: [push]

jobs:
test:
name: Unit Tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install Dependencies
run: yarn install --pure-lockfile
- name: Run Tests
run: yarn test

docs:
name: Docs can be generated
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install Dependencies
run: yarn install --pure-lockfile
- name: Generate Docs
run: yarn docs

test_downstream:
name: Downstream projects still work
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Prepare to Test Downstream Projects
run: |
npm config set scripts-prepend-node-path auto
git config --global user.email uirouter@github.actions
git config --global user.name uirouter_github_actions
- name: Install Dependencies
run: yarn install --pure-lockfile
- name: Test Downstream Projects
run: yarn test:downstream
6 changes: 6 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -18,3 +18,9 @@ _doc
lib
lib-esm
release

# do not ignore github
!.github
!.npmrc
!.npmignore
!.prettier*
23 changes: 23 additions & 0 deletions .mergify.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
pull_request_rules:
- name: Automatically squash and merge on CI success
conditions:
- status-success=Unit Tests
- status-success=Docs can be generated
- status-success=Downstream projects still work
- 'label=ready to squash and merge'
actions:
delete_head_branch: {}
merge:
method: squash
strict: smart
- name: Automatically rebase and merge on CI success
conditions:
- status-success=Unit Tests
- status-success=Docs can be generated
- status-success=Downstream projects still work
- 'label=ready to rebase and merge'
actions:
delete_head_branch: {}
merge:
method: rebase
strict: smart
1 change: 1 addition & 0 deletions .npmrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
scripts-prepend-node-path=auto
30 changes: 0 additions & 30 deletions .travis.yml
View file

This file was deleted.

25 changes: 25 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
## 1.0.24 (2019-12-30)
[Compare `@uirouter/angularjs` versions 1.0.23 and 1.0.24](https://github.com/angular-ui/ui-router/compare/1.0.23...1.0.24)


---


### Updated `@uirouter/core` from 6.0.1 to 6.0.3


Changelog for `@uirouter/core`:


[Compare `@uirouter/core` versions 6.0.1 and 6.0.3](https://github.com/ui-router/core/compare/6.0.1...6.0.3)

### Bug Fixes

* **hof:** Rewrite curry from scratch ([fc324c6](https://github.com/ui-router/core/commit/fc324c6)), closes [#350](https://github.com/ui-router/core/issues/350)
* **IE9:** Add safeConsole so IE9 doesn't break ([9c8579d](https://github.com/ui-router/core/commit/9c8579d))


### Features

* **stateService:** add transition option 'supercede' so transition can be ignored if one is pending ([6e5a56f](https://github.com/ui-router/core/commit/6e5a56f))

## 1.0.23 (2019-10-02)
[Compare `@uirouter/angularjs` versions 1.0.22 and 1.0.23](https://github.com/angular-ui/ui-router/compare/1.0.22...1.0.23)

10 changes: 4 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# AngularUI Router &nbsp;[![Build Status](https://travis-ci.org/angular-ui/ui-router.svg?branch=master)](https://travis-ci.org/angular-ui/ui-router)
# AngularUI Router &nbsp;[![Build Status](https://github.com/angular-ui/ui-router/workflows/CI:%20UIRouter%20for%20AngularJS/badge.svg)](https://github.com/angular-ui/ui-router/actions?query=workflow%3A%22CI%3A+UIRouter+for+AngularJS%22)

[![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)**
**Note: this is the Angular 1.x source for UI-Router version 1.x. If you are looking for the source for UI-Router
version 0.x, it can be found [here](https://github.com/angular-ui/ui-router/tree/legacy)**

---

@@ -13,7 +11,7 @@ version 0.2.x, it can be found [here](https://github.com/angular-ui/ui-router/tr
**[Tutorials](https://ui-router.github.io/tutorials/)** |
**[API Docs](https://ui-router.github.io/docs/latest/)** |
**[Download stable](http://unpkg.com/@uirouter/angularjs@latest/release/angular-ui-router.js)** (or **[Minified](http://unpkg.com/@uirouter/angularjs@latest/release/angular-ui-router.min.js)**) **|**
**[Guide](https://github.com/angular-ui/ui-router/wiki) |**
**[Guide](https://ui-router.github.io/guide/) |**
**[Sample App](http://ui-router.github.io/resources/sampleapp/) |**
**[FAQ](https://github.com/angular-ui/ui-router/wiki/Frequently-Asked-Questions) |**
**[Report an Issue](https://github.com/angular-ui/ui-router/blob/master/CONTRIBUTING.md#report-an-issue) |**
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -17,5 +17,5 @@
"test",
"src"
],
"version": "1.0.20"
"version": "1.0.23"
}
42 changes: 21 additions & 21 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@uirouter/angularjs",
"description": "State-based routing for AngularJS 1.x",
"version": "1.0.23",
"version": "1.0.24",
"scripts": {
"clean": "shx rm -rf lib lib-esm _doc build release *.log",
"compile": "tsc && tsc -m es6 --outDir lib-esm && npm run fixdts",
@@ -21,7 +21,7 @@
"test:ng14": "karma start --ngversion 1.4",
"test:ng15": "karma start --ngversion 1.5",
"test:ng16": "karma start --ngversion 1.6",
"test:downstream": "npm run build && test_downstream_projects --workspace",
"test:downstream": "test_downstream_projects",
"watch": "karma start --singleRun=false --autoWatch=true --autoWatchInterval=1",
"debug": "karma start --singleRun=false --autoWatch=true --autoWatchInterval=1 --browsers=Chrome",
"docs": "generate_docs",
@@ -72,40 +72,40 @@
"module": "lib-esm/index.js",
"typings": "lib/index.d.ts",
"dependencies": {
"@uirouter/core": "6.0.1"
"@uirouter/core": "6.0.3"
},
"peerDependencies": {
"angular": ">=1.2.0"
},
"devDependencies": {
"@types/angular": "1.6.54",
"@types/angular": "1.6.57",
"@types/angular-animate": "^1.5.10",
"@types/angular-mocks": "^1.7.0",
"@types/jasmine": "^3.3.13",
"@uirouter/publish-scripts": "^2.3.27",
"@types/jasmine": "^3.5.0",
"@uirouter/publish-scripts": "^2.3.44",
"dts-downlevel": "^0.3.0",
"fork-ts-checker-webpack-plugin": "^1.3.6",
"husky": "^2.4.1",
"jasmine-core": "^3.4.0",
"karma": "^4.1.0",
"karma-chrome-launcher": "^2.2.0",
"fork-ts-checker-webpack-plugin": "^3.1.1",
"husky": "^3.1.0",
"jasmine-core": "^3.5.0",
"karma": "^4.4.1",
"karma-chrome-launcher": "^3.1.0",
"karma-jasmine": "^2.0.1",
"karma-mocha-reporter": "^2.2.5",
"karma-sourcemap-loader": "^0.3.7",
"karma-super-dots-reporter": "^0.2.0",
"karma-webpack": "^4.0.2",
"lodash": "^4.17.11",
"prettier": "^1.18.2",
"pretty-quick": "^1.11.0",
"rollup": "^1.15.3",
"rollup-plugin-node-resolve": "^5.0.2",
"lodash": "^4.17.15",
"prettier": "^1.19.1",
"pretty-quick": "^2.0.1",
"rollup": "^1.27.14",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-uglify": "^6.0.2",
"ts-loader": "^6.0.2",
"tslint": "^5.17.0",
"rollup-plugin-uglify": "^6.0.4",
"ts-loader": "^6.2.1",
"tslint": "^5.20.1",
"tslint-eslint-rules": "^5.4.0",
"typescript": "^3.5.2",
"webpack": "^4.34.0"
"typescript": "^3.6.4",
"webpack": "^4.41.5"
},
"husky": {
"hooks": {
Loading