Skip to content

Commit b47b503

Browse files
committed
Merge branch 'feature/dependency-update' into develop
2 parents da8f621 + ad48ae2 commit b47b503

File tree

8 files changed

+1926
-1531
lines changed

8 files changed

+1926
-1531
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
"expose-loader": "^0.7.3",
101101
"extract-text-webpack-plugin": "^3.0.0",
102102
"favicons-webpack-plugin": "^0.0.7",
103-
"file-loader": "^0.11.2",
103+
"file-loader": "^1.1.5",
104104
"html-webpack-plugin": "^2.30.1",
105105
"http-server": "^0.10.0",
106106
"img-loader": "^2.0.0",
@@ -123,14 +123,14 @@
123123
"postcss-loader": "^2.0.6",
124124
"protractor": "^5.1.2",
125125
"sass-loader": "^6.0.6",
126-
"style-loader": "^0.18.2",
126+
"style-loader": "^0.19.0",
127127
"ts-jest": "^20.0.14",
128128
"ts-node": "^3.3.0",
129129
"tslib": "^1.7.1",
130130
"tslint": "^5.7.0",
131131
"tslint-loader": "^3.5.3",
132132
"typescript": "^2.5.2",
133-
"url-loader": "^0.5.9",
133+
"url-loader": "^0.6.2",
134134
"wait-on": "^2.0.2",
135135
"webpack": "^3.5.5",
136136
"webpack-dev-server": "^2.7.1",
@@ -144,15 +144,15 @@
144144
"aurelia-fetch-client": "^1.1.3",
145145
"aurelia-framework": "^1.1.4",
146146
"aurelia-history-browser": "^1.0.0",
147-
"aurelia-i18n": "^1.6.2",
147+
"aurelia-i18n": "^2.0.0",
148148
"aurelia-loader-webpack": "^2.1.0",
149149
"aurelia-logging-console": "^1.0.0",
150150
"aurelia-pal-browser": "^1.2.1",
151151
"aurelia-polyfills": "^1.2.2",
152152
"aurelia-router": "^1.3.0",
153153
"aurelia-templating": "^1.4.2",
154154
"aurelia-templating-binding": "^1.3.0",
155-
"aurelia-templating-resources": "^1.4.0",
155+
"aurelia-templating-resources": "^1.5.4",
156156
"aurelia-templating-router": "^1.1.0",
157157
"aurelia-validation": "^1.1.1",
158158
"bluebird": "^3.5.0",

src/app/main.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ export async function configure(aurelia: Aurelia): Promise<void> {
6666
'de-DE': ['de-CH', 'en-US'],
6767
'default': ['en-US']
6868
},
69+
lng: 'en-US',
6970
debug: false,
7071
detection: {
7172
order: ['localStorage', 'navigator'],

test/jest-pretest.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'aurelia-polyfills';
22
import 'isomorphic-fetch';
33
import {Options} from 'aurelia-loader-nodejs';
4-
import {globalize} from 'aurelia-pal-nodejs';
4+
import {initialize} from 'aurelia-pal-nodejs';
55
import * as path from 'path';
66
Options.relativeToDir = path.join(__dirname, 'unit');
7-
globalize();
7+
initialize();

test/unit/app.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ describe('the App module', () => {
8989
expect(sut.router.routes).toContainEqual({
9090
route: 'users',
9191
name: 'users',
92-
moduleId: './modules/users/users.vm',
92+
moduleId: PLATFORM.moduleName('./modules/users/users.vm'),
9393
nav: true,
9494
title: 'Github Users'
9595
});
@@ -99,7 +99,7 @@ describe('the App module', () => {
9999
expect(sut.router.routes).toContainEqual({
100100
route: 'child-router',
101101
name: 'child-router',
102-
moduleId: './modules/child-router/child-router.vm',
102+
moduleId: PLATFORM.moduleName('./modules/child-router/child-router.vm'),
103103
nav: true,
104104
title: 'Child Router'
105105
});

test/unit/child-router.spec.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { PLATFORM } from 'aurelia-framework';
2+
13
import { ChildRouterViewModel } from '../../src/app/modules/child-router/child-router.vm';
24

35
class RouterStub {
@@ -34,7 +36,7 @@ describe('the Child Router module', () => {
3436
expect(sut.router.routes).toContainEqual({
3537
route: ['', 'welcome'],
3638
name: 'welcome',
37-
moduleId: './../welcome/welcome.vm',
39+
moduleId: PLATFORM.moduleName('./../welcome/welcome.vm'),
3840
nav: true,
3941
title: 'Welcome'
4042
});
@@ -44,7 +46,7 @@ describe('the Child Router module', () => {
4446
expect(sut.router.routes).toContainEqual({
4547
route: 'users',
4648
name: 'users',
47-
moduleId: './../users/users.vm',
49+
moduleId: PLATFORM.moduleName('./../users/users.vm'),
4850
nav: true,
4951
title: 'Github Users'
5052
});
@@ -54,7 +56,7 @@ describe('the Child Router module', () => {
5456
expect(sut.router.routes).toContainEqual({
5557
route: 'child-router',
5658
name: 'child-router',
57-
moduleId: './../child-router/child-router.vm',
59+
moduleId: PLATFORM.moduleName('./../child-router/child-router.vm'),
5860
nav: true,
5961
title: 'Child Router'
6062
});

test/unit/welcome.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { bootstrap } from 'aurelia-bootstrapper';
22
import { StageComponent } from 'aurelia-testing';
3-
import { PLATFORM } from 'aurelia-pal';
3+
import { PLATFORM } from 'aurelia-framework';
44

55
describe('WelcomeComponent', () => {
66
let component;

tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"compileOnSave": false,
23
"compilerOptions": {
34
"target": "es5",
45
"module": "es6",

0 commit comments

Comments
 (0)