@schematics/angular 21.0.0-next.0 → 21.0.0-next.2

package/directive/index.js

@@ -7,12 +7,12 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
 const schematics_1 = require("@angular-devkit/schematics");
 const add_declaration_to_ng_module_1 = require("../utility/add-declaration-to-ng-module");
 const find_module_1 = require("../utility/find-module");
 const generate_from_files_1 = require("../utility/generate-from-files");
 const parse_name_1 = require("../utility/parse-name");
+const project_1 = require("../utility/project");
 const validation_1 = require("../utility/validation");
 const workspace_1 = require("../utility/workspace");
 function buildSelector(options, projectPrefix) {
@@ -25,29 +25,27 @@ function buildSelector(options, projectPrefix) {
     }
     return schematics_1.strings.camelize(selector);
 }
-function default_1(options) {
-    return async (host) => {
-        const workspace = await (0, workspace_1.getWorkspace)(host);
-        const project = workspace.projects.get(options.project);
-        if (!project) {
-            throw new schematics_1.SchematicsException(`Project "${options.project}" does not exist.`);
-        }
-        if (options.path === undefined) {
-            options.path = (0, workspace_1.buildDefaultPath)(project);
-        }
-        options.module = (0, find_module_1.findModuleFromOptions)(host, options);
-        const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
-        options.name = parsedPath.name;
-        options.path = parsedPath.path;
-        options.selector = options.selector || buildSelector(options, project.prefix || '');
-        (0, validation_1.validateHtmlSelector)(options.selector);
-        (0, validation_1.validateClassName)(schematics_1.strings.classify(options.name));
-        return (0, schematics_1.chain)([
-            (0, add_declaration_to_ng_module_1.addDeclarationToNgModule)({
-                type: 'directive',
-                ...options,
-            }),
-            (0, generate_from_files_1.generateFromFiles)(options),
-        ]);
-    };
-}
+exports.default = (0, project_1.createProjectSchematic)((options, { project, tree }) => {
+    if (options.path === undefined) {
+        options.path = (0, workspace_1.buildDefaultPath)(project);
+    }
+    options.module = (0, find_module_1.findModuleFromOptions)(tree, options);
+    const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
+    options.name = parsedPath.name;
+    options.path = parsedPath.path;
+    options.selector = options.selector || buildSelector(options, project.prefix || '');
+    (0, validation_1.validateHtmlSelector)(options.selector);
+    const classifiedName = schematics_1.strings.classify(options.name) +
+        (options.addTypeToClassName && options.type ? schematics_1.strings.classify(options.type) : '');
+    (0, validation_1.validateClassName)(classifiedName);
+    return (0, schematics_1.chain)([
+        (0, add_declaration_to_ng_module_1.addDeclarationToNgModule)({
+            type: 'directive',
+            ...options,
+        }),
+        (0, generate_from_files_1.generateFromFiles)({
+            ...options,
+            classifiedName,
+        }),
+    ]);
+});

package/directive/schema.d.ts

@@ -5,6 +5,11 @@
  * and boilerplate code for a new directive.
  */
 export type Schema = {
+    /**
+     * When true, the 'type' option will be appended to the generated class name. When false,
+     * only the file name will include the type.
+     */
+    addTypeToClassName?: boolean;
     /**
      * Automatically export the directive from the specified NgModule, making it accessible to
      * other modules in the application.

package/directive/schema.json

@@ -84,6 +84,11 @@
     "type": {
       "type": "string",
       "description": "Append a custom type to the directive's filename. For example, if you set the type to `directive`, the file will be named `example.directive.ts`."
+    },
+    "addTypeToClassName": {
+      "type": "boolean",
+      "default": true,
+      "description": "When true, the 'type' option will be appended to the generated class name. When false, only the file name will include the type."
     }
   },
   "required": ["name", "project"]

package/migrations/karma/karma-config-comparer.js

@@ -27,7 +27,7 @@ const karma_config_analyzer_1 = require("./karma-config-analyzer");
  * @returns The content of the default `karma.conf.js` file.
  */
 async function generateDefaultKarmaConfig(relativePathToWorkspaceRoot, projectName, needDevkitPlugin) {
-    const templatePath = posix_1.default.join(__dirname, '../../config/files/karma.conf.js.template');
+    const templatePath = require.resolve('../../config/files/karma.conf.js.template');
     let template = await (0, promises_1.readFile)(templatePath, 'utf-8');
     // TODO: Replace this with the actual schematic templating logic.
     template = template

package/migrations/migration-collection.json

@@ -1,4 +1,5 @@
 {
+  "encapsulation": false,
   "schematics": {
     "use-application-builder": {
       "version": "21.0.0",

package/module/index.d.ts

@@ -7,4 +7,5 @@
  */
 import { Rule } from '@angular-devkit/schematics';
 import { Schema as ModuleOptions } from './schema';
-export default function (options: ModuleOptions): Rule;
+declare const _default: (options: ModuleOptions) => Rule;
+export default _default;

package/module/index.js

@@ -40,7 +40,6 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
 const schematics_1 = require("@angular-devkit/schematics");
 const posix_1 = require("node:path/posix");
 const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
@@ -48,6 +47,7 @@ const ast_utils_1 = require("../utility/ast-utils");
 const change_1 = require("../utility/change");
 const find_module_1 = require("../utility/find-module");
 const parse_name_1 = require("../utility/parse-name");
+const project_1 = require("../utility/project");
 const validation_1 = require("../utility/validation");
 const workspace_1 = require("../utility/workspace");
 const schema_1 = require("./schema");
@@ -112,53 +112,51 @@ function buildRoute(options, modulePath) {
     const loadChildren = `() => import('${relativeModulePath}').then(m => m.${moduleName})`;
     return `{ path: '${options.route}', loadChildren: ${loadChildren} }`;
 }
-function default_1(options) {
-    return async (host) => {
-        if (options.path === undefined) {
-            options.path = await (0, workspace_1.createDefaultPath)(host, options.project);
-        }
-        if (options.module) {
-            options.module = (0, find_module_1.findModuleFromOptions)(host, options);
-        }
-        let routingModulePath;
-        const isLazyLoadedModuleGen = !!(options.route && options.module);
-        if (isLazyLoadedModuleGen) {
-            options.routingScope = schema_1.RoutingScope.Child;
-            routingModulePath = getRoutingModulePath(host, options.module);
-        }
-        const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
-        options.name = parsedPath.name;
-        options.path = parsedPath.path;
-        (0, validation_1.validateClassName)(schematics_1.strings.classify(options.name));
-        const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
-            options.routing || (isLazyLoadedModuleGen && routingModulePath)
-                ? (0, schematics_1.noop)()
-                : (0, schematics_1.filter)((path) => !path.includes('-routing')),
-            (0, schematics_1.applyTemplates)({
-                ...schematics_1.strings,
-                'if-flat': (s) => (options.flat ? '' : s),
-                lazyRoute: isLazyLoadedModuleGen,
-                lazyRouteWithoutRouteModule: isLazyLoadedModuleGen && !routingModulePath,
-                lazyRouteWithRouteModule: isLazyLoadedModuleGen && !!routingModulePath,
-                ...options,
-            }),
-            (0, schematics_1.move)(parsedPath.path),
-        ]);
-        const moduleDasherized = schematics_1.strings.dasherize(options.name);
-        const modulePath = `${!options.flat ? moduleDasherized + '/' : ''}${moduleDasherized}${options.typeSeparator}module.ts`;
-        const componentOptions = {
-            module: modulePath,
-            flat: options.flat,
-            name: options.name,
-            path: options.path,
-            project: options.project,
-            standalone: false,
-        };
-        return (0, schematics_1.chain)([
-            !isLazyLoadedModuleGen ? addImportToNgModule(options) : (0, schematics_1.noop)(),
-            addRouteDeclarationToNgModule(options, routingModulePath),
-            (0, schematics_1.mergeWith)(templateSource),
-            isLazyLoadedModuleGen ? (0, schematics_1.schematic)('component', componentOptions) : (0, schematics_1.noop)(),
-        ]);
+exports.default = (0, project_1.createProjectSchematic)(async (options, { tree }) => {
+    if (options.path === undefined) {
+        options.path = await (0, workspace_1.createDefaultPath)(tree, options.project);
+    }
+    if (options.module) {
+        options.module = (0, find_module_1.findModuleFromOptions)(tree, options);
+    }
+    let routingModulePath;
+    const isLazyLoadedModuleGen = !!(options.route && options.module);
+    if (isLazyLoadedModuleGen) {
+        options.routingScope = schema_1.RoutingScope.Child;
+        routingModulePath = getRoutingModulePath(tree, options.module);
+    }
+    const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
+    options.name = parsedPath.name;
+    options.path = parsedPath.path;
+    (0, validation_1.validateClassName)(schematics_1.strings.classify(options.name));
+    const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
+        options.routing || (isLazyLoadedModuleGen && routingModulePath)
+            ? (0, schematics_1.noop)()
+            : (0, schematics_1.filter)((path) => !path.includes('-routing')),
+        (0, schematics_1.applyTemplates)({
+            ...schematics_1.strings,
+            'if-flat': (s) => (options.flat ? '' : s),
+            lazyRoute: isLazyLoadedModuleGen,
+            lazyRouteWithoutRouteModule: isLazyLoadedModuleGen && !routingModulePath,
+            lazyRouteWithRouteModule: isLazyLoadedModuleGen && !!routingModulePath,
+            ...options,
+        }),
+        (0, schematics_1.move)(parsedPath.path),
+    ]);
+    const moduleDasherized = schematics_1.strings.dasherize(options.name);
+    const modulePath = `${!options.flat ? moduleDasherized + '/' : ''}${moduleDasherized}${options.typeSeparator}module.ts`;
+    const componentOptions = {
+        module: modulePath,
+        flat: options.flat,
+        name: options.name,
+        path: options.path,
+        project: options.project,
+        standalone: false,
     };
-}
+    return (0, schematics_1.chain)([
+        !isLazyLoadedModuleGen ? addImportToNgModule(options) : (0, schematics_1.noop)(),
+        addRouteDeclarationToNgModule(options, routingModulePath),
+        (0, schematics_1.mergeWith)(templateSource),
+        isLazyLoadedModuleGen ? (0, schematics_1.schematic)('component', componentOptions) : (0, schematics_1.noop)(),
+    ]);
+});

package/ng-new/index.js

@@ -41,6 +41,7 @@ function default_1(options) {
         standalone: options.standalone,
         ssr: options.ssr,
         zoneless: options.zoneless,
+        fileNameStyleGuide: options.fileNameStyleGuide,
     };
     return (0, schematics_1.chain)([
         (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.empty)(), [

package/ng-new/schema.d.ts

@@ -25,6 +25,13 @@ export type Schema = {
      * the workspace will be created in the current directory.
      */
     directory?: string;
+    /**
+     * The file naming convention to use for generated files. The '2025' style guide (default)
+     * uses a concise format (e.g., `app.ts` for the root component), while the '2016' style
+     * guide includes the type in the file name (e.g., `app.component.ts`). For more
+     * information, see the Angular Style Guide (https://angular.dev/style-guide).
+     */
+    fileNameStyleGuide?: FileNameStyleGuide;
     /**
      * Include the styles for the initial application's root component directly within the
      * `app.component.ts` file. By default, a separate stylesheet file (e.g.,
@@ -135,12 +142,21 @@ export type CommitObject = {
     name: string;
     [property: string]: any;
 };
+/**
+ * The file naming convention to use for generated files. The '2025' style guide (default)
+ * uses a concise format (e.g., `app.ts` for the root component), while the '2016' style
+ * guide includes the type in the file name (e.g., `app.component.ts`). For more
+ * information, see the Angular Style Guide (https://angular.dev/style-guide).
+ */
+export declare enum FileNameStyleGuide {
+    The2016 = "2016",
+    The2025 = "2025"
+}
 /**
  * The package manager used to install dependencies.
  */
 export declare enum PackageManager {
     Bun = "bun",
-    Cnpm = "cnpm",
     Npm = "npm",
     Pnpm = "pnpm",
     Yarn = "yarn"
@@ -152,7 +168,8 @@ export declare enum Style {
     Css = "css",
     Less = "less",
     Sass = "sass",
-    Scss = "scss"
+    Scss = "scss",
+    Tailwind = "tailwind"
 }
 /**
  * Sets the view encapsulation mode for components in the initial project. This determines

package/ng-new/schema.js

@@ -2,7 +2,7 @@
 // THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
 // CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ViewEncapsulation = exports.Style = exports.PackageManager = exports.AiConfig = void 0;
+exports.ViewEncapsulation = exports.Style = exports.PackageManager = exports.FileNameStyleGuide = exports.AiConfig = void 0;
 var AiConfig;
 (function (AiConfig) {
     AiConfig["Claude"] = "claude";
@@ -13,13 +13,23 @@ var AiConfig;
     AiConfig["None"] = "none";
     AiConfig["Windsurf"] = "windsurf";
 })(AiConfig || (exports.AiConfig = AiConfig = {}));
+/**
+ * The file naming convention to use for generated files. The '2025' style guide (default)
+ * uses a concise format (e.g., `app.ts` for the root component), while the '2016' style
+ * guide includes the type in the file name (e.g., `app.component.ts`). For more
+ * information, see the Angular Style Guide (https://angular.dev/style-guide).
+ */
+var FileNameStyleGuide;
+(function (FileNameStyleGuide) {
+    FileNameStyleGuide["The2016"] = "2016";
+    FileNameStyleGuide["The2025"] = "2025";
+})(FileNameStyleGuide || (exports.FileNameStyleGuide = FileNameStyleGuide = {}));
 /**
  * The package manager used to install dependencies.
  */
 var PackageManager;
 (function (PackageManager) {
     PackageManager["Bun"] = "bun";
-    PackageManager["Cnpm"] = "cnpm";
     PackageManager["Npm"] = "npm";
     PackageManager["Pnpm"] = "pnpm";
     PackageManager["Yarn"] = "yarn";
@@ -33,6 +43,7 @@ var Style;
     Style["Less"] = "less";
     Style["Sass"] = "sass";
     Style["Scss"] = "scss";
+    Style["Tailwind"] = "tailwind";
 })(Style || (exports.Style = Style = {}));
 /**
  * Sets the view encapsulation mode for components in the initial project. This determines

package/ng-new/schema.json

@@ -99,7 +99,7 @@
     "style": {
       "description": "The type of stylesheet files to be created for components in the initial project.",
       "type": "string",
-      "enum": ["css", "scss", "sass", "less"],
+      "enum": ["css", "scss", "sass", "less", "tailwind"],
       "x-user-analytics": "ep.ng_style"
     },
     "skipTests": {
@@ -126,7 +126,7 @@
     "packageManager": {
       "description": "The package manager used to install dependencies.",
       "type": "string",
-      "enum": ["npm", "yarn", "pnpm", "cnpm", "bun"]
+      "enum": ["npm", "yarn", "pnpm", "bun"]
     },
     "standalone": {
       "description": "Creates an application based upon the standalone API, without NgModules.",
@@ -151,6 +151,12 @@
         "type": "string",
         "enum": ["none", "gemini", "copilot", "claude", "cursor", "jetbrains", "windsurf"]
       }
+    },
+    "fileNameStyleGuide": {
+      "type": "string",
+      "enum": ["2016", "2025"],
+      "default": "2025",
+      "description": "The file naming convention to use for generated files. The '2025' style guide (default) uses a concise format (e.g., `app.ts` for the root component), while the '2016' style guide includes the type in the file name (e.g., `app.component.ts`). For more information, see the Angular Style Guide (https://angular.dev/style-guide)."
     }
   },
   "required": ["name", "version"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "21.0.0-next.0",
+  "version": "21.0.0-next.2",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -22,15 +22,15 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "21.0.0-next.0",
-    "@angular-devkit/schematics": "21.0.0-next.0",
+    "@angular-devkit/core": "21.0.0-next.2",
+    "@angular-devkit/schematics": "21.0.0-next.2",
     "jsonc-parser": "3.3.1"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"
   },
-  "packageManager": "pnpm@10.15.0",
+  "packageManager": "pnpm@10.15.1",
   "engines": {
     "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",

package/pipe/index.d.ts

@@ -5,6 +5,6 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
-import { Rule } from '@angular-devkit/schematics';
 import { Schema as PipeOptions } from './schema';
-export default function (options: PipeOptions): Rule;
+declare const _default: (options: PipeOptions) => import("@angular-devkit/schematics").Rule;
+export default _default;

package/pipe/index.js

@@ -7,28 +7,26 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
 const schematics_1 = require("@angular-devkit/schematics");
 const add_declaration_to_ng_module_1 = require("../utility/add-declaration-to-ng-module");
 const find_module_1 = require("../utility/find-module");
 const generate_from_files_1 = require("../utility/generate-from-files");
 const parse_name_1 = require("../utility/parse-name");
+const project_1 = require("../utility/project");
 const validation_1 = require("../utility/validation");
 const workspace_1 = require("../utility/workspace");
-function default_1(options) {
-    return async (host) => {
-        options.path ??= await (0, workspace_1.createDefaultPath)(host, options.project);
-        options.module = (0, find_module_1.findModuleFromOptions)(host, options);
-        const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
-        options.name = parsedPath.name;
-        options.path = parsedPath.path;
-        (0, validation_1.validateClassName)(schematics_1.strings.classify(options.name));
-        return (0, schematics_1.chain)([
-            (0, add_declaration_to_ng_module_1.addDeclarationToNgModule)({
-                type: 'pipe',
-                ...options,
-            }),
-            (0, generate_from_files_1.generateFromFiles)(options),
-        ]);
-    };
-}
+exports.default = (0, project_1.createProjectSchematic)(async (options, { tree }) => {
+    options.path ??= await (0, workspace_1.createDefaultPath)(tree, options.project);
+    options.module = (0, find_module_1.findModuleFromOptions)(tree, options);
+    const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
+    options.name = parsedPath.name;
+    options.path = parsedPath.path;
+    (0, validation_1.validateClassName)(schematics_1.strings.classify(options.name));
+    return (0, schematics_1.chain)([
+        (0, add_declaration_to_ng_module_1.addDeclarationToNgModule)({
+            type: 'pipe',
+            ...options,
+        }),
+        (0, generate_from_files_1.generateFromFiles)(options),
+    ]);
+});

package/server/index.d.ts

@@ -7,4 +7,5 @@
  */
 import { Rule } from '@angular-devkit/schematics';
 import { Schema as ServerOptions } from './schema';
-export default function (options: ServerOptions): Rule;
+declare const _default: (options: ServerOptions) => Rule;
+export default _default;

package/server/index.js

@@ -7,7 +7,6 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const node_path_1 = require("node:path");
@@ -17,6 +16,7 @@ const json_file_1 = require("../utility/json-file");
 const latest_versions_1 = require("../utility/latest-versions");
 const ng_ast_utils_1 = require("../utility/ng-ast-utils");
 const paths_1 = require("../utility/paths");
+const project_1 = require("../utility/project");
 const project_targets_1 = require("../utility/project-targets");
 const app_component_1 = require("../utility/standalone/app_component");
 const util_1 = require("../utility/standalone/util");
@@ -132,74 +132,70 @@ function addDependencies(skipInstall) {
         ]);
     };
 }
-function default_1(options) {
-    return async (host) => {
-        const workspace = await (0, workspace_1.getWorkspace)(host);
-        const clientProject = workspace.projects.get(options.project);
-        if (clientProject?.extensions.projectType !== 'application') {
-            throw new schematics_1.SchematicsException(`Server schematic requires a project type of "application".`);
-        }
-        const clientBuildTarget = clientProject.targets.get('build');
-        if (!clientBuildTarget) {
-            throw (0, project_targets_1.targetBuildNotFoundError)();
-        }
-        const usingApplicationBuilder = (0, project_targets_1.isUsingApplicationBuilder)(clientProject);
-        if (clientProject.targets.has('server') ||
-            (usingApplicationBuilder && clientBuildTarget.options?.server !== undefined)) {
-            // Server has already been added.
-            return;
-        }
-        const clientBuildOptions = clientBuildTarget.options;
-        const browserEntryPoint = await (0, util_1.getMainFilePath)(host, options.project);
-        const isStandalone = (0, ng_ast_utils_1.isStandaloneApp)(host, browserEntryPoint);
-        const sourceRoot = clientProject.sourceRoot ?? (0, core_1.join)((0, core_1.normalize)(clientProject.root), 'src');
-        let filesUrl = `./files/${usingApplicationBuilder ? 'application-builder/' : 'server-builder/'}`;
-        filesUrl += isStandalone ? 'standalone-src' : 'ngmodule-src';
-        const { componentName, componentImportPathInSameFile, moduleName, moduleImportPathInSameFile } = (0, app_component_1.resolveBootstrappedComponentData)(host, browserEntryPoint) || {
-            componentName: 'App',
-            componentImportPathInSameFile: './app/app',
-            moduleName: 'AppModule',
-            moduleImportPathInSameFile: './app/app.module',
-        };
-        const templateSource = (0, schematics_1.apply)((0, schematics_1.url)(filesUrl), [
-            (0, schematics_1.applyTemplates)({
-                ...schematics_1.strings,
-                ...options,
-                appComponentName: componentName,
-                appComponentPath: componentImportPathInSameFile,
-                appModuleName: moduleName,
-                appModulePath: moduleImportPathInSameFile === null
-                    ? null
-                    : `./${node_path_1.posix.basename(moduleImportPathInSameFile)}`,
-            }),
-            (0, schematics_1.move)(sourceRoot),
-        ]);
-        const clientTsConfig = (0, core_1.normalize)(clientBuildOptions.tsConfig);
-        const tsConfigExtends = (0, core_1.basename)(clientTsConfig);
-        const tsConfigDirectory = (0, core_1.dirname)(clientTsConfig);
-        return (0, schematics_1.chain)([
-            (0, schematics_1.mergeWith)(templateSource),
-            ...(usingApplicationBuilder
-                ? [
-                    updateConfigFileApplicationBuilder(options),
-                    updateTsConfigFile(clientBuildOptions.tsConfig),
-                ]
-                : [
-                    (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files/server-builder/root'), [
-                        (0, schematics_1.applyTemplates)({
-                            ...schematics_1.strings,
-                            ...options,
-                            stripTsExtension: (s) => s.replace(/\.ts$/, ''),
-                            tsConfigExtends,
-                            hasLocalizePackage: !!(0, dependencies_1.getPackageJsonDependency)(host, '@angular/localize'),
-                            relativePathToWorkspaceRoot: (0, paths_1.relativePathToWorkspaceRoot)(tsConfigDirectory),
-                        }),
-                        (0, schematics_1.move)(tsConfigDirectory),
-                    ])),
-                    updateConfigFileBrowserBuilder(options, tsConfigDirectory),
-                ]),
-            addDependencies(options.skipInstall),
-            (0, utility_1.addRootProvider)(options.project, ({ code, external }) => code `${external('provideClientHydration', '@angular/platform-browser')}(${external('withEventReplay', '@angular/platform-browser')}())`),
-        ]);
+exports.default = (0, project_1.createProjectSchematic)(async (options, { project, tree }) => {
+    if (project?.extensions.projectType !== 'application') {
+        throw new schematics_1.SchematicsException(`Server schematic requires a project type of "application".`);
+    }
+    const clientBuildTarget = project.targets.get('build');
+    if (!clientBuildTarget) {
+        throw (0, project_targets_1.targetBuildNotFoundError)();
+    }
+    const usingApplicationBuilder = (0, project_targets_1.isUsingApplicationBuilder)(project);
+    if (project.targets.has('server') ||
+        (usingApplicationBuilder && clientBuildTarget.options?.server !== undefined)) {
+        // Server has already been added.
+        return (0, schematics_1.noop)();
+    }
+    const clientBuildOptions = clientBuildTarget.options;
+    const browserEntryPoint = await (0, util_1.getMainFilePath)(tree, options.project);
+    const isStandalone = (0, ng_ast_utils_1.isStandaloneApp)(tree, browserEntryPoint);
+    const sourceRoot = project.sourceRoot ?? (0, core_1.join)((0, core_1.normalize)(project.root), 'src');
+    let filesUrl = `./files/${usingApplicationBuilder ? 'application-builder/' : 'server-builder/'}`;
+    filesUrl += isStandalone ? 'standalone-src' : 'ngmodule-src';
+    const { componentName, componentImportPathInSameFile, moduleName, moduleImportPathInSameFile } = (0, app_component_1.resolveBootstrappedComponentData)(tree, browserEntryPoint) || {
+        componentName: 'App',
+        componentImportPathInSameFile: './app/app',
+        moduleName: 'AppModule',
+        moduleImportPathInSameFile: './app/app.module',
     };
-}
+    const templateSource = (0, schematics_1.apply)((0, schematics_1.url)(filesUrl), [
+        (0, schematics_1.applyTemplates)({
+            ...schematics_1.strings,
+            ...options,
+            appComponentName: componentName,
+            appComponentPath: componentImportPathInSameFile,
+            appModuleName: moduleName,
+            appModulePath: moduleImportPathInSameFile === null
+                ? null
+                : `./${node_path_1.posix.basename(moduleImportPathInSameFile)}`,
+        }),
+        (0, schematics_1.move)(sourceRoot),
+    ]);
+    const clientTsConfig = (0, core_1.normalize)(clientBuildOptions.tsConfig);
+    const tsConfigExtends = (0, core_1.basename)(clientTsConfig);
+    const tsConfigDirectory = (0, core_1.dirname)(clientTsConfig);
+    return (0, schematics_1.chain)([
+        (0, schematics_1.mergeWith)(templateSource),
+        ...(usingApplicationBuilder
+            ? [
+                updateConfigFileApplicationBuilder(options),
+                updateTsConfigFile(clientBuildOptions.tsConfig),
+            ]
+            : [
+                (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files/server-builder/root'), [
+                    (0, schematics_1.applyTemplates)({
+                        ...schematics_1.strings,
+                        ...options,
+                        stripTsExtension: (s) => s.replace(/\.ts$/, ''),
+                        tsConfigExtends,
+                        hasLocalizePackage: !!(0, dependencies_1.getPackageJsonDependency)(tree, '@angular/localize'),
+                        relativePathToWorkspaceRoot: (0, paths_1.relativePathToWorkspaceRoot)(tsConfigDirectory),
+                    }),
+                    (0, schematics_1.move)(tsConfigDirectory),
+                ])),
+                updateConfigFileBrowserBuilder(options, tsConfigDirectory),
+            ]),
+        addDependencies(options.skipInstall),
+        (0, utility_1.addRootProvider)(options.project, ({ code, external }) => code `${external('provideClientHydration', '@angular/platform-browser')}(${external('withEventReplay', '@angular/platform-browser')}())`),
+    ]);
+});