Skip to content

Commit 34d97d2

Browse files
Update Ionic to v6 (ionic-team#1752)
1 parent bc53030 commit 34d97d2

27 files changed

+31658
-10604
lines changed
File renamed without changes.

.eslintrc.json

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"root": true,
3+
"ignorePatterns": [
4+
"projects/**/*"
5+
],
6+
"overrides": [
7+
{
8+
"files": [
9+
"*.ts"
10+
],
11+
"parserOptions": {
12+
"project": [
13+
"tsconfig.json",
14+
"e2e/tsconfig.json"
15+
],
16+
"createDefaultProgram": true
17+
},
18+
"extends": [
19+
"plugin:@angular-eslint/recommended",
20+
"plugin:@angular-eslint/template/process-inline-templates"
21+
],
22+
"rules": {
23+
"@angular-eslint/directive-selector": [
24+
"error",
25+
{
26+
"type": "attribute",
27+
"prefix": "app",
28+
"style": "camelCase"
29+
}
30+
],
31+
"@angular-eslint/component-class-suffix": "off"
32+
}
33+
},
34+
{
35+
"files": [
36+
"*.html"
37+
],
38+
"extends": [
39+
"plugin:@angular-eslint/template/recommended"
40+
],
41+
"rules": {}
42+
}
43+
]
44+
}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/.angular/cache
12
# Specifies intentionally untracked files to ignore when using Git
23
# http://git-scm.com/docs/gitignore
34
www/

angular.json

Lines changed: 38 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,21 @@
3333
],
3434
"styles": [
3535
{
36-
"input": "src/theme/variables.scss"
36+
"input": "src/theme/variables.scss",
37+
"inject": true
3738
},
3839
{
39-
"input": "src/global.scss"
40+
"input": "src/global.scss",
41+
"inject": true
4042
}
4143
],
42-
"scripts": []
44+
"scripts": [],
45+
"vendorChunk": true,
46+
"extractLicenses": false,
47+
"buildOptimizer": false,
48+
"sourceMap": true,
49+
"optimization": false,
50+
"namedChunks": true
4351
},
4452
"configurations": {
4553
"production": {
@@ -52,9 +60,7 @@
5260
"optimization": true,
5361
"outputHashing": "all",
5462
"sourceMap": false,
55-
"extractCss": true,
5663
"namedChunks": false,
57-
"aot": true,
5864
"extractLicenses": true,
5965
"vendorChunk": false,
6066
"buildOptimizer": true,
@@ -64,13 +70,24 @@
6470
"type": "initial",
6571
"maximumWarning": "2mb",
6672
"maximumError": "5mb"
73+
},
74+
{
75+
"type": "anyComponentStyle",
76+
"maximumWarning": "6kb"
6777
}
6878
]
6979
},
7080
"ci": {
81+
"budgets": [
82+
{
83+
"type": "anyComponentStyle",
84+
"maximumWarning": "6kb"
85+
}
86+
],
7187
"progress": false
7288
}
73-
}
89+
},
90+
"defaultConfiguration": ""
7491
},
7592
"serve": {
7693
"builder": "@angular-devkit/build-angular:dev-server",
@@ -82,9 +99,7 @@
8299
"production": {
83100
"browserTarget": "app:build:production"
84101
},
85-
"ci": {
86-
"progress": false
87-
}
102+
"ci": {}
88103
}
89104
},
90105
"extract-i18n": {
@@ -102,10 +117,12 @@
102117
"karmaConfig": "src/karma.conf.js",
103118
"styles": [
104119
{
105-
"input": "src/theme/variables.scss"
120+
"input": "src/theme/variables.scss",
121+
"inject": true
106122
},
107123
{
108-
"input": "src/global.scss"
124+
"input": "src/global.scss",
125+
"inject": true
109126
}
110127
],
111128
"scripts": [],
@@ -129,17 +146,6 @@
129146
}
130147
}
131148
},
132-
"lint": {
133-
"builder": "@angular-devkit/build-angular:tslint",
134-
"options": {
135-
"tsConfig": [
136-
"tsconfig.app.json",
137-
"tsconfig.spec.json",
138-
"e2e/tsconfig.json"
139-
],
140-
"exclude": ["**/node_modules/**"]
141-
}
142-
},
143149
"e2e": {
144150
"builder": "@angular-devkit/build-angular:protractor",
145151
"options": {
@@ -178,12 +184,21 @@
178184
"devServerTarget": "app:serve:production"
179185
}
180186
}
187+
},
188+
"lint": {
189+
"builder": "@angular-eslint/builder:lint",
190+
"options": {
191+
"lintFilePatterns": [
192+
"src/**/*.ts",
193+
"src/**/*.html"
194+
]
195+
}
181196
}
182197
}
183198
}
184199
},
185200
"cli": {
186-
"defaultCollection": "@ionic/angular-toolkit"
201+
"defaultCollection": "@angular-eslint/schematics"
187202
},
188203
"schematics": {
189204
"@ionic/angular-toolkit:component": {

e2e/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"compilerOptions": {
44
"outDir": "../out-tsc/app",
55
"module": "commonjs",
6-
"target": "es5",
6+
"target": "es2018",
77
"types": [
88
"jasmine",
99
"jasminewd2",

0 commit comments

Comments
 (0)