Skip to content

Commit 13a78da

Browse files
EisenbergEffectEisenbergEffect
committed
chore(all): prepare release 1.0.0-beta.1.0.8
1 parent fafe797 commit 13a78da

File tree

10 files changed

+141
-87
lines changed

10 files changed

+141
-87
lines changed

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aurelia-framework",
3-
"version": "1.0.0-beta.1.0.7",
3+
"version": "1.0.0-beta.1.0.8",
44
"description": "The aurelia framework brings together all the required core aurelia libraries into a ready-to-go application-building platform.",
55
"keywords": [
66
"aurelia",

‎config.js‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ System.config({
1414
},
1515

1616
map: {
17-
"aurelia-binding": "npm:[email protected].1",
18-
"aurelia-dependency-injection": "npm:[email protected]",
19-
"aurelia-loader": "npm:[email protected]",
17+
"aurelia-binding": "npm:[email protected].5",
18+
"aurelia-dependency-injection": "npm:[email protected].0.1",
19+
"aurelia-loader": "npm:[email protected].0.1",
2020
"aurelia-logging": "npm:[email protected]",
2121
"aurelia-metadata": "npm:[email protected]",
22-
"aurelia-pal": "npm:[email protected]",
23-
"aurelia-pal-browser": "npm:[email protected]",
22+
"aurelia-pal": "npm:[email protected].0.2",
23+
"aurelia-pal-browser": "npm:[email protected].0.3",
2424
"aurelia-path": "npm:[email protected]",
25-
"aurelia-task-queue": "npm:[email protected]",
26-
"aurelia-templating": "npm:[email protected]",
27-
"babel": "npm:babel-core@5.2.2",
28-
"babel-runtime": "npm:babel-runtime@5.2.2",
25+
"aurelia-task-queue": "npm:[email protected].0.1",
26+
"aurelia-templating": "npm:[email protected].0.3",
27+
"babel": "npm:babel-core@5.8.34",
28+
"babel-runtime": "npm:babel-runtime@5.8.34",
2929
"core-js": "npm:[email protected]",
3030
"github:jspm/[email protected]": {
3131
"assert": "npm:[email protected]"
@@ -42,43 +42,47 @@ System.config({
4242
"npm:[email protected]": {
4343
"util": "npm:[email protected]"
4444
},
45-
"npm:[email protected].1": {
45+
"npm:[email protected].5": {
4646
"aurelia-metadata": "npm:[email protected]",
47-
"aurelia-pal": "npm:[email protected]",
48-
"aurelia-task-queue": "npm:[email protected]",
47+
"aurelia-pal": "npm:[email protected].0.2",
48+
"aurelia-task-queue": "npm:[email protected].0.1",
4949
"core-js": "npm:[email protected]"
5050
},
51-
"npm:[email protected]": {
51+
"npm:[email protected].0.1": {
5252
"aurelia-logging": "npm:[email protected]",
5353
"aurelia-metadata": "npm:[email protected]",
54-
"aurelia-pal": "npm:[email protected]",
54+
"aurelia-pal": "npm:[email protected].0.2",
5555
"core-js": "npm:[email protected]"
5656
},
57-
"npm:[email protected]": {
57+
"npm:[email protected].0.1": {
5858
"aurelia-metadata": "npm:[email protected]",
5959
"aurelia-path": "npm:[email protected]"
6060
},
6161
"npm:[email protected]": {
62-
"aurelia-pal": "npm:[email protected]",
62+
"aurelia-pal": "npm:[email protected].0.2",
6363
"core-js": "npm:[email protected]"
6464
},
65-
"npm:[email protected]": {
66-
"aurelia-pal": "npm:[email protected]"
65+
"npm:[email protected]": {
66+
"aurelia-pal": "npm:[email protected]",
67+
"core-js": "npm:[email protected]"
6768
},
68-
"npm:[email protected]": {
69-
"aurelia-pal": "npm:[email protected]"
69+
"npm:[email protected].0.1": {
70+
"aurelia-pal": "npm:[email protected].0.2"
7071
},
71-
"npm:[email protected]": {
72-
"aurelia-binding": "npm:[email protected].1",
73-
"aurelia-dependency-injection": "npm:[email protected]",
74-
"aurelia-loader": "npm:[email protected]",
72+
"npm:[email protected].0.3": {
73+
"aurelia-binding": "npm:[email protected].5",
74+
"aurelia-dependency-injection": "npm:[email protected].0.1",
75+
"aurelia-loader": "npm:[email protected].0.1",
7576
"aurelia-logging": "npm:[email protected]",
7677
"aurelia-metadata": "npm:[email protected]",
77-
"aurelia-pal": "npm:[email protected]",
78+
"aurelia-pal": "npm:[email protected].0.2",
7879
"aurelia-path": "npm:[email protected]",
79-
"aurelia-task-queue": "npm:[email protected]",
80+
"aurelia-task-queue": "npm:[email protected].0.1",
8081
"core-js": "npm:[email protected]"
8182
},
83+
"npm:[email protected]": {
84+
"process": "github:jspm/[email protected]"
85+
},
8286
"npm:[email protected]": {
8387
"fs": "github:jspm/[email protected]",
8488
"path": "github:jspm/[email protected]",

‎dist/amd/aurelia-framework.js‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-
7373
this.postTasks = [];
7474
this.resourcesToLoad = {};
7575
this.preTask(function () {
76-
return _this.bootstrapperName = aurelia.loader.normalizeSync('aurelia-bootstrapper');
76+
return aurelia.loader.normalize('aurelia-bootstrapper').then(function (name) {
77+
return _this.bootstrapperName = name;
78+
});
7779
});
7880
this.postTask(function () {
7981
return loadResources(aurelia.container, _this.resourcesToLoad, aurelia.resources);
@@ -158,12 +160,13 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-
158160

159161
this.plugin(plugin);
160162
this.preTask(function () {
161-
var normalizedName = _this2.aurelia.loader.normalizeSync(name, _this2.bootstrapperName);
162-
normalizedName = normalizedName.endsWith('.js') || normalizedName.endsWith('.ts') ? normalizedName.substring(0, normalizedName.length - 3) : normalizedName;
163+
return _this2.aurelia.loader.normalize(name, _this2.bootstrapperName).then(function (normalizedName) {
164+
normalizedName = normalizedName.endsWith('.js') || normalizedName.endsWith('.ts') ? normalizedName.substring(0, normalizedName.length - 3) : normalizedName;
163165

164-
plugin.moduleId = normalizedName;
165-
plugin.resourcesRelativeTo = normalizedName;
166-
_this2.aurelia.loader.map(name, normalizedName);
166+
plugin.moduleId = normalizedName;
167+
plugin.resourcesRelativeTo = normalizedName;
168+
_this2.aurelia.loader.map(name, normalizedName);
169+
});
167170
});
168171

169172
return this;
@@ -197,10 +200,11 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-
197200
var _this3 = this;
198201

199202
this.preTask(function () {
200-
var name = _this3.aurelia.loader.normalizeSync('aurelia-logging-console', _this3.bootstrapperName);
201-
return _this3.aurelia.loader.loadModule(name).then(function (m) {
202-
_aureliaLogging.addAppender(new m.ConsoleAppender());
203-
_aureliaLogging.setLevel(_aureliaLogging.logLevel.debug);
203+
return _this3.aurelia.loader.normalize('aurelia-logging-console', _this3.bootstrapperName).then(function (name) {
204+
return _this3.aurelia.loader.loadModule(name).then(function (m) {
205+
_aureliaLogging.addAppender(new m.ConsoleAppender());
206+
_aureliaLogging.setLevel(_aureliaLogging.logLevel.debug);
207+
});
204208
});
205209
});
206210

@@ -319,6 +323,11 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-
319323
var engine = undefined;
320324
var instruction = {};
321325

326+
if (this.root && this.root.viewModel && this.root.viewModel.router) {
327+
this.root.viewModel.router.deactivate();
328+
this.root.viewModel.router.reset();
329+
}
330+
322331
this._configureHost(applicationHost);
323332

324333
engine = this.container.get(_aureliaTemplating.TemplatingEngine);

‎dist/aurelia-framework.js‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export class FrameworkConfiguration {
8383
this.preTasks = [];
8484
this.postTasks = [];
8585
this.resourcesToLoad = {};
86-
this.preTask(() => this.bootstrapperName = aurelia.loader.normalizeSync('aurelia-bootstrapper'));
86+
this.preTask(() => aurelia.loader.normalize('aurelia-bootstrapper').then(name => this.bootstrapperName = name));
8787
this.postTask(() => loadResources(aurelia.container, this.resourcesToLoad, aurelia.resources));
8888
}
8989

@@ -214,13 +214,14 @@ export class FrameworkConfiguration {
214214

215215
this.plugin(plugin);
216216
this.preTask(() => {
217-
let normalizedName = this.aurelia.loader.normalizeSync(name, this.bootstrapperName);
218-
normalizedName = normalizedName.endsWith('.js') || normalizedName.endsWith('.ts')
219-
? normalizedName.substring(0, normalizedName.length - 3) : normalizedName;
217+
return this.aurelia.loader.normalize(name, this.bootstrapperName).then(normalizedName => {
218+
normalizedName = normalizedName.endsWith('.js') || normalizedName.endsWith('.ts')
219+
? normalizedName.substring(0, normalizedName.length - 3) : normalizedName;
220220

221-
plugin.moduleId = normalizedName;
222-
plugin.resourcesRelativeTo = normalizedName;
223-
this.aurelia.loader.map(name, normalizedName);
221+
plugin.moduleId = normalizedName;
222+
plugin.resourcesRelativeTo = normalizedName;
223+
this.aurelia.loader.map(name, normalizedName);
224+
});
224225
});
225226

226227
return this;
@@ -280,10 +281,11 @@ export class FrameworkConfiguration {
280281
*/
281282
developmentLogging(): FrameworkConfiguration {
282283
this.preTask(() => {
283-
let name = this.aurelia.loader.normalizeSync('aurelia-logging-console', this.bootstrapperName);
284-
return this.aurelia.loader.loadModule(name).then(m => {
285-
TheLogManager.addAppender(new m.ConsoleAppender());
286-
TheLogManager.setLevel(TheLogManager.logLevel.debug);
284+
return this.aurelia.loader.normalize('aurelia-logging-console', this.bootstrapperName).then(name => {
285+
return this.aurelia.loader.loadModule(name).then(m => {
286+
TheLogManager.addAppender(new m.ConsoleAppender());
287+
TheLogManager.setLevel(TheLogManager.logLevel.debug);
288+
});
287289
});
288290
});
289291

@@ -428,6 +430,11 @@ export class Aurelia {
428430
let engine;
429431
let instruction = {};
430432

433+
if (this.root && this.root.viewModel && this.root.viewModel.router) {
434+
this.root.viewModel.router.deactivate();
435+
this.root.viewModel.router.reset();
436+
}
437+
431438
this._configureHost(applicationHost);
432439

433440
engine = this.container.get(TemplatingEngine);

‎dist/commonjs/aurelia-framework.js‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ var FrameworkConfiguration = (function () {
9090
this.postTasks = [];
9191
this.resourcesToLoad = {};
9292
this.preTask(function () {
93-
return _this.bootstrapperName = aurelia.loader.normalizeSync('aurelia-bootstrapper');
93+
return aurelia.loader.normalize('aurelia-bootstrapper').then(function (name) {
94+
return _this.bootstrapperName = name;
95+
});
9496
});
9597
this.postTask(function () {
9698
return loadResources(aurelia.container, _this.resourcesToLoad, aurelia.resources);
@@ -175,12 +177,13 @@ var FrameworkConfiguration = (function () {
175177

176178
this.plugin(plugin);
177179
this.preTask(function () {
178-
var normalizedName = _this2.aurelia.loader.normalizeSync(name, _this2.bootstrapperName);
179-
normalizedName = normalizedName.endsWith('.js') || normalizedName.endsWith('.ts') ? normalizedName.substring(0, normalizedName.length - 3) : normalizedName;
180+
return _this2.aurelia.loader.normalize(name, _this2.bootstrapperName).then(function (normalizedName) {
181+
normalizedName = normalizedName.endsWith('.js') || normalizedName.endsWith('.ts') ? normalizedName.substring(0, normalizedName.length - 3) : normalizedName;
180182

181-
plugin.moduleId = normalizedName;
182-
plugin.resourcesRelativeTo = normalizedName;
183-
_this2.aurelia.loader.map(name, normalizedName);
183+
plugin.moduleId = normalizedName;
184+
plugin.resourcesRelativeTo = normalizedName;
185+
_this2.aurelia.loader.map(name, normalizedName);
186+
});
184187
});
185188

186189
return this;
@@ -214,10 +217,11 @@ var FrameworkConfiguration = (function () {
214217
var _this3 = this;
215218

216219
this.preTask(function () {
217-
var name = _this3.aurelia.loader.normalizeSync('aurelia-logging-console', _this3.bootstrapperName);
218-
return _this3.aurelia.loader.loadModule(name).then(function (m) {
219-
TheLogManager.addAppender(new m.ConsoleAppender());
220-
TheLogManager.setLevel(TheLogManager.logLevel.debug);
220+
return _this3.aurelia.loader.normalize('aurelia-logging-console', _this3.bootstrapperName).then(function (name) {
221+
return _this3.aurelia.loader.loadModule(name).then(function (m) {
222+
TheLogManager.addAppender(new m.ConsoleAppender());
223+
TheLogManager.setLevel(TheLogManager.logLevel.debug);
224+
});
221225
});
222226
});
223227

@@ -336,6 +340,11 @@ var Aurelia = (function () {
336340
var engine = undefined;
337341
var instruction = {};
338342

343+
if (this.root && this.root.viewModel && this.root.viewModel.router) {
344+
this.root.viewModel.router.deactivate();
345+
this.root.viewModel.router.reset();
346+
}
347+
339348
this._configureHost(applicationHost);
340349

341350
engine = this.container.get(_aureliaTemplating.TemplatingEngine);

‎dist/es6/aurelia-framework.js‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export class FrameworkConfiguration {
8383
this.preTasks = [];
8484
this.postTasks = [];
8585
this.resourcesToLoad = {};
86-
this.preTask(() => this.bootstrapperName = aurelia.loader.normalizeSync('aurelia-bootstrapper'));
86+
this.preTask(() => aurelia.loader.normalize('aurelia-bootstrapper').then(name => this.bootstrapperName = name));
8787
this.postTask(() => loadResources(aurelia.container, this.resourcesToLoad, aurelia.resources));
8888
}
8989

@@ -214,13 +214,14 @@ export class FrameworkConfiguration {
214214

215215
this.plugin(plugin);
216216
this.preTask(() => {
217-
let normalizedName = this.aurelia.loader.normalizeSync(name, this.bootstrapperName);
218-
normalizedName = normalizedName.endsWith('.js') || normalizedName.endsWith('.ts')
219-
? normalizedName.substring(0, normalizedName.length - 3) : normalizedName;
217+
return this.aurelia.loader.normalize(name, this.bootstrapperName).then(normalizedName => {
218+
normalizedName = normalizedName.endsWith('.js') || normalizedName.endsWith('.ts')
219+
? normalizedName.substring(0, normalizedName.length - 3) : normalizedName;
220220

221-
plugin.moduleId = normalizedName;
222-
plugin.resourcesRelativeTo = normalizedName;
223-
this.aurelia.loader.map(name, normalizedName);
221+
plugin.moduleId = normalizedName;
222+
plugin.resourcesRelativeTo = normalizedName;
223+
this.aurelia.loader.map(name, normalizedName);
224+
});
224225
});
225226

226227
return this;
@@ -280,10 +281,11 @@ export class FrameworkConfiguration {
280281
*/
281282
developmentLogging(): FrameworkConfiguration {
282283
this.preTask(() => {
283-
let name = this.aurelia.loader.normalizeSync('aurelia-logging-console', this.bootstrapperName);
284-
return this.aurelia.loader.loadModule(name).then(m => {
285-
TheLogManager.addAppender(new m.ConsoleAppender());
286-
TheLogManager.setLevel(TheLogManager.logLevel.debug);
284+
return this.aurelia.loader.normalize('aurelia-logging-console', this.bootstrapperName).then(name => {
285+
return this.aurelia.loader.loadModule(name).then(m => {
286+
TheLogManager.addAppender(new m.ConsoleAppender());
287+
TheLogManager.setLevel(TheLogManager.logLevel.debug);
288+
});
287289
});
288290
});
289291

@@ -428,6 +430,11 @@ export class Aurelia {
428430
let engine;
429431
let instruction = {};
430432

433+
if (this.root && this.root.viewModel && this.root.viewModel.router) {
434+
this.root.viewModel.router.deactivate();
435+
this.root.viewModel.router.reset();
436+
}
437+
431438
this._configureHost(applicationHost);
432439

433440
engine = this.container.get(TemplatingEngine);

‎dist/system/aurelia-framework.js‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,9 @@ System.register(['core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-pa
132132
this.postTasks = [];
133133
this.resourcesToLoad = {};
134134
this.preTask(function () {
135-
return _this.bootstrapperName = aurelia.loader.normalizeSync('aurelia-bootstrapper');
135+
return aurelia.loader.normalize('aurelia-bootstrapper').then(function (name) {
136+
return _this.bootstrapperName = name;
137+
});
136138
});
137139
this.postTask(function () {
138140
return loadResources(aurelia.container, _this.resourcesToLoad, aurelia.resources);
@@ -217,12 +219,13 @@ System.register(['core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-pa
217219

218220
this.plugin(plugin);
219221
this.preTask(function () {
220-
var normalizedName = _this2.aurelia.loader.normalizeSync(name, _this2.bootstrapperName);
221-
normalizedName = normalizedName.endsWith('.js') || normalizedName.endsWith('.ts') ? normalizedName.substring(0, normalizedName.length - 3) : normalizedName;
222+
return _this2.aurelia.loader.normalize(name, _this2.bootstrapperName).then(function (normalizedName) {
223+
normalizedName = normalizedName.endsWith('.js') || normalizedName.endsWith('.ts') ? normalizedName.substring(0, normalizedName.length - 3) : normalizedName;
222224

223-
plugin.moduleId = normalizedName;
224-
plugin.resourcesRelativeTo = normalizedName;
225-
_this2.aurelia.loader.map(name, normalizedName);
225+
plugin.moduleId = normalizedName;
226+
plugin.resourcesRelativeTo = normalizedName;
227+
_this2.aurelia.loader.map(name, normalizedName);
228+
});
226229
});
227230

228231
return this;
@@ -256,10 +259,11 @@ System.register(['core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-pa
256259
var _this3 = this;
257260

258261
this.preTask(function () {
259-
var name = _this3.aurelia.loader.normalizeSync('aurelia-logging-console', _this3.bootstrapperName);
260-
return _this3.aurelia.loader.loadModule(name).then(function (m) {
261-
TheLogManager.addAppender(new m.ConsoleAppender());
262-
TheLogManager.setLevel(TheLogManager.logLevel.debug);
262+
return _this3.aurelia.loader.normalize('aurelia-logging-console', _this3.bootstrapperName).then(function (name) {
263+
return _this3.aurelia.loader.loadModule(name).then(function (m) {
264+
TheLogManager.addAppender(new m.ConsoleAppender());
265+
TheLogManager.setLevel(TheLogManager.logLevel.debug);
266+
});
263267
});
264268
});
265269

@@ -367,6 +371,11 @@ System.register(['core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-pa
367371
var engine = undefined;
368372
var instruction = {};
369373

374+
if (this.root && this.root.viewModel && this.root.viewModel.router) {
375+
this.root.viewModel.router.deactivate();
376+
this.root.viewModel.router.reset();
377+
}
378+
370379
this._configureHost(applicationHost);
371380

372381
engine = this.container.get(TemplatingEngine);

0 commit comments

Comments
 (0)