diff --git a/bower.json b/bower.json index e4d7caa..8be0f50 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "aurelia-bootstrapper", - "version": "0.13.1", + "version": "0.14.0", "description": "Sets up the default configuration for the aurelia framework and gets you up and running quick and easy.", "keywords": [ "aurelia", @@ -17,17 +17,17 @@ "url": "http://github.com/aurelia/bootstrapper" }, "dependencies": { - "aurelia-event-aggregator": "^0.5.0", - "aurelia-framework": "^0.12.0", - "aurelia-history": "^0.5.0", - "aurelia-history-browser": "^0.5.0", - "aurelia-loader-default": "^0.8.0", - "aurelia-logging-console": "^0.5.0", - "aurelia-router": "^0.9.0", - "aurelia-templating": "^0.12.0", - "aurelia-templating-binding": "^0.12.0", - "aurelia-templating-resources": "^0.12.0", - "aurelia-templating-router": "^0.13.0", + "aurelia-event-aggregator": "^0.6.0", + "aurelia-framework": "^0.13.0", + "aurelia-history": "^0.6.0", + "aurelia-history-browser": "^0.6.0", + "aurelia-loader-default": "^0.9.0", + "aurelia-logging-console": "^0.6.0", + "aurelia-router": "^0.10.0", + "aurelia-templating": "^0.13.0", + "aurelia-templating-binding": "^0.13.0", + "aurelia-templating-resources": "^0.13.0", + "aurelia-templating-router": "^0.14.0", "core-js": "zloirock/core-js" } } diff --git a/config.js b/config.js index abc5f96..f129b2b 100644 --- a/config.js +++ b/config.js @@ -16,64 +16,107 @@ System.config({ System.config({ "map": { - "aurelia-event-aggregator": "github:aurelia/event-aggregator@0.5.0", - "aurelia-framework": "github:aurelia/framework@0.12.0", - "aurelia-history": "github:aurelia/history@0.5.0", - "aurelia-history-browser": "github:aurelia/history-browser@0.5.0", - "aurelia-loader-default": "github:aurelia/loader-default@0.8.0", - "aurelia-logging-console": "github:aurelia/logging-console@0.5.0", - "aurelia-router": "github:aurelia/router@0.9.0", - "aurelia-templating": "github:aurelia/templating@0.12.0", - "aurelia-templating-binding": "github:aurelia/templating-binding@0.12.0", - "aurelia-templating-resources": "github:aurelia/templating-resources@0.12.0", - "aurelia-templating-router": "github:aurelia/templating-router@0.13.0", + "aurelia-event-aggregator": "github:aurelia/event-aggregator@0.6.0", + "aurelia-framework": "github:aurelia/framework@0.13.0", + "aurelia-history": "github:aurelia/history@0.6.0", + "aurelia-history-browser": "github:aurelia/history-browser@0.6.0", + "aurelia-loader-default": "github:aurelia/loader-default@0.9.0", + "aurelia-logging-console": "github:aurelia/logging-console@0.6.0", + "aurelia-router": "github:aurelia/router@0.10.0", + "aurelia-templating": "github:aurelia/templating@0.13.0", + "aurelia-templating-binding": "github:aurelia/templating-binding@0.13.0", + "aurelia-templating-resources": "github:aurelia/templating-resources@0.13.0", + "aurelia-templating-router": "github:aurelia/templating-router@0.14.0", "babel": "npm:babel-core@5.2.2", "babel-runtime": "npm:babel-runtime@5.2.2", - "core-js": "npm:core-js@0.9.15", + "core-js": "npm:core-js@0.9.18", "github:aurelia/binding@0.7.0": { "aurelia-dependency-injection": "github:aurelia/dependency-injection@0.8.1", "aurelia-metadata": "github:aurelia/metadata@0.6.0", "aurelia-task-queue": "github:aurelia/task-queue@0.5.0", - "core-js": "npm:core-js@0.9.15" + "core-js": "npm:core-js@0.9.18" + }, + "github:aurelia/binding@0.8.0": { + "aurelia-dependency-injection": "github:aurelia/dependency-injection@0.9.0", + "aurelia-metadata": "github:aurelia/metadata@0.7.0", + "aurelia-task-queue": "github:aurelia/task-queue@0.6.0", + "core-js": "npm:core-js@0.9.18" }, "github:aurelia/dependency-injection@0.8.1": { "aurelia-logging": "github:aurelia/logging@0.5.0", "aurelia-metadata": "github:aurelia/metadata@0.6.0", - "core-js": "npm:core-js@0.9.15" + "core-js": "npm:core-js@0.9.18" + }, + "github:aurelia/dependency-injection@0.9.0": { + "aurelia-logging": "github:aurelia/logging@0.6.0", + "aurelia-metadata": "github:aurelia/metadata@0.7.0", + "core-js": "npm:core-js@0.9.18" }, "github:aurelia/event-aggregator@0.5.0": { "aurelia-logging": "github:aurelia/logging@0.5.0" }, - "github:aurelia/framework@0.12.0": { - "aurelia-binding": "github:aurelia/binding@0.7.0", - "aurelia-dependency-injection": "github:aurelia/dependency-injection@0.8.1", - "aurelia-loader": "github:aurelia/loader@0.7.0", - "aurelia-logging": "github:aurelia/logging@0.5.0", - "aurelia-metadata": "github:aurelia/metadata@0.6.0", - "aurelia-path": "github:aurelia/path@0.7.0", - "aurelia-task-queue": "github:aurelia/task-queue@0.5.0", - "aurelia-templating": "github:aurelia/templating@0.12.0", - "core-js": "npm:core-js@0.9.15" + "github:aurelia/event-aggregator@0.6.0": { + "aurelia-logging": "github:aurelia/logging@0.6.0" + }, + "github:aurelia/framework@0.13.0": { + "aurelia-binding": "github:aurelia/binding@0.8.0", + "aurelia-dependency-injection": "github:aurelia/dependency-injection@0.9.0", + "aurelia-loader": "github:aurelia/loader@0.8.0", + "aurelia-logging": "github:aurelia/logging@0.6.0", + "aurelia-metadata": "github:aurelia/metadata@0.7.0", + "aurelia-path": "github:aurelia/path@0.8.0", + "aurelia-task-queue": "github:aurelia/task-queue@0.6.0", + "aurelia-templating": "github:aurelia/templating@0.13.0", + "core-js": "npm:core-js@0.9.18" }, "github:aurelia/history-browser@0.5.0": { "aurelia-history": "github:aurelia/history@0.5.0", - "core-js": "npm:core-js@0.9.15" + "core-js": "npm:core-js@0.9.18" + }, + "github:aurelia/history-browser@0.6.0": { + "aurelia-history": "github:aurelia/history@0.6.0", + "core-js": "npm:core-js@0.9.18" }, "github:aurelia/loader-default@0.8.0": { "aurelia-loader": "github:aurelia/loader@0.7.0", "aurelia-metadata": "github:aurelia/metadata@0.6.0" }, + "github:aurelia/loader-default@0.9.0": { + "aurelia-loader": "github:aurelia/loader@0.8.0", + "aurelia-metadata": "github:aurelia/metadata@0.7.0" + }, "github:aurelia/loader@0.7.0": { "aurelia-html-template-element": "github:aurelia/html-template-element@0.2.0", "aurelia-path": "github:aurelia/path@0.7.0", - "core-js": "npm:core-js@0.9.15", + "core-js": "npm:core-js@0.9.18", + "webcomponentsjs": "github:webcomponents/webcomponentsjs@0.6.3" + }, + "github:aurelia/loader@0.8.0": { + "aurelia-html-template-element": "github:aurelia/html-template-element@0.2.0", + "aurelia-path": "github:aurelia/path@0.8.0", + "core-js": "npm:core-js@0.9.18", "webcomponentsjs": "github:webcomponents/webcomponentsjs@0.6.3" }, "github:aurelia/metadata@0.6.0": { - "core-js": "npm:core-js@0.9.15" + "core-js": "npm:core-js@0.9.18" + }, + "github:aurelia/metadata@0.7.0": { + "core-js": "npm:core-js@0.9.18" }, "github:aurelia/route-recognizer@0.5.0": { - "core-js": "npm:core-js@0.9.15" + "core-js": "npm:core-js@0.9.18" + }, + "github:aurelia/route-recognizer@0.6.0": { + "core-js": "npm:core-js@0.9.18" + }, + "github:aurelia/router@0.10.0": { + "aurelia-dependency-injection": "github:aurelia/dependency-injection@0.9.0", + "aurelia-event-aggregator": "github:aurelia/event-aggregator@0.6.0", + "aurelia-history": "github:aurelia/history@0.6.0", + "aurelia-logging": "github:aurelia/logging@0.6.0", + "aurelia-path": "github:aurelia/path@0.8.0", + "aurelia-route-recognizer": "github:aurelia/route-recognizer@0.6.0", + "core-js": "npm:core-js@0.9.18" }, "github:aurelia/router@0.9.0": { "aurelia-dependency-injection": "github:aurelia/dependency-injection@0.8.1", @@ -81,20 +124,33 @@ System.config({ "aurelia-history": "github:aurelia/history@0.5.0", "aurelia-path": "github:aurelia/path@0.7.0", "aurelia-route-recognizer": "github:aurelia/route-recognizer@0.5.0", - "core-js": "npm:core-js@0.9.15" + "core-js": "npm:core-js@0.9.18" }, "github:aurelia/templating-binding@0.12.0": { "aurelia-binding": "github:aurelia/binding@0.7.0", "aurelia-logging": "github:aurelia/logging@0.5.0", "aurelia-templating": "github:aurelia/templating@0.12.0" }, + "github:aurelia/templating-binding@0.13.0": { + "aurelia-binding": "github:aurelia/binding@0.8.0", + "aurelia-logging": "github:aurelia/logging@0.6.0", + "aurelia-templating": "github:aurelia/templating@0.13.0" + }, "github:aurelia/templating-resources@0.12.0": { "aurelia-binding": "github:aurelia/binding@0.7.0", "aurelia-dependency-injection": "github:aurelia/dependency-injection@0.8.1", "aurelia-logging": "github:aurelia/logging@0.5.0", "aurelia-task-queue": "github:aurelia/task-queue@0.5.0", "aurelia-templating": "github:aurelia/templating@0.12.0", - "core-js": "npm:core-js@0.9.15" + "core-js": "npm:core-js@0.9.18" + }, + "github:aurelia/templating-resources@0.13.0": { + "aurelia-binding": "github:aurelia/binding@0.8.0", + "aurelia-dependency-injection": "github:aurelia/dependency-injection@0.9.0", + "aurelia-logging": "github:aurelia/logging@0.6.0", + "aurelia-task-queue": "github:aurelia/task-queue@0.6.0", + "aurelia-templating": "github:aurelia/templating@0.13.0", + "core-js": "npm:core-js@0.9.18" }, "github:aurelia/templating-router@0.13.0": { "aurelia-dependency-injection": "github:aurelia/dependency-injection@0.8.1", @@ -103,6 +159,13 @@ System.config({ "aurelia-router": "github:aurelia/router@0.9.0", "aurelia-templating": "github:aurelia/templating@0.12.0" }, + "github:aurelia/templating-router@0.14.0": { + "aurelia-dependency-injection": "github:aurelia/dependency-injection@0.9.0", + "aurelia-metadata": "github:aurelia/metadata@0.7.0", + "aurelia-path": "github:aurelia/path@0.8.0", + "aurelia-router": "github:aurelia/router@0.10.0", + "aurelia-templating": "github:aurelia/templating@0.13.0" + }, "github:aurelia/templating@0.12.0": { "aurelia-binding": "github:aurelia/binding@0.7.0", "aurelia-dependency-injection": "github:aurelia/dependency-injection@0.8.1", @@ -112,12 +175,23 @@ System.config({ "aurelia-metadata": "github:aurelia/metadata@0.6.0", "aurelia-path": "github:aurelia/path@0.7.0", "aurelia-task-queue": "github:aurelia/task-queue@0.5.0", - "core-js": "npm:core-js@0.9.15" + "core-js": "npm:core-js@0.9.18" + }, + "github:aurelia/templating@0.13.0": { + "aurelia-binding": "github:aurelia/binding@0.8.0", + "aurelia-dependency-injection": "github:aurelia/dependency-injection@0.9.0", + "aurelia-html-template-element": "github:aurelia/html-template-element@0.2.0", + "aurelia-loader": "github:aurelia/loader@0.8.0", + "aurelia-logging": "github:aurelia/logging@0.6.0", + "aurelia-metadata": "github:aurelia/metadata@0.7.0", + "aurelia-path": "github:aurelia/path@0.8.0", + "aurelia-task-queue": "github:aurelia/task-queue@0.6.0", + "core-js": "npm:core-js@0.9.18" }, "github:jspm/nodelibs-process@0.1.1": { "process": "npm:process@0.10.1" }, - "npm:core-js@0.9.15": { + "npm:core-js@0.9.18": { "fs": "github:jspm/nodelibs-fs@0.1.2", "process": "github:jspm/nodelibs-process@0.1.1", "systemjs-json": "github:systemjs/plugin-json@0.1.0" diff --git a/dist/amd/index.js b/dist/amd/index.js index ff715af..0d26cc1 100644 --- a/dist/amd/index.js +++ b/dist/amd/index.js @@ -9,7 +9,6 @@ define(['exports', 'core-js', 'aurelia-framework', 'aurelia-logging-console'], f var _core = _interopRequireDefault(_coreJs); var logger = _aureliaFramework.LogManager.getLogger('bootstrapper'); - var readyQueue = []; var isReady = false; @@ -59,7 +58,7 @@ define(['exports', 'core-js', 'aurelia-framework', 'aurelia-logging-console'], f function ensureLoader() { if (!window.AureliaLoader) { - if (window.System) { + if (window.System && !window.System.isFake) { return System.normalize('aurelia-bootstrapper').then(function (bootstrapperName) { return System.normalize('aurelia-loader-default', bootstrapperName).then(function (loaderName) { return System['import'](loaderName); @@ -85,13 +84,6 @@ define(['exports', 'core-js', 'aurelia-framework', 'aurelia-logging-console'], f return System.normalize('aurelia-loader', frameworkName).then(function (loaderName) { var toLoad = []; - if (!System.polyfilled) { - logger.debug('loading core-js'); - toLoad.push(System.normalize('core-js', loaderName).then(function (name) { - return System['import'](name); - })); - } - toLoad.push(System.normalize('aurelia-dependency-injection', frameworkName).then(function (name) { System.map['aurelia-dependency-injection'] = name; })); diff --git a/dist/commonjs/index.js b/dist/commonjs/index.js index 4094474..dd88931 100644 --- a/dist/commonjs/index.js +++ b/dist/commonjs/index.js @@ -14,7 +14,6 @@ var _aureliaFramework = require('aurelia-framework'); var _aureliaLoggingConsole = require('aurelia-logging-console'); var logger = _aureliaFramework.LogManager.getLogger('bootstrapper'); - var readyQueue = []; var isReady = false; @@ -64,7 +63,7 @@ function ready(global) { function ensureLoader() { if (!window.AureliaLoader) { - if (window.System) { + if (window.System && !window.System.isFake) { return System.normalize('aurelia-bootstrapper').then(function (bootstrapperName) { return System.normalize('aurelia-loader-default', bootstrapperName).then(function (loaderName) { return System['import'](loaderName); @@ -90,13 +89,6 @@ function preparePlatform() { return System.normalize('aurelia-loader', frameworkName).then(function (loaderName) { var toLoad = []; - if (!System.polyfilled) { - logger.debug('loading core-js'); - toLoad.push(System.normalize('core-js', loaderName).then(function (name) { - return System['import'](name); - })); - } - toLoad.push(System.normalize('aurelia-dependency-injection', frameworkName).then(function (name) { System.map['aurelia-dependency-injection'] = name; })); diff --git a/dist/es6/index.js b/dist/es6/index.js index 0a63f2e..c1ab850 100644 --- a/dist/es6/index.js +++ b/dist/es6/index.js @@ -3,7 +3,6 @@ import {Aurelia, LogManager} from 'aurelia-framework'; import {ConsoleAppender} from 'aurelia-logging-console'; var logger = LogManager.getLogger('bootstrapper'); - var readyQueue = []; var isReady = false; @@ -51,7 +50,7 @@ function ready(global) { function ensureLoader(){ if(!window.AureliaLoader){ - if(window.System){ + if(window.System && !window.System.isFake){ return System.normalize('aurelia-bootstrapper').then(bootstrapperName => { return System.normalize('aurelia-loader-default', bootstrapperName).then(loaderName => { return System.import(loaderName); @@ -77,13 +76,6 @@ function preparePlatform(){ return System.normalize('aurelia-loader', frameworkName).then(function(loaderName){ var toLoad = []; - if(!System.polyfilled){ - logger.debug('loading core-js'); - toLoad.push(System.normalize('core-js', loaderName).then(function(name){ - return System.import(name); - })); - } - toLoad.push(System.normalize('aurelia-dependency-injection', frameworkName).then(function(name){ System.map['aurelia-dependency-injection'] = name; })); diff --git a/dist/system/index.js b/dist/system/index.js index 2bf3029..b3fa4c9 100644 --- a/dist/system/index.js +++ b/dist/system/index.js @@ -51,7 +51,7 @@ System.register(['core-js', 'aurelia-framework', 'aurelia-logging-console'], fun function ensureLoader() { if (!window.AureliaLoader) { - if (window.System) { + if (window.System && !window.System.isFake) { return System.normalize('aurelia-bootstrapper').then(function (bootstrapperName) { return System.normalize('aurelia-loader-default', bootstrapperName).then(function (loaderName) { return System['import'](loaderName); @@ -77,13 +77,6 @@ System.register(['core-js', 'aurelia-framework', 'aurelia-logging-console'], fun return System.normalize('aurelia-loader', frameworkName).then(function (loaderName) { var toLoad = []; - if (!System.polyfilled) { - logger.debug('loading core-js'); - toLoad.push(System.normalize('core-js', loaderName).then(function (name) { - return System['import'](name); - })); - } - toLoad.push(System.normalize('aurelia-dependency-injection', frameworkName).then(function (name) { System.map['aurelia-dependency-injection'] = name; })); diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 0bd026b..ca75f49 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -1,3 +1,11 @@ +## 0.14.0 (2015-07-02) + + +#### Bug Fixes + +* **all:** detect fake system and remove core-js dup load ([f135ad39](http://github.com/aurelia/bootstrapper/commit/f135ad39eccb9a5a8e439c09a2354787cedd0fbe)) + + ### 0.13.1 (2015-06-09) diff --git a/package.json b/package.json index eda973a..802f147 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aurelia-bootstrapper", - "version": "0.13.1", + "version": "0.14.0", "description": "Sets up the default configuration for the aurelia framework and gets you up and running quick and easy.", "keywords": [ "aurelia", @@ -25,17 +25,17 @@ "lib": "dist/amd" }, "dependencies": { - "aurelia-event-aggregator": "github:aurelia/event-aggregator@^0.5.0", - "aurelia-framework": "github:aurelia/framework@^0.12.0", - "aurelia-history": "github:aurelia/history@^0.5.0", - "aurelia-history-browser": "github:aurelia/history-browser@^0.5.0", - "aurelia-loader-default": "github:aurelia/loader-default@^0.8.0", - "aurelia-logging-console": "github:aurelia/logging-console@^0.5.0", - "aurelia-router": "github:aurelia/router@^0.9.0", - "aurelia-templating": "github:aurelia/templating@^0.12.0", - "aurelia-templating-binding": "github:aurelia/templating-binding@^0.12.0", - "aurelia-templating-resources": "github:aurelia/templating-resources@^0.12.0", - "aurelia-templating-router": "github:aurelia/templating-router@^0.13.0", + "aurelia-event-aggregator": "github:aurelia/event-aggregator@^0.6.0", + "aurelia-framework": "github:aurelia/framework@^0.13.0", + "aurelia-history": "github:aurelia/history@^0.6.0", + "aurelia-history-browser": "github:aurelia/history-browser@^0.6.0", + "aurelia-loader-default": "github:aurelia/loader-default@^0.9.0", + "aurelia-logging-console": "github:aurelia/logging-console@^0.6.0", + "aurelia-router": "github:aurelia/router@^0.10.0", + "aurelia-templating": "github:aurelia/templating@^0.13.0", + "aurelia-templating-binding": "github:aurelia/templating-binding@^0.13.0", + "aurelia-templating-resources": "github:aurelia/templating-resources@^0.13.0", + "aurelia-templating-router": "github:aurelia/templating-router@^0.14.0", "core-js": "npm:core-js@^0.9.5" }, "devDependencies": {