Skip to content
This repository was archived by the owner on Apr 18, 2025. It is now read-only.

Commit 5f144e7

Browse files
authored
Update dependencies (#63)
* Update node.js version on travis-ci * Update client * Fix lint warnings * Update server
1 parent 3a36f41 commit 5f144e7

15 files changed

+81
-59
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ addons:
1010

1111
language: node_js
1212
node_js:
13-
- "6"
14-
- "7"
13+
- "8"
1514

1615
services:
1716
- postgresql

client/.angular-cli.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
}
5252
},
5353
"defaults": {
54-
"styleExt": "css",
54+
"styleExt": "scss",
5555
"component": {}
5656
}
5757
}

client/e2e/app.po.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { browser, element, by } from 'protractor';
1+
import { browser, by, element } from 'protractor';
22

33
export class ClientPage {
44
navigateTo() {

client/e2e/tsconfig.e2e.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
"extends": "../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
5+
"baseUrl": "./",
56
"module": "commonjs",
67
"target": "es5",
7-
"types":[
8+
"types": [
89
"jasmine",
10+
"jasminewd2",
911
"node"
1012
]
1113
}

client/karma.conf.js

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ module.exports = function (config) {
1212
require('karma-coverage-istanbul-reporter'),
1313
require('@angular/cli/plugins/karma')
1414
],
15-
client:{
16-
clearContext: false // leave Jasmine Spec Runner output visible in browser
17-
},
1815
files: [{
1916
pattern: './node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
2017
included: true,
@@ -23,11 +20,8 @@ module.exports = function (config) {
2320
pattern: './src/test.ts',
2421
watched: false
2522
}],
26-
preprocessors: {
27-
'./src/test.ts': ['@angular/cli']
28-
},
29-
mime: {
30-
'text/x-typescript': ['ts','tsx']
23+
client:{
24+
clearContext: false // leave Jasmine Spec Runner output visible in browser
3125
},
3226
coverageIstanbulReporter: {
3327
reports: [ 'html', 'lcovonly' ],
@@ -36,9 +30,7 @@ module.exports = function (config) {
3630
angularCli: {
3731
environment: 'dev'
3832
},
39-
reporters: config.angularCli && config.angularCli.codeCoverage
40-
? ['progress', 'coverage-istanbul']
41-
: ['progress', 'kjhtml'],
33+
reporters: ['progress', 'kjhtml'],
4234
port: 9876,
4335
colors: true,
4436
logLevel: config.LOG_INFO,

client/package.json

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"private": false,
1515
"dependencies": {
16-
"@angular/animations": "^4.2.5",
16+
"@angular/animations": "^4.3.0",
1717
"@angular/common": "^4.0.0",
1818
"@angular/compiler": "^4.0.0",
1919
"@angular/core": "^4.0.0",
@@ -24,37 +24,38 @@
2424
"@angular/platform-browser-dynamic": "^4.0.0",
2525
"@angular/router": "^4.0.0",
2626
"@ngrx/core": "^1.2.0",
27-
"@ngrx/effects": "^2.0.3",
28-
"@ngrx/store": "^2.2.2",
29-
"@ngrx/store-devtools": "^3.2.4",
27+
"@ngrx/effects": "^2.0.4",
28+
"@ngrx/store": "^2.2.3",
3029
"core-js": "^2.4.1",
3130
"hammerjs": "^2.0.8",
3231
"reselect": "^3.0.1",
33-
"rxjs": "^5.4.2",
32+
"rxjs": "^5.1.0",
3433
"zone.js": "^0.8.4"
3534
},
3635
"devDependencies": {
3736
"@angular/cdk": "^2.0.0-beta.8",
38-
"@angular/cli": "1.0.2",
37+
"@angular/cli": "1.2.1",
3938
"@angular/compiler-cli": "^4.0.0",
39+
"@angular/language-service": "^4.0.0",
4040
"@ngrx/store-devtools": "^3.2.4",
4141
"@types/hammerjs": "^2.0.34",
42-
"@types/jasmine": "2.5.38",
42+
"@types/jasmine": "~2.5.53",
43+
"@types/jasminewd2": "~2.0.2",
4344
"@types/node": "~6.0.60",
44-
"codelyzer": "~2.0.0",
45-
"jasmine-core": "~2.5.2",
46-
"jasmine-spec-reporter": "~3.2.0",
47-
"karma": "~1.4.1",
48-
"karma-chrome-launcher": "~2.0.0",
45+
"codelyzer": "~3.0.1",
46+
"jasmine-core": "~2.6.2",
47+
"jasmine-spec-reporter": "~4.1.0",
48+
"karma": "~1.7.0",
49+
"karma-chrome-launcher": "~2.1.1",
4950
"karma-cli": "~1.0.1",
50-
"karma-coverage-istanbul-reporter": "^0.2.0",
51+
"karma-coverage-istanbul-reporter": "^1.2.1",
5152
"karma-jasmine": "~1.1.0",
5253
"karma-jasmine-html-reporter": "^0.2.2",
5354
"ngrx-store-freeze": "^0.1.9",
54-
"protractor": "~5.1.0",
55-
"sw-precache": "^5.1.1",
56-
"ts-node": "~2.0.0",
57-
"tslint": "~4.5.0",
58-
"typescript": "~2.2.0"
55+
"protractor": "~5.1.2",
56+
"sw-precache": "^5.2.0",
57+
"ts-node": "~3.0.4",
58+
"tslint": "~5.3.2",
59+
"typescript": "~2.3.3"
5960
}
6061
}

client/protractor.conf.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@ exports.config = {
1919
defaultTimeoutInterval: 30000,
2020
print: function() {}
2121
},
22-
beforeLaunch: function() {
22+
onPrepare() {
2323
require('ts-node').register({
2424
project: 'e2e/tsconfig.e2e.json'
2525
});
26-
},
27-
onPrepare() {
2826
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
2927
}
3028
};

client/src/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!doctype html>
2-
<html>
2+
<html lang="en">
33
<head>
44
<meta charset="utf-8">
55
<title>Client</title>

client/src/polyfills.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@
3131
// import 'core-js/es6/array';
3232
// import 'core-js/es6/regexp';
3333
// import 'core-js/es6/map';
34+
// import 'core-js/es6/weak-map';
3435
// import 'core-js/es6/set';
3536

3637
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
3738
// import 'classlist.js'; // Run `npm install --save classlist.js`.
3839

39-
/** IE10 and IE11 requires the following to support `@angular/animation`. */
40-
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
41-
42-
4340
/** Evergreen browsers require these. **/
4441
import 'core-js/es6/reflect';
4542
import 'core-js/es7/reflect';
4643

4744

48-
/** ALL Firefox browsers require the following to support `@angular/animation`. **/
45+
/**
46+
* Required to support Web Animations `@angular/animation`.
47+
* Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
48+
**/
4949
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
5050

5151

@@ -66,3 +66,7 @@ import 'zone.js/dist/zone'; // Included with Angular CLI.
6666
* Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
6767
*/
6868
// import 'intl'; // Run `npm install --save intl`.
69+
/**
70+
* Need to import at least one locale-data with intl.
71+
*/
72+
// import 'intl/locale-data/jsonp/en';

client/src/test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import {
1313
} from '@angular/platform-browser-dynamic/testing';
1414

1515
// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
16-
declare var __karma__: any;
17-
declare var require: any;
16+
declare const __karma__: any;
17+
declare const require: any;
1818

1919
// Prevent Karma from running prematurely.
2020
__karma__.loaded = function () {};

0 commit comments

Comments
 (0)