Skip to content

Commit

Permalink
chore(all): prepare release 1.0.0-beta.1.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
EisenbergEffect committed Mar 1, 2016
1 parent dd9e082 commit c6f7b87
Show file tree
Hide file tree
Showing 16 changed files with 89 additions and 77 deletions.
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aurelia-framework",
"version": "1.0.0-beta.1.1.3",
"version": "1.0.0-beta.1.1.4",
"description": "The aurelia framework brings together all the required core aurelia libraries into a ready-to-go application-building platform.",
"keywords": [
"aurelia",
Expand All @@ -25,6 +25,6 @@
"aurelia-pal": "^1.0.0-beta.1.1.1",
"aurelia-path": "^1.0.0-beta.1.1.0",
"aurelia-task-queue": "^1.0.0-beta.1.1.0",
"aurelia-templating": "^1.0.0-beta.1.1.0"
"aurelia-templating": "^1.0.0-beta.1.1.2"
}
}
62 changes: 29 additions & 33 deletions config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ System.config({
},

map: {
"aurelia-binding": "npm:[email protected].1.0",
"aurelia-dependency-injection": "npm:[email protected].2",
"aurelia-loader": "npm:[email protected].0",
"aurelia-logging": "npm:[email protected].1",
"aurelia-metadata": "npm:[email protected].3",
"aurelia-binding": "npm:[email protected].2.1",
"aurelia-dependency-injection": "npm:[email protected].4",
"aurelia-loader": "npm:[email protected].1",
"aurelia-logging": "npm:[email protected].2",
"aurelia-metadata": "npm:[email protected].5",
"aurelia-pal": "npm:[email protected]",
"aurelia-pal-browser": "npm:[email protected]",
"aurelia-path": "npm:[email protected].0",
"aurelia-task-queue": "npm:[email protected].0",
"aurelia-templating": "npm:[email protected].0",
"aurelia-path": "npm:[email protected].1",
"aurelia-task-queue": "npm:[email protected].1",
"aurelia-templating": "npm:[email protected].2",
"babel": "npm:[email protected]",
"babel-runtime": "npm:[email protected]",
"core-js": "npm:[email protected]",
Expand All @@ -42,43 +42,39 @@ System.config({
"npm:[email protected]": {
"util": "npm:[email protected]"
},
"npm:[email protected].1.0": {
"aurelia-metadata": "npm:[email protected].3",
"npm:[email protected].2.1": {
"aurelia-metadata": "npm:[email protected].5",
"aurelia-pal": "npm:[email protected]",
"aurelia-task-queue": "npm:[email protected]",
"core-js": "npm:[email protected]"
"aurelia-task-queue": "npm:[email protected]"
},
"npm:[email protected]": {
"aurelia-logging": "npm:[email protected]",
"aurelia-metadata": "npm:[email protected]",
"aurelia-pal": "npm:[email protected]",
"core-js": "npm:[email protected]"
"npm:[email protected]": {
"aurelia-logging": "npm:[email protected]",
"aurelia-metadata": "npm:[email protected]",
"aurelia-pal": "npm:[email protected]"
},
"npm:[email protected].0": {
"aurelia-metadata": "npm:[email protected].3",
"aurelia-path": "npm:[email protected].0"
"npm:[email protected].1": {
"aurelia-metadata": "npm:[email protected].5",
"aurelia-path": "npm:[email protected].1"
},
"npm:[email protected]": {
"aurelia-pal": "npm:[email protected]",
"core-js": "npm:[email protected]"
"npm:[email protected]": {
"aurelia-pal": "npm:[email protected]"
},
"npm:[email protected]": {
"aurelia-pal": "npm:[email protected]",
"core-js": "npm:[email protected]"
},
"npm:[email protected].0": {
"npm:[email protected].1": {
"aurelia-pal": "npm:[email protected]"
},
"npm:[email protected].0": {
"aurelia-binding": "npm:[email protected].1.0",
"aurelia-dependency-injection": "npm:[email protected].2",
"aurelia-loader": "npm:[email protected].0",
"aurelia-logging": "npm:[email protected].1",
"aurelia-metadata": "npm:[email protected].3",
"npm:[email protected].2": {
"aurelia-binding": "npm:[email protected].2.1",
"aurelia-dependency-injection": "npm:[email protected].4",
"aurelia-loader": "npm:[email protected].1",
"aurelia-logging": "npm:[email protected].2",
"aurelia-metadata": "npm:[email protected].5",
"aurelia-pal": "npm:[email protected]",
"aurelia-path": "npm:[email protected]",
"aurelia-task-queue": "npm:[email protected]",
"core-js": "npm:[email protected]"
"aurelia-path": "npm:[email protected]",
"aurelia-task-queue": "npm:[email protected]"
},
"npm:[email protected]": {
"process": "github:jspm/[email protected]"
Expand Down
3 changes: 1 addition & 2 deletions dist/amd/aurelia-framework.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
declare module 'aurelia-framework' {
import 'core-js';
import * as TheLogManager from 'aurelia-logging';
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine } from 'aurelia-templating';
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine, CompositionTransaction } from 'aurelia-templating';
import { join } from 'aurelia-path';
import { Container } from 'aurelia-dependency-injection';
import { Loader } from 'aurelia-loader';
Expand Down
8 changes: 5 additions & 3 deletions dist/amd/aurelia-framework.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define(['exports', 'core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-path', 'aurelia-dependency-injection', 'aurelia-loader', 'aurelia-pal', 'aurelia-binding', 'aurelia-metadata', 'aurelia-task-queue'], function (exports, _coreJs, _aureliaLogging, _aureliaTemplating, _aureliaPath, _aureliaDependencyInjection, _aureliaLoader, _aureliaPal, _aureliaBinding, _aureliaMetadata, _aureliaTaskQueue) {
define(['exports', 'aurelia-logging', 'aurelia-templating', 'aurelia-path', 'aurelia-dependency-injection', 'aurelia-loader', 'aurelia-pal', 'aurelia-binding', 'aurelia-metadata', 'aurelia-task-queue'], function (exports, _aureliaLogging, _aureliaTemplating, _aureliaPath, _aureliaDependencyInjection, _aureliaLoader, _aureliaPal, _aureliaBinding, _aureliaMetadata, _aureliaTaskQueue) {
'use strict';

exports.__esModule = true;
Expand Down Expand Up @@ -320,7 +320,6 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-
var root = arguments.length <= 0 || arguments[0] === undefined ? 'app' : arguments[0];
var applicationHost = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];

var engine = undefined;
var instruction = {};

if (this.root && this.root.viewModel && this.root.viewModel.router) {
Expand All @@ -330,7 +329,10 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-

this._configureHost(applicationHost);

engine = this.container.get(_aureliaTemplating.TemplatingEngine);
var engine = this.container.get(_aureliaTemplating.TemplatingEngine);
var transaction = this.container.get(_aureliaTemplating.CompositionTransaction);
delete transaction.initialComposition;

instruction.viewModel = root;
instruction.container = instruction.childContainer = this.container;
instruction.viewSlot = this.hostSlot;
Expand Down
3 changes: 1 addition & 2 deletions dist/aurelia-framework.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
declare module 'aurelia-framework' {
import 'core-js';
import * as TheLogManager from 'aurelia-logging';
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine } from 'aurelia-templating';
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine, CompositionTransaction } from 'aurelia-templating';
import { join } from 'aurelia-path';
import { Container } from 'aurelia-dependency-injection';
import { Loader } from 'aurelia-loader';
Expand Down
9 changes: 5 additions & 4 deletions dist/aurelia-framework.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'core-js';
import * as TheLogManager from 'aurelia-logging';
import {ViewEngine,BindingLanguage,ViewSlot,ViewResources,TemplatingEngine} from 'aurelia-templating';
import {ViewEngine,BindingLanguage,ViewSlot,ViewResources,TemplatingEngine,CompositionTransaction} from 'aurelia-templating';
import {join} from 'aurelia-path';
import {Container} from 'aurelia-dependency-injection';
import {Loader} from 'aurelia-loader';
Expand Down Expand Up @@ -427,7 +426,6 @@ export class Aurelia {
* @return Returns a Promise of the current Aurelia instance.
*/
setRoot(root: string = 'app', applicationHost: string | Element = null): Promise<Aurelia> {
let engine;
let instruction = {};

if (this.root && this.root.viewModel && this.root.viewModel.router) {
Expand All @@ -437,7 +435,10 @@ export class Aurelia {

this._configureHost(applicationHost);

engine = this.container.get(TemplatingEngine);
let engine = this.container.get(TemplatingEngine);
let transaction = this.container.get(CompositionTransaction);
delete transaction.initialComposition;

instruction.viewModel = root;
instruction.container = instruction.childContainer = this.container;
instruction.viewSlot = this.hostSlot;
Expand Down
3 changes: 1 addition & 2 deletions dist/commonjs/aurelia-framework.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
declare module 'aurelia-framework' {
import 'core-js';
import * as TheLogManager from 'aurelia-logging';
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine } from 'aurelia-templating';
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine, CompositionTransaction } from 'aurelia-templating';
import { join } from 'aurelia-path';
import { Container } from 'aurelia-dependency-injection';
import { Loader } from 'aurelia-loader';
Expand Down
8 changes: 4 additions & 4 deletions dist/commonjs/aurelia-framework.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }

require('core-js');

var _aureliaLogging = require('aurelia-logging');

var TheLogManager = _interopRequireWildcard(_aureliaLogging);
Expand Down Expand Up @@ -337,7 +335,6 @@ var Aurelia = (function () {
var root = arguments.length <= 0 || arguments[0] === undefined ? 'app' : arguments[0];
var applicationHost = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];

var engine = undefined;
var instruction = {};

if (this.root && this.root.viewModel && this.root.viewModel.router) {
Expand All @@ -347,7 +344,10 @@ var Aurelia = (function () {

this._configureHost(applicationHost);

engine = this.container.get(_aureliaTemplating.TemplatingEngine);
var engine = this.container.get(_aureliaTemplating.TemplatingEngine);
var transaction = this.container.get(_aureliaTemplating.CompositionTransaction);
delete transaction.initialComposition;

instruction.viewModel = root;
instruction.container = instruction.childContainer = this.container;
instruction.viewSlot = this.hostSlot;
Expand Down
3 changes: 1 addition & 2 deletions dist/es6/aurelia-framework.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
declare module 'aurelia-framework' {
import 'core-js';
import * as TheLogManager from 'aurelia-logging';
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine } from 'aurelia-templating';
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine, CompositionTransaction } from 'aurelia-templating';
import { join } from 'aurelia-path';
import { Container } from 'aurelia-dependency-injection';
import { Loader } from 'aurelia-loader';
Expand Down
9 changes: 5 additions & 4 deletions dist/es6/aurelia-framework.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'core-js';
import * as TheLogManager from 'aurelia-logging';
import {ViewEngine,BindingLanguage,ViewSlot,ViewResources,TemplatingEngine} from 'aurelia-templating';
import {ViewEngine,BindingLanguage,ViewSlot,ViewResources,TemplatingEngine,CompositionTransaction} from 'aurelia-templating';
import {join} from 'aurelia-path';
import {Container} from 'aurelia-dependency-injection';
import {Loader} from 'aurelia-loader';
Expand Down Expand Up @@ -427,7 +426,6 @@ export class Aurelia {
* @return Returns a Promise of the current Aurelia instance.
*/
setRoot(root: string = 'app', applicationHost: string | Element = null): Promise<Aurelia> {
let engine;
let instruction = {};

if (this.root && this.root.viewModel && this.root.viewModel.router) {
Expand All @@ -437,7 +435,10 @@ export class Aurelia {

this._configureHost(applicationHost);

engine = this.container.get(TemplatingEngine);
let engine = this.container.get(TemplatingEngine);
let transaction = this.container.get(CompositionTransaction);
delete transaction.initialComposition;

instruction.viewModel = root;
instruction.container = instruction.childContainer = this.container;
instruction.viewSlot = this.hostSlot;
Expand Down
3 changes: 1 addition & 2 deletions dist/system/aurelia-framework.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
declare module 'aurelia-framework' {
import 'core-js';
import * as TheLogManager from 'aurelia-logging';
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine } from 'aurelia-templating';
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine, CompositionTransaction } from 'aurelia-templating';
import { join } from 'aurelia-path';
import { Container } from 'aurelia-dependency-injection';
import { Loader } from 'aurelia-loader';
Expand Down
13 changes: 8 additions & 5 deletions dist/system/aurelia-framework.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
System.register(['core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-path', 'aurelia-dependency-injection', 'aurelia-loader', 'aurelia-pal', 'aurelia-binding', 'aurelia-metadata', 'aurelia-task-queue'], function (_export) {
System.register(['aurelia-logging', 'aurelia-templating', 'aurelia-path', 'aurelia-dependency-injection', 'aurelia-loader', 'aurelia-pal', 'aurelia-binding', 'aurelia-metadata', 'aurelia-task-queue'], function (_export) {
'use strict';

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

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }

Expand Down Expand Up @@ -65,14 +65,15 @@ System.register(['core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-pa
}

return {
setters: [function (_coreJs) {}, function (_aureliaLogging) {
setters: [function (_aureliaLogging) {
TheLogManager = _aureliaLogging;
}, function (_aureliaTemplating) {
ViewEngine = _aureliaTemplating.ViewEngine;
BindingLanguage = _aureliaTemplating.BindingLanguage;
ViewSlot = _aureliaTemplating.ViewSlot;
ViewResources = _aureliaTemplating.ViewResources;
TemplatingEngine = _aureliaTemplating.TemplatingEngine;
CompositionTransaction = _aureliaTemplating.CompositionTransaction;

for (var _key4 in _aureliaTemplating) {
if (_key4 !== 'default') _export(_key4, _aureliaTemplating[_key4]);
Expand Down Expand Up @@ -368,7 +369,6 @@ System.register(['core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-pa
var root = arguments.length <= 0 || arguments[0] === undefined ? 'app' : arguments[0];
var applicationHost = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];

var engine = undefined;
var instruction = {};

if (this.root && this.root.viewModel && this.root.viewModel.router) {
Expand All @@ -378,7 +378,10 @@ System.register(['core-js', 'aurelia-logging', 'aurelia-templating', 'aurelia-pa

this._configureHost(applicationHost);

engine = this.container.get(TemplatingEngine);
var engine = this.container.get(TemplatingEngine);
var transaction = this.container.get(CompositionTransaction);
delete transaction.initialComposition;

instruction.viewModel = root;
instruction.container = instruction.childContainer = this.container;
instruction.viewSlot = this.hostSlot;
Expand Down
14 changes: 14 additions & 0 deletions doc/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
### 1.0.0-beta.1.1.4 (2016-03-01)


#### Bug Fixes

* **all:** remove core-js dependency ([968d6c22](http://github.com/aurelia/framework/commit/968d6c22cab3ddbd03a0104565b178ea2904e189))
* **bower:** remove core-js ([dd9e082f](http://github.com/aurelia/framework/commit/dd9e082f9f230802b084f47a20ba4262579b1221))


#### Features

* **aurelia:** integrate composition transaction ([38851185](http://github.com/aurelia/framework/commit/38851185b57d4b775e8952cff028cb450f0b0d7b))


### 1.0.0-beta.1.1.3 (2016-02-09)


Expand Down
14 changes: 7 additions & 7 deletions doc/api.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"type": {
"type": "reference",
"name": "Loader",
"id": 610,
"id": 329,
"moduleName": "\"aurelia-loader\""
}
},
Expand All @@ -71,7 +71,7 @@
"type": {
"type": "reference",
"name": "Container",
"id": 489,
"id": 208,
"moduleName": "\"aurelia-dependency-injection\""
}
},
Expand All @@ -89,7 +89,7 @@
"type": {
"type": "reference",
"name": "ViewResources",
"id": 1180,
"id": 1236,
"moduleName": "\"aurelia-templating\""
}
}
Expand Down Expand Up @@ -117,7 +117,7 @@
"type": {
"type": "reference",
"name": "Container",
"id": 489,
"id": 208,
"moduleName": "\"aurelia-dependency-injection\""
}
},
Expand All @@ -135,7 +135,7 @@
"type": {
"type": "reference",
"name": "Loader",
"id": 610,
"id": 329,
"moduleName": "\"aurelia-loader\""
}
},
Expand All @@ -153,7 +153,7 @@
"type": {
"type": "reference",
"name": "ViewResources",
"id": 1180,
"id": 1236,
"moduleName": "\"aurelia-templating\""
}
},
Expand Down Expand Up @@ -482,7 +482,7 @@
"type": {
"type": "reference",
"name": "Container",
"id": 489,
"id": 208,
"moduleName": "\"aurelia-dependency-injection\""
}
},
Expand Down
Loading

0 comments on commit c6f7b87

Please sign in to comment.