Skip to content

Commit

Permalink
chore(all): prepare release 1.0.0-rc.1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
EisenbergEffect committed Jun 30, 2016
1 parent 8c2334e commit 191174e
Show file tree
Hide file tree
Showing 11 changed files with 123 additions and 29 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aurelia-framework",
"version": "1.0.0-rc.1.0.0",
"version": "1.0.0-rc.1.0.1",
"description": "The aurelia framework brings together all the required core aurelia libraries into a ready-to-go application-building platform.",
"keywords": [
"aurelia",
Expand Down
16 changes: 14 additions & 2 deletions dist/amd/aurelia-framework.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ define(['exports', 'aurelia-dependency-injection', 'aurelia-binding', 'aurelia-m
Aurelia.prototype.setRoot = function setRoot() {
var _this3 = this;

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

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

if (!root) {
if (this.configModuleId) {
root = (0, _aureliaPath.relativeToFile)('./app', this.configModuleId);
} else {
root = 'app';
}
}

instruction.viewModel = root;
instruction.container = instruction.childContainer = this.container;
instruction.viewSlot = this.hostSlot;
Expand Down Expand Up @@ -482,8 +490,12 @@ define(['exports', 'aurelia-dependency-injection', 'aurelia-binding', 'aurelia-m
return this._addNormalizedPlugin('aurelia-event-aggregator');
};

FrameworkConfiguration.prototype.basicConfiguration = function basicConfiguration() {
return this.defaultBindingLanguage().defaultResources().eventAggregator();
};

FrameworkConfiguration.prototype.standardConfiguration = function standardConfiguration() {
return this.defaultBindingLanguage().defaultResources().history().router().eventAggregator();
return this.basicConfiguration().history().router();
};

FrameworkConfiguration.prototype.developmentLogging = function developmentLogging() {
Expand Down
16 changes: 11 additions & 5 deletions dist/aurelia-framework.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
PLATFORM
} from 'aurelia-pal';
import {
relativeToFile,
join
} from 'aurelia-path';

Expand Down Expand Up @@ -204,7 +205,13 @@ export declare class FrameworkConfiguration {
eventAggregator(): FrameworkConfiguration;

/**
* Sets up the Aurelia configuration. This is equivalent to calling `.defaultBindingLanguage().defaultResources().history().router().eventAggregator();`
* Sets up a basic Aurelia configuration. This is equivalent to calling `.defaultBindingLanguage().defaultResources().eventAggregator();`
* @return Returns the current FrameworkConfiguration instance.
*/
basicConfiguration(): FrameworkConfiguration;

/**
* Sets up the standard Aurelia configuration. This is equivalent to calling `.defaultBindingLanguage().defaultResources().eventAggregator().history().router();`
* @return Returns the current FrameworkConfiguration instance.
*/
standardConfiguration(): FrameworkConfiguration;
Expand All @@ -229,8 +236,7 @@ export * from 'aurelia-loader';
export * from 'aurelia-task-queue';
export * from 'aurelia-path';
export * from 'aurelia-pal';

/**
* The log manager.
*/
export const LogManager: any;
* The log manager.
*/
export const LogManager: any;
24 changes: 20 additions & 4 deletions dist/aurelia-framework.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {Container} from 'aurelia-dependency-injection';
import {Loader} from 'aurelia-loader';
import {BindingLanguage,ViewSlot,ViewResources,TemplatingEngine,CompositionTransaction,ViewEngine} from 'aurelia-templating';
import {DOM,PLATFORM} from 'aurelia-pal';
import {join} from 'aurelia-path';
import {relativeToFile,join} from 'aurelia-path';

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

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

if (!root) {
if (this.configModuleId) {
root = relativeToFile('./app', this.configModuleId);
} else {
root = 'app';
}
}

instruction.viewModel = root;
instruction.container = instruction.childContainer = this.container;
instruction.viewSlot = this.hostSlot;
Expand Down Expand Up @@ -496,11 +504,19 @@ export class FrameworkConfiguration {
}

/**
* Sets up the Aurelia configuration. This is equivalent to calling `.defaultBindingLanguage().defaultResources().history().router().eventAggregator();`
* Sets up a basic Aurelia configuration. This is equivalent to calling `.defaultBindingLanguage().defaultResources().eventAggregator();`
* @return Returns the current FrameworkConfiguration instance.
*/
basicConfiguration(): FrameworkConfiguration {
return this.defaultBindingLanguage().defaultResources().eventAggregator();
}

/**
* Sets up the standard Aurelia configuration. This is equivalent to calling `.defaultBindingLanguage().defaultResources().eventAggregator().history().router();`
* @return Returns the current FrameworkConfiguration instance.
*/
standardConfiguration(): FrameworkConfiguration {
return this.defaultBindingLanguage().defaultResources().history().router().eventAggregator();
return this.basicConfiguration().history().router();
}

/**
Expand Down
16 changes: 14 additions & 2 deletions dist/commonjs/aurelia-framework.js
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ var Aurelia = exports.Aurelia = function () {
Aurelia.prototype.setRoot = function setRoot() {
var _this3 = this;

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

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

if (!root) {
if (this.configModuleId) {
root = (0, _aureliaPath.relativeToFile)('./app', this.configModuleId);
} else {
root = 'app';
}
}

instruction.viewModel = root;
instruction.container = instruction.childContainer = this.container;
instruction.viewSlot = this.hostSlot;
Expand Down Expand Up @@ -492,8 +500,12 @@ var FrameworkConfiguration = function () {
return this._addNormalizedPlugin('aurelia-event-aggregator');
};

FrameworkConfiguration.prototype.basicConfiguration = function basicConfiguration() {
return this.defaultBindingLanguage().defaultResources().eventAggregator();
};

FrameworkConfiguration.prototype.standardConfiguration = function standardConfiguration() {
return this.defaultBindingLanguage().defaultResources().history().router().eventAggregator();
return this.basicConfiguration().history().router();
};

FrameworkConfiguration.prototype.developmentLogging = function developmentLogging() {
Expand Down
20 changes: 16 additions & 4 deletions dist/es2015/aurelia-framework.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Container } from 'aurelia-dependency-injection';
import { Loader } from 'aurelia-loader';
import { BindingLanguage, ViewSlot, ViewResources, TemplatingEngine, CompositionTransaction, ViewEngine } from 'aurelia-templating';
import { DOM, PLATFORM } from 'aurelia-pal';
import { join } from 'aurelia-path';
import { relativeToFile, join } from 'aurelia-path';

function preventActionlessFormSubmit() {
DOM.addEventListener('submit', evt => {
Expand Down Expand Up @@ -67,7 +67,7 @@ export let Aurelia = class Aurelia {
});
}

setRoot(root = 'app', applicationHost = null) {
setRoot(root = null, applicationHost = null) {
let instruction = {};

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

if (!root) {
if (this.configModuleId) {
root = relativeToFile('./app', this.configModuleId);
} else {
root = 'app';
}
}

instruction.viewModel = root;
instruction.container = instruction.childContainer = this.container;
instruction.viewSlot = this.hostSlot;
Expand Down Expand Up @@ -354,8 +362,12 @@ export let FrameworkConfiguration = class FrameworkConfiguration {
return this._addNormalizedPlugin('aurelia-event-aggregator');
}

basicConfiguration() {
return this.defaultBindingLanguage().defaultResources().eventAggregator();
}

standardConfiguration() {
return this.defaultBindingLanguage().defaultResources().history().router().eventAggregator();
return this.basicConfiguration().history().router();
}

developmentLogging() {
Expand Down Expand Up @@ -404,4 +416,4 @@ export * from 'aurelia-task-queue';
export * from 'aurelia-path';
export * from 'aurelia-pal';

export const LogManager = TheLogManager;
export const LogManager = TheLogManager;
24 changes: 18 additions & 6 deletions dist/native-modules/aurelia-framework.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Container } from 'aurelia-dependency-injection';
import { Loader } from 'aurelia-loader';
import { BindingLanguage, ViewSlot, ViewResources, TemplatingEngine, CompositionTransaction, ViewEngine } from 'aurelia-templating';
import { DOM, PLATFORM } from 'aurelia-pal';
import { join } from 'aurelia-path';
import { relativeToFile, join } from 'aurelia-path';

function preventActionlessFormSubmit() {
DOM.addEventListener('submit', function (evt) {
Expand All @@ -20,7 +20,7 @@ function preventActionlessFormSubmit() {

export var Aurelia = function () {
function Aurelia(loader, container, resources) {


this.loader = loader || new PLATFORM.Loader();
this.container = container || new Container().makeGlobal();
Expand Down Expand Up @@ -81,7 +81,7 @@ export var Aurelia = function () {
Aurelia.prototype.setRoot = function setRoot() {
var _this3 = this;

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

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

if (!root) {
if (this.configModuleId) {
root = relativeToFile('./app', this.configModuleId);
} else {
root = 'app';
}
}

instruction.viewModel = root;
instruction.container = instruction.childContainer = this.container;
instruction.viewSlot = this.hostSlot;
Expand Down Expand Up @@ -255,7 +263,7 @@ var FrameworkConfiguration = function () {
function FrameworkConfiguration(aurelia) {
var _this4 = this;



this.aurelia = aurelia;
this.container = aurelia.container;
Expand Down Expand Up @@ -390,8 +398,12 @@ var FrameworkConfiguration = function () {
return this._addNormalizedPlugin('aurelia-event-aggregator');
};

FrameworkConfiguration.prototype.basicConfiguration = function basicConfiguration() {
return this.defaultBindingLanguage().defaultResources().eventAggregator();
};

FrameworkConfiguration.prototype.standardConfiguration = function standardConfiguration() {
return this.defaultBindingLanguage().defaultResources().history().router().eventAggregator();
return this.basicConfiguration().history().router();
};

FrameworkConfiguration.prototype.developmentLogging = function developmentLogging() {
Expand Down Expand Up @@ -451,4 +463,4 @@ export * from 'aurelia-task-queue';
export * from 'aurelia-path';
export * from 'aurelia-pal';

export var LogManager = TheLogManager;
export var LogManager = TheLogManager;
19 changes: 16 additions & 3 deletions dist/system/aurelia-framework.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
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) {
"use strict";

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



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

_export(_exportObj4);
}, function (_aureliaPath) {
relativeToFile = _aureliaPath.relativeToFile;
join = _aureliaPath.join;
var _exportObj5 = {};

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

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

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

if (!root) {
if (this.configModuleId) {
root = relativeToFile('./app', this.configModuleId);
} else {
root = 'app';
}
}

instruction.viewModel = root;
instruction.container = instruction.childContainer = this.container;
instruction.viewSlot = this.hostSlot;
Expand Down Expand Up @@ -472,8 +481,12 @@ System.register(['aurelia-logging', 'aurelia-dependency-injection', 'aurelia-loa
return this._addNormalizedPlugin('aurelia-event-aggregator');
};

FrameworkConfiguration.prototype.basicConfiguration = function basicConfiguration() {
return this.defaultBindingLanguage().defaultResources().eventAggregator();
};

FrameworkConfiguration.prototype.standardConfiguration = function standardConfiguration() {
return this.defaultBindingLanguage().defaultResources().history().router().eventAggregator();
return this.basicConfiguration().history().router();
};

FrameworkConfiguration.prototype.developmentLogging = function developmentLogging() {
Expand Down
11 changes: 11 additions & 0 deletions doc/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
<a name="1.0.0-rc.1.0.1"></a>
# [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)


### Features

* **aurelia:** make default root load relative to config module if defined ([8c2334e](https://github.com/aurelia/framework/commit/8c2334e))
* **framework-configuration:** add basicConfiguration helper ([6329fc9](https://github.com/aurelia/framework/commit/6329fc9))



<a name="1.0.0-rc.1.0.0"></a>
# [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)

Expand Down
2 changes: 1 addition & 1 deletion doc/api.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aurelia-framework",
"version": "1.0.0-rc.1.0.0",
"version": "1.0.0-rc.1.0.1",
"description": "The aurelia framework brings together all the required core aurelia libraries into a ready-to-go application-building platform.",
"keywords": [
"aurelia",
Expand Down

0 comments on commit 191174e

Please sign in to comment.