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

package/src/generators/add-linting/lib/create-eslint-configuration.d.ts

@@ -5,7 +5,7 @@ type EslintExtensionSchema = {
     prefix: string;
 };
 /**
- * @deprecated Use tools from `@nx/eslint/src/generators/utils/eslint-file` instead
+ * @deprecated Use tools from `@nx/eslint/src/generators/utils/eslint-file` instead. It will be removed in Nx v22.
  */
 export declare const extendAngularEslintJson: (json: Linter.Config, options: EslintExtensionSchema) => {
     overrides: ({
@@ -75,7 +75,7 @@ export declare const extendAngularEslintJson: (json: Linter.Config, options: Esl
     rules?: Partial<Linter.RulesRecord>;
 };
 /**
- * @deprecated Use {@link extendAngularEslintJson} instead
+ * @deprecated Use {@link extendAngularEslintJson} instead. It will be removed in Nx v22.
  */
 export declare function createEsLintConfiguration(tree: Tree, options: AddLintingGeneratorSchema): void;
 export {};

package/src/generators/add-linting/lib/create-eslint-configuration.js

@@ -5,7 +5,7 @@ exports.createEsLintConfiguration = createEsLintConfiguration;
 const devkit_1 = require("@nx/devkit");
 const string_utils_1 = require("@nx/devkit/src/utils/string-utils");
 /**
- * @deprecated Use tools from `@nx/eslint/src/generators/utils/eslint-file` instead
+ * @deprecated Use tools from `@nx/eslint/src/generators/utils/eslint-file` instead. It will be removed in Nx v22.
  */
 const extendAngularEslintJson = (json, options) => {
     const overrides = [
@@ -53,7 +53,7 @@ const extendAngularEslintJson = (json, options) => {
 };
 exports.extendAngularEslintJson = extendAngularEslintJson;
 /**
- * @deprecated Use {@link extendAngularEslintJson} instead
+ * @deprecated Use {@link extendAngularEslintJson} instead. It will be removed in Nx v22.
  */
 function createEsLintConfiguration(tree, options) {
     const rootConfig = `${(0, devkit_1.offsetFromRoot)(options.projectRoot)}.eslintrc.json`;

package/src/generators/add-linting/schema.d.ts

@@ -6,4 +6,5 @@ export interface AddLintingGeneratorSchema {
   skipFormat?: boolean;
   skipPackageJson?: boolean;
   unitTestRunner?: string;
+  addPlugin?: boolean;
 }

package/src/generators/application/application.js

@@ -6,13 +6,18 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
 const js_1 = require("@nx/js");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const init_1 = require("../init/init");
+const convert_to_rspack_1 = require("../convert-to-rspack/convert-to-rspack");
 const setup_ssr_1 = require("../setup-ssr/setup-ssr");
 const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
 const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependencies");
 const lib_1 = require("./lib");
 async function applicationGenerator(tree, schema) {
     (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'application');
-    const options = await (0, lib_1.normalizeOptions)(tree, schema);
+    const isRspack = schema.bundler === 'rspack';
+    if (isRspack) {
+        schema.bundler = 'webpack';
+    }
+    const options = await (0, lib_1.normalizeOptions)(tree, schema, isRspack);
     const rootOffset = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
     await (0, js_1.initGenerator)(tree, {
         ...options,
@@ -23,6 +28,7 @@ async function applicationGenerator(tree, schema) {
     await (0, init_1.angularInitGenerator)(tree, {
         ...options,
         skipFormat: true,
+        addPlugin: options.addPlugin,
     });
     if (!options.skipPackageJson) {
         (0, ensure_angular_dependencies_1.ensureAngularDependencies)(tree);
@@ -64,6 +70,19 @@ async function applicationGenerator(tree, schema) {
             serverRouting: options.serverRouting,
         });
     }
+    if (isRspack) {
+        await (0, convert_to_rspack_1.convertToRspack)(tree, {
+            project: options.name,
+            skipInstall: options.skipPackageJson,
+            skipFormat: true,
+        });
+        if (options.ssr) {
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files/rspack-ssr'), options.appProjectSourceRoot, {
+                pathToDistFolder: (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.appProjectRoot), options.outputPath, 'browser'),
+                tmpl: '',
+            });
+        }
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/application/files/rspack-ssr/server.ts__tmpl__

@@ -0,0 +1,72 @@
+import 'zone.js/node';
+
+import { APP_BASE_HREF } from '@angular/common';
+import { CommonEngine } from '@angular/ssr/node';
+import * as express from 'express';
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import bootstrap from './main.server';
+
+// The Express app is exported so that it can be used by serverless Functions.
+export function app(): express.Express {
+  const server = express();
+  const distFolder = join(process.cwd(), "<%= pathToDistFolder %>");
+  const indexHtml = existsSync(join(distFolder, 'index.original.html'))
+    ? join(distFolder, 'index.original.html')
+    : join(distFolder, 'index.html');
+
+  const commonEngine = new CommonEngine();
+
+  server.set('view engine', 'html');
+  server.set('views', distFolder);
+
+  // Example Express Rest API endpoints
+  // server.get('/api/**', (req, res) => { });
+  // Serve static files from /browser
+  server.get(
+    '*.*',
+    express.static(distFolder, {
+      maxAge: '1y',
+    })
+  );
+
+  // All regular routes use the Angular engine
+  server.get('*', (req, res, next) => {
+    const { protocol, originalUrl, baseUrl, headers } = req;
+
+    commonEngine
+      .render({
+        bootstrap,
+        documentFilePath: indexHtml,
+        url: `${protocol}://${headers.host}${originalUrl}`,
+        publicPath: distFolder,
+        providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
+      })
+      .then((html) => res.send(html))
+      .catch((err) => next(err));
+  });
+
+  return server;
+}
+
+function run(): void {
+  const port = process.env['PORT'] || 4000;
+
+  // Start up the Node server
+  const server = app();
+  server.listen(port, () => {
+    console.log(`Node Express server listening on http://localhost:${port}`);
+  });
+}
+
+// Webpack will replace 'require' with '__webpack_require__'
+// '__non_webpack_require__' is a proxy to Node 'require'
+// The below code is to ensure that the server is run only when not requiring the bundle.
+declare const __non_webpack_require__: NodeRequire;
+const mainModule = __non_webpack_require__.main;
+const moduleFilename = (mainModule && mainModule.filename) || '';
+if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
+  run();
+}
+
+export default bootstrap;

package/src/generators/application/lib/add-e2e.js

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 async function addE2e(tree, options) {
     // since e2e are separate projects, default to adding plugins
     const nxJson = (0, devkit_1.readNxJson)(tree);
-    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
+    const addPlugin = nxJson['useInferencePlugins'] !== false &&
+        process.env.NX_ADD_PLUGINS !== 'false';
     const e2eWebServerInfo = getAngularE2EWebServerInfo(tree, options.name, options.port);
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
@@ -37,9 +36,6 @@ async function addE2e(tree, options) {
             rootProject: options.rootProject,
             addPlugin,
         });
-        if (addPlugin) {
-            await (0, target_defaults_utils_1.addE2eCiTargetDefaults)(tree, '@nx/cypress/plugin', '^build', (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'cypress.config.ts'));
-        }
     }
     else if (options.e2eTestRunner === 'playwright') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
@@ -63,9 +59,6 @@ async function addE2e(tree, options) {
             rootProject: options.rootProject,
             addPlugin,
         });
-        if (addPlugin) {
-            await (0, target_defaults_utils_1.addE2eCiTargetDefaults)(tree, '@nx/playwright/plugin', '^build', (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'playwright.config.ts'));
-        }
     }
     return e2eWebServerInfo.e2ePort;
 }

package/src/generators/application/lib/add-linting.js

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = addLinting;
 const tslib_1 = require("tslib");
-const eslint_1 = require("@nx/eslint");
 const add_linting_1 = tslib_1.__importDefault(require("../../add-linting/add-linting"));
 async function addLinting(host, options) {
-    if (options.linter === eslint_1.Linter.None) {
+    if (options.linter === 'none') {
         return;
     }
     await (0, add_linting_1.default)(host, {
@@ -16,5 +15,6 @@ async function addLinting(host, options) {
         skipPackageJson: options.skipPackageJson,
         unitTestRunner: options.unitTestRunner,
         skipFormat: true,
+        addPlugin: options.addPlugin,
     });
 }

package/src/generators/application/lib/add-serve-static-target.js

@@ -13,6 +13,7 @@ function addFileServerTarget(tree, options, targetName, e2ePort) {
     const isUsingApplicationBuilder = options.bundler === 'esbuild';
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.name);
     projectConfig.targets[targetName] = {
+        continuous: true,
         executor: '@nx/web:file-server',
         options: {
             buildTarget: `${options.name}:build`,

package/src/generators/application/lib/add-unit-test-runner.js

@@ -12,6 +12,7 @@ async function addUnitTestRunner(host, options) {
                 projectRoot: options.appProjectRoot,
                 skipPackageJson: options.skipPackageJson,
                 strict: options.strict,
+                addPlugin: options.addPlugin,
             });
             break;
         case test_runners_1.UnitTestRunner.Vitest:
@@ -20,6 +21,7 @@ async function addUnitTestRunner(host, options) {
                 projectRoot: options.appProjectRoot,
                 skipPackageJson: options.skipPackageJson,
                 strict: options.strict,
+                addPlugin: options.addPlugin,
             });
             break;
     }

package/src/generators/application/lib/create-project.js

@@ -82,6 +82,7 @@ function createProject(tree, options) {
                 defaultConfiguration: 'production',
             },
             serve: {
+                continuous: true,
                 executor: '@angular-devkit/build-angular:dev-server',
                 options: options.port
                     ? {

package/src/generators/application/lib/normalize-options.d.ts

@@ -1,4 +1,4 @@
 import { type Tree } from '@nx/devkit';
 import type { Schema } from '../schema';
 import type { NormalizedSchema } from './normalized-schema';
-export declare function normalizeOptions(host: Tree, options: Partial<Schema>): Promise<NormalizedSchema>;
+export declare function normalizeOptions(host: Tree, options: Partial<Schema>, isRspack?: boolean): Promise<NormalizedSchema>;

package/src/generators/application/lib/normalize-options.js

@@ -3,10 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-const eslint_1 = require("@nx/eslint");
 const test_runners_1 = require("../../../utils/test-runners");
-async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
+function arePluginsExplicitlyDisabled(host) {
+    const { useInferencePlugins } = (0, devkit_1.readNxJson)(host);
+    const addPluginEnvVar = process.env.NX_ADD_PLUGINS;
+    return useInferencePlugins === false || addPluginEnvVar === 'false';
+}
+async function normalizeOptions(host, options, isRspack) {
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
     const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
@@ -20,8 +24,10 @@ async function normalizeOptions(host, options) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const bundler = options.bundler ?? 'esbuild';
+    const addPlugin = options.addPlugin ?? (!arePluginsExplicitlyDisabled(host) && isRspack);
     // Set defaults and then overwrite with user options
     return {
+        addPlugin,
         style: 'css',
         routing: true,
         inlineStyle: false,
@@ -29,7 +35,7 @@ async function normalizeOptions(host, options) {
         skipTests: options.unitTestRunner === test_runners_1.UnitTestRunner.None,
         skipFormat: false,
         e2eTestRunner: test_runners_1.E2eTestRunner.Playwright,
-        linter: eslint_1.Linter.EsLint,
+        linter: 'eslint',
         strict: true,
         standalone: true,
         directory: appProjectRoot,

package/src/generators/application/schema.d.ts

@@ -20,15 +20,15 @@ export interface Schema {
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;
   strict?: boolean;
-  standaloneConfig?: boolean;
   port?: number;
   setParserOptionsProject?: boolean;
   skipPackageJson?: boolean;
   standalone?: boolean;
   rootProject?: boolean;
   minimal?: boolean;
-  bundler?: 'webpack' | 'esbuild';
+  bundler?: 'webpack' | 'esbuild' | 'rspack';
   ssr?: boolean;
   serverRouting?: boolean;
   nxCloudToken?: string;
+  addPlugin?: boolean;
 }

package/src/generators/application/schema.json

@@ -130,12 +130,6 @@
       "description": "Create an application with stricter type checking and build optimization options.",
       "default": true
     },
-    "standaloneConfig": {
-      "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
-      "type": "boolean",
-      "default": true,
-      "x-deprecated": "Nx only supports standaloneConfig"
-    },
     "port": {
       "type": "number",
       "description": "The port at which the remote application should be served."
@@ -171,7 +165,7 @@
     "bundler": {
       "description": "Bundler to use to build the application.",
       "type": "string",
-      "enum": ["esbuild", "webpack"],
+      "enum": ["esbuild", "rspack", "webpack"],
       "default": "esbuild",
       "x-prompt": "Which bundler do you want to use to build the application?",
       "x-priority": "important"

package/src/generators/component-test/component-test.js

@@ -6,7 +6,7 @@ const versions_1 = require("../../utils/versions");
 const storybook_inputs_1 = require("../utils/storybook-ast/storybook-inputs");
 async function componentTestGenerator(tree, options) {
     (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-    const { assertMinimumCypressVersion } = require('@nx/cypress/src/utils/cypress-version');
+    const { assertMinimumCypressVersion } = require('@nx/cypress/src/utils/versions');
     assertMinimumCypressVersion(10);
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const componentDirPath = (0, devkit_1.joinPathFragments)(root, options.componentDir);

package/src/generators/convert-to-rspack/convert-to-rspack.d.ts

@@ -0,0 +1,4 @@
+import { type Tree, GeneratorCallback } from '@nx/devkit';
+import type { ConvertToRspackSchema } from './schema';
+export declare function convertToRspack(tree: Tree, schema: ConvertToRspackSchema): Promise<GeneratorCallback>;
+export default convertToRspack;