Skip to content

refactor(@schematic/angular): remove deprecated options from app-shell and universal schematics #17635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2020
Merged

refactor(@schematic/angular): remove deprecated options from app-shell and universal schematics #17635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions packages/schematics/angular/app-shell/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,7 @@ function addUniversalTarget(options: AppShellOptions): Rule {
};

// Delete non-universal options.
delete universalOptions.universalProject;
delete universalOptions.route;
delete universalOptions.name;
delete universalOptions.outDir;
delete universalOptions.root;
delete universalOptions.index;
delete universalOptions.sourceDir;

return schematic('universal', universalOptions);
};
Expand Down
1 change: 0 additions & 1 deletion packages/schematics/angular/app-shell/index_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ describe('App Shell Schematic', () => {
require.resolve('../collection.json'),
);
const defaultOptions: AppShellOptions = {
name: 'foo',
clientProject: 'bar',
};

Expand Down
60 changes: 3 additions & 57 deletions packages/schematics/angular/app-shell/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,74 +13,23 @@
"$source": "projectName"
}
},
"universalProject": {
"type": "string",
"description": "The name of related Universal app.",
"x-deprecated": "This option has no effect."
},
"route": {
"type": "string",
"description": "Route path used to produce the app shell.",
"default": "shell"
},
"name": {
"type": "string",
"format": "html-selector",
"description": "The HTML selector of the Universal app",
"x-deprecated": "This option has no effect."
},
"appId": {
"type": "string",
"format": "html-selector",
"description": "The app ID to use in withServerTransition().",
"default": "serverApp"
},
"outDir": {
"type": "string",
"format": "path",
"description": "The output directory for build results.",
"default": "dist-server",
"x-deprecated": "This option has no effect."
},
"root": {
"type": "string",
"format": "path",
"description": "The root directory of the app.",
"default": "src",
"x-deprecated": "This option has no effect."
},
"index": {
"type": "string",
"format": "path",
"description": "The name of the index file",
"default": "index.html",
"x-deprecated": "This option has no effect."
},
"main": {
"type": "string",
"format": "path",
"description": "The name of the main entry-point file.",
"default": "main.server.ts"
},
"test": {
"type": "string",
"format": "path",
"description": "The name of the test entry-point file.",
"x-deprecated": "This option has no effect."
},
"tsconfigFileName": {
"type": "string",
"format": "path",
"default": "tsconfig.server",
"description": "The name of the TypeScript configuration file."
},
"testTsconfigFileName": {
"type": "string",
"format": "path",
"description": "The name of the TypeScript configuration file for tests.",
"default": "tsconfig.spec",
"x-deprecated": "This option has no effect."
},
"appDir": {
"type": "string",
"format": "path",
Expand All @@ -99,13 +48,10 @@
"description": "The name of the root module class.",
"default": "AppServerModule"
},
"sourceDir": {
"tsconfigFileName": {
"type": "string",
"format": "path",
"description": "The path of the source directory.",
"default": "src",
"alias": "D",
"x-deprecated": "This option has no effect."
"default": "tsconfig.server",
"description": "The name of the TypeScript configuration file."
}
},
"required": [
Expand Down
13 changes: 0 additions & 13 deletions packages/schematics/angular/universal/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,11 @@
"description": "The name of the main entry-point file.",
"default": "main.server.ts"
},
"test": {
"type": "string",
"format": "path",
"description": "The name of the test entry-point file.",
"x-deprecated": "This option has no effect."
},
"tsconfigFileName": {
"type": "string",
"default": "tsconfig.server",
"description": "The name of the TypeScript configuration file."
},
"testTsconfigFileName": {
"type": "string",
"format": "path",
"description": "The name of the TypeScript configuration file for tests.",
"default": "tsconfig.spec",
"x-deprecated": "This option has no effect."
},
"appDir": {
"type": "string",
"format": "path",
Expand Down