fix(typescript): Update to typescript 2.4 and @uirouter/core 5.0.5

Author: christopherthielen

package.json

@@ -69,7 +69,7 @@
   "jsnext:main": "lib-esm/index.js",
   "typings": "lib/index.d.ts",
   "dependencies": {
-    "@uirouter/core": "5.0.3"
+    "@uirouter/core": "5.0.5"
   },
   "peerDependencies": {
     "angular": ">=1.2.0"
@@ -115,7 +115,7 @@
     "typedoc-plugin-external-module-name": "^1.0.2",
     "typedoc-plugin-internal-external": "^1.0.0",
     "typedoc-plugin-ui-router": "^1.0.0",
-    "typescript": "^2.1.4",
+    "typescript": "~2.4.0",
     "ui-router-typedoc-themes": "^1.0.1",
     "watch": "^0.18.0",
     "webpack": "1.x",

src/stateFilters.ts

@@ -15,7 +15,7 @@ import { Obj, StateService, StateOrName } from "@uirouter/core";
  */
 $IsStateFilter.$inject = ['$state'];
 export function $IsStateFilter($state: StateService) {
-  var isFilter: any = function(state: StateOrName, params: Obj, options?: { relative?: boolean }) {
+  var isFilter: any = function(state: StateOrName, params: Obj, options?: { relative?: StateOrName }) {
     return $state.is(state, params, options);
   };
   isFilter.$stateful = true;
@@ -34,7 +34,7 @@ export function $IsStateFilter($state: StateService) {
  */
 $IncludedByStateFilter.$inject = ['$state'];
 export function $IncludedByStateFilter($state: StateService) {
-  var includesFilter: any = function(state: StateOrName, params: Obj, options: Obj) {
+  var includesFilter: any = function(state: StateOrName, params: Obj, options: { relative?: StateOrName }) {
     return $state.includes(state, params, options);
   };
   includesFilter.$stateful = true;

src/templateFactory.ts

@@ -42,19 +42,19 @@ export class TemplateFactory implements TemplateFactoryProvider {
    * @return {string|object}  The template html as a string, or a promise for
    * that string,or `null` if no template is configured.
    */
-  fromConfig(config: Ng1ViewDeclaration, params: any, context: ResolveContext) {
+  fromConfig(config: Ng1ViewDeclaration, params: any, context: ResolveContext): Promise<{ template?: string, component?: string }> {
     const defaultTemplate = "<ui-view></ui-view>";
 
-    const asTemplate = (result) => services.$q.when(result).then(str => ({ template: str }));
+    const asTemplate  = (result) => services.$q.when(result).then(str => ({ template:  str }));
     const asComponent = (result) => services.$q.when(result).then(str => ({ component: str }));
 
     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)
+        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)
     );
   };