@nx/angular 21.0.0-beta.1 → 21.0.0-beta.3

package/src/generators/setup-ssr/files/v19+/application-builder/ngmodule-src/app/__rootModuleFileName__

@@ -1,13 +1,13 @@
 import { NgModule } from '@angular/core';
 import { ServerModule } from '@angular/platform-server';<% if(serverRouting) { %>
-import { provideServerRoutesConfig } from '@angular/ssr';<% } %>
+import { <%= provideServerRoutingFn %> } from '@angular/ssr';<% } %>
 import { AppComponent } from './app.component';
 import { AppModule } from './app.module';<% if(serverRouting) { %>
 import { serverRoutes } from './app.routes.server';<% } %>
 
 @NgModule({
   imports: [AppModule, ServerModule],<% if(serverRouting) { %>
-  providers: [provideServerRoutesConfig(serverRoutes)],<% } %>
+  providers: [<%= provideServerRoutingFn %>(serverRoutes)],<% } %>
   bootstrap: [AppComponent],
 })
 export class <%= rootModuleClassName %> {}

package/src/generators/setup-ssr/files/v19+/application-builder/server/__serverFileName__

@@ -61,6 +61,6 @@ if (isMainModule(import.meta.url)) {
 }
 
 /**
- * The request handler used by the Angular CLI (dev-server and during build).
+ * Request handler used by the Angular CLI (for dev-server and during build) or Firebase Cloud Functions.
  */
 export const reqHandler = createNodeRequestHandler(app);

package/src/generators/setup-ssr/files/v19+/application-builder/standalone-src/app/app.config.server.ts__tpl__

@@ -1,13 +1,13 @@
 import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
 import { provideServerRendering } from '@angular/platform-server';<% if(serverRouting) { %>
-import { provideServerRoutesConfig } from '@angular/ssr';<% } %>
+import { <%= provideServerRoutingFn %> } from '@angular/ssr';<% } %>
 import { appConfig } from './app.config';<% if(serverRouting) { %>
 import { serverRoutes } from './app.routes.server';<% } %>
 
 const serverConfig: ApplicationConfig = {
   providers: [
     provideServerRendering()<% if(serverRouting) { %>,
-    provideServerRoutesConfig(serverRoutes)<% } %>
+    <%= provideServerRoutingFn %>(serverRoutes)<% } %>
   ]
 };
 

package/src/generators/setup-ssr/files/v19+/application-builder-common-engine/server/__serverFileName__

@@ -63,3 +63,5 @@ if (isMainModule(import.meta.url)) {
     console.log(`Node Express server listening on http://localhost:${port}`);
   });
 }
+
+export default app;

package/src/generators/setup-ssr/lib/generate-files.js

@@ -4,6 +4,7 @@ exports.generateSSRFiles = generateSSRFiles;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const version_utils_1 = require("../../utils/version-utils");
+const semver_1 = require("semver");
 function generateSSRFiles(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (project.targets.server ||
@@ -24,7 +25,17 @@ function generateSSRFiles(tree, options) {
         pathToFiles = (0, path_1.join)(baseFilesPath, 'pre-v19', options.standalone ? 'standalone-src' : 'ngmodule-src');
     }
     const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
-    (0, devkit_1.generateFiles)(tree, pathToFiles, sourceRoot, { ...options, tpl: '' });
+    const ssrVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/ssr');
+    const cleanedSsrVersion = ssrVersion
+        ? (0, semver_1.clean)(ssrVersion) ?? (0, semver_1.coerce)(ssrVersion).version
+        : null;
+    (0, devkit_1.generateFiles)(tree, pathToFiles, sourceRoot, {
+        ...options,
+        provideServerRoutingFn: !cleanedSsrVersion || (0, semver_1.gte)(cleanedSsrVersion, '19.2.0')
+            ? 'provideServerRouting'
+            : 'provideServerRoutesConfig',
+        tpl: '',
+    });
     if (angularMajorVersion >= 19 && !options.serverRouting) {
         tree.delete((0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.routes.server.ts'));
     }

package/src/generators/setup-ssr/lib/update-project-config.js

@@ -76,6 +76,7 @@ function updateProjectConfigForBrowserBuilder(tree, options) {
         defaultConfiguration: 'production',
     };
     projectConfig.targets['serve-ssr'] = {
+        continuous: true,
         executor: '@angular-devkit/build-angular:ssr-dev-server',
         configurations: {
             development: {

package/src/generators/stories/stories.js

@@ -7,7 +7,7 @@ const component_story_1 = tslib_1.__importDefault(require("../component-story/co
 const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
 const module_info_1 = require("../utils/storybook-ast/module-info");
-const minimatch_1 = require("minimatch");
+const picomatch = require("picomatch");
 const versions_1 = require("../../utils/versions");
 async function angularStoriesGenerator(tree, options) {
     const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.name);
@@ -17,7 +17,7 @@ async function angularStoriesGenerator(tree, options) {
         componentsInfo.push(...(0, component_info_1.getComponentsInfo)(tree, entryPoint, moduleFilePaths, options.name), ...(0, component_info_1.getStandaloneComponentsInfo)(tree, entryPoint));
     }
     const componentInfos = componentsInfo.filter((f) => !options.ignorePaths?.some((pattern) => {
-        const shouldIgnorePath = (0, minimatch_1.minimatch)((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`), pattern);
+        const shouldIgnorePath = picomatch(pattern)((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`));
         return shouldIgnorePath;
     }));
     for (const info of componentInfos) {

package/src/generators/utils/add-jest.d.ts

@@ -4,5 +4,6 @@ export type AddJestOptions = {
     projectRoot: string;
     skipPackageJson: boolean;
     strict: boolean;
+    addPlugin?: boolean;
 };
 export declare function addJest(tree: Tree, options: AddJestOptions): Promise<void>;

package/src/generators/utils/add-jest.js

@@ -16,8 +16,8 @@ async function addJest(tree, options) {
         skipSerializers: false,
         skipPackageJson: options.skipPackageJson,
         skipFormat: true,
-        addPlugin: false,
-        addExplicitTargets: true,
+        addPlugin: options.addPlugin ?? false,
+        addExplicitTargets: !options.addPlugin,
     });
     const setupFile = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', 'test-setup.ts');
     if (options.strict && tree.exists(setupFile)) {

package/src/generators/utils/add-vitest.d.ts

@@ -4,5 +4,6 @@ export type AddVitestOptions = {
     projectRoot: string;
     skipPackageJson: boolean;
     strict: boolean;
+    addPlugin?: boolean;
 };
 export declare function addVitest(tree: Tree, options: AddVitestOptions): Promise<void>;

package/src/generators/utils/add-vitest.js

@@ -10,6 +10,6 @@ async function addVitest(tree, options) {
         uiFramework: 'angular',
         testEnvironment: 'jsdom',
         coverageProvider: 'v8',
-        addPlugin: false,
+        addPlugin: options.addPlugin ?? false,
     });
 }

package/src/generators/utils/ensure-angular-dependencies.js

@@ -19,7 +19,6 @@ function ensureAngularDependencies(tree) {
         const rxjsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'rxjs') ?? pkgVersions.rxjsVersion;
         const tsLibVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'tslib') ?? pkgVersions.tsLibVersion;
         const zoneJsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'zone.js') ?? pkgVersions.zoneJsVersion;
-        dependencies['@angular/animations'] = angularVersion;
         dependencies['@angular/common'] = angularVersion;
         dependencies['@angular/compiler'] = angularVersion;
         dependencies['@angular/core'] = angularVersion;

package/src/migrations/update-19-6-0/turn-off-dts-by-default.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const minimatch_1 = require("minimatch");
+const picomatch = require("picomatch");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 async function default_1(tree) {
     (0, devkit_1.visitNotIgnoredFiles)(tree, '', (path) => {
         const webpackConfigGlob = '**/webpack*.config*.{js,ts,mjs,cjs}';
-        const result = (0, minimatch_1.minimatch)(path, webpackConfigGlob);
+        const result = picomatch(webpackConfigGlob)(path);
         if (!result) {
             return;
         }

package/src/migrations/update-20-5-0/update-angular-cli.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export declare const angularCliVersion = "~19.2.0";
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-20-5-0/update-angular-cli.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.angularCliVersion = void 0;
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+exports.angularCliVersion = '~19.2.0';
+async function default_1(tree) {
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+}

package/src/migrations/update-21-0-0/set-continuous-option.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export declare const continuousExecutors: Set<string>;
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-21-0-0/set-continuous-option.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.continuousExecutors = void 0;
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+exports.continuousExecutors = new Set([
+    '@angular-devkit/build-angular:dev-server',
+    '@angular-devkit/build-angular:ssr-dev-server',
+    '@nx/angular:dev-server',
+    '@nx/angular:module-federation-dev-server',
+    '@nx/angular:module-federation-dev-ssr',
+]);
+async function default_1(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [projectName, projectConfig] of projects) {
+        let updated = false;
+        for (const targetConfig of Object.values(projectConfig.targets ?? {})) {
+            if (exports.continuousExecutors.has(targetConfig.executor) &&
+                targetConfig.continuous === undefined) {
+                targetConfig.continuous = true;
+                updated = true;
+            }
+        }
+        if (updated) {
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
+        }
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}

package/src/plugins/plugin.js

@@ -114,6 +114,7 @@ async function buildAngularProjects(configFilePath, options, angularWorkspaceRoo
                 await updateBuildTarget(nxTargetName, targets[nxTargetName], angularTarget, context, angularWorkspaceRoot, project.root, namedInputs);
             }
             else if (knownExecutors.devServer.has(angularTarget.builder)) {
+                targets[nxTargetName].continuous = true;
                 targets[nxTargetName].metadata.help.example.options = { port: 4201 };
             }
             else if (knownExecutors.extractI18n.has(angularTarget.builder)) {
@@ -128,6 +129,7 @@ async function buildAngularProjects(configFilePath, options, angularWorkspaceRoo
                 updateServerTarget(targets[nxTargetName], angularTarget, context, angularWorkspaceRoot, project.root, namedInputs);
             }
             else if (knownExecutors.serveSsr.has(angularTarget.builder)) {
+                targets[nxTargetName].continuous = true;
                 targets[nxTargetName].metadata.help.example.options = { port: 4201 };
             }
             else if (knownExecutors.prerender.has(angularTarget.builder)) {

package/src/utils/backward-compatible-versions.js

@@ -6,6 +6,7 @@ exports.backwardCompatibleVersions = {
         angularVersion: '~17.3.0',
         angularDevkitVersion: '~17.3.0',
         ngPackagrVersion: '~17.3.0',
+        angularRspackVersion: '~20.6.1',
         ngrxVersion: '~17.0.0',
         rxjsVersion: '~7.8.0',
         zoneJsVersion: '~0.14.3',
@@ -33,6 +34,7 @@ exports.backwardCompatibleVersions = {
         angularVersion: '~18.2.0',
         angularDevkitVersion: '~18.2.0',
         ngPackagrVersion: '~18.2.0',
+        angularRspackVersion: '~20.6.1',
         ngrxVersion: '~18.0.2',
         rxjsVersion: '~7.8.0',
         zoneJsVersion: '~0.14.3',

package/src/utils/versions.d.ts

@@ -1,7 +1,8 @@
 export declare const nxVersion: any;
-export declare const angularVersion = "~19.1.0";
-export declare const angularDevkitVersion = "~19.1.0";
-export declare const ngPackagrVersion = "~19.1.0";
+export declare const angularVersion = "~19.2.0";
+export declare const angularDevkitVersion = "~19.2.0";
+export declare const ngPackagrVersion = "~19.2.0";
+export declare const angularRspackVersion = "~20.6.1";
 export declare const ngrxVersion = "^19.0.0";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.15.0";
@@ -12,9 +13,9 @@ export declare const typesCorsVersion = "~2.8.5";
 export declare const expressVersion = "^4.21.2";
 export declare const typesExpressVersion = "^4.17.21";
 export declare const browserSyncVersion = "^3.0.0";
-export declare const moduleFederationNodeVersion = "^2.6.21";
-export declare const moduleFederationEnhancedVersion = "^0.8.8";
-export declare const angularEslintVersion = "^19.0.2";
+export declare const moduleFederationNodeVersion = "^2.6.26";
+export declare const moduleFederationEnhancedVersion = "^0.9.0";
+export declare const angularEslintVersion = "^19.2.0";
 export declare const typescriptEslintVersion = "^7.16.0";
 export declare const tailwindVersion = "^3.0.2";
 export declare const postcssVersion = "^8.4.5";

package/src/utils/versions.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
+exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularRspackVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.angularVersion = '~19.1.0';
-exports.angularDevkitVersion = '~19.1.0';
-exports.ngPackagrVersion = '~19.1.0';
+exports.angularVersion = '~19.2.0';
+exports.angularDevkitVersion = '~19.2.0';
+exports.ngPackagrVersion = '~19.2.0';
+exports.angularRspackVersion = '~20.6.1';
 exports.ngrxVersion = '^19.0.0';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.15.0';
@@ -15,9 +16,9 @@ exports.typesCorsVersion = '~2.8.5';
 exports.expressVersion = '^4.21.2';
 exports.typesExpressVersion = '^4.17.21';
 exports.browserSyncVersion = '^3.0.0';
-exports.moduleFederationNodeVersion = '^2.6.21';
-exports.moduleFederationEnhancedVersion = '^0.8.8';
-exports.angularEslintVersion = '^19.0.2';
+exports.moduleFederationNodeVersion = '^2.6.26';
+exports.moduleFederationEnhancedVersion = '^0.9.0';
+exports.angularEslintVersion = '^19.2.0';
 exports.typescriptEslintVersion = '^7.16.0';
 exports.tailwindVersion = '^3.0.2';
 exports.postcssVersion = '^8.4.5';