Skip to content

Commit 8b83128

Browse files
committed
fix(*): Webpack fails on some recursive imports
1 parent 3688fe0 commit 8b83128

File tree

7 files changed

+12
-8
lines changed

7 files changed

+12
-8
lines changed

src/params/interface.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** @module params */ /** for typedoc */
2-
import {Type} from "./module";
2+
import {Type} from "./type";
33

44
export interface RawParams {
55
[key: string]: any

src/params/param.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
import {isInjectable, extend, isDefined, isString, isArray, filter, map, pick, prop, propEq, curry, applyPairs} from "../common/common";
33
import {RawParams} from "../params/interface";
44
import {runtime} from "../common/angular1";
5-
import {matcherConfig} from "../url/module";
6-
import {Type, paramTypes} from "./module";
5+
import {matcherConfig} from "../url/urlMatcherConfig";
6+
import {Type} from "./type";
7+
import {paramTypes} from "./paramTypes";
78

89
let hasOwn = Object.prototype.hasOwnProperty;
910
let isShorthand = cfg => ["value", "type", "squash", "array", "dynamic"].filter(hasOwn.bind(cfg || {})).length === 0;

src/resolve/resolvable.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {IPromise} from "angular";
66
import {Resolvables, IOptions1} from "./interface"
77

88
import {State} from "../state/module";
9-
import {ResolveContext} from "./module"
9+
import {ResolveContext} from "./resolveContext";
1010

1111
/**
1212
* The basic building block for the resolve system.

src/resolve/resolveContext.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {IPromise} from "angular";
66
import {Resolvables, ResolvePolicy, IOptions1} from "./interface";
77

88
import {Node} from "../path/module";
9-
import {Resolvable} from "./module";
9+
import {Resolvable} from "./resolvable";
1010
import {State} from "../state/module";
1111

1212
// TODO: make this configurable

src/resolve/resolveInjector.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/** @module path */ /** for typedoc */
22
import {map} from "../common/common";
33

4-
import {Resolvable, ResolveContext} from "./module";
4+
import {Resolvable} from "./resolvable";
5+
import {ResolveContext} from "./resolveContext";
56
import {State} from "../state/module";
67

78
export class ResolveInjector {

src/state/interface.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import {IPromise} from "angular";
44
import {TransitionOptions} from "../transition/interface";
55
import {ParamDeclaration, RawParams, ParamsOrArray} from "../params/interface";
66

7-
import {State, TargetState} from "./module";
7+
import {State} from "./stateObject";
8+
import {TargetState} from "./targetState";
89
import {UrlMatcher} from "../url/module";
910
import {Param} from "../params/module";
1011
import {ViewContext} from "../view/interface";

src/transition/transitionService.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import {IServiceProviderFactory} from "angular";
55

66
import {IHookRegistry, ITransitionService, TransitionOptions, IHookRegistration, IHookGetter} from "./interface";
77

8-
import {Transition, HookRegistry} from "./module";
8+
import {Transition} from "./transition";
9+
import {HookRegistry} from "./hookRegistry";
910
import {TargetState} from "../state/module";
1011
import {Node} from "../path/module";
1112

0 commit comments

Comments
 (0)