Skip to content

Commit c22620a

Browse files
committed
Merge branch 'feature/Use_npm_typings' into develop
2 parents 239447f + 4e73e3a commit c22620a

File tree

20 files changed

+105
-4637
lines changed

20 files changed

+105
-4637
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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,7 +75,10 @@
7775
"mapCoverage": true
7876
},
7977
"devDependencies": {
78+
"@types/cordova": "^0.0.34",
79+
"@types/i18next-browser-languagedetector": "^0.0.31",
8080
"@types/jest": "^19.2.4",
81+
"@types/jquery": "^2.0.46",
8182
"@types/lodash": "^4.14.65",
8283
"@types/node": "^7.0.29",
8384
"@types/webpack": "^2.2.15",
@@ -129,7 +130,6 @@
129130
"tslint": "^5.4.3",
130131
"tslint-loader": "^3.5.3",
131132
"typescript": "^2.3.4",
132-
"typings": "^2.1.1",
133133
"url-loader": "^0.5.8",
134134
"wait-on": "^2.0.2",
135135
"webpack": "^2.6.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)