CHANGELOG.md

@@ -1,3 +1,20 @@
+## 1.0.21 (2019-01-10)
+[Compare `@uirouter/angularjs` versions 1.0.20 and 1.0.21](https://github.com/angular-ui/ui-router/compare/1.0.20...1.0.21)
+
+
+### Updated `@uirouter/core` from 5.0.21 to 5.0.22
+[Compare `@uirouter/core` versions 5.0.21 and 5.0.22](https://github.com/ui-router/core/compare/5.0.21...5.0.22)
+
+### Bug Fixes
+
+* **lazyLoad:** StateBuilder should not mutate the state declaration ([1478a3c](https://github.com/ui-router/core/commit/1478a3c)), closes [/github.com/ui-router/core/commit/3cd5a2a#r31260154](https://github.com//github.com/ui-router/core/commit/3cd5a2a/issues/r31260154)
+* **state:** Update URL in response to ignored transition due to redirect ([c64c252](https://github.com/ui-router/core/commit/c64c252))
+
+
+### Features
+
+* **TransitionHook:** Pass in transition to HookMatchCriteria ([#255](https://github.com/ui-router/core/issues/255)) ([926705e](https://github.com/ui-router/core/commit/926705e))
+
 ## 1.0.20 (2018-08-11)
 [Compare `@uirouter/angularjs` versions 1.0.19 and 1.0.20](https://github.com/angular-ui/ui-router/compare/1.0.19...1.0.20)
 

artifacts.json

@@ -1,8 +1,3 @@
 {
-  "ARTIFACTS": [
-    "lib",
-    "lib-esm",
-    "release",
-    "package.json"
-  ]
+  "ARTIFACTS": ["lib", "lib-esm", "release", "package.json"]
 }

bower.json

@@ -17,5 +17,5 @@
     "test",
     "src"
   ],
-  "version": "1.0.19"
+  "version": "1.0.20"
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uirouter/angularjs",
   "description": "State-based routing for AngularJS 1.x",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "scripts": {
     "clean": "shx rm -rf lib lib-esm _doc build release *.log",
     "compile": "tsc && tsc -m es6 --outDir lib-esm && npm run fixdts",
@@ -28,8 +28,7 @@
     "docs:publish": "generate_docs && publish_docs",
     "release": "release --deps @uirouter/core && node ./scripts/npm_angular_ui_router_release.js && node ./scripts/bower_release.js",
     "prepublishOnly": "npm run build",
-    "artifacts": "artifact_tagging",
-    "precommit": "pretty-quick --staged"
+    "artifacts": "artifact_tagging"
   },
   "homepage": "https://ui-router.github.io",
   "contributors": [
@@ -73,41 +72,45 @@
   "module": "lib-esm/index.js",
   "typings": "lib/index.d.ts",
   "dependencies": {
-    "@uirouter/core": "5.0.21"
+    "@uirouter/core": "5.0.22"
   },
   "peerDependencies": {
     "angular": ">=1.2.0"
   },
   "devDependencies": {
-    "@types/angular": "=1.6.25",
+    "@types/angular": "1.6.53",
     "@types/angular-animate": "^1.5.10",
-    "@types/angular-mocks": "^1.6.1",
-    "@types/jasmine": "^2.8.8",
-    "@types/jquery": "^3.3.5",
-    "@uirouter/publish-scripts": "^2.3.20",
+    "@types/angular-mocks": "^1.7.0",
+    "@types/jasmine": "^3.3.5",
+    "@types/jquery": "^3.3.29",
+    "@uirouter/publish-scripts": "^2.3.24",
     "dts-downlevel": "^0.3.0",
-    "fork-ts-checker-webpack-plugin": "^0.4.8",
-    "husky": "^0.14.3",
-    "jasmine-core": "^3.2.0",
-    "karma": "^3.0.0",
+    "fork-ts-checker-webpack-plugin": "^0.5.2",
+    "husky": "^1.3.1",
+    "jasmine-core": "^3.3.0",
+    "karma": "^3.1.4",
     "karma-chrome-launcher": "^2.2.0",
-    "karma-jasmine": "^1.1.2",
+    "karma-jasmine": "^2.0.1",
     "karma-mocha-reporter": "^2.2.5",
-    "karma-phantomjs-launcher": "^1.0.4",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-super-dots-reporter": "^0.2.0",
-    "karma-webpack": "^3.0.0",
-    "lodash": "^4.17.10",
-    "prettier": "^1.14.2",
-    "pretty-quick": "^1.6.0",
-    "rollup": "^0.64.1",
-    "rollup-plugin-node-resolve": "^3.3.0",
+    "karma-webpack": "^3.0.5",
+    "lodash": "^4.17.11",
+    "prettier": "^1.15.3",
+    "pretty-quick": "^1.8.0",
+    "rollup": "^1.1.0",
+    "rollup-plugin-node-resolve": "^4.0.0",
     "rollup-plugin-sourcemaps": "^0.4.2",
-    "rollup-plugin-uglify": "^4.0.0",
-    "ts-loader": "^4.4.2",
-    "tslint": "^5.11.0",
-    "tslint-eslint-rules": "^5.3.1",
-    "typescript": "^3.0.1",
-    "webpack": "^4.16.5"
+    "rollup-plugin-uglify": "^6.0.0",
+    "ts-loader": "^5.3.3",
+    "tslint": "^5.12.0",
+    "tslint-eslint-rules": "^5.4.0",
+    "typescript": "^3.2.2",
+    "webpack": "^4.28.1"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "pretty-quick --staged"
+    }
   }
 }

rollup.config.js

@@ -119,11 +119,11 @@ const RESOLVE_CONFIG = Object.assign({}, BASE_CONFIG, {
 const CONFIG = RESOLVE
   ? RESOLVE_CONFIG
   : EVENTS
-    ? EVENTS_CONFIG
-    : MONOLITHIC
-      ? MONOLITHIC_ROUTER_CONFIG
-      : ROUTER
-        ? ROUTER_CONFIG
-        : ROUTER_CONFIG;
+  ? EVENTS_CONFIG
+  : MONOLITHIC
+  ? MONOLITHIC_ROUTER_CONFIG
+  : ROUTER
+  ? ROUTER_CONFIG
+  : ROUTER_CONFIG;
 
 export default CONFIG;

src/directives/stateDirectives.ts

@@ -143,7 +143,7 @@ function bindEvents(element: IAugmentedJQuery, scope: IScope, hookFn: EventHandl
   scope.$on('$destroy', function() {
     const off = element.off ? 'off' : 'unbind';
     for (const event of events) {
-      element[off](event, hookFn);
+      element[off](event, hookFn as any);
     }
   });
 }

src/directives/viewDirective.ts

@@ -398,7 +398,7 @@ function $ViewDirectiveFill(
         trace.traceUIViewFill(data.$uiView, $element.html());
 
         const link = $compile($element.contents() as any);
-        const controller = cfg.controller;
+        const controller = cfg.controller as angular.IControllerService;
         const controllerAs: string = getControllerAs(cfg);
         const resolveAs: string = getResolveAs(cfg);
         const locals = resolveCtx && getLocals(resolveCtx);

src/legacy/stateEvents.ts

@@ -338,7 +338,7 @@ export let $stateNotFound: IAngularEvent;
 
   angular
     .module('ui.router.state.events', ['ui.router.state'])
-    .provider('$stateEvents', <IServiceProviderFactory>$StateEventsProvider)
+    .provider('$stateEvents', ($StateEventsProvider as any) as IServiceProviderFactory)
     .run([
       '$stateEvents',
       function($stateEvents: any) {

src/templateFactory.ts

@@ -70,14 +70,14 @@ export class TemplateFactory implements TemplateFactoryProvider {
     return isDefined(config.template)
       ? asTemplate(this.fromString(config.template, params))
       : isDefined(config.templateUrl)
-        ? asTemplate(this.fromUrl(config.templateUrl, params))
-        : isDefined(config.templateProvider)
-          ? asTemplate(this.fromProvider(config.templateProvider, params, context))
-          : isDefined(config.component)
-            ? asComponent(config.component)
-            : isDefined(config.componentProvider)
-              ? asComponent(this.fromComponentProvider(config.componentProvider, params, context))
-              : asTemplate(defaultTemplate);
+      ? asTemplate(this.fromUrl(config.templateUrl, params))
+      : isDefined(config.templateProvider)
+      ? asTemplate(this.fromProvider(config.templateProvider, params, context))
+      : isDefined(config.component)
+      ? asComponent(config.component)
+      : isDefined(config.componentProvider)
+      ? asComponent(this.fromComponentProvider(config.componentProvider, params, context))
+      : asTemplate(defaultTemplate);
   }
 
   /**

test/tsconfig.json

@@ -5,13 +5,11 @@
     "moduleResolution": "node",
     "module": "commonjs",
     "target": "es5",
-    "lib": [ "es6", "dom" ],
+    "lib": ["es6", "dom"],
     "allowSyntheticDefaultImports": true,
     "outDir": "../.testlib",
     "declaration": false,
     "sourceMap": false
   },
-  "include": [
-    "*.ts"
-  ]
+  "include": ["*.ts"]
 }

test/typescript2.2/tsconfig.json

@@ -2,11 +2,11 @@
   "compilerOptions": {
     "moduleResolution": "node",
     "module": "commonjs",
-    "lib": [ "es6", "dom" ],
+    "lib": ["es6", "dom"],
     "noImplicitAny": true,
     "noEmit": true,
     "target": "es5",
     "typeRoots": ["node_modules/@types"]
   },
-  "files": [ "index.ts" ]
+  "files": ["index.ts"]
 }

test/typescript2.3/tsconfig.json

@@ -2,11 +2,11 @@
   "compilerOptions": {
     "moduleResolution": "node",
     "module": "commonjs",
-    "lib": [ "es6", "dom" ],
+    "lib": ["es6", "dom"],
     "noImplicitAny": true,
     "noEmit": true,
     "target": "es5",
     "typeRoots": ["node_modules/@types"]
   },
-  "files": [ "index.ts" ]
+  "files": ["index.ts"]
 }

test/typescript2.4/tsconfig.json

@@ -2,11 +2,11 @@
   "compilerOptions": {
     "moduleResolution": "node",
     "module": "commonjs",
-    "lib": [ "es6", "dom" ],
+    "lib": ["es6", "dom"],
     "noImplicitAny": true,
     "noEmit": true,
     "target": "es5",
     "typeRoots": ["node_modules/@types"]
   },
-  "files": [ "index.ts" ]
+  "files": ["index.ts"]
 }

test/typescript2.5/tsconfig.json

@@ -2,11 +2,11 @@
   "compilerOptions": {
     "moduleResolution": "node",
     "module": "commonjs",
-    "lib": [ "es6", "dom" ],
+    "lib": ["es6", "dom"],
     "noImplicitAny": true,
     "noEmit": true,
     "target": "es5",
     "typeRoots": ["node_modules/@types"]
   },
-  "files": [ "index.ts" ]
+  "files": ["index.ts"]
 }

test/typescript2.6/tsconfig.json

@@ -2,11 +2,11 @@
   "compilerOptions": {
     "moduleResolution": "node",
     "module": "commonjs",
-    "lib": [ "es6", "dom" ],
+    "lib": ["es6", "dom"],
     "noImplicitAny": true,
     "noEmit": true,
     "target": "es5",
     "typeRoots": ["node_modules/@types"]
   },
-  "files": [ "index.ts" ]
+  "files": ["index.ts"]
 }

tsconfig.json

@@ -5,17 +5,13 @@
     "moduleResolution": "node",
     "module": "commonjs",
     "target": "es5",
-    "lib": [ "es6", "dom" ],
+    "lib": ["es6", "dom"],
     "allowSyntheticDefaultImports": true,
     "outDir": "lib",
     "declaration": true,
     "skipLibCheck": true,
     "sourceMap": true,
     "inlineSources": true
   },
-  "files": [
-    "src/index.ts",
-    "src/legacy/stateEvents.ts",
-    "src/legacy/resolveService.ts"
-  ]
+  "files": ["src/index.ts", "src/legacy/stateEvents.ts", "src/legacy/resolveService.ts"]
 }

tslint.json

@@ -1,22 +1,22 @@
 {
-  "extends": [ "tslint-eslint-rules" ],
+  "extends": ["tslint-eslint-rules"],
   "rules": {
     "align": [true, "parameters", "statements"],
     "ban": false,
     "class-name": true,
-    "comment-format": [ true, "check-space" ],
+    "comment-format": [true, "check-space"],
     "curly": false,
     "eofline": true,
     "forin": true,
-    "indent": [ true, "spaces" ],
+    "indent": [true, "spaces"],
     "label-position": true,
     "max-line-length": [true, 180],
     "member-access": false,
-    "member-ordering": [ true, "static-before-instance", "variables-before-functions" ],
+    "member-ordering": [true, "static-before-instance", "variables-before-functions"],
     "no-arg": true,
     "no-bitwise": true,
     "no-conditional-assignment": true,
-    "no-console": [ true, "log", "warn", "debug", "info", "time", "timeEnd", "trace" ],
+    "no-console": [true, "log", "warn", "debug", "info", "time", "timeEnd", "trace"],
     "no-construct": true,
     "no-debugger": true,
     "no-duplicate-variable": true,
@@ -27,25 +27,33 @@
     "no-string-literal": false,
     "no-switch-case-fall-through": true,
     "no-trailing-whitespace": true,
-    "no-unused-expression": [ true, "allow-fast-null-checks" ],
+    "no-unused-expression": [true, "allow-fast-null-checks"],
     "no-unused-variable": true,
     "no-use-before-declare": true,
     "no-var-keyword": true,
     "object-curly-spacing": "always",
     "object-literal-sort-keys": false,
-    "one-line": [ true, "check-catch", "check-else", "check-open-brace", "check-whitespace" ],
-    "prefer-const": [ true, { "destructuring": "all" } ],
-    "quotemark": [ true, "single", "avoid-escape", "jsx-double" ],
+    "one-line": [true, "check-catch", "check-else", "check-open-brace", "check-whitespace"],
+    "prefer-const": [true, { "destructuring": "all" }],
+    "quotemark": [true, "single", "avoid-escape", "jsx-double"],
     "radix": true,
-    "semicolon": [ true, "always", "ignore-bound-class-methods", "ignore-interfaces" ],
-    "trailing-comma": [true, {"multiline": "always", "singleline": "never"}],
-    "triple-equals": [ true, "allow-null-check" ],
-    "typedef": [ "call-signature", "property-declaration" ],
-    "typedef-whitespace": [ true, { "call-signature": "nospace", "index-signature": "nospace", "parameter": "nospace", "property-declaration": "nospace", "variable-declaration": "nospace" } ],
-    "variable-name": [ true, "ban-keywords", "allow-leading-underscore" ],
-    "whitespace": [ true, "check-branch", "check-decl", "check-operator", "check-separator", "check-type" ],
+    "semicolon": [true, "always", "ignore-bound-class-methods", "ignore-interfaces"],
+    "trailing-comma": [true, { "multiline": "always", "singleline": "never" }],
+    "triple-equals": [true, "allow-null-check"],
+    "typedef": ["call-signature", "property-declaration"],
+    "typedef-whitespace": [
+      true,
+      {
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      }
+    ],
+    "variable-name": [true, "ban-keywords", "allow-leading-underscore"],
+    "whitespace": [true, "check-branch", "check-decl", "check-operator", "check-separator", "check-type"],
     "jsx-no-multiline-js": false,
     "jsx-no-lambda": false
   }
 }
-