@nx/angular 17.3.1 → 18.0.0-beta.1

package/migrations.json

@@ -356,6 +356,12 @@
       },
       "description": "Add 'autoprefixer' as dev dependency when '@nx/angular:ng-packagr-lite' or '@nx/angular:package` is used.",
       "factory": "./src/migrations/update-17-3-0/add-autoprefixer-dependency"
+    },
+    "add-module-federation-env-var-to-target-defaults": {
+      "cli": "nx",
+      "version": "18.0.0-beta.0",
+      "description": "Add NX_MF_DEV_SERVER_STATIC_REMOTES to inputs for task hashing when '@nx/angular:webpack-browser' is used for Module Federation.",
+      "factory": "./src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "17.3.1",
+  "version": "18.0.0-beta.1",
   "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, 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- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -74,20 +74,20 @@
     "ignore": "^5.0.4",
     "magic-string": "~0.30.2",
     "minimatch": "9.0.3",
-    "semver": "7.5.3",
+    "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "17.3.1",
-    "@nx/cypress": "17.3.1",
-    "@nx/jest": "17.3.1",
-    "@nx/js": "17.3.1",
-    "@nx/eslint": "17.3.1",
-    "@nx/webpack": "17.3.1",
-    "@nx/web": "17.3.1",
-    "@nx/workspace": "17.3.1",
+    "@nx/devkit": "18.0.0-beta.1",
+    "@nx/cypress": "18.0.0-beta.1",
+    "@nx/jest": "18.0.0-beta.1",
+    "@nx/js": "18.0.0-beta.1",
+    "@nx/eslint": "18.0.0-beta.1",
+    "@nx/webpack": "18.0.0-beta.1",
+    "@nx/web": "18.0.0-beta.1",
+    "@nx/workspace": "18.0.0-beta.1",
     "piscina": "^4.2.1",
-    "@nrwl/angular": "17.3.1"
+    "@nrwl/angular": "18.0.0-beta.1"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 15.0.0 < 18.0.0",

package/src/generators/application/application.js

@@ -8,6 +8,7 @@ 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");
+const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 async function applicationGenerator(tree, schema) {
     return await applicationGeneratorInternal(tree, {
         projectNameAndRootFormat: 'derived',
@@ -68,6 +69,7 @@ async function applicationGeneratorInternal(tree, schema) {
     }
     return () => {
         (0, devkit_1.installPackagesTask)(tree);
+        (0, log_show_project_command_1.logShowProjectCommand)(options.name);
     };
 }
 exports.applicationGeneratorInternal = applicationGeneratorInternal;

package/src/generators/host/host.js

@@ -8,6 +8,7 @@ const application_1 = require("../application/application");
 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");
 async function host(tree, options) {
     return await hostInternal(tree, {
         projectNameAndRootFormat: 'derived',
@@ -90,6 +91,7 @@ async function hostInternal(tree, schema) {
             typescriptConfiguration,
         });
     }
+    (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(tree);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/library/library.js

@@ -20,6 +20,7 @@ const add_project_1 = require("./lib/add-project");
 const add_jest_1 = require("../utils/add-jest");
 const set_generator_defaults_1 = require("./lib/set-generator-defaults");
 const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependencies");
+const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
         // provide a default projectNameAndRootFormat to avoid breaking changes
@@ -80,6 +81,7 @@ async function libraryGeneratorInternal(tree, schema) {
     }
     return () => {
         (0, devkit_1.installPackagesTask)(tree);
+        (0, log_show_project_command_1.logShowProjectCommand)(libraryOptions.name);
     };
 }
 exports.libraryGeneratorInternal = libraryGeneratorInternal;

package/src/generators/remote/remote.js

@@ -8,6 +8,7 @@ const application_1 = require("../application/application");
 const setup_mf_1 = require("../setup-mf/setup-mf");
 const lib_1 = require("./lib");
 const versions_1 = require("@nx/js/src/utils/versions");
+const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
 async function remote(tree, options) {
     return await remoteInternal(tree, {
         projectNameAndRootFormat: 'derived',
@@ -68,6 +69,7 @@ async function remoteInternal(tree, schema) {
         });
         installTasks.push(ssrInstallTask);
     }
+    (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(tree);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/utils/add-mf-env-to-inputs.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export declare function addMfEnvToTargetDefaultInputs(tree: Tree): void;

package/src/generators/utils/add-mf-env-to-inputs.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addMfEnvToTargetDefaultInputs = void 0;
+const devkit_1 = require("@nx/devkit");
+function addMfEnvToTargetDefaultInputs(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const webpackExecutor = '@nx/angular:webpack-browser';
+    const mfEnvVar = 'NX_MF_DEV_SERVER_STATIC_REMOTES';
+    nxJson.targetDefaults ??= {};
+    nxJson.targetDefaults[webpackExecutor] ??= {};
+    nxJson.targetDefaults[webpackExecutor].inputs ??= [];
+    let mfEnvVarExists = false;
+    for (const input of nxJson.targetDefaults[webpackExecutor].inputs) {
+        if (typeof input === 'object' && input['env'] === mfEnvVar) {
+            mfEnvVarExists = true;
+            break;
+        }
+    }
+    if (!mfEnvVarExists) {
+        nxJson.targetDefaults[webpackExecutor].inputs.push({ env: mfEnvVar });
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+}
+exports.addMfEnvToTargetDefaultInputs = addMfEnvToTargetDefaultInputs;

package/src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults.d.ts

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

package/src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const add_mf_env_to_inputs_1 = require("../../generators/utils/add-mf-env-to-inputs");
+async function default_1(tree) {
+    if (!isWebpackBrowserUsed(tree)) {
+        return;
+    }
+    (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(tree);
+    await (0, devkit_1.formatFiles)(tree);
+}
+exports.default = default_1;
+function isWebpackBrowserUsed(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const project of projects.values()) {
+        const targets = project.targets;
+        for (const [_, target] of Object.entries(targets)) {
+            if (target.executor === '@nx/angular:webpack-browser' &&
+                (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'module-federation.config.ts')) ||
+                    tree.exists((0, devkit_1.joinPathFragments)(project.root, 'module-federation.config.js')))) {
+                return true;
+            }
+        }
+    }
+    return false;
+}