Skip to content

Commit c76ba65

Browse files
committed
upgraded to angular-material 5.2.1 and angular-cli 1.0.0-beta.19-3
1 parent 280685f commit c76ba65

File tree

7 files changed

+41
-22
lines changed

7 files changed

+41
-22
lines changed

Diff for: .editorconfig

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ root = true
55
charset = utf-8
66
indent_style = space
77
indent_size = 2
8-
end_of_line = lf
98
insert_final_newline = true
109
trim_trailing_whitespace = true
1110

Diff for: angular-cli.json

+18-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
{
22
"project": {
3-
"version": "1.0.0-beta.15",
3+
"version": "1.0.0-beta.19-3",
44
"name": "angular-example"
55
},
66
"apps": [
77
{
88
"root": "src",
99
"outDir": "dist",
10-
"assets": "assets",
10+
"assets": [
11+
"assets",
12+
"favicon.ico"
13+
],
1114
"index": "index.html",
1215
"main": "main.ts",
1316
"test": "test.ts",
@@ -42,6 +45,18 @@
4245
},
4346
"defaults": {
4447
"styleExt": "css",
45-
"prefixInterfaces": false
48+
"prefixInterfaces": false,
49+
"inline": {
50+
"style": false,
51+
"template": false
52+
},
53+
"spec": {
54+
"class": false,
55+
"component": true,
56+
"directive": true,
57+
"module": false,
58+
"pipe": true,
59+
"service": true
60+
}
4661
}
4762
}

Diff for: e2e/app.po.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { browser, element, by } from 'protractor/globals';
1+
import { browser, element, by } from 'protractor';
22

33
export class AngularExamplePage {
44
navigateTo() {

Diff for: karma.conf.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ module.exports = function (config) {
2727
config: './angular-cli.json',
2828
environment: 'dev'
2929
},
30-
reporters: ['progress', 'karma-remap-istanbul'],
30+
reporters: config.angularCli && config.angularCli.codeCoverage
31+
? ['progress', 'karma-remap-istanbul']
32+
: ['progress'],
3133
port: 9876,
3234
colors: true,
3335
logLevel: config.LOG_INFO,

Diff for: package.json

+15-13
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
},
1313
"private": true,
1414
"dependencies": {
15-
"@angular/common": "2.0.0",
16-
"@angular/compiler": "2.0.0",
17-
"@angular/core": "2.0.0",
18-
"@angular/forms": "2.0.0",
19-
"@angular/http": "2.0.0",
20-
"@angular/platform-browser": "2.0.0",
21-
"@angular/platform-browser-dynamic": "2.0.0",
22-
"@angular/router": "3.0.0",
23-
"angular2-materialize": "^5.1.4",
15+
"@angular/common": "~2.1.0",
16+
"@angular/compiler": "~2.1.0",
17+
"@angular/core": "~2.1.0",
18+
"@angular/forms": "~2.1.0",
19+
"@angular/http": "~2.1.0",
20+
"@angular/platform-browser": "~2.1.0",
21+
"@angular/platform-browser-dynamic": "~2.1.0",
22+
"@angular/router": "~3.1.0",
23+
"angular2-materialize": "^5.2.1",
2424
"core-js": "^2.4.1",
2525
"jquery": "^2.2.4",
2626
"materialize-css": "^0.97.7",
@@ -30,18 +30,20 @@
3030
},
3131
"devDependencies": {
3232
"@types/jasmine": "^2.2.30",
33-
"angular-cli": "1.0.0-beta.15",
34-
"codelyzer": "~0.0.26",
33+
"@types/node": "^6.0.42",
34+
"angular-cli": "1.0.0-beta.19-3",
35+
"codelyzer": "1.0.0-beta.1",
3536
"jasmine-core": "2.4.1",
3637
"jasmine-spec-reporter": "2.5.0",
3738
"karma": "1.2.0",
3839
"karma-chrome-launcher": "^2.0.0",
3940
"karma-cli": "^1.0.1",
4041
"karma-jasmine": "^1.0.2",
4142
"karma-remap-istanbul": "^0.2.1",
42-
"protractor": "4.0.5",
43+
"protractor": "4.0.9",
4344
"ts-node": "1.2.1",
4445
"tslint": "3.13.0",
45-
"typescript": "2.0.2"
46+
"typescript": "~2.0.3",
47+
"webdriver-manager": "10.2.5"
4648
}
4749
}

Diff for: src/typings.d.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Typings reference file, see links for more information
2-
// https://github.com/typings/typings
1+
// Typings reference file, you can add your own global typings here
32
// https://www.typescriptlang.org/docs/handbook/writing-declaration-files.html
43

54
declare var System: any;

Diff for: tslint.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@
107107
"use-life-cycle-interface": true,
108108
"use-pipe-transform-interface": true,
109109
"component-class-suffix": true,
110-
"directive-class-suffix": true
110+
"directive-class-suffix": true,
111+
"templates-use-public": true,
112+
"invoke-injectable": true
111113
}
112114
}

0 commit comments

Comments
 (0)