@nx/angular 19.1.0-canary.20240508-fd78152 → 19.1.0-canary.20240510-1a85787

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "19.1.0-canary.20240508-fd78152",
+  "version": "19.1.0-canary.20240510-1a85787",
   "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": {
@@ -78,14 +78,14 @@
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "19.1.0-canary.20240508-fd78152",
-    "@nx/js": "19.1.0-canary.20240508-fd78152",
-    "@nx/eslint": "19.1.0-canary.20240508-fd78152",
-    "@nx/webpack": "19.1.0-canary.20240508-fd78152",
-    "@nx/web": "19.1.0-canary.20240508-fd78152",
-    "@nx/workspace": "19.1.0-canary.20240508-fd78152",
+    "@nx/devkit": "19.1.0-canary.20240510-1a85787",
+    "@nx/js": "19.1.0-canary.20240510-1a85787",
+    "@nx/eslint": "19.1.0-canary.20240510-1a85787",
+    "@nx/webpack": "19.1.0-canary.20240510-1a85787",
+    "@nx/web": "19.1.0-canary.20240510-1a85787",
+    "@nx/workspace": "19.1.0-canary.20240510-1a85787",
     "piscina": "^4.4.0",
-    "@nrwl/angular": "19.1.0-canary.20240508-fd78152"
+    "@nrwl/angular": "19.1.0-canary.20240510-1a85787"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 15.0.0 < 18.0.0",

package/src/builders/dev-server/schema.json

@@ -17,7 +17,7 @@
       "type": "string",
       "description": "A browser builder target to serve in the format of `project:target[:configuration]`. Ignored if `buildTarget` is set.",
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$",
-      "x-deprecated": "Use 'buildTarget' instead. It will be removed in Nx v19."
+      "x-deprecated": "Use 'buildTarget' instead. It will be removed in Nx v20."
     },
     "buildTarget": {
       "type": "string",

package/src/builders/utilities/module-federation.d.ts

@@ -2,5 +2,8 @@ import { ProjectConfiguration } from '@nx/devkit';
 export declare function getDynamicRemotes(project: ProjectConfiguration, context: import('@angular-devkit/architect').BuilderContext, workspaceProjects: Record<string, ProjectConfiguration>, remotesToSkip: Set<string>, pathToManifestFile?: string): string[];
 export declare function getStaticRemotes(project: ProjectConfiguration, context: import('@angular-devkit/architect').BuilderContext, workspaceProjects: Record<string, ProjectConfiguration>, remotesToSkip: Set<string>): string[];
 export declare function validateDevRemotes(options: {
-    devRemotes?: string[];
+    devRemotes?: (string | {
+        remoteName: string;
+        configuration: string;
+    })[];
 }, workspaceProjects: Record<string, ProjectConfiguration>): void;

package/src/builders/utilities/module-federation.js

@@ -85,7 +85,9 @@ function getStaticRemotes(project, context, workspaceProjects, remotesToSkip) {
 }
 exports.getStaticRemotes = getStaticRemotes;
 function validateDevRemotes(options, workspaceProjects) {
-    const invalidDevRemotes = options.devRemotes?.filter((remote) => !workspaceProjects[remote]) ?? [];
+    const invalidDevRemotes = options.devRemotes?.filter((remote) => !(typeof remote === 'string'
+        ? workspaceProjects[remote]
+        : workspaceProjects[remote.remoteName])) ?? [];
     if (invalidDevRemotes.length) {
         throw new Error(invalidDevRemotes.length === 1
             ? `Invalid dev remote provided: ${invalidDevRemotes[0]}.`

package/src/builders/webpack-browser/schema.d.ts

@@ -7,7 +7,7 @@ export type BrowserBuilderSchema = Schema & {
   indexHtmlTransformer?: string;
   buildLibsFromSource?: boolean;
   /**
-   * @deprecated Use `indexHtmlTransformer` instead. It will be removed in Nx 19.
+   * @deprecated Use `indexHtmlTransformer` instead. It will be removed in Nx 20.
    */
   indexFileTransformer?: string;
 };

package/src/executors/module-federation-dev-server/lib/start-dev-remotes.js

@@ -13,10 +13,11 @@ async function startRemotes(remotes, workspaceProjects, options, context, target
         }
         const [collection, executor] = workspaceProjects[app].targets[target].executor.split(':');
         const isUsingModuleFederationDevServerExecutor = executor.includes('module-federation-dev-server');
+        const configurationOverride = options.devRemotes.find((r) => typeof r !== 'string' && r.remoteName === app)?.configuration;
         remoteIters.push(await (0, devkit_1.runExecutor)({
             project: app,
             target,
-            configuration: context.configurationName,
+            configuration: configurationOverride ?? context.configurationName,
         }, {
             ...(target === 'serve' ? { verbose: options.verbose ?? false } : {}),
             ...(isUsingModuleFederationDevServerExecutor

package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -52,14 +52,17 @@ async function* moduleFederationDevServerExecutor(schema, context) {
     }
     (0, module_federation_2.validateDevRemotes)(options, workspaceProjects);
     const moduleFederationConfig = (0, module_federation_1.getModuleFederationConfig)(project.targets.build.options.tsConfig, context.root, project.root, 'angular');
-    const remotes = (0, module_federation_1.getRemotes)(options.devRemotes, options.skipRemotes, moduleFederationConfig, {
+    const remoteNames = options.devRemotes?.map((r) => typeof r === 'string' ? r : r.remoteName);
+    const remotes = (0, module_federation_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
         projectName: project.name,
         projectGraph: context.projectGraph,
         root: context.root,
     }, pathToManifestFile);
     if (remotes.devRemotes.length > 0 && !schema.staticRemotesPort) {
         options.staticRemotesPort = options.devRemotes.reduce((portToUse, r) => {
-            const remotePort = context.projectGraph.nodes[r].data.targets['serve'].options.port;
+            const remoteName = typeof r === 'string' ? r : r.remoteName;
+            const remotePort = context.projectGraph.nodes[remoteName].data.targets['serve'].options
+                .port;
             if (remotePort >= portToUse) {
                 return remotePort + 1;
             }

package/src/executors/module-federation-dev-server/schema.d.ts

@@ -16,7 +16,13 @@ interface BaseSchema {
   hmr?: boolean;
   watch?: boolean;
   poll?: number;
-  devRemotes?: string[];
+  devRemotes?: (
+    | string
+    | {
+        remoteName: string;
+        configuration: string;
+      }
+  )[];
   skipRemotes?: string[];
   pathToManifestFile?: string;
   static?: boolean;

package/src/executors/module-federation-dev-server/schema.json

@@ -15,7 +15,7 @@
       "type": "string",
       "description": "A browser builder target to serve in the format of `project:target[:configuration]`.",
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$",
-      "x-deprecated": "Use 'buildTarget' instead. It will be removed in Nx v19."
+      "x-deprecated": "Use 'buildTarget' instead. It will be removed in Nx v20."
     },
     "buildTarget": {
       "type": "string",
@@ -112,7 +112,24 @@
     "devRemotes": {
       "type": "array",
       "items": {
-        "type": "string"
+        "oneOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "remoteName": {
+                "type": "string"
+              },
+              "configuration": {
+                "type": "string"
+              }
+            },
+            "required": ["remoteName"],
+            "additionalProperties": false
+          }
+        ]
       },
       "description": "List of remote applications to run in development mode (i.e. using serve target).",
       "x-priority": "important"

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

@@ -22,15 +22,15 @@ export interface Schema {
   skipFormat?: boolean;
 
   /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
    */
   flat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead. It will be removed in Nx v20.
    */
   path?: string;
   /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
    */
   project?: string;
 }

package/src/generators/component/schema.json

@@ -34,7 +34,7 @@
         "$source": "projectName"
       },
       "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
     },
     "prefix": {
       "type": "string",
@@ -98,7 +98,7 @@
       "type": "boolean",
       "description": "Create the new files at the top level of the current project.",
       "default": false,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
     },
     "skipImport": {
       "type": "boolean",

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

@@ -13,15 +13,15 @@ export interface Schema {
   export?: boolean;
   skipFormat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
    */
   flat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead. It will be removed in Nx v20.
    */
   path?: string;
   /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
    */
   project?: string;
 }

package/src/generators/directive/schema.json

@@ -34,7 +34,7 @@
         "$source": "projectName"
       },
       "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
     },
     "prefix": {
       "type": "string",
@@ -74,7 +74,7 @@
       "type": "boolean",
       "description": "When true (the default), creates the new files at the top level of the current project.",
       "default": true,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
     },
     "module": {
       "type": "string",

package/src/generators/host/host.js

@@ -9,6 +9,7 @@ const remote_1 = require("../remote/remote");
 const setup_mf_1 = require("../setup-mf/setup-mf");
 const lib_1 = require("./lib");
 const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
+const js_1 = require("@nx/js");
 async function host(tree, options) {
     return await hostInternal(tree, {
         projectNameAndRootFormat: 'derived',
@@ -22,6 +23,16 @@ async function hostInternal(tree, schema) {
     const projects = (0, devkit_1.getProjects)(tree);
     const remotesToGenerate = [];
     const remotesToIntegrate = [];
+    // Check to see if remotes are provided and also check if --dynamic is provided
+    // if both are check that the remotes are valid names else throw an error.
+    if (options.dynamic && options.remotes?.length > 0) {
+        options.remotes.forEach((remote) => {
+            const isValidRemote = (0, js_1.isValidVariable)(remote);
+            if (!isValidRemote.isValid) {
+                throw new Error(`Invalid remote name provided: ${remote}. ${isValidRemote.message}`);
+            }
+        });
+    }
     if (options.remotes && options.remotes.length > 0) {
         options.remotes.forEach((remote) => {
             if (!projects.has(remote)) {

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

@@ -11,15 +11,15 @@ export interface Schema {
   export?: boolean;
   skipFormat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
    */
   flat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead. It will be removed in Nx v20.
    */
   path?: string;
   /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
    */
   project?: string;
 }

package/src/generators/pipe/schema.json

@@ -34,13 +34,13 @@
         "$source": "projectName"
       },
       "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
     },
     "flat": {
       "type": "boolean",
       "default": true,
       "description": "When true (the default) creates files at the top level of the project.",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
     },
     "skipTests": {
       "type": "boolean",

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

@@ -19,15 +19,15 @@ export interface Schema {
   export?: boolean;
   skipFormat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
    */
   flat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead. It will be removed in Nx v20.
    */
   path?: string;
   /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
    */
   project?: string;
 }

package/src/generators/scam/schema.json

@@ -40,7 +40,7 @@
         "$source": "projectName"
       },
       "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
     },
     "displayBlock": {
       "description": "Specifies if the style will contain `:host { display: block; }`.",
@@ -94,7 +94,7 @@
       "type": "boolean",
       "description": "Create the new files at the top level of the current project.",
       "default": false,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
     },
     "selector": {
       "type": "string",

package/src/generators/scam-directive/schema.d.ts

@@ -11,15 +11,15 @@ export interface Schema {
   export?: boolean;
   skipFormat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
    */
   flat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead. It will be removed in Nx v20.
    */
   path?: string;
   /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
    */
   project?: string;
 }

package/src/generators/scam-directive/schema.json

@@ -41,7 +41,7 @@
         "$source": "projectName"
       },
       "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
     },
     "skipTests": {
       "type": "boolean",
@@ -58,7 +58,7 @@
       "type": "boolean",
       "description": "Create the new files at the top level of the current project.",
       "default": true,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
     },
     "selector": {
       "type": "string",

package/src/generators/scam-pipe/schema.d.ts

@@ -9,15 +9,15 @@ export interface Schema {
   export?: boolean;
   skipFormat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
    */
   flat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead. It will be removed in Nx v20.
    */
   path?: string;
   /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
    */
   project?: string;
 }

package/src/generators/scam-pipe/schema.json

@@ -41,7 +41,7 @@
         "$source": "projectName"
       },
       "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
     },
     "skipTests": {
       "type": "boolean",
@@ -58,7 +58,7 @@
       "type": "boolean",
       "description": "Create the new files at the top level of the current project.",
       "default": true,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
     },
     "export": {
       "type": "boolean",

package/src/generators/storybook-configuration/schema.json

@@ -29,7 +29,7 @@
     "configureCypress": {
       "type": "boolean",
       "description": "Specifies whether to configure Cypress or not.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
     },
     "generateStories": {
       "type": "boolean",
@@ -41,7 +41,7 @@
     "generateCypressSpecs": {
       "type": "boolean",
       "description": "Specifies whether to automatically generate test files in the generated Cypress e2e app.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
     },
     "configureStaticServe": {
       "type": "boolean",
@@ -53,7 +53,7 @@
     "cypressDirectory": {
       "type": "string",
       "description": "A directory where the Cypress project will be placed. Placed at the root by default.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
     },
     "linter": {
       "description": "The tool to use for running lint checks.",