Skip to content
This repository has been archived by the owner on Jun 1, 2022. It is now read-only.

Commit

Permalink
fix(all): update to latest framework versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@EisenbergEffect
EisenbergEffect committed Mar 25, 2015
1 parent 0e8dea7 commit 8637820
Show file tree
Hide file tree
Showing 9 changed files with 80 additions and 79 deletions.
124 changes: 63 additions & 61 deletions config.js
View file
@@ -1,104 +1,107 @@
System.config({
"paths": {
"*": "*.js",
"*": "dist/*.js",

This comment has been minimized.

Sign in to view

Copy link
@zewa666

zewa666 Mar 26, 2015

Member

Why this change? This makes sadly our unit tests fail. If it's necessary we can work around this by asking the guys from karma-jspm for help to setup a custom path override

This comment has been minimized.

Sign in to view

Copy link
@EisenbergEffect

EisenbergEffect Mar 26, 2015

Author Contributor

Because, prior to our latest release, Aurelia was not using the ES6 loader correctly. We were hacking some paths internally and this broke a lot of scenarios. Now, the Aurelia loader relies entirely on system.js path mapping for everything. Without this path config, the system.js loader cannot find app code at runtime.

More details: We used "baseUrl" to get around this before. But that was actually a typo. System.js uses baseURL...and this changes the base for everything, including jspm packages. So, that doesn't work at all. This typo led to hacked internals for Aurelia. The last set of updates fixed all of this. The only way I know to map app code to the dist folder is with the path config above.
"github:*": "jspm_packages/github/*.js",
"npm:*": "jspm_packages/npm/*.js",
"aurelia-skeleton-navigation/*": "lib/*.js"
"aurelia-skeleton-navigation/*": "dist/*.js"
}
});

System.config({
"map": {
"aurelia-bootstrapper": "github:aurelia/bootstrapper@0.9.5",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.4.5",
"aurelia-framework": "github:aurelia/framework@0.8.8",
"aurelia-http-client": "github:aurelia/http-client@0.5.5",
"aurelia-router": "github:aurelia/router@0.5.8",
"aurelia-bootstrapper": "github:aurelia/bootstrapper@0.10.0",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.5.0",
"aurelia-framework": "github:aurelia/framework@0.9.0",
"aurelia-http-client": "github:aurelia/http-client@0.6.0",
"aurelia-router": "github:aurelia/router@0.6.0",
"bootstrap": "github:twbs/bootstrap@3.3.2",
"font-awesome": "npm:font-awesome@4.3.0",
"github:aurelia/binding@0.3.7": {
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.4.5",
"aurelia-metadata": "github:aurelia/metadata@0.3.3",
"github:aurelia/binding@0.4.0": {
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.5.0",
"aurelia-metadata": "github:aurelia/metadata@0.3.4",
"aurelia-task-queue": "github:aurelia/task-queue@0.2.5"
},
"github:aurelia/bootstrapper@0.9.5": {
"github:aurelia/bootstrapper@0.10.0": {
"aurelia-event-aggregator": "github:aurelia/event-aggregator@0.2.4",
"aurelia-framework": "github:aurelia/framework@0.8.8",
"aurelia-framework": "github:aurelia/framework@0.9.0",
"aurelia-history": "github:aurelia/history@0.2.4",
"aurelia-history-browser": "github:aurelia/history-browser@0.2.5",
"aurelia-loader-default": "github:aurelia/loader-default@0.4.3",
"aurelia-loader-default": "github:aurelia/loader-default@0.5.0",
"aurelia-logging-console": "github:aurelia/logging-console@0.2.4",
"aurelia-router": "github:aurelia/router@0.5.8",
"aurelia-templating": "github:aurelia/templating@0.8.14",
"aurelia-templating-binding": "github:aurelia/templating-binding@0.8.7",
"aurelia-templating-resources": "github:aurelia/templating-resources@0.8.10",
"aurelia-templating-router": "github:aurelia/templating-router@0.9.4"
},
"github:aurelia/dependency-injection@0.4.5": {
"aurelia-metadata": "github:aurelia/metadata@0.3.3",
"aurelia-router": "github:aurelia/router@0.6.0",
"aurelia-templating": "github:aurelia/templating@0.9.0",
"aurelia-templating-binding": "github:aurelia/templating-binding@0.9.0",
"aurelia-templating-resources": "github:aurelia/templating-resources@0.9.1",
"aurelia-templating-router": "github:aurelia/templating-router@0.10.0"
},
"github:aurelia/dependency-injection@0.5.0": {
"aurelia-logging": "github:aurelia/logging@0.2.6",
"aurelia-metadata": "github:aurelia/metadata@0.3.4",
"core-js": "npm:core-js@0.4.10"
},
"github:aurelia/framework@0.8.8": {
"aurelia-binding": "github:aurelia/binding@0.3.7",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.4.5",
"aurelia-loader": "github:aurelia/loader@0.3.5",
"aurelia-logging": "github:aurelia/logging@0.2.5",
"aurelia-metadata": "github:aurelia/metadata@0.3.3",
"github:aurelia/framework@0.9.0": {
"aurelia-binding": "github:aurelia/binding@0.4.0",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.5.0",
"aurelia-loader": "github:aurelia/loader@0.4.0",
"aurelia-logging": "github:aurelia/logging@0.2.6",
"aurelia-metadata": "github:aurelia/metadata@0.3.4",
"aurelia-path": "github:aurelia/path@0.4.6",
"aurelia-task-queue": "github:aurelia/task-queue@0.2.5",
"aurelia-templating": "github:aurelia/templating@0.8.14"
"aurelia-templating": "github:aurelia/templating@0.9.0"
},
"github:aurelia/history-browser@0.2.5": {
"aurelia-history": "github:aurelia/history@0.2.4",
"core-js": "npm:core-js@0.4.10"
},
"github:aurelia/http-client@0.5.5": {
"aurelia-path": "github:aurelia/path@0.4.5",
"github:aurelia/http-client@0.6.0": {
"aurelia-path": "github:aurelia/path@0.4.6",
"core-js": "npm:core-js@0.4.10"
},
"github:aurelia/loader-default@0.4.3": {
"aurelia-loader": "github:aurelia/loader@0.3.5",
"aurelia-metadata": "github:aurelia/metadata@0.3.3",
"aurelia-path": "github:aurelia/path@0.4.5"
"github:aurelia/loader-default@0.5.0": {
"aurelia-loader": "github:aurelia/loader@0.4.0",
"aurelia-metadata": "github:aurelia/metadata@0.3.4"
},
"github:aurelia/loader@0.3.5": {
"github:aurelia/loader@0.4.0": {
"aurelia-html-template-element": "github:aurelia/html-template-element@0.1.3",
"aurelia-path": "github:aurelia/path@0.4.6",
"core-js": "npm:core-js@0.4.10",
"webcomponentsjs": "github:webcomponents/webcomponentsjs@0.5.5"
},
"github:aurelia/router@0.5.8": {
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.4.5",
"github:aurelia/router@0.6.0": {
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.5.0",
"aurelia-event-aggregator": "github:aurelia/event-aggregator@0.2.4",
"aurelia-history": "github:aurelia/history@0.2.4",
"aurelia-path": "github:aurelia/path@0.4.5",
"aurelia-path": "github:aurelia/path@0.4.6",
"aurelia-route-recognizer": "github:aurelia/route-recognizer@0.2.4",
"core-js": "npm:core-js@0.4.10"
},
"github:aurelia/templating-binding@0.8.7": {
"aurelia-binding": "github:aurelia/binding@0.3.7",
"aurelia-templating": "github:aurelia/templating@0.8.14"
"github:aurelia/templating-binding@0.9.0": {
"aurelia-binding": "github:aurelia/binding@0.4.0",
"aurelia-logging": "github:aurelia/logging@0.2.6",
"aurelia-templating": "github:aurelia/templating@0.9.0"
},
"github:aurelia/templating-resources@0.8.10": {
"aurelia-binding": "github:aurelia/binding@0.3.7",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.4.5",
"aurelia-logging": "github:aurelia/logging@0.2.5",
"aurelia-templating": "github:aurelia/templating@0.8.14",
"github:aurelia/templating-resources@0.9.1": {
"aurelia-binding": "github:aurelia/binding@0.4.0",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.5.0",
"aurelia-logging": "github:aurelia/logging@0.2.6",
"aurelia-templating": "github:aurelia/templating@0.9.0",
"core-js": "npm:core-js@0.4.10"
},
"github:aurelia/templating-router@0.9.4": {
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.4.5",
"aurelia-metadata": "github:aurelia/metadata@0.3.3",
"aurelia-path": "github:aurelia/path@0.4.5",
"aurelia-router": "github:aurelia/router@0.5.8",
"aurelia-templating": "github:aurelia/templating@0.8.14"
"github:aurelia/templating-router@0.10.0": {
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.5.0",
"aurelia-metadata": "github:aurelia/metadata@0.3.4",
"aurelia-path": "github:aurelia/path@0.4.6",
"aurelia-router": "github:aurelia/router@0.6.0",
"aurelia-templating": "github:aurelia/templating@0.9.0"
},
"github:aurelia/templating@0.8.14": {
"aurelia-binding": "github:aurelia/binding@0.3.7",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.4.5",
"github:aurelia/templating@0.9.0": {
"aurelia-binding": "github:aurelia/binding@0.4.0",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@0.5.0",
"aurelia-html-template-element": "github:aurelia/html-template-element@0.1.3",
"aurelia-loader": "github:aurelia/loader@0.3.5",
"aurelia-logging": "github:aurelia/logging@0.2.5",
"aurelia-metadata": "github:aurelia/metadata@0.3.3",
"aurelia-path": "github:aurelia/path@0.4.5",
"aurelia-loader": "github:aurelia/loader@0.4.0",
"aurelia-logging": "github:aurelia/logging@0.2.6",
"aurelia-metadata": "github:aurelia/metadata@0.3.4",
"aurelia-path": "github:aurelia/path@0.4.6",
"aurelia-task-queue": "github:aurelia/task-queue@0.2.5",
"core-js": "npm:core-js@0.4.10"
},
Expand Down Expand Up @@ -129,7 +132,7 @@ System.config({
"path-browserify": "npm:path-browserify@0.0.0"
},
"github:jspm/nodelibs-process@0.1.1": {
"process": "npm:process@0.10.0"
"process": "npm:process@0.10.1"
},
"github:jspm/nodelibs-querystring@0.1.0": {
"querystring": "npm:querystring@0.2.0"
Expand Down Expand Up @@ -246,4 +249,3 @@ System.config({
}
}
});

2 changes: 1 addition & 1 deletion dist/app.html
View file
@@ -1,5 +1,5 @@
<template>
<import from='./nav-bar'></import>
<require from='./nav-bar'></require>

<nav-bar router.bind="router"></nav-bar>

Expand Down
4 changes: 2 additions & 2 deletions dist/app.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/child-router.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion index.html
View file
Expand Up @@ -14,7 +14,6 @@
<script src="jspm_packages/system.js"></script>
<script src="config.js"></script>
<script>
System.baseUrl = 'dist'; //NOTE: You can move this into the config.js file, if you like.
System.import('aurelia-bootstrapper');
</script>
</body>
Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Expand Up @@ -47,11 +47,11 @@
},
"jspm": {
"dependencies": {
"aurelia-bootstrapper": "github:aurelia/bootstrapper@^0.9.5",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@^0.4.5",
"aurelia-framework": "github:aurelia/framework@^0.8.8",
"aurelia-http-client": "github:aurelia/http-client@^0.5.5",
"aurelia-router": "github:aurelia/router@^0.5.8",
"aurelia-bootstrapper": "github:aurelia/bootstrapper@^0.10.0",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@^0.5.0",
"aurelia-framework": "github:aurelia/framework@^0.9.0",
"aurelia-http-client": "github:aurelia/http-client@^0.6.0",
"aurelia-router": "github:aurelia/router@^0.6.0",
"bootstrap": "github:twbs/bootstrap@^3.3.1",
"font-awesome": "npm:font-awesome@^4.3.0"
}
Expand Down
2 changes: 1 addition & 1 deletion src/app.html
View file
@@ -1,5 +1,5 @@
<template>
<import from='./nav-bar'></import>
<require from='./nav-bar'></require>

<nav-bar router.bind="router"></nav-bar>

Expand Down
6 changes: 3 additions & 3 deletions src/app.js
View file
Expand Up @@ -8,9 +8,9 @@ export class App {
this.router.configure(config => {
config.title = 'Aurelia';
config.map([
{ route: ['','welcome'], moduleId: 'welcome', nav: true, title:'Welcome' },
{ route: 'flickr', moduleId: 'flickr', nav: true },
{ route: 'child-router', moduleId: 'child-router', nav: true, title:'Child Router' }
{ route: ['','welcome'], moduleId: './welcome', nav: true, title:'Welcome' },
{ route: 'flickr', moduleId: './flickr', nav: true },
{ route: 'child-router', moduleId: './child-router', nav: true, title:'Child Router' }
]);
});
}
Expand Down
6 changes: 3 additions & 3 deletions src/child-router.js
View file
Expand Up @@ -7,9 +7,9 @@ export class ChildRouter{
this.router = router;
router.configure(config => {
config.map([
{ route: ['','welcome'], moduleId: 'welcome', nav: true, title:'Welcome' },
{ route: 'flickr', moduleId: 'flickr', nav: true },
{ route: 'child-router', moduleId: 'child-router', nav: true, title:'Child Router' }
{ route: ['','welcome'], moduleId: './welcome', nav: true, title:'Welcome' },
{ route: 'flickr', moduleId: './flickr', nav: true },
{ route: 'child-router', moduleId: './child-router', nav: true, title:'Child Router' }
]);
});
}
Expand Down

0 comments on commit 8637820

Please sign in to comment.