Skip to content

Commit 191174e

Browse files
EisenbergEffectEisenbergEffect
committed
chore(all): prepare release 1.0.0-rc.1.0.1
1 parent 8c2334e commit 191174e

File tree

11 files changed

+123
-29
lines changed

11 files changed

+123
-29
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-rc.1.0.0",
3+
"version": "1.0.0-rc.1.0.1",
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",

‎dist/amd/aurelia-framework.js‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ define(['exports', 'aurelia-dependency-injection', 'aurelia-binding', 'aurelia-m
173173
Aurelia.prototype.setRoot = function setRoot() {
174174
var _this3 = this;
175175

176-
var root = arguments.length <= 0 || arguments[0] === undefined ? 'app' : arguments[0];
176+
var root = arguments.length <= 0 || arguments[0] === undefined ? null : arguments[0];
177177
var applicationHost = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
178178

179179
var instruction = {};
@@ -189,6 +189,14 @@ define(['exports', 'aurelia-dependency-injection', 'aurelia-binding', 'aurelia-m
189189
var transaction = this.container.get(_aureliaTemplating.CompositionTransaction);
190190
delete transaction.initialComposition;
191191

192+
if (!root) {
193+
if (this.configModuleId) {
194+
root = (0, _aureliaPath.relativeToFile)('./app', this.configModuleId);
195+
} else {
196+
root = 'app';
197+
}
198+
}
199+
192200
instruction.viewModel = root;
193201
instruction.container = instruction.childContainer = this.container;
194202
instruction.viewSlot = this.hostSlot;
@@ -482,8 +490,12 @@ define(['exports', 'aurelia-dependency-injection', 'aurelia-binding', 'aurelia-m
482490
return this._addNormalizedPlugin('aurelia-event-aggregator');
483491
};
484492

493+
FrameworkConfiguration.prototype.basicConfiguration = function basicConfiguration() {
494+
return this.defaultBindingLanguage().defaultResources().eventAggregator();
495+
};
496+
485497
FrameworkConfiguration.prototype.standardConfiguration = function standardConfiguration() {
486-
return this.defaultBindingLanguage().defaultResources().history().router().eventAggregator();
498+
return this.basicConfiguration().history().router();
487499
};
488500

489501
FrameworkConfiguration.prototype.developmentLogging = function developmentLogging() {

‎dist/aurelia-framework.d.ts‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
PLATFORM
1919
} from 'aurelia-pal';
2020
import {
21+
relativeToFile,
2122
join
2223
} from 'aurelia-path';
2324

@@ -204,7 +205,13 @@ export declare class FrameworkConfiguration {
204205
eventAggregator(): FrameworkConfiguration;
205206

206207
/**
207-
* Sets up the Aurelia configuration. This is equivalent to calling `.defaultBindingLanguage().defaultResources().history().router().eventAggregator();`
208+
* Sets up a basic Aurelia configuration. This is equivalent to calling `.defaultBindingLanguage().defaultResources().eventAggregator();`
209+
* @return Returns the current FrameworkConfiguration instance.
210+
*/
211+
basicConfiguration(): FrameworkConfiguration;
212+
213+
/**
214+
* Sets up the standard Aurelia configuration. This is equivalent to calling `.defaultBindingLanguage().defaultResources().eventAggregator().history().router();`
208215
* @return Returns the current FrameworkConfiguration instance.
209216
*/
210217
standardConfiguration(): FrameworkConfiguration;
@@ -229,8 +236,7 @@ export * from 'aurelia-loader';
229236
export * from 'aurelia-task-queue';
230237
export * from 'aurelia-path';
231238
export * from 'aurelia-pal';
232-
233239
/**
234-
* The log manager.
235-
*/
236-
export const LogManager: any;
240+
* The log manager.
241+
*/
242+
export const LogManager: any;

‎dist/aurelia-framework.js‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {Container} from 'aurelia-dependency-injection';
33
import {Loader} from 'aurelia-loader';
44
import {BindingLanguage,ViewSlot,ViewResources,TemplatingEngine,CompositionTransaction,ViewEngine} from 'aurelia-templating';
55
import {DOM,PLATFORM} from 'aurelia-pal';
6-
import {join} from 'aurelia-path';
6+
import {relativeToFile,join} from 'aurelia-path';
77

88
/*eslint no-unused-vars:0*/
99
function preventActionlessFormSubmit() {
@@ -116,7 +116,7 @@ export class Aurelia {
116116
* @param applicationHost The DOM object that Aurelia will attach to.
117117
* @return Returns a Promise of the current Aurelia instance.
118118
*/
119-
setRoot(root: string = 'app', applicationHost: string | Element = null): Promise<Aurelia> {
119+
setRoot(root: string = null, applicationHost: string | Element = null): Promise<Aurelia> {
120120
let instruction = {};
121121

122122
if (this.root && this.root.viewModel && this.root.viewModel.router) {
@@ -130,6 +130,14 @@ export class Aurelia {
130130
let transaction = this.container.get(CompositionTransaction);
131131
delete transaction.initialComposition;
132132

133+
if (!root) {
134+
if (this.configModuleId) {
135+
root = relativeToFile('./app', this.configModuleId);
136+
} else {
137+
root = 'app';
138+
}
139+
}
140+
133141
instruction.viewModel = root;
134142
instruction.container = instruction.childContainer = this.container;
135143
instruction.viewSlot = this.hostSlot;
@@ -496,11 +504,19 @@ export class FrameworkConfiguration {
496504
}
497505

498506
/**
499-
* Sets up the Aurelia configuration. This is equivalent to calling `.defaultBindingLanguage().defaultResources().history().router().eventAggregator();`
507+
* Sets up a basic Aurelia configuration. This is equivalent to calling `.defaultBindingLanguage().defaultResources().eventAggregator();`
508+
* @return Returns the current FrameworkConfiguration instance.
509+
*/
510+
basicConfiguration(): FrameworkConfiguration {
511+
return this.defaultBindingLanguage().defaultResources().eventAggregator();
512+
}
513+
514+
/**
515+
* Sets up the standard Aurelia configuration. This is equivalent to calling `.defaultBindingLanguage().defaultResources().eventAggregator().history().router();`
500516
* @return Returns the current FrameworkConfiguration instance.
501517
*/
502518
standardConfiguration(): FrameworkConfiguration {
503-
return this.defaultBindingLanguage().defaultResources().history().router().eventAggregator();
519+
return this.basicConfiguration().history().router();
504520
}
505521

506522
/**

‎dist/commonjs/aurelia-framework.js‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ var Aurelia = exports.Aurelia = function () {
183183
Aurelia.prototype.setRoot = function setRoot() {
184184
var _this3 = this;
185185

186-
var root = arguments.length <= 0 || arguments[0] === undefined ? 'app' : arguments[0];
186+
var root = arguments.length <= 0 || arguments[0] === undefined ? null : arguments[0];
187187
var applicationHost = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
188188

189189
var instruction = {};
@@ -199,6 +199,14 @@ var Aurelia = exports.Aurelia = function () {
199199
var transaction = this.container.get(_aureliaTemplating.CompositionTransaction);
200200
delete transaction.initialComposition;
201201

202+
if (!root) {
203+
if (this.configModuleId) {
204+
root = (0, _aureliaPath.relativeToFile)('./app', this.configModuleId);
205+
} else {
206+
root = 'app';
207+
}
208+
}
209+
202210
instruction.viewModel = root;
203211
instruction.container = instruction.childContainer = this.container;
204212
instruction.viewSlot = this.hostSlot;
@@ -492,8 +500,12 @@ var FrameworkConfiguration = function () {
492500
return this._addNormalizedPlugin('aurelia-event-aggregator');
493501
};
494502

503+
FrameworkConfiguration.prototype.basicConfiguration = function basicConfiguration() {
504+
return this.defaultBindingLanguage().defaultResources().eventAggregator();
505+
};
506+
495507
FrameworkConfiguration.prototype.standardConfiguration = function standardConfiguration() {
496-
return this.defaultBindingLanguage().defaultResources().history().router().eventAggregator();
508+
return this.basicConfiguration().history().router();
497509
};
498510

499511
FrameworkConfiguration.prototype.developmentLogging = function developmentLogging() {

‎dist/es2015/aurelia-framework.js‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Container } from 'aurelia-dependency-injection';
33
import { Loader } from 'aurelia-loader';
44
import { BindingLanguage, ViewSlot, ViewResources, TemplatingEngine, CompositionTransaction, ViewEngine } from 'aurelia-templating';
55
import { DOM, PLATFORM } from 'aurelia-pal';
6-
import { join } from 'aurelia-path';
6+
import { relativeToFile, join } from 'aurelia-path';
77

88
function preventActionlessFormSubmit() {
99
DOM.addEventListener('submit', evt => {
@@ -67,7 +67,7 @@ export let Aurelia = class Aurelia {
6767
});
6868
}
6969

70-
setRoot(root = 'app', applicationHost = null) {
70+
setRoot(root = null, applicationHost = null) {
7171
let instruction = {};
7272

7373
if (this.root && this.root.viewModel && this.root.viewModel.router) {
@@ -81,6 +81,14 @@ export let Aurelia = class Aurelia {
8181
let transaction = this.container.get(CompositionTransaction);
8282
delete transaction.initialComposition;
8383

84+
if (!root) {
85+
if (this.configModuleId) {
86+
root = relativeToFile('./app', this.configModuleId);
87+
} else {
88+
root = 'app';
89+
}
90+
}
91+
8492
instruction.viewModel = root;
8593
instruction.container = instruction.childContainer = this.container;
8694
instruction.viewSlot = this.hostSlot;
@@ -354,8 +362,12 @@ export let FrameworkConfiguration = class FrameworkConfiguration {
354362
return this._addNormalizedPlugin('aurelia-event-aggregator');
355363
}
356364

365+
basicConfiguration() {
366+
return this.defaultBindingLanguage().defaultResources().eventAggregator();
367+
}
368+
357369
standardConfiguration() {
358-
return this.defaultBindingLanguage().defaultResources().history().router().eventAggregator();
370+
return this.basicConfiguration().history().router();
359371
}
360372

361373
developmentLogging() {
@@ -404,4 +416,4 @@ export * from 'aurelia-task-queue';
404416
export * from 'aurelia-path';
405417
export * from 'aurelia-pal';
406418

407-
export const LogManager = TheLogManager;
419+
export const LogManager = TheLogManager;

‎dist/native-modules/aurelia-framework.js‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Container } from 'aurelia-dependency-injection';
55
import { Loader } from 'aurelia-loader';
66
import { BindingLanguage, ViewSlot, ViewResources, TemplatingEngine, CompositionTransaction, ViewEngine } from 'aurelia-templating';
77
import { DOM, PLATFORM } from 'aurelia-pal';
8-
import { join } from 'aurelia-path';
8+
import { relativeToFile, join } from 'aurelia-path';
99

1010
function preventActionlessFormSubmit() {
1111
DOM.addEventListener('submit', function (evt) {
@@ -20,7 +20,7 @@ function preventActionlessFormSubmit() {
2020

2121
export var Aurelia = function () {
2222
function Aurelia(loader, container, resources) {
23-
23+
2424

2525
this.loader = loader || new PLATFORM.Loader();
2626
this.container = container || new Container().makeGlobal();
@@ -81,7 +81,7 @@ export var Aurelia = function () {
8181
Aurelia.prototype.setRoot = function setRoot() {
8282
var _this3 = this;
8383

84-
var root = arguments.length <= 0 || arguments[0] === undefined ? 'app' : arguments[0];
84+
var root = arguments.length <= 0 || arguments[0] === undefined ? null : arguments[0];
8585
var applicationHost = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
8686

8787
var instruction = {};
@@ -97,6 +97,14 @@ export var Aurelia = function () {
9797
var transaction = this.container.get(CompositionTransaction);
9898
delete transaction.initialComposition;
9999

100+
if (!root) {
101+
if (this.configModuleId) {
102+
root = relativeToFile('./app', this.configModuleId);
103+
} else {
104+
root = 'app';
105+
}
106+
}
107+
100108
instruction.viewModel = root;
101109
instruction.container = instruction.childContainer = this.container;
102110
instruction.viewSlot = this.hostSlot;
@@ -255,7 +263,7 @@ var FrameworkConfiguration = function () {
255263
function FrameworkConfiguration(aurelia) {
256264
var _this4 = this;
257265

258-
266+
259267

260268
this.aurelia = aurelia;
261269
this.container = aurelia.container;
@@ -390,8 +398,12 @@ var FrameworkConfiguration = function () {
390398
return this._addNormalizedPlugin('aurelia-event-aggregator');
391399
};
392400

401+
FrameworkConfiguration.prototype.basicConfiguration = function basicConfiguration() {
402+
return this.defaultBindingLanguage().defaultResources().eventAggregator();
403+
};
404+
393405
FrameworkConfiguration.prototype.standardConfiguration = function standardConfiguration() {
394-
return this.defaultBindingLanguage().defaultResources().history().router().eventAggregator();
406+
return this.basicConfiguration().history().router();
395407
};
396408

397409
FrameworkConfiguration.prototype.developmentLogging = function developmentLogging() {
@@ -451,4 +463,4 @@ export * from 'aurelia-task-queue';
451463
export * from 'aurelia-path';
452464
export * from 'aurelia-pal';
453465

454-
export var LogManager = TheLogManager;
466+
export var LogManager = TheLogManager;

‎dist/system/aurelia-framework.js‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
System.register(['aurelia-logging', 'aurelia-dependency-injection', 'aurelia-loader', 'aurelia-templating', 'aurelia-pal', 'aurelia-path', 'aurelia-binding', 'aurelia-metadata', 'aurelia-task-queue'], function (_export, _context) {
44
"use strict";
55

6-
var TheLogManager, Container, Loader, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine, CompositionTransaction, ViewEngine, DOM, PLATFORM, join, Aurelia, logger, extPattern, FrameworkConfiguration, LogManager;
6+
var TheLogManager, Container, Loader, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine, CompositionTransaction, ViewEngine, DOM, PLATFORM, relativeToFile, join, Aurelia, logger, extPattern, FrameworkConfiguration, LogManager;
77

88

99

@@ -169,6 +169,7 @@ System.register(['aurelia-logging', 'aurelia-dependency-injection', 'aurelia-loa
169169

170170
_export(_exportObj4);
171171
}, function (_aureliaPath) {
172+
relativeToFile = _aureliaPath.relativeToFile;
172173
join = _aureliaPath.join;
173174
var _exportObj5 = {};
174175

@@ -266,7 +267,7 @@ System.register(['aurelia-logging', 'aurelia-dependency-injection', 'aurelia-loa
266267
Aurelia.prototype.setRoot = function setRoot() {
267268
var _this3 = this;
268269

269-
var root = arguments.length <= 0 || arguments[0] === undefined ? 'app' : arguments[0];
270+
var root = arguments.length <= 0 || arguments[0] === undefined ? null : arguments[0];
270271
var applicationHost = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
271272

272273
var instruction = {};
@@ -282,6 +283,14 @@ System.register(['aurelia-logging', 'aurelia-dependency-injection', 'aurelia-loa
282283
var transaction = this.container.get(CompositionTransaction);
283284
delete transaction.initialComposition;
284285

286+
if (!root) {
287+
if (this.configModuleId) {
288+
root = relativeToFile('./app', this.configModuleId);
289+
} else {
290+
root = 'app';
291+
}
292+
}
293+
285294
instruction.viewModel = root;
286295
instruction.container = instruction.childContainer = this.container;
287296
instruction.viewSlot = this.hostSlot;
@@ -472,8 +481,12 @@ System.register(['aurelia-logging', 'aurelia-dependency-injection', 'aurelia-loa
472481
return this._addNormalizedPlugin('aurelia-event-aggregator');
473482
};
474483

484+
FrameworkConfiguration.prototype.basicConfiguration = function basicConfiguration() {
485+
return this.defaultBindingLanguage().defaultResources().eventAggregator();
486+
};
487+
475488
FrameworkConfiguration.prototype.standardConfiguration = function standardConfiguration() {
476-
return this.defaultBindingLanguage().defaultResources().history().router().eventAggregator();
489+
return this.basicConfiguration().history().router();
477490
};
478491

479492
FrameworkConfiguration.prototype.developmentLogging = function developmentLogging() {

‎doc/CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
<a name="1.0.0-rc.1.0.1"></a>
2+
# [1.0.0-rc.1.0.1](https://github.com/aurelia/framework/compare/1.0.0-rc.1.0.0...v1.0.0-rc.1.0.1) (2016-06-30)
3+
4+
5+
### Features
6+
7+
* **aurelia:** make default root load relative to config module if defined ([8c2334e](https://github.com/aurelia/framework/commit/8c2334e))
8+
* **framework-configuration:** add basicConfiguration helper ([6329fc9](https://github.com/aurelia/framework/commit/6329fc9))
9+
10+
11+
112
<a name="1.0.0-rc.1.0.0"></a>
213
# [1.0.0-rc.1.0.0](https://github.com/aurelia/framework/compare/1.0.0-beta.2.0.1...v1.0.0-rc.1.0.0) (2016-06-22)
314

‎doc/api.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)