@nx/angular 21.1.1 → 21.1.3

package/README.md

@@ -1,7 +1,7 @@
 <p style="text-align: center;">
   <picture>
     <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
-    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
+    <img alt="Nx - Smart Repos · Fast Builds" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
   </picture>
 </p>
 
@@ -20,9 +20,9 @@
 
 <hr>
 
-# Nx: Smart Monorepos · Fast CI
+# Nx: Smart Repos · Fast Builds
 
-Nx is a build system, optimized for monorepos, with plugins for popular frameworks and tools and advanced CI capabilities including caching and distribution.
+An AI-first build platform that connects everything from your editor to CI. Helping you deliver fast, without breaking things.
 
 This package is an [Angular plugin for Nx](https://nx.dev/nx-api/angular).
 
@@ -64,5 +64,5 @@ npx nx@latest init
 - [Blog Posts About Nx](https://nx.dev/blog)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
+width="100%" alt="Nx - Smart Repos · Fast Builds"></a></p>
 

package/fesm2022/nx-angular-mf.mjs

@@ -1,3 +1,5 @@
+import { extname } from 'node:path';
+
 let resolveRemoteUrl;
 /**
  * @deprecated Use Runtime Helpers from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.
@@ -104,10 +106,15 @@ async function loadRemoteContainer(remoteName) {
     const remoteUrl = remoteUrlDefinitions
         ? remoteUrlDefinitions[remoteName]
         : await resolveRemoteUrl(remoteName);
-    let containerUrl = remoteUrl;
-    if (!remoteUrl.endsWith('.mjs') && !remoteUrl.endsWith('.js')) {
-        containerUrl = `${remoteUrl}${remoteUrl.endsWith('/') ? '' : '/'}remoteEntry.mjs`;
+    const url = new URL(remoteUrl);
+    const ext = extname(url.pathname);
+    const needsRemoteEntry = !['.js', '.mjs', '.json'].includes(ext);
+    if (needsRemoteEntry) {
+        url.pathname = url.pathname.endsWith('/')
+            ? `${url.pathname}remoteEntry.mjs`
+            : `${url.pathname}/remoteEntry.mjs`;
     }
+    const containerUrl = url.href;
     const container = await loadModule(containerUrl);
     await container.init(__webpack_share_scopes__.default);
     remoteContainerMap.set(remoteName, container);

package/fesm2022/nx-angular-mf.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"nx-angular-mf.mjs","sources":["../../../../packages/angular/mf/mf.ts","../../../../packages/angular/mf/nx-angular-mf.ts"],"sourcesContent":["export type ResolveRemoteUrlFunction = (\n  remoteName: string\n) => string | Promise<string>;\n\ndeclare const __webpack_init_sharing__: (scope: 'default') => Promise<void>;\ndeclare const __webpack_share_scopes__: { default: unknown };\n\nlet resolveRemoteUrl: ResolveRemoteUrlFunction;\n\n/**\n * @deprecated Use Runtime Helpers from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n */\nexport function setRemoteUrlResolver(\n  _resolveRemoteUrl: ResolveRemoteUrlFunction\n) {\n  resolveRemoteUrl = _resolveRemoteUrl;\n}\n\nlet remoteUrlDefinitions: Record<string, string>;\n\n/**\n * @deprecated Use init() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you have a remote app called `my-remote-app` and you want to use the `http://localhost:4201/mf-manifest.json` as the remote url, you should change it from:\n * ```ts\n * import { setRemoteDefinitions } from '@nx/angular/mf';\n *\n * setRemoteDefinitions({\n *   'my-remote-app': 'http://localhost:4201/mf-manifest.json'\n * });\n * ```\n * to use init():\n * ```ts\n * import { init } from '@module-federation/enhanced/runtime';\n *\n * init({\n *   name: 'host',\n *   remotes: [{\n *     name: 'my-remote-app',\n *     entry: 'http://localhost:4201/mf-manifest.json'\n *   }]\n * });\n * ```\n */\nexport function setRemoteDefinitions(definitions: Record<string, string>) {\n  remoteUrlDefinitions = definitions;\n}\n\n/**\n * @deprecated Use registerRemotes() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you set a remote app with `setRemoteDefinition` such as:\n * ```ts\n * import { setRemoteDefinition } from '@nx/angular/mf';\n *\n * setRemoteDefinition(\n *   'my-remote-app',\n *   'http://localhost:4201/mf-manifest.json'\n * );\n * ```\n * change it to use registerRemotes():\n * ```ts\n * import { registerRemotes } from '@module-federation/enhanced/runtime';\n *\n * registerRemotes([\n *  {\n *     name: 'my-remote-app',\n *     entry: 'http://localhost:4201/mf-manifest.json'\n *   }\n * ]);\n * ```\n */\nexport function setRemoteDefinition(remoteName: string, remoteUrl: string) {\n  remoteUrlDefinitions ??= {};\n  remoteUrlDefinitions[remoteName] = remoteUrl;\n}\n\nlet remoteModuleMap = new Map<string, unknown>();\nlet remoteContainerMap = new Map<string, unknown>();\n\n/**\n * @deprecated Use loadRemote() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you set a load a remote with `loadRemoteModule` such as:\n * ```ts\n * import { loadRemoteModule } from '@nx/angular/mf';\n *\n * loadRemoteModule('my-remote-app', './Module').then(m => m.RemoteEntryModule);\n * ```\n * change it to use loadRemote():\n * ```ts\n * import { loadRemote } from '@module-federation/enhanced/runtime';\n *\n * loadRemote<typeof import('my-remote-app/Module')>('my-remote-app/Module').then(m => m.RemoteEntryModule);\n * ```\n */\nexport async function loadRemoteModule(remoteName: string, moduleName: string) {\n  const remoteModuleKey = `${remoteName}:${moduleName}`;\n  if (remoteModuleMap.has(remoteModuleKey)) {\n    return remoteModuleMap.get(remoteModuleKey);\n  }\n\n  const container = remoteContainerMap.has(remoteName)\n    ? remoteContainerMap.get(remoteName)\n    : await loadRemoteContainer(remoteName);\n\n  const factory = await container.get(moduleName);\n  const Module = factory();\n\n  remoteModuleMap.set(remoteModuleKey, Module);\n\n  return Module;\n}\n\nfunction loadModule(url: string) {\n  return import(/* webpackIgnore:true */ url);\n}\n\nlet initialSharingScopeCreated = false;\n\nasync function loadRemoteContainer(remoteName: string) {\n  if (!resolveRemoteUrl && !remoteUrlDefinitions) {\n    throw new Error(\n      'Call setRemoteDefinitions or setRemoteUrlResolver to allow Dynamic Federation to find the remote apps correctly.'\n    );\n  }\n\n  if (!initialSharingScopeCreated) {\n    initialSharingScopeCreated = true;\n    await __webpack_init_sharing__('default');\n  }\n\n  const remoteUrl = remoteUrlDefinitions\n    ? remoteUrlDefinitions[remoteName]\n    : await resolveRemoteUrl(remoteName);\n\n  let containerUrl = remoteUrl;\n  if (!remoteUrl.endsWith('.mjs') && !remoteUrl.endsWith('.js')) {\n    containerUrl = `${remoteUrl}${\n      remoteUrl.endsWith('/') ? '' : '/'\n    }remoteEntry.mjs`;\n  }\n\n  const container = await loadModule(containerUrl);\n  await container.init(__webpack_share_scopes__.default);\n\n  remoteContainerMap.set(remoteName, container);\n  return container;\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"AAOA,IAAI,gBAA0C;AAE9C;;AAEG;AACG,SAAU,oBAAoB,CAClC,iBAA2C,EAAA;IAE3C,gBAAgB,GAAG,iBAAiB;AACtC;AAEA,IAAI,oBAA4C;AAEhD;;;;;;;;;;;;;;;;;;;;;;AAsBG;AACG,SAAU,oBAAoB,CAAC,WAAmC,EAAA;IACtE,oBAAoB,GAAG,WAAW;AACpC;AAEA;;;;;;;;;;;;;;;;;;;;;;AAsBG;AACa,SAAA,mBAAmB,CAAC,UAAkB,EAAE,SAAiB,EAAA;IACvE,oBAAoB,KAAK,EAAE;AAC3B,IAAA,oBAAoB,CAAC,UAAU,CAAC,GAAG,SAAS;AAC9C;AAEA,IAAI,eAAe,GAAG,IAAI,GAAG,EAAmB;AAChD,IAAI,kBAAkB,GAAG,IAAI,GAAG,EAAmB;AAEnD;;;;;;;;;;;;;;AAcG;AACI,eAAe,gBAAgB,CAAC,UAAkB,EAAE,UAAkB,EAAA;AAC3E,IAAA,MAAM,eAAe,GAAG,CAAA,EAAG,UAAU,CAAI,CAAA,EAAA,UAAU,EAAE;AACrD,IAAA,IAAI,eAAe,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE;AACxC,QAAA,OAAO,eAAe,CAAC,GAAG,CAAC,eAAe,CAAC;;AAG7C,IAAA,MAAM,SAAS,GAAG,kBAAkB,CAAC,GAAG,CAAC,UAAU;AACjD,UAAE,kBAAkB,CAAC,GAAG,CAAC,UAAU;AACnC,UAAE,MAAM,mBAAmB,CAAC,UAAU,CAAC;IAEzC,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC;AAC/C,IAAA,MAAM,MAAM,GAAG,OAAO,EAAE;AAExB,IAAA,eAAe,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC;AAE5C,IAAA,OAAO,MAAM;AACf;AAEA,SAAS,UAAU,CAAC,GAAW,EAAA;AAC7B,IAAA,OAAO,gCAAgC,GAAG,CAAC;AAC7C;AAEA,IAAI,0BAA0B,GAAG,KAAK;AAEtC,eAAe,mBAAmB,CAAC,UAAkB,EAAA;AACnD,IAAA,IAAI,CAAC,gBAAgB,IAAI,CAAC,oBAAoB,EAAE;AAC9C,QAAA,MAAM,IAAI,KAAK,CACb,kHAAkH,CACnH;;IAGH,IAAI,CAAC,0BAA0B,EAAE;QAC/B,0BAA0B,GAAG,IAAI;AACjC,QAAA,MAAM,wBAAwB,CAAC,SAAS,CAAC;;IAG3C,MAAM,SAAS,GAAG;AAChB,UAAE,oBAAoB,CAAC,UAAU;AACjC,UAAE,MAAM,gBAAgB,CAAC,UAAU,CAAC;IAEtC,IAAI,YAAY,GAAG,SAAS;AAC5B,IAAA,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;AAC7D,QAAA,YAAY,GAAG,CAAG,EAAA,SAAS,GACzB,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,GACjC,iBAAiB;;AAGnB,IAAA,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC;IAChD,MAAM,SAAS,CAAC,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC;AAEtD,IAAA,kBAAkB,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC;AAC7C,IAAA,OAAO,SAAS;AAClB;;ACjJA;;AAEG;;;;"}
+{"version":3,"file":"nx-angular-mf.mjs","sources":["../../../../packages/angular/mf/mf.ts","../../../../packages/angular/mf/nx-angular-mf.ts"],"sourcesContent":["import { extname } from 'node:path';\n\nexport type ResolveRemoteUrlFunction = (\n  remoteName: string\n) => string | Promise<string>;\n\ndeclare const __webpack_init_sharing__: (scope: 'default') => Promise<void>;\ndeclare const __webpack_share_scopes__: { default: unknown };\n\nlet resolveRemoteUrl: ResolveRemoteUrlFunction;\n\n/**\n * @deprecated Use Runtime Helpers from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n */\nexport function setRemoteUrlResolver(\n  _resolveRemoteUrl: ResolveRemoteUrlFunction\n) {\n  resolveRemoteUrl = _resolveRemoteUrl;\n}\n\nlet remoteUrlDefinitions: Record<string, string>;\n\n/**\n * @deprecated Use init() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you have a remote app called `my-remote-app` and you want to use the `http://localhost:4201/mf-manifest.json` as the remote url, you should change it from:\n * ```ts\n * import { setRemoteDefinitions } from '@nx/angular/mf';\n *\n * setRemoteDefinitions({\n *   'my-remote-app': 'http://localhost:4201/mf-manifest.json'\n * });\n * ```\n * to use init():\n * ```ts\n * import { init } from '@module-federation/enhanced/runtime';\n *\n * init({\n *   name: 'host',\n *   remotes: [{\n *     name: 'my-remote-app',\n *     entry: 'http://localhost:4201/mf-manifest.json'\n *   }]\n * });\n * ```\n */\nexport function setRemoteDefinitions(definitions: Record<string, string>) {\n  remoteUrlDefinitions = definitions;\n}\n\n/**\n * @deprecated Use registerRemotes() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you set a remote app with `setRemoteDefinition` such as:\n * ```ts\n * import { setRemoteDefinition } from '@nx/angular/mf';\n *\n * setRemoteDefinition(\n *   'my-remote-app',\n *   'http://localhost:4201/mf-manifest.json'\n * );\n * ```\n * change it to use registerRemotes():\n * ```ts\n * import { registerRemotes } from '@module-federation/enhanced/runtime';\n *\n * registerRemotes([\n *  {\n *     name: 'my-remote-app',\n *     entry: 'http://localhost:4201/mf-manifest.json'\n *   }\n * ]);\n * ```\n */\nexport function setRemoteDefinition(remoteName: string, remoteUrl: string) {\n  remoteUrlDefinitions ??= {};\n  remoteUrlDefinitions[remoteName] = remoteUrl;\n}\n\nlet remoteModuleMap = new Map<string, unknown>();\nlet remoteContainerMap = new Map<string, unknown>();\n\n/**\n * @deprecated Use loadRemote() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you set a load a remote with `loadRemoteModule` such as:\n * ```ts\n * import { loadRemoteModule } from '@nx/angular/mf';\n *\n * loadRemoteModule('my-remote-app', './Module').then(m => m.RemoteEntryModule);\n * ```\n * change it to use loadRemote():\n * ```ts\n * import { loadRemote } from '@module-federation/enhanced/runtime';\n *\n * loadRemote<typeof import('my-remote-app/Module')>('my-remote-app/Module').then(m => m.RemoteEntryModule);\n * ```\n */\nexport async function loadRemoteModule(remoteName: string, moduleName: string) {\n  const remoteModuleKey = `${remoteName}:${moduleName}`;\n  if (remoteModuleMap.has(remoteModuleKey)) {\n    return remoteModuleMap.get(remoteModuleKey);\n  }\n\n  const container = remoteContainerMap.has(remoteName)\n    ? remoteContainerMap.get(remoteName)\n    : await loadRemoteContainer(remoteName);\n\n  const factory = await container.get(moduleName);\n  const Module = factory();\n\n  remoteModuleMap.set(remoteModuleKey, Module);\n\n  return Module;\n}\n\nfunction loadModule(url: string) {\n  return import(/* webpackIgnore:true */ url);\n}\n\nlet initialSharingScopeCreated = false;\n\nasync function loadRemoteContainer(remoteName: string) {\n  if (!resolveRemoteUrl && !remoteUrlDefinitions) {\n    throw new Error(\n      'Call setRemoteDefinitions or setRemoteUrlResolver to allow Dynamic Federation to find the remote apps correctly.'\n    );\n  }\n\n  if (!initialSharingScopeCreated) {\n    initialSharingScopeCreated = true;\n    await __webpack_init_sharing__('default');\n  }\n\n  const remoteUrl = remoteUrlDefinitions\n    ? remoteUrlDefinitions[remoteName]\n    : await resolveRemoteUrl(remoteName);\n\n  const url = new URL(remoteUrl);\n  const ext = extname(url.pathname);\n\n  const needsRemoteEntry = !['.js', '.mjs', '.json'].includes(ext);\n\n  if (needsRemoteEntry) {\n    url.pathname = url.pathname.endsWith('/')\n      ? `${url.pathname}remoteEntry.mjs`\n      : `${url.pathname}/remoteEntry.mjs`;\n  }\n\n  const containerUrl = url.href;\n\n  const container = await loadModule(containerUrl);\n  await container.init(__webpack_share_scopes__.default);\n\n  remoteContainerMap.set(remoteName, container);\n  return container;\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;AASA,IAAI,gBAA0C;AAE9C;;AAEG;AACG,SAAU,oBAAoB,CAClC,iBAA2C,EAAA;IAE3C,gBAAgB,GAAG,iBAAiB;AACtC;AAEA,IAAI,oBAA4C;AAEhD;;;;;;;;;;;;;;;;;;;;;;AAsBG;AACG,SAAU,oBAAoB,CAAC,WAAmC,EAAA;IACtE,oBAAoB,GAAG,WAAW;AACpC;AAEA;;;;;;;;;;;;;;;;;;;;;;AAsBG;AACa,SAAA,mBAAmB,CAAC,UAAkB,EAAE,SAAiB,EAAA;IACvE,oBAAoB,KAAK,EAAE;AAC3B,IAAA,oBAAoB,CAAC,UAAU,CAAC,GAAG,SAAS;AAC9C;AAEA,IAAI,eAAe,GAAG,IAAI,GAAG,EAAmB;AAChD,IAAI,kBAAkB,GAAG,IAAI,GAAG,EAAmB;AAEnD;;;;;;;;;;;;;;AAcG;AACI,eAAe,gBAAgB,CAAC,UAAkB,EAAE,UAAkB,EAAA;AAC3E,IAAA,MAAM,eAAe,GAAG,CAAA,EAAG,UAAU,CAAI,CAAA,EAAA,UAAU,EAAE;AACrD,IAAA,IAAI,eAAe,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE;AACxC,QAAA,OAAO,eAAe,CAAC,GAAG,CAAC,eAAe,CAAC;;AAG7C,IAAA,MAAM,SAAS,GAAG,kBAAkB,CAAC,GAAG,CAAC,UAAU;AACjD,UAAE,kBAAkB,CAAC,GAAG,CAAC,UAAU;AACnC,UAAE,MAAM,mBAAmB,CAAC,UAAU,CAAC;IAEzC,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC;AAC/C,IAAA,MAAM,MAAM,GAAG,OAAO,EAAE;AAExB,IAAA,eAAe,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC;AAE5C,IAAA,OAAO,MAAM;AACf;AAEA,SAAS,UAAU,CAAC,GAAW,EAAA;AAC7B,IAAA,OAAO,gCAAgC,GAAG,CAAC;AAC7C;AAEA,IAAI,0BAA0B,GAAG,KAAK;AAEtC,eAAe,mBAAmB,CAAC,UAAkB,EAAA;AACnD,IAAA,IAAI,CAAC,gBAAgB,IAAI,CAAC,oBAAoB,EAAE;AAC9C,QAAA,MAAM,IAAI,KAAK,CACb,kHAAkH,CACnH;;IAGH,IAAI,CAAC,0BAA0B,EAAE;QAC/B,0BAA0B,GAAG,IAAI;AACjC,QAAA,MAAM,wBAAwB,CAAC,SAAS,CAAC;;IAG3C,MAAM,SAAS,GAAG;AAChB,UAAE,oBAAoB,CAAC,UAAU;AACjC,UAAE,MAAM,gBAAgB,CAAC,UAAU,CAAC;AAEtC,IAAA,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC;IAC9B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;AAEjC,IAAA,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;IAEhE,IAAI,gBAAgB,EAAE;QACpB,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG;AACtC,cAAE,CAAA,EAAG,GAAG,CAAC,QAAQ,CAAiB,eAAA;AAClC,cAAE,CAAG,EAAA,GAAG,CAAC,QAAQ,kBAAkB;;AAGvC,IAAA,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI;AAE7B,IAAA,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC;IAChD,MAAM,SAAS,CAAC,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC;AAEtD,IAAA,kBAAkB,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC;AAC7C,IAAA,OAAO,SAAS;AAClB;;ACzJA;;AAEG;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "21.1.1",
+  "version": "21.1.3",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -67,14 +67,14 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "21.1.1",
-    "@nx/js": "21.1.1",
-    "@nx/eslint": "21.1.1",
-    "@nx/webpack": "21.1.1",
-    "@nx/rspack": "21.1.1",
-    "@nx/module-federation": "21.1.1",
-    "@nx/web": "21.1.1",
-    "@nx/workspace": "21.1.1",
+    "@nx/devkit": "21.1.3",
+    "@nx/js": "21.1.3",
+    "@nx/eslint": "21.1.3",
+    "@nx/webpack": "21.1.3",
+    "@nx/rspack": "21.1.3",
+    "@nx/module-federation": "21.1.3",
+    "@nx/web": "21.1.3",
+    "@nx/workspace": "21.1.3",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

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

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

package/src/generators/convert-to-rspack/convert-to-rspack.js

@@ -2,15 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToRspack = convertToRspack;
 const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
+const enquirer_1 = require("enquirer");
+const path_1 = require("path");
+const posix_1 = require("path/posix");
 const versions_1 = require("../../utils/versions");
 const create_config_1 = require("./lib/create-config");
 const get_custom_webpack_config_1 = require("./lib/get-custom-webpack-config");
 const update_tsconfig_1 = require("./lib/update-tsconfig");
 const validate_supported_executor_1 = require("./lib/validate-supported-executor");
-const posix_1 = require("path/posix");
-const path_1 = require("path");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-const enquirer_1 = require("enquirer");
 const SUPPORTED_EXECUTORS = [
     '@angular-devkit/build-angular:browser',
     '@angular-devkit/build-angular:dev-server',
@@ -169,10 +170,6 @@ function handleBuildTargetOptions(tree, options, newConfigurationOptions, root)
         customWebpackConfigPath = options.customWebpackConfig.path;
         delete options.customWebpackConfig;
     }
-    if (options.outputs) {
-        // handled by the Rspack inference plugin
-        delete options.outputs;
-    }
     for (const [key, value] of Object.entries(options)) {
         let optionName = key;
         let optionValue = key in PATH_NORMALIZER ? PATH_NORMALIZER[key](tree, value, root) : value;
@@ -252,8 +249,9 @@ async function convertToRspack(tree, schema) {
         root: project.root,
     };
     const configurationOptions = {};
-    const buildTargetNames = [];
-    const serveTargetNames = [];
+    let buildTarget;
+    let serveTarget;
+    const targetsToRemove = [];
     let customWebpackConfigPath;
     (0, validate_supported_executor_1.validateSupportedBuildExecutor)(Object.values(project.targets));
     let projectServePort = DEFAULT_PORT;
@@ -267,14 +265,15 @@ async function convertToRspack(tree, schema) {
                     handleBuildTargetOptions(tree, configuration, configurationOptions[configurationName], project.root);
                 }
             }
-            buildTargetNames.push(targetName);
+            buildTarget = { name: targetName, config: target };
+            targetsToRemove.push(targetName);
         }
         else if (target.executor === '@angular-devkit/build-angular:server' ||
             target.executor === '@nx/angular:webpack-server') {
             createConfigOptions.ssr ??= {};
             createConfigOptions.ssr.entry ??= normalizeFromProjectRoot(tree, target.options.main, project.root);
             createConfigOptions.server = './src/main.server.ts';
-            buildTargetNames.push(targetName);
+            targetsToRemove.push(targetName);
         }
         else if (target.executor === '@angular-devkit/build-angular:dev-server' ||
             target.executor === '@nx/angular:dev-server' ||
@@ -282,7 +281,7 @@ async function convertToRspack(tree, schema) {
             createConfigOptions.devServer = {};
             if (target.options) {
                 handleDevServerTargetOptions(tree, target.options, createConfigOptions.devServer, project.root);
-                if (target.options.port !== DEFAULT_PORT) {
+                if (target.options.port && target.options.port !== DEFAULT_PORT) {
                     projectServePort = target.options.port;
                 }
             }
@@ -293,7 +292,8 @@ async function convertToRspack(tree, schema) {
                     handleDevServerTargetOptions(tree, configuration, configurationOptions[configurationName].devServer, project.root);
                 }
             }
-            serveTargetNames.push(targetName);
+            serveTarget = { name: targetName, config: target };
+            targetsToRemove.push(targetName);
         }
         else if (target.executor === '@angular-devkit/build-angular:prerender') {
             if (target.options) {
@@ -314,11 +314,11 @@ async function convertToRspack(tree, schema) {
                     }
                 }
             }
-            buildTargetNames.push(targetName);
+            targetsToRemove.push(targetName);
         }
         else if (target.executor === '@angular-devkit/build-angular:app-shell') {
             createConfigOptions.appShell = true;
-            buildTargetNames.push(targetName);
+            targetsToRemove.push(targetName);
         }
     }
     const customWebpackConfigInfo = customWebpackConfigPath
@@ -326,20 +326,169 @@ async function convertToRspack(tree, schema) {
         : undefined;
     (0, create_config_1.createConfig)(tree, createConfigOptions, configurationOptions, customWebpackConfigInfo?.normalizedPathToCustomWebpackConfig, customWebpackConfigInfo?.isWebpackConfigFunction);
     (0, update_tsconfig_1.updateTsconfig)(tree, project.root);
-    for (const targetName of [...buildTargetNames, ...serveTargetNames]) {
+    for (const targetName of targetsToRemove) {
         delete project.targets[targetName];
     }
-    if (projectServePort !== DEFAULT_PORT) {
-        project.targets.serve ??= {};
-        project.targets.serve.options ??= {};
-        project.targets.serve.options.port = projectServePort;
-    }
     (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
+    // ensure plugin is registered
     const { rspackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxVersion);
     await rspackInitGenerator(tree, {
         addPlugin: true,
         framework: 'angular',
     });
+    // find the inferred target names
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    let inferredBuildTargetName = 'build';
+    let inferredServeTargetName = 'serve';
+    const pluginRegistration = nxJson.plugins.find((p) => typeof p === 'string' ? false : p.plugin === '@nx/rspack/plugin');
+    if (pluginRegistration) {
+        inferredBuildTargetName =
+            pluginRegistration.options.buildTargetName ?? inferredBuildTargetName;
+        inferredServeTargetName =
+            pluginRegistration.options.serveTargetName ?? inferredServeTargetName;
+    }
+    if (buildTarget) {
+        // these are all replaced by the inferred task
+        delete buildTarget.config.options;
+        delete buildTarget.config.configurations;
+        delete buildTarget.config.defaultConfiguration;
+        delete buildTarget.config.executor;
+        const shouldOverrideInputs = (inputs) => {
+            if (!inputs?.length) {
+                return false;
+            }
+            if (inputs.length === 2) {
+                // check whether the existing inputs would match the inferred task
+                // inputs with the exception of the @rspack/cli external dependency
+                // which webpack tasks wouldn't have
+                const namedInputs = (0, get_named_inputs_1.getNamedInputs)(project.root, {
+                    nxJsonConfiguration: nxJson,
+                    configFiles: [],
+                    workspaceRoot: devkit_1.workspaceRoot,
+                });
+                if ('production' in namedInputs) {
+                    return !['production', '^production'].every((input) => inputs.includes(input));
+                }
+                return !['default', '^default'].every((input) => inputs.includes(input));
+            }
+            return true;
+        };
+        if (shouldOverrideInputs(buildTarget.config.inputs)) {
+            // keep existing inputs and add the @rspack/cli external dependency
+            buildTarget.config.inputs = [
+                ...buildTarget.config.inputs,
+                { externalDependencies: ['@rspack/cli'] },
+            ];
+        }
+        else {
+            delete buildTarget.config.inputs;
+        }
+        if (buildTarget.config.cache) {
+            delete buildTarget.config.cache;
+        }
+        if (buildTarget.config.dependsOn?.length === 1 &&
+            buildTarget.config.dependsOn[0] === `^${buildTarget.name}`) {
+            delete buildTarget.config.dependsOn;
+        }
+        else if (buildTarget.config.dependsOn) {
+            buildTarget.config.dependsOn = buildTarget.config.dependsOn.map((dep) => dep === `^${buildTarget.name}` ? `^${inferredBuildTargetName}` : dep);
+        }
+        const newOutputPath = (0, devkit_1.joinPathFragments)(project.root, createConfigOptions.outputPath.base);
+        const shouldOverrideOutputs = (outputs) => {
+            if (!outputs?.length) {
+                // this means the target was wrongly configured, so, we don't override
+                // anything and let the inferred outputs be used
+                return false;
+            }
+            if (outputs.length === 1) {
+                if (outputs[0] === '{options.outputPath}') {
+                    // the inferred task output is created after the createConfig
+                    // outputPath option, so we don't need to keep this
+                    return false;
+                }
+                const normalizedOutputPath = outputs[0]
+                    .replace('{workspaceRoot}/', '')
+                    .replace('{projectRoot}', project.root)
+                    .replace('{projectName}', '');
+                if (normalizedOutputPath === newOutputPath ||
+                    normalizedOutputPath.replace(/\/browser\/?$/, '') === newOutputPath) {
+                    return false;
+                }
+            }
+            return true;
+        };
+        const normalizeOutput = (path, workspaceRoot, projectRoot) => {
+            const fullProjectRoot = (0, path_1.resolve)(workspaceRoot, projectRoot);
+            const fullPath = (0, path_1.resolve)(workspaceRoot, path);
+            const pathRelativeToProjectRoot = (0, devkit_1.normalizePath)((0, path_1.relative)(fullProjectRoot, fullPath));
+            if (pathRelativeToProjectRoot.startsWith('..')) {
+                return (0, devkit_1.joinPathFragments)('{workspaceRoot}', (0, path_1.relative)(workspaceRoot, fullPath));
+            }
+            return (0, devkit_1.joinPathFragments)('{projectRoot}', pathRelativeToProjectRoot);
+        };
+        if (shouldOverrideOutputs(buildTarget.config.outputs)) {
+            buildTarget.config.outputs = buildTarget.config.outputs.map((output) => {
+                if (output === '{options.outputPath}') {
+                    // the target won't have an outputPath option, so we replace it with the new output path
+                    return normalizeOutput(newOutputPath, devkit_1.workspaceRoot, project.root);
+                }
+                const normalizedOutputPath = output
+                    .replace('{workspaceRoot}/', '')
+                    .replace('{projectRoot}', project.root)
+                    .replace('{projectName}', '');
+                if (/\/browser\/?$/.test(normalizedOutputPath) &&
+                    normalizedOutputPath.replace(/\/browser\/?$/, '') === newOutputPath) {
+                    return normalizeOutput(newOutputPath, devkit_1.workspaceRoot, project.root);
+                }
+                return output;
+            });
+        }
+        else {
+            delete buildTarget.config.outputs;
+        }
+        if (buildTarget.config.syncGenerators?.length === 1 &&
+            buildTarget.config.syncGenerators[0] === '@nx/js:typescript-sync') {
+            delete buildTarget.config.syncGenerators;
+        }
+        else if (buildTarget.config.syncGenerators?.length) {
+            buildTarget.config.syncGenerators = Array.from(new Set([
+                ...buildTarget.config.syncGenerators,
+                '@nx/js:typescript-sync',
+            ]));
+        }
+        if (Object.keys(buildTarget.config).length) {
+            // there's extra target metadata left that wouldn't be inferred, we keep it
+            project.targets[inferredBuildTargetName] = buildTarget.config;
+        }
+    }
+    if (serveTarget) {
+        delete serveTarget.config.options;
+        delete serveTarget.config.configurations;
+        delete serveTarget.config.defaultConfiguration;
+        delete serveTarget.config.executor;
+        if (serveTarget.config.continuous) {
+            delete serveTarget.config.continuous;
+        }
+        if (serveTarget.config.syncGenerators?.length === 1 &&
+            serveTarget.config.syncGenerators[0] === '@nx/js:typescript-sync') {
+            delete serveTarget.config.syncGenerators;
+        }
+        else if (serveTarget.config.syncGenerators?.length) {
+            serveTarget.config.syncGenerators = Array.from(new Set([
+                ...serveTarget.config.syncGenerators,
+                '@nx/js:typescript-sync',
+            ]));
+        }
+        if (projectServePort !== DEFAULT_PORT) {
+            serveTarget.config.options = {};
+            serveTarget.config.options.port = projectServePort;
+        }
+        if (Object.keys(serveTarget.config).length) {
+            // there's extra target metadata left that wouldn't be inferred, we keep it
+            project.targets[inferredServeTargetName] = serveTarget.config;
+        }
+    }
+    (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
     // This is needed to prevent a circular execution of the build target
     const rootPkgJson = (0, devkit_1.readJson)(tree, 'package.json');
     if (rootPkgJson.scripts?.build === 'nx build') {