@nx/angular 19.2.0-canary.20240601-6f22300 → 19.2.0-canary.20240605-5a06daa

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "19.2.0-canary.20240601-6f22300",
+  "version": "19.2.0-canary.20240605-5a06daa",
   "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": {
@@ -79,14 +79,14 @@
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "19.2.0-canary.20240601-6f22300",
-    "@nx/js": "19.2.0-canary.20240601-6f22300",
-    "@nx/eslint": "19.2.0-canary.20240601-6f22300",
-    "@nx/webpack": "19.2.0-canary.20240601-6f22300",
-    "@nx/web": "19.2.0-canary.20240601-6f22300",
-    "@nx/workspace": "19.2.0-canary.20240601-6f22300",
+    "@nx/devkit": "19.2.0-canary.20240605-5a06daa",
+    "@nx/js": "19.2.0-canary.20240605-5a06daa",
+    "@nx/eslint": "19.2.0-canary.20240605-5a06daa",
+    "@nx/webpack": "19.2.0-canary.20240605-5a06daa",
+    "@nx/web": "19.2.0-canary.20240605-5a06daa",
+    "@nx/workspace": "19.2.0-canary.20240605-5a06daa",
     "piscina": "^4.4.0",
-    "@nrwl/angular": "19.2.0-canary.20240601-6f22300"
+    "@nrwl/angular": "19.2.0-canary.20240605-5a06daa"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 16.0.0 < 19.0.0",

package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js

@@ -31,16 +31,16 @@ function executeModuleFederationDevSSRBuilder(schema, context) {
     else {
         pathToManifestFile = (0, module_federation_1.getDynamicMfManifestFile)(project, context.workspaceRoot);
     }
-    (0, module_federation_1.validateDevRemotes)(options, workspaceProjects);
-    const remotesToSkip = new Set(options.skipRemotes ?? []);
-    const staticRemotes = (0, module_federation_1.getStaticRemotes)(project, context, workspaceProjects, remotesToSkip);
-    const dynamicRemotes = (0, module_federation_1.getDynamicRemotes)(project, context, workspaceProjects, remotesToSkip, pathToManifestFile);
-    const remotes = [...staticRemotes, ...dynamicRemotes];
     const devServeRemotes = !options.devRemotes
         ? []
         : Array.isArray(options.devRemotes)
             ? options.devRemotes
             : [options.devRemotes];
+    (0, module_federation_1.validateDevRemotes)({ devRemotes: devServeRemotes }, workspaceProjects);
+    const remotesToSkip = new Set(options.skipRemotes ?? []);
+    const staticRemotes = (0, module_federation_1.getStaticRemotes)(project, context, workspaceProjects, remotesToSkip);
+    const dynamicRemotes = (0, module_federation_1.getDynamicRemotes)(project, context, workspaceProjects, remotesToSkip, pathToManifestFile);
+    const remotes = [...staticRemotes, ...dynamicRemotes];
     const remoteProcessPromises = [];
     for (const remote of remotes) {
         const isDev = devServeRemotes.includes(remote);

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

@@ -1,10 +1,11 @@
 import { ProjectConfiguration } from '@nx/devkit';
+export type DevRemoteDefinition = string | {
+    remoteName: string;
+    configuration: string;
+};
 export declare function getDynamicRemotes(project: ProjectConfiguration, context: import('@angular-devkit/architect').BuilderContext, workspaceProjects: Record<string, ProjectConfiguration>, remotesToSkip: Set<string>, pathToManifestFile: string | undefined): 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 | {
-        remoteName: string;
-        configuration: string;
-    })[];
+    devRemotes: DevRemoteDefinition[];
 }, workspaceProjects: Record<string, ProjectConfiguration>): void;
 export declare function getDynamicMfManifestFile(project: ProjectConfiguration, workspaceRoot: string): string | undefined;

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

@@ -86,7 +86,7 @@ function getStaticRemotes(project, context, workspaceProjects, remotesToSkip) {
 }
 exports.getStaticRemotes = getStaticRemotes;
 function validateDevRemotes(options, workspaceProjects) {
-    const invalidDevRemotes = options.devRemotes?.filter((remote) => !(typeof remote === 'string'
+    const invalidDevRemotes = options.devRemotes.filter((remote) => !(typeof remote === 'string'
         ? workspaceProjects[remote]
         : workspaceProjects[remote.remoteName])) ?? [];
     if (invalidDevRemotes.length) {

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

@@ -30,7 +30,7 @@ async function buildStaticRemotes(staticRemotesConfig, nxBin, context, options)
             stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
         });
         // File to debug build failures e.g. 2024-01-01T00_00_0_0Z-build.log'
-        const remoteBuildLogFile = (0, node_path_1.join)(cache_directory_1.projectGraphCacheDirectory, `${new Date().toISOString().replace(/[:\.]/g, '_')}-build.log`);
+        const remoteBuildLogFile = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `${new Date().toISOString().replace(/[:\.]/g, '_')}-build.log`);
         const stdoutStream = (0, node_fs_1.createWriteStream)(remoteBuildLogFile);
         staticProcess.stdout.on('data', (data) => {
             const ANSII_CODE_REGEX = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;

package/src/executors/module-federation-dev-server/lib/normalize-options.js

@@ -13,6 +13,7 @@ function normalizeOptions(schema) {
     return {
         ...schema,
         buildTarget,
+        devRemotes: schema.devRemotes ?? [],
         host: schema.host ?? 'localhost',
         port: schema.port ?? 4200,
         liveReload: schema.liveReload ?? true,

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

@@ -56,7 +56,7 @@ 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 remoteNames = options.devRemotes?.map((r) => typeof r === 'string' ? r : r.remoteName);
+    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,

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

@@ -1,3 +1,5 @@
+import type { DevRemoteDefinition } from '../../builders/utilities/module-federation';
+
 interface BaseSchema {
   port?: number;
   host?: string;
@@ -16,13 +18,7 @@ interface BaseSchema {
   hmr?: boolean;
   watch?: boolean;
   poll?: number;
-  devRemotes?: (
-    | string
-    | {
-        remoteName: string;
-        configuration: string;
-      }
-  )[];
+  devRemotes?: DevRemoteDefinition[];
   skipRemotes?: string[];
   pathToManifestFile?: string;
   static?: boolean;
@@ -43,6 +39,7 @@ export type SchemaWithBuildTarget = BaseSchema & {
 export type Schema = SchemaWithBrowserTarget | SchemaWithBuildTarget;
 
 export type NormalizedSchema = SchemaWithBuildTarget & {
+  devRemotes: DevRemoteDefinition[];
   liveReload: boolean;
   open: boolean;
   ssl: boolean;

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/pre-v17/ng-package/options.di.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NX_DEFAULT_OPTIONS_PROVIDER = exports.nxProvideOptions = exports.NX_OPTIONS_TOKEN = void 0;
 const tslib_1 = require("tslib");
-const findCacheDirectory = tslib_1.__importStar(require("find-cache-dir"));
+const find_cache_dir_1 = tslib_1.__importDefault(require("find-cache-dir"));
 const injection_js_1 = require("injection-js");
 const os_1 = require("os");
 const path_1 = require("path");
@@ -31,5 +31,5 @@ function normalizeOptions(options = {}) {
 }
 function findCachePath() {
     const name = 'ng-packagr';
-    return findCacheDirectory({ name }) || (0, path_1.resolve)((0, os_1.tmpdir)(), name);
+    return (0, find_cache_dir_1.default)({ name }) || (0, path_1.resolve)((0, os_1.tmpdir)(), name);
 }

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/pre-v17/styles/stylesheet-processor.js

@@ -15,7 +15,7 @@ const cache_1 = require("ng-packagr/lib/utils/cache");
 const log = tslib_1.__importStar(require("ng-packagr/lib/utils/log"));
 const path_1 = require("path");
 const autoprefixer_1 = tslib_1.__importDefault(require("autoprefixer"));
-const postcssUrl = tslib_1.__importStar(require("postcss-url"));
+const postcss_url_1 = tslib_1.__importDefault(require("postcss-url"));
 const node_url_1 = require("node:url");
 const tailwindcss_1 = require("../../../../utilities/ng-packagr/tailwindcss");
 const postcss = require('postcss');
@@ -135,7 +135,7 @@ class StylesheetProcessor {
             postCssPlugins.push((0, tailwindcss_1.getTailwindPostCssPlugin)(tailwindSetup));
         }
         if (this.cssUrl !== CssUrl.none) {
-            postCssPlugins.push(postcssUrl({ url: this.cssUrl }));
+            postCssPlugins.push((0, postcss_url_1.default)({ url: this.cssUrl }));
         }
         postCssPlugins.push((0, autoprefixer_1.default)({
             ignoreUnknownVersions: true,

package/src/executors/package/ng-packagr-adjustments/ng-package/options.di.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NX_DEFAULT_OPTIONS_PROVIDER = exports.nxProvideOptions = exports.NX_OPTIONS_TOKEN = void 0;
 const tslib_1 = require("tslib");
-const findCacheDirectory = tslib_1.__importStar(require("find-cache-dir"));
+const find_cache_dir_1 = tslib_1.__importDefault(require("find-cache-dir"));
 const injection_js_1 = require("injection-js");
 const os_1 = require("os");
 const path_1 = require("path");
@@ -31,5 +31,5 @@ function normalizeOptions(options = {}) {
 }
 function findCachePath() {
     const name = 'ng-packagr';
-    return findCacheDirectory({ name }) || (0, path_1.resolve)((0, os_1.tmpdir)(), name);
+    return (0, find_cache_dir_1.default)({ name }) || (0, path_1.resolve)((0, os_1.tmpdir)(), name);
 }

package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js

@@ -15,7 +15,7 @@ const cache_1 = require("ng-packagr/lib/utils/cache");
 const log = tslib_1.__importStar(require("ng-packagr/lib/utils/log"));
 const path_1 = require("path");
 const autoprefixer_1 = tslib_1.__importDefault(require("autoprefixer"));
-const postcssUrl = tslib_1.__importStar(require("postcss-url"));
+const postcss_url_1 = tslib_1.__importDefault(require("postcss-url"));
 const node_url_1 = require("node:url");
 const tailwindcss_1 = require("../../../utilities/ng-packagr/tailwindcss");
 const postcss = require('postcss');
@@ -128,7 +128,7 @@ class StylesheetProcessor {
             postCssPlugins.push((0, tailwindcss_1.getTailwindPostCssPlugin)(tailwindSetup));
         }
         if (this.cssUrl !== CssUrl.none) {
-            postCssPlugins.push(postcssUrl({ url: this.cssUrl }));
+            postCssPlugins.push((0, postcss_url_1.default)({ url: this.cssUrl }));
         }
         postCssPlugins.push((0, autoprefixer_1.default)({
             ignoreUnknownVersions: true,