diff --git a/dist/amd/routable-resource.js b/dist/amd/routable-resource.js
index 130ee6c..5f9d0cf 100644
--- a/dist/amd/routable-resource.js
+++ b/dist/amd/routable-resource.js
@@ -6,7 +6,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
-define(["require", "exports", "aurelia-logging", "aurelia-pal", "./router-metadata"], function (require, exports, aurelia_logging_1, aurelia_pal_1, router_metadata_1) {
+define(["require", "exports", "aurelia-dependency-injection", "aurelia-logging", "aurelia-pal", "./router-metadata"], function (require, exports, aurelia_dependency_injection_1, aurelia_logging_1, aurelia_pal_1, router_metadata_1) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
const configureRouterSymbol = Symbol("configureRouter");
@@ -148,7 +148,8 @@ define(["require", "exports", "aurelia-logging", "aurelia-pal", "./router-metada
if (this.areChildRouteModulesLoaded) {
return;
}
- yield aurelia_pal_1.PLATFORM.Loader.loadAllModules(this.routableModuleIds);
+ const loader = aurelia_dependency_injection_1.Container.instance.get(aurelia_pal_1.PLATFORM.Loader);
+ yield loader.loadAllModules(this.routableModuleIds);
if (this.enableEagerLoading) {
for (const moduleId of this.routableModuleIds) {
const resource = router_metadata_1.routerMetadata.getOwn(moduleId);
diff --git a/dist/amd/routable-resource.js.map b/dist/amd/routable-resource.js.map
index 685bbb3..5b3406f 100644
--- a/dist/amd/routable-resource.js.map
+++ b/dist/amd/routable-resource.js.map
@@ -1 +1 @@
-{"version":3,"file":"routable-resource.js","sourceRoot":"","sources":["../../src/routable-resource.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"routable-resource.js","sourceRoot":"","sources":["../../src/routable-resource.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/commonjs/routable-resource.js b/dist/commonjs/routable-resource.js
index 853836b..46c4843 100644
--- a/dist/commonjs/routable-resource.js
+++ b/dist/commonjs/routable-resource.js
@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
});
};
Object.defineProperty(exports, "__esModule", { value: true });
+const aurelia_dependency_injection_1 = require("aurelia-dependency-injection");
const aurelia_logging_1 = require("aurelia-logging");
const aurelia_pal_1 = require("aurelia-pal");
const router_metadata_1 = require("./router-metadata");
@@ -150,7 +151,8 @@ class RoutableResource {
if (this.areChildRouteModulesLoaded) {
return;
}
- yield aurelia_pal_1.PLATFORM.Loader.loadAllModules(this.routableModuleIds);
+ const loader = aurelia_dependency_injection_1.Container.instance.get(aurelia_pal_1.PLATFORM.Loader);
+ yield loader.loadAllModules(this.routableModuleIds);
if (this.enableEagerLoading) {
for (const moduleId of this.routableModuleIds) {
const resource = router_metadata_1.routerMetadata.getOwn(moduleId);
diff --git a/dist/commonjs/routable-resource.js.map b/dist/commonjs/routable-resource.js.map
index c054c72..652338b 100644
--- a/dist/commonjs/routable-resource.js.map
+++ b/dist/commonjs/routable-resource.js.map
@@ -1 +1 @@
-{"version":3,"file":"routable-resource.js","sourceRoot":"","sources":["../../src/routable-resource.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"routable-resource.js","sourceRoot":"","sources":["../../src/routable-resource.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/es2015/routable-resource.js b/dist/es2015/routable-resource.js
index 0a94955..70284d5 100644
--- a/dist/es2015/routable-resource.js
+++ b/dist/es2015/routable-resource.js
@@ -6,6 +6,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
+import { Container } from "aurelia-dependency-injection";
import { getLogger } from "aurelia-logging";
import { PLATFORM } from "aurelia-pal";
import { routerMetadata } from "./router-metadata";
@@ -148,7 +149,8 @@ export class RoutableResource {
if (this.areChildRouteModulesLoaded) {
return;
}
- yield PLATFORM.Loader.loadAllModules(this.routableModuleIds);
+ const loader = Container.instance.get(PLATFORM.Loader);
+ yield loader.loadAllModules(this.routableModuleIds);
if (this.enableEagerLoading) {
for (const moduleId of this.routableModuleIds) {
const resource = routerMetadata.getOwn(moduleId);
diff --git a/dist/es2015/routable-resource.js.map b/dist/es2015/routable-resource.js.map
index 1347f95..327115f 100644
--- a/dist/es2015/routable-resource.js.map
+++ b/dist/es2015/routable-resource.js.map
@@ -1 +1 @@
-{"version":3,"file":"routable-resource.js","sourceRoot":"","sources":["../../src/routable-resource.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"routable-resource.js","sourceRoot":"","sources":["../../src/routable-resource.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/es2017/routable-resource.js b/dist/es2017/routable-resource.js
index ba678be..f299769 100644
--- a/dist/es2017/routable-resource.js
+++ b/dist/es2017/routable-resource.js
@@ -1,3 +1,4 @@
+import { Container } from "aurelia-dependency-injection";
import { getLogger } from "aurelia-logging";
import { PLATFORM } from "aurelia-pal";
import { routerMetadata } from "./router-metadata";
@@ -137,7 +138,8 @@ export class RoutableResource {
if (this.areChildRouteModulesLoaded) {
return;
}
- await PLATFORM.Loader.loadAllModules(this.routableModuleIds);
+ const loader = Container.instance.get(PLATFORM.Loader);
+ await loader.loadAllModules(this.routableModuleIds);
if (this.enableEagerLoading) {
for (const moduleId of this.routableModuleIds) {
const resource = routerMetadata.getOwn(moduleId);
diff --git a/dist/es2017/routable-resource.js.map b/dist/es2017/routable-resource.js.map
index 246e5b8..f2b50e5 100644
--- a/dist/es2017/routable-resource.js.map
+++ b/dist/es2017/routable-resource.js.map
@@ -1 +1 @@
-{"version":3,"file":"routable-resource.js","sourceRoot":"","sources":["../../src/routable-resource.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"routable-resource.js","sourceRoot":"","sources":["../../src/routable-resource.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/native-modules/routable-resource.js b/dist/native-modules/routable-resource.js
index 0a94955..70284d5 100644
--- a/dist/native-modules/routable-resource.js
+++ b/dist/native-modules/routable-resource.js
@@ -6,6 +6,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
+import { Container } from "aurelia-dependency-injection";
import { getLogger } from "aurelia-logging";
import { PLATFORM } from "aurelia-pal";
import { routerMetadata } from "./router-metadata";
@@ -148,7 +149,8 @@ export class RoutableResource {
if (this.areChildRouteModulesLoaded) {
return;
}
- yield PLATFORM.Loader.loadAllModules(this.routableModuleIds);
+ const loader = Container.instance.get(PLATFORM.Loader);
+ yield loader.loadAllModules(this.routableModuleIds);
if (this.enableEagerLoading) {
for (const moduleId of this.routableModuleIds) {
const resource = routerMetadata.getOwn(moduleId);
diff --git a/dist/native-modules/routable-resource.js.map b/dist/native-modules/routable-resource.js.map
index 1347f95..327115f 100644
--- a/dist/native-modules/routable-resource.js.map
+++ b/dist/native-modules/routable-resource.js.map
@@ -1 +1 @@
-{"version":3,"file":"routable-resource.js","sourceRoot":"","sources":["../../src/routable-resource.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"routable-resource.js","sourceRoot":"","sources":["../../src/routable-resource.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/system/routable-resource.js b/dist/system/routable-resource.js
index b1f0747..876f06c 100644
--- a/dist/system/routable-resource.js
+++ b/dist/system/routable-resource.js
@@ -1,4 +1,4 @@
-System.register(["aurelia-logging", "aurelia-pal", "./router-metadata"], function (exports_1, context_1) {
+System.register(["aurelia-dependency-injection", "aurelia-logging", "aurelia-pal", "./router-metadata"], function (exports_1, context_1) {
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
return new (P || (P = Promise))(function (resolve, reject) {
@@ -44,9 +44,12 @@ System.register(["aurelia-logging", "aurelia-pal", "./router-metadata"], functio
const name = target.name;
return (name.charAt(0).toLowerCase() + name.slice(1)).replace(/([A-Z])/g, (char) => `-${char.toLowerCase()}`);
}
- var aurelia_logging_1, aurelia_pal_1, router_metadata_1, configureRouterSymbol, logger, routeConfigProperies, RoutableResource;
+ var aurelia_dependency_injection_1, aurelia_logging_1, aurelia_pal_1, router_metadata_1, configureRouterSymbol, logger, routeConfigProperies, RoutableResource;
return {
setters: [
+ function (aurelia_dependency_injection_1_1) {
+ aurelia_dependency_injection_1 = aurelia_dependency_injection_1_1;
+ },
function (aurelia_logging_1_1) {
aurelia_logging_1 = aurelia_logging_1_1;
},
@@ -197,7 +200,8 @@ System.register(["aurelia-logging", "aurelia-pal", "./router-metadata"], functio
if (this.areChildRouteModulesLoaded) {
return;
}
- yield aurelia_pal_1.PLATFORM.Loader.loadAllModules(this.routableModuleIds);
+ const loader = aurelia_dependency_injection_1.Container.instance.get(aurelia_pal_1.PLATFORM.Loader);
+ yield loader.loadAllModules(this.routableModuleIds);
if (this.enableEagerLoading) {
for (const moduleId of this.routableModuleIds) {
const resource = router_metadata_1.routerMetadata.getOwn(moduleId);
diff --git a/dist/system/routable-resource.js.map b/dist/system/routable-resource.js.map
index 4de5733..de17196 100644
--- a/dist/system/routable-resource.js.map
+++ b/dist/system/routable-resource.js.map
@@ -1 +1 @@
-{"version":3,"file":"routable-resource.js","sourceRoot":"","sources":["../../src/routable-resource.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"routable-resource.js","sourceRoot":"","sources":["../../src/routable-resource.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index fd9118a..205b864 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -1,3 +1,22 @@
+
+## 0.3.2 (2018-02-18)
+
+* 0.2.0 ([60a09d6](https://github.com/fkleuver/aurelia-router-metadata/commit/60a09d6))
+* add childRoutes to RouteConfig.settings when they are eagerly loaded ([c04348c](https://github.com/fkleuver/aurelia-router-metadata/commit/c04348c))
+* big refactor ([1c54bef](https://github.com/fkleuver/aurelia-router-metadata/commit/1c54bef))
+* correct filter type check ([3495f5f](https://github.com/fkleuver/aurelia-router-metadata/commit/3495f5f))
+* create a few more basic tests ([a754b19](https://github.com/fkleuver/aurelia-router-metadata/commit/a754b19))
+* fix getModuleId ([6db240e](https://github.com/fkleuver/aurelia-router-metadata/commit/6db240e))
+* fix loader reference ([a5de8bd](https://github.com/fkleuver/aurelia-router-metadata/commit/a5de8bd))
+* prepare release v0.3.0 ([587fb80](https://github.com/fkleuver/aurelia-router-metadata/commit/587fb80))
+* set up unit testing and add a few initial tests ([d553954](https://github.com/fkleuver/aurelia-router-metadata/commit/d553954))
+* update readme for eager loading ([e2e6092](https://github.com/fkleuver/aurelia-router-metadata/commit/e2e6092))
+* v0.3.0 ([ea6fb5d](https://github.com/fkleuver/aurelia-router-metadata/commit/ea6fb5d))
+* v0.3.1 ([2a9844f](https://github.com/fkleuver/aurelia-router-metadata/commit/2a9844f))
+* v0.3.1 ([cee04c9](https://github.com/fkleuver/aurelia-router-metadata/commit/cee04c9))
+
+
+
## 0.3.1 (2018-02-18)
diff --git a/package.json b/package.json
index 9ee6e1b..1f20f36 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "aurelia-router-metadata",
- "version": "0.3.1",
+ "version": "0.3.2",
"description": "Adds decorator configuration with conventions and eager loading capabilities to aurelia-router",
"keywords": [
"aurelia",