Skip to content

Commit 9dc3848

Browse files
committed
Merge branch 'release/6.0.0'
2 parents 69274ac + cc5f2ac commit 9dc3848

File tree

21 files changed

+634
-4809
lines changed

21 files changed

+634
-4809
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: node_js
22
node_js:
33
- "6.9.1"
44
install:
5-
- npm run install:dev
5+
- npm install
66
script:
77
- npm test
88
- npm start -- build

package.json

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aurelia-typescript-boilerplate",
3-
"version": "5.0.1",
3+
"version": "6.0.0",
44
"title": "Aurelia Typescript Boilerplate",
55
"description": "A starter kit for building a standard navigation-style app with Aurelia and Webpack.",
66
"main": "dist/app.bundle.js",
@@ -35,9 +35,7 @@
3535
},
3636
"scripts": {
3737
"start": "nps",
38-
"test": "nps test",
39-
"install:dev": "npm i && npm run install:typings",
40-
"install:typings": "./node_modules/.bin/typings i"
38+
"test": "nps test"
4139
},
4240
"jest": {
4341
"modulePaths": [
@@ -77,10 +75,13 @@
7775
"mapCoverage": true
7876
},
7977
"devDependencies": {
80-
"@types/jest": "^19.2.3",
81-
"@types/lodash": "^4.14.64",
82-
"@types/node": "^7.0.21",
83-
"@types/webpack": "^2.2.15",
78+
"@types/cordova": "^0.0.34",
79+
"@types/i18next-browser-languagedetector": "^0.0.31",
80+
"@types/jest": "^20.0.2",
81+
"@types/jquery": "^2.0.46",
82+
"@types/lodash": "^4.14.66",
83+
"@types/node": "^8.0.2",
84+
"@types/webpack": "^3.0.0",
8485
"aurelia-loader-nodejs": "^1.0.1",
8586
"aurelia-pal-nodejs": "1.0.0-beta.1.0.0",
8687
"aurelia-protractor-plugin": "^1.0.3",
@@ -89,51 +90,50 @@
8990
"aurelia-webpack-plugin": "^2.0.0-rc.2",
9091
"autoprefixer": "^7.1.1",
9192
"awesome-typescript-loader": "^3.1.3",
92-
"case-sensitive-paths-webpack-plugin": "^2.0.0",
93+
"case-sensitive-paths-webpack-plugin": "^2.1.1",
9394
"chalk": "^1.1.3",
9495
"compression-webpack-plugin": "^0.4.0",
9596
"copy-webpack-plugin": "^4.0.1",
9697
"cordova": "^7.0.1",
97-
"cross-env": "^5.0.0",
98-
"css-loader": "^0.28.1",
98+
"cross-env": "^5.0.1",
99+
"css-loader": "^0.28.4",
99100
"expose-loader": "^0.7.3",
100-
"extract-text-webpack-plugin": "^2.1.0",
101+
"extract-text-webpack-plugin": "^2.1.2",
101102
"favicons-webpack-plugin": "^0.0.7",
102-
"file-loader": "^0.11.1",
103-
"html-webpack-plugin": "^2.28.0",
103+
"file-loader": "^0.11.2",
104+
"html-webpack-plugin": "^2.29.0",
104105
"http-server": "^0.10.0",
105106
"img-loader": "^2.0.0",
106107
"istanbul-instrumenter-loader": "^2.0.0",
107-
"jasmine-core": "^2.6.2",
108-
"jest": "^20.0.3",
109-
"jest-cli": "^20.0.3",
108+
"jasmine-core": "^2.6.4",
109+
"jest": "^20.0.4",
110+
"jest-cli": "^20.0.4",
110111
"json-loader": "^0.5.4",
111112
"karma": "^1.7.0",
112-
"karma-chrome-launcher": "^2.1.1",
113-
"karma-coverage-istanbul-reporter": "^1.2.1",
113+
"karma-chrome-launcher": "^2.2.0",
114+
"karma-coverage-istanbul-reporter": "^1.3.0",
114115
"karma-jasmine": "^1.1.0",
115116
"karma-mocha-reporter": "^2.2.3",
116117
"karma-webpack": "^2.0.3",
117118
"loader-utils": "^1.1.0",
118119
"ncp": "^2.0.0",
119120
"node-sass": "^4.5.3",
120-
"nps": "^5.2.0",
121+
"nps": "^5.3.2",
121122
"nps-utils": "^1.2.0",
122-
"postcss-loader": "^2.0.5",
123+
"postcss-loader": "^2.0.6",
123124
"protractor": "^5.1.2",
124-
"sass-loader": "^6.0.5",
125-
"style-loader": "^0.17.0",
126-
"ts-jest": "^20.0.4",
127-
"ts-node": "^3.0.4",
125+
"sass-loader": "^6.0.6",
126+
"style-loader": "^0.18.2",
127+
"ts-jest": "^20.0.6",
128+
"ts-node": "^3.1.0",
128129
"tslib": "^1.7.1",
129-
"tslint": "^5.2.0",
130+
"tslint": "^5.4.3",
130131
"tslint-loader": "^3.5.3",
131-
"typescript": "^2.3.2",
132-
"typings": "^2.1.1",
133-
"url-loader": "^0.5.8",
132+
"typescript": "^2.3.4",
133+
"url-loader": "^0.5.9",
134134
"wait-on": "^2.0.2",
135-
"webpack": "^2.5.1",
136-
"webpack-dev-server": "^2.4.5",
135+
"webpack": "^3.0.0",
136+
"webpack-dev-server": "^2.5.0",
137137
"webpack-notifier": "^1.5.0"
138138
},
139139
"dependencies": {
@@ -144,7 +144,7 @@
144144
"aurelia-fetch-client": "^1.1.2",
145145
"aurelia-framework": "^1.1.2",
146146
"aurelia-history-browser": "^1.0.0",
147-
"aurelia-i18n": "^1.6.0",
147+
"aurelia-i18n": "^1.6.1",
148148
"aurelia-loader-webpack": "^2.1.0",
149149
"aurelia-logging-console": "^1.0.0",
150150
"aurelia-pal-browser": "^1.2.1",
@@ -158,7 +158,7 @@
158158
"bluebird": "^3.5.0",
159159
"bootstrap-sass": "^3.3.7",
160160
"font-awesome": "^4.7.0",
161-
"i18next-browser-languagedetector": "^1.0.1",
161+
"i18next-browser-languagedetector": "^2.0.0",
162162
"isomorphic-fetch": "^2.2.1",
163163
"jquery": "^3.2.1",
164164
"moment": "^2.18.1"

src/app/app.vm.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Lazy, inject, PLATFORM } from 'aurelia-framework';
22
import { Router, RouterConfiguration } from 'aurelia-router';
33
import { I18N } from 'aurelia-i18n';
44
import { HttpClient } from 'aurelia-fetch-client';
5-
import * as moment from 'moment';
5+
import moment from 'moment';
66

77
import { LogManager, Logger} from './services/logger.service';
88
import { AppConfigService } from './services/app-config.service';

src/app/modules/welcome/welcome.vm.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h3>Custom global attribute</h3>
2424
<div red-square></div>
2525

2626
<h3>Global value converter</h3>
27-
<p>${currentDate | dateFormat}</p>
27+
<p>${currentDate | dateFormat & signal:'locale:changed'}</p>
2828

2929
<h3>Switch Language</h3>
3030
<button click.delegate="switchLanguage()" class="btn btn-primary">Click me!</button>

src/app/resources/converters/date-format.converter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as moment from 'moment';
1+
import moment from 'moment';
22

33
export class DateFormatValueConverter {
44
public toView(value: Date): string {

src/app/services/language.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { autoinject } from 'aurelia-framework';
22
import { I18N } from 'aurelia-i18n';
33
import { BindingSignaler } from 'aurelia-templating-resources';
4-
import * as moment from 'moment/moment';
4+
import moment from 'moment';
55

66
import { Logger, LogManager} from './logger.service';
77

tsconfig.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
// Be strict
1616
"alwaysStrict": true,
1717
"strict": true,
18-
"noImplicitAny": false
18+
"noImplicitAny": false,
19+
// For i18next and any other module with default export error
20+
"allowSyntheticDefaultImports": true
1921
},
2022
"exclude": [
2123
"node_modules",

typings.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

typings/globals/cordova/index.d.ts

Lines changed: 0 additions & 74 deletions
This file was deleted.

typings/globals/cordova/typings.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)