Skip to content

Commit c6f7b87

Browse files
chore(all): prepare release 1.0.0-beta.1.1.4
1 parent dd9e082 commit c6f7b87

16 files changed

+89
-77
lines changed

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aurelia-framework",
3-
"version": "1.0.0-beta.1.1.3",
3+
"version": "1.0.0-beta.1.1.4",
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",
@@ -25,6 +25,6 @@
2525
"aurelia-pal": "^1.0.0-beta.1.1.1",
2626
"aurelia-path": "^1.0.0-beta.1.1.0",
2727
"aurelia-task-queue": "^1.0.0-beta.1.1.0",
28-
"aurelia-templating": "^1.0.0-beta.1.1.0"
28+
"aurelia-templating": "^1.0.0-beta.1.1.2"
2929
}
3030
}

config.js

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

1616
map: {
17-
"aurelia-binding": "npm:[email protected].1.0",
18-
"aurelia-dependency-injection": "npm:[email protected].2",
19-
"aurelia-loader": "npm:[email protected].0",
20-
"aurelia-logging": "npm:[email protected].1",
21-
"aurelia-metadata": "npm:[email protected].3",
17+
"aurelia-binding": "npm:[email protected].2.1",
18+
"aurelia-dependency-injection": "npm:[email protected].4",
19+
"aurelia-loader": "npm:[email protected].1",
20+
"aurelia-logging": "npm:[email protected].2",
21+
"aurelia-metadata": "npm:[email protected].5",
2222
"aurelia-pal": "npm:[email protected]",
2323
"aurelia-pal-browser": "npm:[email protected]",
24-
"aurelia-path": "npm:[email protected].0",
25-
"aurelia-task-queue": "npm:[email protected].0",
26-
"aurelia-templating": "npm:[email protected].0",
24+
"aurelia-path": "npm:[email protected].1",
25+
"aurelia-task-queue": "npm:[email protected].1",
26+
"aurelia-templating": "npm:[email protected].2",
2727
"babel": "npm:[email protected]",
2828
"babel-runtime": "npm:[email protected]",
2929
"core-js": "npm:[email protected]",
@@ -42,43 +42,39 @@ System.config({
4242
4343
"util": "npm:[email protected]"
4444
},
45-
"npm:[email protected].1.0": {
46-
"aurelia-metadata": "npm:[email protected].3",
45+
"npm:[email protected].2.1": {
46+
"aurelia-metadata": "npm:[email protected].5",
4747
"aurelia-pal": "npm:[email protected]",
48-
"aurelia-task-queue": "npm:[email protected]",
49-
"core-js": "npm:[email protected]"
48+
"aurelia-task-queue": "npm:[email protected]"
5049
},
51-
52-
"aurelia-logging": "npm:[email protected]",
53-
"aurelia-metadata": "npm:[email protected]",
54-
"aurelia-pal": "npm:[email protected]",
55-
"core-js": "npm:[email protected]"
50+
51+
"aurelia-logging": "npm:[email protected]",
52+
"aurelia-metadata": "npm:[email protected]",
53+
"aurelia-pal": "npm:[email protected]"
5654
},
57-
"npm:[email protected].0": {
58-
"aurelia-metadata": "npm:[email protected].3",
59-
"aurelia-path": "npm:[email protected].0"
55+
"npm:[email protected].1": {
56+
"aurelia-metadata": "npm:[email protected].5",
57+
"aurelia-path": "npm:[email protected].1"
6058
},
61-
62-
"aurelia-pal": "npm:[email protected]",
63-
"core-js": "npm:[email protected]"
59+
60+
"aurelia-pal": "npm:[email protected]"
6461
},
6562
6663
"aurelia-pal": "npm:[email protected]",
6764
"core-js": "npm:[email protected]"
6865
},
69-
"npm:[email protected].0": {
66+
"npm:[email protected].1": {
7067
"aurelia-pal": "npm:[email protected]"
7168
},
72-
"npm:[email protected].0": {
73-
"aurelia-binding": "npm:[email protected].1.0",
74-
"aurelia-dependency-injection": "npm:[email protected].2",
75-
"aurelia-loader": "npm:[email protected].0",
76-
"aurelia-logging": "npm:[email protected].1",
77-
"aurelia-metadata": "npm:[email protected].3",
69+
"npm:[email protected].2": {
70+
"aurelia-binding": "npm:[email protected].2.1",
71+
"aurelia-dependency-injection": "npm:[email protected].4",
72+
"aurelia-loader": "npm:[email protected].1",
73+
"aurelia-logging": "npm:[email protected].2",
74+
"aurelia-metadata": "npm:[email protected].5",
7875
"aurelia-pal": "npm:[email protected]",
79-
"aurelia-path": "npm:[email protected]",
80-
"aurelia-task-queue": "npm:[email protected]",
81-
"core-js": "npm:[email protected]"
76+
"aurelia-path": "npm:[email protected]",
77+
"aurelia-task-queue": "npm:[email protected]"
8278
},
8379
8480
"process": "github:jspm/[email protected]"

dist/amd/aurelia-framework.d.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
declare module 'aurelia-framework' {
2-
import 'core-js';
32
import * as TheLogManager from 'aurelia-logging';
4-
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine } from 'aurelia-templating';
3+
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine, CompositionTransaction } from 'aurelia-templating';
54
import { join } from 'aurelia-path';
65
import { Container } from 'aurelia-dependency-injection';
76
import { Loader } from 'aurelia-loader';

dist/amd/aurelia-framework.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
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) {
1+
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) {
22
'use strict';
33

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

323-
var engine = undefined;
324323
var instruction = {};
325324

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

331330
this._configureHost(applicationHost);
332331

333-
engine = this.container.get(_aureliaTemplating.TemplatingEngine);
332+
var engine = this.container.get(_aureliaTemplating.TemplatingEngine);
333+
var transaction = this.container.get(_aureliaTemplating.CompositionTransaction);
334+
delete transaction.initialComposition;
335+
334336
instruction.viewModel = root;
335337
instruction.container = instruction.childContainer = this.container;
336338
instruction.viewSlot = this.hostSlot;

dist/aurelia-framework.d.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
declare module 'aurelia-framework' {
2-
import 'core-js';
32
import * as TheLogManager from 'aurelia-logging';
4-
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine } from 'aurelia-templating';
3+
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine, CompositionTransaction } from 'aurelia-templating';
54
import { join } from 'aurelia-path';
65
import { Container } from 'aurelia-dependency-injection';
76
import { Loader } from 'aurelia-loader';

dist/aurelia-framework.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import 'core-js';
21
import * as TheLogManager from 'aurelia-logging';
3-
import {ViewEngine,BindingLanguage,ViewSlot,ViewResources,TemplatingEngine} from 'aurelia-templating';
2+
import {ViewEngine,BindingLanguage,ViewSlot,ViewResources,TemplatingEngine,CompositionTransaction} from 'aurelia-templating';
43
import {join} from 'aurelia-path';
54
import {Container} from 'aurelia-dependency-injection';
65
import {Loader} from 'aurelia-loader';
@@ -427,7 +426,6 @@ export class Aurelia {
427426
* @return Returns a Promise of the current Aurelia instance.
428427
*/
429428
setRoot(root: string = 'app', applicationHost: string | Element = null): Promise<Aurelia> {
430-
let engine;
431429
let instruction = {};
432430

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

438436
this._configureHost(applicationHost);
439437

440-
engine = this.container.get(TemplatingEngine);
438+
let engine = this.container.get(TemplatingEngine);
439+
let transaction = this.container.get(CompositionTransaction);
440+
delete transaction.initialComposition;
441+
441442
instruction.viewModel = root;
442443
instruction.container = instruction.childContainer = this.container;
443444
instruction.viewSlot = this.hostSlot;

dist/commonjs/aurelia-framework.d.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
declare module 'aurelia-framework' {
2-
import 'core-js';
32
import * as TheLogManager from 'aurelia-logging';
4-
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine } from 'aurelia-templating';
3+
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine, CompositionTransaction } from 'aurelia-templating';
54
import { join } from 'aurelia-path';
65
import { Container } from 'aurelia-dependency-injection';
76
import { Loader } from 'aurelia-loader';

dist/commonjs/aurelia-framework.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
1010

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

13-
require('core-js');
14-
1513
var _aureliaLogging = require('aurelia-logging');
1614

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

340-
var engine = undefined;
341338
var instruction = {};
342339

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

348345
this._configureHost(applicationHost);
349346

350-
engine = this.container.get(_aureliaTemplating.TemplatingEngine);
347+
var engine = this.container.get(_aureliaTemplating.TemplatingEngine);
348+
var transaction = this.container.get(_aureliaTemplating.CompositionTransaction);
349+
delete transaction.initialComposition;
350+
351351
instruction.viewModel = root;
352352
instruction.container = instruction.childContainer = this.container;
353353
instruction.viewSlot = this.hostSlot;

dist/es6/aurelia-framework.d.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
declare module 'aurelia-framework' {
2-
import 'core-js';
32
import * as TheLogManager from 'aurelia-logging';
4-
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine } from 'aurelia-templating';
3+
import { ViewEngine, BindingLanguage, ViewSlot, ViewResources, TemplatingEngine, CompositionTransaction } from 'aurelia-templating';
54
import { join } from 'aurelia-path';
65
import { Container } from 'aurelia-dependency-injection';
76
import { Loader } from 'aurelia-loader';

dist/es6/aurelia-framework.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import 'core-js';
21
import * as TheLogManager from 'aurelia-logging';
3-
import {ViewEngine,BindingLanguage,ViewSlot,ViewResources,TemplatingEngine} from 'aurelia-templating';
2+
import {ViewEngine,BindingLanguage,ViewSlot,ViewResources,TemplatingEngine,CompositionTransaction} from 'aurelia-templating';
43
import {join} from 'aurelia-path';
54
import {Container} from 'aurelia-dependency-injection';
65
import {Loader} from 'aurelia-loader';
@@ -427,7 +426,6 @@ export class Aurelia {
427426
* @return Returns a Promise of the current Aurelia instance.
428427
*/
429428
setRoot(root: string = 'app', applicationHost: string | Element = null): Promise<Aurelia> {
430-
let engine;
431429
let instruction = {};
432430

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

438436
this._configureHost(applicationHost);
439437

440-
engine = this.container.get(TemplatingEngine);
438+
let engine = this.container.get(TemplatingEngine);
439+
let transaction = this.container.get(CompositionTransaction);
440+
delete transaction.initialComposition;
441+
441442
instruction.viewModel = root;
442443
instruction.container = instruction.childContainer = this.container;
443444
instruction.viewSlot = this.hostSlot;

0 commit comments

Comments
 (0)