.github/workflows/ci.yml

@@ -1,39 +1,34 @@
-name: 'CI: UIRouter for AngularJS'
+name: 'CI'
 
-on: [push]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
-  test:
-    name: Unit Tests
+  ci:
+    needs: [test]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Install Dependencies
-        run: yarn install --pure-lockfile
-      - name: Run Tests
-        run: yarn test
+      - run: true
 
-  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
+  test:
+    name: yarn ${{ matrix.yarncmd }}
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        yarncmd: ['test', 'test:downstream', 'docs']
     steps:
       - uses: actions/checkout@v2
-      - name: Prepare to Test Downstream Projects
+      - name: Configure Environment
         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
+      - name: Check Peer Dependencies
+        run: npx check-peer-dependencies
+      - name: Run yarn ${{ matrix.yarncmd }}
+        run: yarn ${{ matrix.yarncmd }}

.github/workflows/update_dependencies.yml

@@ -0,0 +1,64 @@
+# This workflow requires a personal access token for uirouterbot
+name: Weekly Dependency Bumps
+on:
+  repository_dispatch:
+    types: [update_dependencies]
+  schedule:
+    - cron: '0 20 * * 0'
+
+jobs:
+  upgrade-dependencies:
+    runs-on: ubuntu-latest
+    name: Update dependencies
+    strategy:
+      matrix:
+        excludes: ['']
+        deptype: ['dependencies', 'devDependencies']
+        latest: [false]
+    steps:
+      - uses: actions/checkout@v2
+      - run: |
+          git config user.name uirouterbot
+          git config user.password ${{ secrets.UIROUTERBOT_PAT }}
+          git remote set-url origin $(git remote get-url origin | sed -e 's/ui-router/uirouterbot/')
+          git fetch --unshallow -p origin
+      - name: Update dependencies
+        id: upgrade
+        uses: ui-router/publish-scripts/actions/upgrade@actions-upgrade-v1.0.3
+        with:
+          excludes: ${{ matrix.excludes }}
+          deptype: ${{ matrix.deptype }}
+          latest: ${{ matrix.latest }}
+      - name: Create Pull Request
+        id: cpr
+        if: ${{ steps.upgrade.outputs.upgrades != '' }}
+        # the following hash is from https://github.com/peter-evans/create-pull-request/releases/tag/v2.7.0
+        uses: peter-evans/create-pull-request@340e629d2f63059fb3e3f15437e92cfbc7acd85b
+        with:
+          token: ${{ secrets.UIROUTERBOT_PAT }}
+          request-to-parent: true
+          branch-suffix: 'random'
+          commit-message: 'chore(package): Update ${{ steps.upgrade.outputs.upgradecount }} ${{ matrix.deptype }} to ${{ steps.upgrade.outputs.upgradestrategy }}'
+          title: 'chore(package): Update ${{ steps.upgrade.outputs.upgradecount }} ${{ matrix.deptype }} to ${{ steps.upgrade.outputs.upgradestrategy }}'
+          body: |
+            chore(package): Update ${{ steps.upgrade.outputs.upgradecount }} ${{ matrix.deptype }} to ${{ steps.upgrade.outputs.upgradestrategy }}
+
+            ```
+            ${{ steps.upgrade.outputs.upgrades }}
+            ```
+
+            Auto-generated by [create-pull-request][1]
+
+            [1]: https://github.com/peter-evans/create-pull-request
+      - name: Apply Merge Label
+        if: ${{ steps.cpr.outputs.pr_number != '' }}
+        uses: actions/github-script@0.9.0
+        with:
+          github-token: ${{ secrets.UIROUTERBOT_PAT }}
+          script: |
+            await github.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: ${{ steps.cpr.outputs.pr_number }},
+              labels: ['ready to squash and merge']
+            });

.mergify.yml

@@ -1,20 +1,18 @@
 pull_request_rules:
-  - name: Automatically squash and merge on CI success
+  - name: Auto Squash and Merge
     conditions:
-      - status-success=Unit Tests
-      - status-success=Docs can be generated
-      - status-success=Downstream projects still work
+      - base=master
+      - status-success=ci
       - 'label=ready to squash and merge'
     actions:
       delete_head_branch: {}
       merge:
         method: squash
         strict: smart
-  - name: Automatically rebase and merge on CI success
+  - name: Auto Rebase and Merge
     conditions:
-      - status-success=Unit Tests
-      - status-success=Docs can be generated
-      - status-success=Downstream projects still work
+      - base=master
+      - status-success=ci
       - 'label=ready to rebase and merge'
     actions:
       delete_head_branch: {}

CHANGELOG.md

@@ -1,3 +1,26 @@
+## 1.0.27 (2020-07-21)
+[Compare `@uirouter/angularjs` versions 1.0.26 and 1.0.27](https://github.com/angular-ui/ui-router/compare/1.0.26...1.0.27)
+
+### Bug Fixes
+
+* make augmented StateRegistry.register overload better match the signature in core ([db4e63f](https://github.com/angular-ui/ui-router/commit/db4e63f))
+
+
+---
+
+### Updated `@uirouter/core` from 6.0.5 to 6.0.6
+
+
+Changelog for `@uirouter/core`:
+
+
+[Compare `@uirouter/core` versions 6.0.5 and 6.0.6](https://github.com/ui-router/core/compare/6.0.5...6.0.6)
+
+### Bug Fixes
+
+* **params:** Bi-directionally en/decode path and search params. ([#618](https://github.com/ui-router/core/issues/618)) ([89e99cd](https://github.com/ui-router/core/commit/89e99cd))
+
+
 ## 1.0.26 (2020-04-29)
 [Compare `@uirouter/angularjs` versions 1.0.25 and 1.0.26](https://github.com/angular-ui/ui-router/compare/1.0.25...1.0.26)
 

bower.json

@@ -17,5 +17,5 @@
     "test",
     "src"
   ],
-  "version": "1.0.25"
+  "version": "1.0.26"
 }

downstream_projects.json

@@ -1,8 +1,23 @@
 {
-  "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"
+  "typescript": {
+    "typescript2.2": "./test/typescript/2.2",
+    "typescript2.3": "./test/typescript/2.3",
+    "typescript2.4": "./test/typescript/2.4",
+    "typescript2.5": "./test/typescript/2.5",
+    "typescript2.6": "./test/typescript/2.6",
+    "typescript2.8": "./test/typescript/2.8",
+    "typescript2.7": "./test/typescript/2.7",
+    "typescript2.9": "./test/typescript/2.9",
+    "typescript3.0": "./test/typescript/3.0",
+    "typescript3.1": "./test/typescript/3.1",
+    "typescript3.2": "./test/typescript/3.2",
+    "typescript3.3": "./test/typescript/3.3",
+    "typescript3.4": "./test/typescript/3.4",
+    "typescript3.5": "./test/typescript/3.5",
+    "typescript3.6": "./test/typescript/3.6",
+    "typescript3.7": "./test/typescript/3.7",
+    "typescript3.8": "./test/typescript/3.8",
+    "typescript3.9": "./test/typescript/3.9"
+  },
+  "sample-app-angularjs": "https://github.com/ui-router/sample-app-angularjs.git"
 }

jest.config.js

@@ -0,0 +1,17 @@
+const NG = process.env.NG || '1.7';
+
+console.log(`Testing with AngularJS ${NG}`);
+
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'jsdom',
+  roots: ['src', 'test'],
+  testMatch: ['**/__tests__/**/*.[jt]s?(x)', '**/?(*.)+(spec|test).[jt]s?(x)', '**/?*Spec.[jt]s'],
+  setupFilesAfterEnv: ['./test/jest.init.ts'],
+  moduleNameMapper: {
+    '^angular$': '<rootDir>/test/angular/jest-angular.js',
+    '^jest-angular-import$': `<rootDir>/test/angular/${NG}/angular.js`,
+    '^angular-animate$': `<rootDir>/test/angular/${NG}/angular-animate.js`,
+    '^angular-mocks$': `<rootDir>/test/angular/${NG}/angular-mocks.js`,
+  },
+};

karma.conf.js

@@ -24,14 +24,14 @@ function karmaServedFiles(ngVersion) {
     ];
   }
 
-  var angularFiles = angular(ngVersion).map(function(pattern) {
+  var angularFiles = angular(ngVersion).map(function (pattern) {
     return { watched: false, included: true, nocache: true, pattern: pattern };
   });
 
   return angularFiles.concat('test/index.js');
 }
 
-module.exports = function(config) {
+module.exports = function (config) {
   var ngVersion = config.ngversion || DEFAULT_NG_VERSION;
 
   config.set({

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uirouter/angularjs",
   "description": "State-based routing for AngularJS 1.x",
-  "version": "1.0.26",
+  "version": "1.0.27",
   "scripts": {
     "clean": "shx rm -rf lib lib-esm _doc build release *.log",
     "compile": "tsc && tsc -m es6 --outDir lib-esm && npm run fixdts",
@@ -15,15 +15,17 @@
     "bundle_router": "rollup -c --environment ROUTER  && rollup -c --environment ROUTER,MINIFY",
     "bundle_events": "rollup -c --environment EVENTS  && rollup -c --environment EVENTS,MINIFY",
     "bundle_resolve": "rollup -c --environment RESOLVE && rollup -c --environment RESOLVE,MINIFY",
-    "test": "tsc && 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": "tsc && NG=1.7 jest && NG=1.6 jest && NG=1.5 jest && NG=1.4 jest && NG=1.3 jest && NG=1.2 jest",
+    "test:debug": "node --inspect ./node_modules/.bin/jest --runInBand --watch",
+    "test:ng12": "NG=1.2 jest",
+    "test:ng13": "NG=1.3 jest",
+    "test:ng14": "NG=1.4 jest",
+    "test:ng15": "NG=1.5 jest",
+    "test:ng16": "NG=1.6 jest",
+    "test:ng17": "NG=1.7 jest",
     "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",
+    "watch": "jest --watch",
+    "debug": "npm run test:debug",
     "docs": "generate_docs",
     "docs:publish": "generate_docs && publish_docs",
     "release": "release --deps @uirouter/core && node ./scripts/npm_angular_ui_router_release.js && node ./scripts/bower_release.js",
@@ -72,7 +74,7 @@
   "module": "lib-esm/index.js",
   "typings": "lib/index.d.ts",
   "dependencies": {
-    "@uirouter/core": "6.0.5"
+    "@uirouter/core": "6.0.6"
   },
   "peerDependencies": {
     "angular": ">=1.2.0"
@@ -81,35 +83,65 @@
     "@types/angular": "1.6.57",
     "@types/angular-animate": "^1.5.10",
     "@types/angular-mocks": "^1.7.0",
-    "@types/jasmine": "^3.5.10",
-    "@uirouter/publish-scripts": "^2.3.45",
-    "dts-downlevel": "^0.3.0",
-    "fork-ts-checker-webpack-plugin": "^4.1.3",
+    "@types/jest": "^26.0.5",
+    "@uirouter/publish-scripts": "2.5.3",
+    "angular": "1.8.0",
+    "bufferutil": "4.0.1",
+    "canvas": "2.6.1",
+    "dts-downlevel": "^0.4.0",
     "husky": "^4.2.5",
-    "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.15",
+    "jest": "^26.0.1",
+    "lodash": "^4.17.19",
     "prettier": "^2.0.5",
     "pretty-quick": "^2.0.1",
-    "rollup": "^1.27.14",
+    "rollup": "^2.22.1",
     "rollup-plugin-node-resolve": "^5.2.0",
-    "rollup-plugin-sourcemaps": "^0.5.0",
-    "rollup-plugin-uglify": "^6.0.4",
-    "ts-loader": "^7.0.1",
-    "tslint": "^6.1.2",
+    "rollup-plugin-sourcemaps": "^0.6.2",
+    "rollup-plugin-terser": "^6.1.0",
+    "ts-jest": "^26.0.0",
+    "tslint": "5.20.1",
     "tslint-eslint-rules": "^5.4.0",
-    "typescript": "^3.6.4",
-    "webpack": "^4.43.0"
+    "typescript": "^3.9.7",
+    "utf-8-validate": "5.0.2"
   },
   "husky": {
     "hooks": {
       "pre-commit": "pretty-quick --staged"
     }
+  },
+  "docgen": {
+    "publishDir": "_ng1_docs",
+    "navigation": {
+      "": [
+        "UIRouter"
+      ],
+      "Services": [
+        "StateService",
+        "StateRegistry",
+        "TransitionService",
+        "UrlService",
+        "UrlConfig",
+        "UrlRules"
+      ],
+      "Interfaces": [
+        "Ng1StateDeclaration"
+      ],
+      "Components": [
+        "uiView",
+        "UISref",
+        "UISrefActive"
+      ],
+      "Other": [
+        "Transition",
+        "Trace"
+      ]
+    },
+    "include": [
+      {
+        "pkg": "@uirouter/core",
+        "repo": "https://github.com/ui-router/core",
+        "branch": "master"
+      }
+    ]
   }
 }