Skip to content

Commit ac3aff2

Browse files
alan-agius4dgp1130
authored andcommitted
refactor(@schematics/angular): remove deprecated options from app-shell and universal schematics
BREAKING CHANGE: The below options have been removed as they had no effect - `test` and `testTsconfigFileName` have been removed form the universal schematic - `universalProject`, `name`, `outDir`, `root` and `index` have been removed from the app-shell schematic
1 parent 0fd3c55 commit ac3aff2

File tree

4 files changed

+3
-77
lines changed

4 files changed

+3
-77
lines changed

packages/schematics/angular/app-shell/index.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,7 @@ function addUniversalTarget(options: AppShellOptions): Rule {
148148
};
149149

150150
// Delete non-universal options.
151-
delete universalOptions.universalProject;
152151
delete universalOptions.route;
153-
delete universalOptions.name;
154-
delete universalOptions.outDir;
155-
delete universalOptions.root;
156-
delete universalOptions.index;
157-
delete universalOptions.sourceDir;
158152

159153
return schematic('universal', universalOptions);
160154
};

packages/schematics/angular/app-shell/index_spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ describe('App Shell Schematic', () => {
1717
require.resolve('../collection.json'),
1818
);
1919
const defaultOptions: AppShellOptions = {
20-
name: 'foo',
2120
clientProject: 'bar',
2221
};
2322

packages/schematics/angular/app-shell/schema.json

Lines changed: 3 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -13,74 +13,23 @@
1313
"$source": "projectName"
1414
}
1515
},
16-
"universalProject": {
17-
"type": "string",
18-
"description": "The name of related Universal app.",
19-
"x-deprecated": "This option has no effect."
20-
},
2116
"route": {
2217
"type": "string",
2318
"description": "Route path used to produce the app shell.",
2419
"default": "shell"
2520
},
26-
"name": {
27-
"type": "string",
28-
"format": "html-selector",
29-
"description": "The HTML selector of the Universal app",
30-
"x-deprecated": "This option has no effect."
31-
},
3221
"appId": {
3322
"type": "string",
3423
"format": "html-selector",
3524
"description": "The app ID to use in withServerTransition().",
3625
"default": "serverApp"
3726
},
38-
"outDir": {
39-
"type": "string",
40-
"format": "path",
41-
"description": "The output directory for build results.",
42-
"default": "dist-server",
43-
"x-deprecated": "This option has no effect."
44-
},
45-
"root": {
46-
"type": "string",
47-
"format": "path",
48-
"description": "The root directory of the app.",
49-
"default": "src",
50-
"x-deprecated": "This option has no effect."
51-
},
52-
"index": {
53-
"type": "string",
54-
"format": "path",
55-
"description": "The name of the index file",
56-
"default": "index.html",
57-
"x-deprecated": "This option has no effect."
58-
},
5927
"main": {
6028
"type": "string",
6129
"format": "path",
6230
"description": "The name of the main entry-point file.",
6331
"default": "main.server.ts"
6432
},
65-
"test": {
66-
"type": "string",
67-
"format": "path",
68-
"description": "The name of the test entry-point file.",
69-
"x-deprecated": "This option has no effect."
70-
},
71-
"tsconfigFileName": {
72-
"type": "string",
73-
"format": "path",
74-
"default": "tsconfig.server",
75-
"description": "The name of the TypeScript configuration file."
76-
},
77-
"testTsconfigFileName": {
78-
"type": "string",
79-
"format": "path",
80-
"description": "The name of the TypeScript configuration file for tests.",
81-
"default": "tsconfig.spec",
82-
"x-deprecated": "This option has no effect."
83-
},
8433
"appDir": {
8534
"type": "string",
8635
"format": "path",
@@ -99,13 +48,10 @@
9948
"description": "The name of the root module class.",
10049
"default": "AppServerModule"
10150
},
102-
"sourceDir": {
51+
"tsconfigFileName": {
10352
"type": "string",
104-
"format": "path",
105-
"description": "The path of the source directory.",
106-
"default": "src",
107-
"alias": "D",
108-
"x-deprecated": "This option has no effect."
53+
"default": "tsconfig.server",
54+
"description": "The name of the TypeScript configuration file."
10955
}
11056
},
11157
"required": [

packages/schematics/angular/universal/schema.json

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,11 @@
2121
"description": "The name of the main entry-point file.",
2222
"default": "main.server.ts"
2323
},
24-
"test": {
25-
"type": "string",
26-
"format": "path",
27-
"description": "The name of the test entry-point file.",
28-
"x-deprecated": "This option has no effect."
29-
},
3024
"tsconfigFileName": {
3125
"type": "string",
3226
"default": "tsconfig.server",
3327
"description": "The name of the TypeScript configuration file."
3428
},
35-
"testTsconfigFileName": {
36-
"type": "string",
37-
"format": "path",
38-
"description": "The name of the TypeScript configuration file for tests.",
39-
"default": "tsconfig.spec",
40-
"x-deprecated": "This option has no effect."
41-
},
4229
"appDir": {
4330
"type": "string",
4431
"format": "path",

0 commit comments

Comments
 (0)