Skip to content

Commit 5ff459e

Browse files
alan-agius4dylhunn
alan-agius4
authored and
dylhunn
committed
test: remove defaultProject workspace option (angular#45410)
The `defaultProject` workspace option has been deprecated. The project to use will be determined from the current working directory. See: angular/angular-cli#22852 PR Close angular#45410
1 parent 85782e6 commit 5ff459e

File tree

13 files changed

+94
-260
lines changed

13 files changed

+94
-260
lines changed

‎integration/animations/angular.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,5 @@
136136
}
137137
}
138138
}
139-
},
140-
"defaultProject": "animations"
139+
}
141140
}

‎integration/cli-elements-universal/angular.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,5 @@
163163
}
164164
}
165165
}
166-
},
167-
"defaultProject": "cli-elements-universal"
166+
}
168167
}

‎integration/cli-hello-world-ivy-compat/angular.json‎

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,8 @@
1919
"polyfills": "src/polyfills.ts",
2020
"tsConfig": "tsconfig.app.json",
2121
"aot": true,
22-
"assets": [
23-
"src/favicon.ico",
24-
"src/assets"
25-
],
26-
"styles": [
27-
"src/styles.css"
28-
],
22+
"assets": ["src/favicon.ico", "src/assets"],
23+
"styles": ["src/styles.css"],
2924
"scripts": [],
3025
"progress": false
3126
},
@@ -68,10 +63,9 @@
6863
"production": {
6964
"browserTarget": "cli-hello-world-ivy-compat:build:production"
7065
},
71-
"ci": {
72-
},
66+
"ci": {},
7367
"ci-production": {
74-
"browserTarget": "cli-hello-world-ivy-compat:build:production",
68+
"browserTarget": "cli-hello-world-ivy-compat:build:production"
7569
}
7670
}
7771
},
@@ -88,13 +82,8 @@
8882
"polyfills": "src/polyfills.ts",
8983
"tsConfig": "tsconfig.spec.json",
9084
"karmaConfig": "karma.conf.js",
91-
"assets": [
92-
"src/favicon.ico",
93-
"src/assets"
94-
],
95-
"styles": [
96-
"src/styles.css"
97-
],
85+
"assets": ["src/favicon.ico", "src/assets"],
86+
"styles": ["src/styles.css"],
9887
"scripts": [],
9988
"progress": false,
10089
"watch": false
@@ -103,14 +92,8 @@
10392
"lint": {
10493
"builder": "@angular-devkit/build-angular:tslint",
10594
"options": {
106-
"tsConfig": [
107-
"tsconfig.app.json",
108-
"tsconfig.spec.json",
109-
"e2e/tsconfig.json"
110-
],
111-
"exclude": [
112-
"**/node_modules/**"
113-
]
95+
"tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"],
96+
"exclude": ["**/node_modules/**"]
11497
}
11598
},
11699
"e2e": {
@@ -133,6 +116,6 @@
133116
}
134117
}
135118
}
136-
}},
137-
"defaultProject": "cli-hello-world-ivy-compat"
119+
}
120+
}
138121
}

‎integration/cli-hello-world-ivy-i18n/angular.json‎

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,8 @@
2525
"main": "src/main.ts",
2626
"polyfills": "src/polyfills.ts",
2727
"tsConfig": "tsconfig.app.json",
28-
"assets": [
29-
"src/favicon.ico",
30-
"src/assets"
31-
],
32-
"styles": [
33-
"src/styles.css"
34-
],
28+
"assets": ["src/favicon.ico", "src/assets"],
29+
"styles": ["src/styles.css"],
3530
"scripts": [],
3631
"progress": false,
3732
"i18nMissingTranslation": "error"
@@ -106,13 +101,8 @@
106101
"polyfills": "src/polyfills.ts",
107102
"tsConfig": "tsconfig.spec.json",
108103
"karmaConfig": "karma.conf.js",
109-
"assets": [
110-
"src/favicon.ico",
111-
"src/assets"
112-
],
113-
"styles": [
114-
"src/styles.css"
115-
],
104+
"assets": ["src/favicon.ico", "src/assets"],
105+
"styles": ["src/styles.css"],
116106
"scripts": [],
117107
"progress": false,
118108
"watch": false
@@ -121,14 +111,8 @@
121111
"lint": {
122112
"builder": "@angular-devkit/build-angular:tslint",
123113
"options": {
124-
"tsConfig": [
125-
"tsconfig.app.json",
126-
"tsconfig.spec.json",
127-
"e2e/tsconfig.json"
128-
],
129-
"exclude": [
130-
"**/node_modules/**"
131-
]
114+
"tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"],
115+
"exclude": ["**/node_modules/**"]
132116
}
133117
},
134118
"e2e": {
@@ -149,12 +133,12 @@
149133
"specs": ["./fr/app.e2e-spec.ts"]
150134
},
151135
"de": {
152-
"devServerTarget": "cli-hello-world-ivy-i18n:serve:de",
136+
"devServerTarget": "cli-hello-world-ivy-i18n:serve:de",
153137
"specs": ["./de/app.e2e-spec.ts"]
154138
}
155139
}
156140
}
157141
}
158-
}},
159-
"defaultProject": "cli-hello-world-ivy-i18n"
142+
}
143+
}
160144
}

‎integration/cli-hello-world-ivy-minimal/angular.json‎

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,8 @@
1919
"polyfills": "src/polyfills.ts",
2020
"tsConfig": "tsconfig.app.json",
2121
"aot": true,
22-
"assets": [
23-
"src/favicon.ico",
24-
"src/assets"
25-
],
26-
"styles": [
27-
"src/styles.css"
28-
],
22+
"assets": ["src/favicon.ico", "src/assets"],
23+
"styles": ["src/styles.css"],
2924
"scripts": [],
3025
"progress": false
3126
},
@@ -68,10 +63,9 @@
6863
"production": {
6964
"browserTarget": "cli-hello-world-ivy-minimal:build:production"
7065
},
71-
"ci": {
72-
},
66+
"ci": {},
7367
"ci-production": {
74-
"browserTarget": "cli-hello-world-ivy-minimal:build:production",
68+
"browserTarget": "cli-hello-world-ivy-minimal:build:production"
7569
}
7670
}
7771
},
@@ -88,13 +82,8 @@
8882
"polyfills": "src/polyfills.ts",
8983
"tsConfig": "tsconfig.spec.json",
9084
"karmaConfig": "karma.conf.js",
91-
"assets": [
92-
"src/favicon.ico",
93-
"src/assets"
94-
],
95-
"styles": [
96-
"src/styles.css"
97-
],
85+
"assets": ["src/favicon.ico", "src/assets"],
86+
"styles": ["src/styles.css"],
9887
"scripts": [],
9988
"progress": false,
10089
"watch": false
@@ -103,14 +92,8 @@
10392
"lint": {
10493
"builder": "@angular-devkit/build-angular:tslint",
10594
"options": {
106-
"tsConfig": [
107-
"tsconfig.app.json",
108-
"tsconfig.spec.json",
109-
"e2e/tsconfig.json"
110-
],
111-
"exclude": [
112-
"**/node_modules/**"
113-
]
95+
"tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"],
96+
"exclude": ["**/node_modules/**"]
11497
}
11598
},
11699
"e2e": {
@@ -133,6 +116,6 @@
133116
}
134117
}
135118
}
136-
}},
137-
"defaultProject": "cli-hello-world-ivy-minimal"
119+
}
120+
}
138121
}

‎integration/cli-hello-world-lazy/angular.json‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,8 @@
2020
"polyfills": "src/polyfills.ts",
2121
"tsConfig": "tsconfig.app.json",
2222
"aot": true,
23-
"assets": [
24-
"src/favicon.ico",
25-
"src/assets"
26-
],
27-
"styles": [
28-
"src/styles.css"
29-
],
23+
"assets": ["src/favicon.ico", "src/assets"],
24+
"styles": ["src/styles.css"],
3025
"scripts": [],
3126
"progress": false
3227
},
@@ -83,27 +78,16 @@
8378
"polyfills": "src/polyfills.ts",
8479
"tsConfig": "tsconfig.spec.json",
8580
"karmaConfig": "karma.conf.js",
86-
"assets": [
87-
"src/favicon.ico",
88-
"src/assets"
89-
],
90-
"styles": [
91-
"src/styles.css"
92-
],
81+
"assets": ["src/favicon.ico", "src/assets"],
82+
"styles": ["src/styles.css"],
9383
"scripts": []
9484
}
9585
},
9686
"lint": {
9787
"builder": "@angular-devkit/build-angular:tslint",
9888
"options": {
99-
"tsConfig": [
100-
"tsconfig.app.json",
101-
"tsconfig.spec.json",
102-
"e2e/tsconfig.json"
103-
],
104-
"exclude": [
105-
"**/node_modules/**"
106-
]
89+
"tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"],
90+
"exclude": ["**/node_modules/**"]
10791
}
10892
},
10993
"e2e": {
@@ -120,6 +104,6 @@
120104
}
121105
}
122106
}
123-
}},
124-
"defaultProject": "cli-hello-world-lazy"
107+
}
108+
}
125109
}

‎integration/cli-hello-world-mocha/angular.json‎

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,8 @@
1919
"polyfills": "src/polyfills.ts",
2020
"tsConfig": "tsconfig.app.json",
2121
"aot": true,
22-
"assets": [
23-
"src/favicon.ico",
24-
"src/assets"
25-
],
26-
"styles": [
27-
"src/styles.css"
28-
],
22+
"assets": ["src/favicon.ico", "src/assets"],
23+
"styles": ["src/styles.css"],
2924
"scripts": [],
3025
"progress": false
3126
},
@@ -71,10 +66,9 @@
7166
"production": {
7267
"browserTarget": "cli-hello-world:build:production"
7368
},
74-
"ci": {
75-
},
69+
"ci": {},
7670
"ci-production": {
77-
"browserTarget": "cli-hello-world:build:production",
71+
"browserTarget": "cli-hello-world:build:production"
7872
}
7973
}
8074
},
@@ -91,13 +85,8 @@
9185
"polyfills": "src/polyfills.ts",
9286
"tsConfig": "tsconfig.spec.json",
9387
"karmaConfig": "karma.conf.js",
94-
"assets": [
95-
"src/favicon.ico",
96-
"src/assets"
97-
],
98-
"styles": [
99-
"src/styles.css"
100-
],
88+
"assets": ["src/favicon.ico", "src/assets"],
89+
"styles": ["src/styles.css"],
10190
"scripts": [],
10291
"progress": false,
10392
"watch": false
@@ -106,14 +95,8 @@
10695
"lint": {
10796
"builder": "@angular-devkit/build-angular:tslint",
10897
"options": {
109-
"tsConfig": [
110-
"tsconfig.app.json",
111-
"tsconfig.spec.json",
112-
"e2e/tsconfig.json"
113-
],
114-
"exclude": [
115-
"**/node_modules/**"
116-
]
98+
"tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"],
99+
"exclude": ["**/node_modules/**"]
117100
}
118101
},
119102
"e2e": {
@@ -136,6 +119,6 @@
136119
}
137120
}
138121
}
139-
}},
140-
"defaultProject": "cli-hello-world"
122+
}
123+
}
141124
}

0 commit comments

Comments
 (0)