@schematics/angular 20.0.0-next.1 → 20.0.0-next.2

package/ssr/index.js

@@ -6,42 +6,8 @@
  * 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
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
-exports.setPrompterForTestOnly = setPrompterForTestOnly;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const node_path_1 = require("node:path");
@@ -52,8 +18,6 @@ const ng_ast_utils_1 = require("../utility/ng-ast-utils");
 const project_targets_1 = require("../utility/project-targets");
 const util_1 = require("../utility/standalone/util");
 const workspace_1 = require("../utility/workspace");
-const workspace_models_1 = require("../utility/workspace-models");
-const tty_1 = require("./tty");
 const SERVE_SSR_TARGET_NAME = 'serve-ssr';
 const PRERENDER_TARGET_NAME = 'prerender';
 const DEFAULT_BROWSER_DIR = 'browser';
@@ -174,8 +138,7 @@ function updateApplicationBuilderWorkspaceConfigRule(projectSourceRoot, options,
         buildTarget.options = {
             ...buildTarget.options,
             outputPath,
-            outputMode: options.serverRouting ? 'server' : undefined,
-            prerender: options.serverRouting ? undefined : true,
+            outputMode: 'server',
             ssr: {
                 entry: (0, core_1.join)((0, core_1.normalize)(projectSourceRoot), 'server.ts'),
             },
@@ -285,12 +248,11 @@ function addServerFile(projectSourceRoot, options, isStandalone) {
         if (!project) {
             throw new schematics_1.SchematicsException(`Invalid project name (${projectName})`);
         }
-        const isUsingApplicationBuilder = usingApplicationBuilder(project);
-        const browserDistDirectory = isUsingApplicationBuilder
+        const usingApplicationBuilder = (0, project_targets_1.isUsingApplicationBuilder)(project);
+        const browserDistDirectory = usingApplicationBuilder
             ? (await getApplicationBuilderOutputPaths(host, projectName)).browser
             : await getLegacyOutputPaths(host, projectName, 'build');
-        const applicationBuilderFiles = 'application-builder' + (options.serverRouting ? '' : '-common-engine');
-        return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)(`./files/${isUsingApplicationBuilder ? applicationBuilderFiles : 'server-builder'}`), [
+        return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)(`./files/${usingApplicationBuilder ? 'application-builder' : 'server-builder'}`), [
             (0, schematics_1.applyTemplates)({
                 ...core_1.strings,
                 ...options,
@@ -301,25 +263,23 @@ function addServerFile(projectSourceRoot, options, isStandalone) {
         ]));
     };
 }
-function default_1(inputOptions) {
+function default_1(options) {
     return async (host, context) => {
-        const browserEntryPoint = await (0, util_1.getMainFilePath)(host, inputOptions.project);
+        const browserEntryPoint = await (0, util_1.getMainFilePath)(host, options.project);
         const isStandalone = (0, ng_ast_utils_1.isStandaloneApp)(host, browserEntryPoint);
         const workspace = await (0, workspace_1.getWorkspace)(host);
-        const clientProject = workspace.projects.get(inputOptions.project);
+        const clientProject = workspace.projects.get(options.project);
         if (!clientProject) {
             throw (0, project_targets_1.targetBuildNotFoundError)();
         }
-        const isUsingApplicationBuilder = usingApplicationBuilder(clientProject);
-        const serverRouting = await isServerRoutingEnabled(isUsingApplicationBuilder, inputOptions);
-        const options = { ...inputOptions, serverRouting };
+        const usingApplicationBuilder = (0, project_targets_1.isUsingApplicationBuilder)(clientProject);
         const sourceRoot = clientProject.sourceRoot ?? node_path_1.posix.join(clientProject.root, 'src');
         return (0, schematics_1.chain)([
             (0, schematics_1.schematic)('server', {
                 ...options,
                 skipInstall: true,
             }),
-            ...(isUsingApplicationBuilder
+            ...(usingApplicationBuilder
                 ? [
                     updateApplicationBuilderWorkspaceConfigRule(sourceRoot, options, context),
                     updateApplicationBuilderTsConfigRule(options),
@@ -329,53 +289,8 @@ function default_1(inputOptions) {
                     updateWebpackBuilderWorkspaceConfigRule(sourceRoot, options),
                 ]),
             addServerFile(sourceRoot, options, isStandalone),
-            addScriptsRule(options, isUsingApplicationBuilder),
-            addDependencies(options, isUsingApplicationBuilder),
+            addScriptsRule(options, usingApplicationBuilder),
+            addDependencies(options, usingApplicationBuilder),
         ]);
     };
 }
-function usingApplicationBuilder(project) {
-    const buildBuilder = project.targets.get('build')?.builder;
-    const isUsingApplicationBuilder = buildBuilder === workspace_models_1.Builders.Application || buildBuilder === workspace_models_1.Builders.BuildApplication;
-    return isUsingApplicationBuilder;
-}
-const defaultPrompter = async (message, defaultValue) => {
-    const { confirm } = await Promise.resolve().then(() => __importStar(require('@inquirer/prompts')));
-    return await confirm({
-        message,
-        default: defaultValue,
-    });
-};
-// Allow the prompt functionality to be overridden to facilitate testing.
-let prompt = defaultPrompter;
-function setPrompterForTestOnly(prompter) {
-    prompt = prompter ?? defaultPrompter;
-}
-/** Returns whether or not server routing is enabled, potentially prompting the user if necessary. */
-async function isServerRoutingEnabled(isUsingApplicationBuilder, options) {
-    if (!isUsingApplicationBuilder) {
-        if (options.serverRouting) {
-            throw new schematics_1.SchematicsException('Server routing APIs can only be added to a project using `application` builder.');
-        }
-        else {
-            return false;
-        }
-    }
-    // Use explicit option if provided.
-    if (options.serverRouting !== undefined) {
-        return options.serverRouting;
-    }
-    const serverRoutingDefault = false;
-    // Use the default if not in an interactive terminal.
-    if (!(0, tty_1.isTTY)()) {
-        return serverRoutingDefault;
-    }
-    // `inquirer` requires `async_hooks` which isn't supported by webcontainers, therefore we can't prompt in that context.
-    // See: https://github.com/SBoudrias/Inquirer.js/issues/1426
-    if (process.versions.webcontainer) {
-        return serverRoutingDefault;
-    }
-    // Prompt the user if in an interactive terminal and no option was provided.
-    return await prompt('Would you like to use the Server Routing and App Engine APIs (Developer Preview) for this server application?', 
-    /* defaultValue */ serverRoutingDefault);
-}

package/ssr/schema.d.ts

@@ -10,11 +10,6 @@ export type Schema = {
      * The name of the project you want to enable SSR for.
      */
     project: string;
-    /**
-     * Configure the server application to use the Angular Server Routing API and App Engine
-     * APIs (currently in Developer Preview).
-     */
-    serverRouting?: boolean;
     /**
      * Skip the automatic installation of packages. You will need to manually install the
      * dependencies later.

package/ssr/schema.json

@@ -16,10 +16,6 @@
       "description": "Skip the automatic installation of packages. You will need to manually install the dependencies later.",
       "type": "boolean",
       "default": false
-    },
-    "serverRouting": {
-      "description": "Configure the server application to use the Angular Server Routing API and App Engine APIs (currently in Developer Preview).",
-      "type": "boolean"
     }
   },
   "required": ["project"],

package/utility/find-module.js

@@ -42,7 +42,7 @@ function findModuleFromOptions(host, options) {
         for (const c of candidatesDirs) {
             const candidateFiles = ['', `${moduleBaseName}.ts`, `${moduleBaseName}${moduleExt}`].map((x) => (0, core_1.join)(c, x));
             for (const sc of candidateFiles) {
-                if (host.exists(sc)) {
+                if (host.exists(sc) && host.readText(sc).includes('@NgModule')) {
                     return (0, core_1.normalize)(sc);
                 }
             }

package/utility/generate-from-files.d.ts

@@ -14,5 +14,6 @@ export interface GenerateFromFilesOptions {
     project: string;
     skipTests?: boolean;
     templateFilesDirectory?: string;
+    type?: string;
 }
 export declare function generateFromFiles(options: GenerateFromFilesOptions, extraTemplateValues?: Record<string, string | ((v: string) => string)>): Rule;

package/utility/generate-from-files.js

@@ -29,6 +29,16 @@ function generateFromFiles(options, extraTemplateValues = {}) {
                 ...options,
                 ...extraTemplateValues,
             }),
+            !options.type
+                ? (0, schematics_1.forEach)(((file) => {
+                    return file.path.includes('..')
+                        ? {
+                            content: file.content,
+                            path: file.path.replace('..', '.'),
+                        }
+                        : file;
+                }))
+                : (0, schematics_1.noop)(),
             (0, schematics_1.move)(parsedPath.path + (options.flat ? '' : '/' + schematics_1.strings.dasherize(options.name))),
         ]);
         return (0, schematics_1.chain)([(0, schematics_1.mergeWith)(templateSource)]);

package/utility/latest-versions.js

@@ -16,7 +16,7 @@ exports.latestVersions = {
     // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
     Angular: '^20.0.0-next.0',
     NgPackagr: '^20.0.0-next.0',
-    DevkitBuildAngular: '^20.0.0-next.1',
-    AngularBuild: '^20.0.0-next.1',
-    AngularSSR: '^20.0.0-next.1',
+    DevkitBuildAngular: '^20.0.0-next.2',
+    AngularBuild: '^20.0.0-next.2',
+    AngularSSR: '^20.0.0-next.2',
 };

package/utility/project-targets.d.ts

@@ -6,4 +6,6 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import { SchematicsException } from '@angular-devkit/schematics';
+import { ProjectDefinition } from './workspace';
 export declare function targetBuildNotFoundError(): SchematicsException;
+export declare function isUsingApplicationBuilder(project: ProjectDefinition): boolean;

package/utility/project-targets.js

@@ -8,7 +8,14 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.targetBuildNotFoundError = targetBuildNotFoundError;
+exports.isUsingApplicationBuilder = isUsingApplicationBuilder;
 const schematics_1 = require("@angular-devkit/schematics");
+const workspace_models_1 = require("./workspace-models");
 function targetBuildNotFoundError() {
     return new schematics_1.SchematicsException(`Project target "build" not found.`);
 }
+function isUsingApplicationBuilder(project) {
+    const buildBuilder = project.targets.get('build')?.builder;
+    const isUsingApplicationBuilder = buildBuilder === workspace_models_1.Builders.Application || buildBuilder === workspace_models_1.Builders.BuildApplication;
+    return isUsingApplicationBuilder;
+}

package/web-worker/index.js

@@ -24,7 +24,7 @@ function addSnippet(options) {
             .getDir(options.path)
             .subfiles // Find all files that start with the same name, are ts files,
             // and aren't spec or module files.
-            .filter((f) => fileRegExp.test(f) && !/(module|spec)\.ts$/.test(f))
+            .filter((f) => fileRegExp.test(f) && !/(module|spec|config|routes)\.ts$/.test(f))
             // Sort alphabetically for consistency.
             .sort();
         if (siblingModules.length === 0) {

package/directive/files/__name@dasherize@if-flat__/__name@dasherize__.directive.spec.ts.template

@@ -1,8 +0,0 @@
-import { <%= classify(name) %>Directive } from './<%= dasherize(name) %>.directive';
-
-describe('<%= classify(name) %>Directive', () => {
-  it('should create an instance', () => {
-    const directive = new <%= classify(name) %>Directive();
-    expect(directive).toBeTruthy();
-  });
-});

package/service/files/__name@dasherize@if-flat__/__name@dasherize__.service.spec.ts.template

@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { <%= classify(name) %>Service } from './<%= dasherize(name) %>.service';
-
-describe('<%= classify(name) %>Service', () => {
-  let service: <%= classify(name) %>Service;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(<%= classify(name) %>Service);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});

package/ssr/files/application-builder-common-engine/server.ts.template

@@ -1,67 +0,0 @@
-import { APP_BASE_HREF } from '@angular/common';
-import { CommonEngine, isMainModule } from '@angular/ssr/node';
-import express from 'express';
-import { dirname, join, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import <% if (isStandalone) { %>bootstrap<% } else { %>AppServerModule<% } %> from './main.server';
-
-const serverDistFolder = dirname(fileURLToPath(import.meta.url));
-const browserDistFolder = resolve(serverDistFolder, '../<%= browserDistDirectory %>');
-const indexHtml = join(serverDistFolder, 'index.server.html');
-
-const app = express();
-const commonEngine = new CommonEngine();
-
-/**
- * Example Express Rest API endpoints can be defined here.
- * Uncomment and define endpoints as necessary.
- *
- * Example:
- * ```ts
- * app.get('/api/**', (req, res) => {
- *   // Handle API request
- * });
- * ```
- */
-
-/**
- * Serve static files from /<%= browserDistDirectory %>
- */
-app.get(
-  '**',
-  express.static(browserDistFolder, {
-    maxAge: '1y',
-    index: 'index.html'
-  }),
-);
-
-/**
- * Handle all other requests by rendering the Angular application.
- */
-app.get('**', (req, res, next) => {
-  const { protocol, originalUrl, baseUrl, headers } = req;
-
-  commonEngine
-    .render({
-      <% if (isStandalone) { %>bootstrap<% } else { %>bootstrap: AppServerModule<% } %>,
-      documentFilePath: indexHtml,
-      url: `${protocol}://${headers.host}${originalUrl}`,
-      publicPath: browserDistFolder,
-      providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
-    })
-    .then((html) => res.send(html))
-    .catch((err) => next(err));
-});
-
-/**
- * Start the server if this module is the main entry point.
- * The server listens on the port defined by the `PORT` environment variable, or defaults to 4000.
- */
-if (isMainModule(import.meta.url)) {
-  const port = process.env['PORT'] || 4000;
-  app.listen(port, () => {
-    console.log(`Node Express server listening on http://localhost:${port}`);
-  });
-}
-
-export default app;