@nx/angular 23.0.0-beta.18 → 23.0.0-beta.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "23.0.0-beta.18",
+  "version": "23.0.0-beta.19",
   "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, 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": {
@@ -61,13 +61,13 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.18",
-    "@nx/eslint": "23.0.0-beta.18",
-    "@nx/js": "23.0.0-beta.18",
-    "@nx/module-federation": "23.0.0-beta.18",
-    "@nx/rspack": "23.0.0-beta.18",
-    "@nx/web": "23.0.0-beta.18",
-    "@nx/webpack": "23.0.0-beta.18",
+    "@nx/devkit": "23.0.0-beta.19",
+    "@nx/eslint": "23.0.0-beta.19",
+    "@nx/js": "23.0.0-beta.19",
+    "@nx/module-federation": "23.0.0-beta.19",
+    "@nx/rspack": "23.0.0-beta.19",
+    "@nx/web": "23.0.0-beta.19",
+    "@nx/webpack": "23.0.0-beta.19",
     "@phenomnomnominal/tsquery": "~6.2.0",
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",

package/plugins/component-testing.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxComponentTestingPreset = nxComponentTestingPreset;
 const cypress_preset_1 = require("@nx/cypress/plugins/cypress-preset");
-const ct_helpers_1 = require("@nx/cypress/src/utils/ct-helpers");
+const internal_1 = require("@nx/cypress/internal");
 const devkit_1 = require("@nx/devkit");
-const internal_1 = require("@nx/js/internal");
+const internal_2 = require("@nx/js/internal");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const semver_1 = require("semver");
@@ -46,9 +46,9 @@ This is likely due to not running via nx. i.e. 'nx component-test my-project'.
 Please open an issue if this error persists.
 ${e.stack ? e.stack : e}`);
     }
-    const ctProjectConfig = (0, ct_helpers_1.getProjectConfigByPath)(graph, pathToConfig);
+    const ctProjectConfig = (0, internal_1.getProjectConfigByPath)(graph, pathToConfig);
     const ctConfigurationName = process.env.NX_CYPRESS_TARGET_CONFIGURATION;
-    const ctContext = (0, ct_helpers_1.createExecutorContext)(graph, ctProjectConfig.targets, ctProjectConfig.name, options?.ctTargetName || 'component-test', ctConfigurationName);
+    const ctContext = (0, internal_1.createExecutorContext)(graph, ctProjectConfig.targets, ctProjectConfig.name, options?.ctTargetName || 'component-test', ctConfigurationName);
     const buildTarget = options?.buildTarget
         ? (0, devkit_1.parseTargetString)(options.buildTarget, graph)
         : // for backwards compat, if no buildTargetin the preset options, get it from the target options
@@ -65,7 +65,7 @@ ${e.stack ? e.stack : e}`);
     const offset = isOffsetNeeded(ctContext, ctProjectConfig)
         ? (0, devkit_1.offsetFromRoot)(normalizedFromWorkspaceRootPath)
         : undefined;
-    const buildContext = (0, ct_helpers_1.createExecutorContext)(graph, graph.nodes[buildTarget.project]?.data.targets, buildTarget.project, buildTarget.target, buildTarget.configuration);
+    const buildContext = (0, internal_1.createExecutorContext)(graph, graph.nodes[buildTarget.project]?.data.targets, buildTarget.project, buildTarget.target, buildTarget.configuration);
     const buildableProjectConfig = normalizeBuildTargetOptions(buildContext, ctContext, offset);
     return {
         ...(0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig, { testingType: 'component' }),
@@ -116,7 +116,7 @@ function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
         configuration: buildContext.configurationName,
     }, buildContext);
     const project = buildContext.projectsConfigurations.projects[buildContext.projectName];
-    const sourceRoot = (0, internal_1.getProjectSourceRoot)(project);
+    const sourceRoot = (0, internal_2.getProjectSourceRoot)(project);
     const buildOptions = withSchemaDefaults(options, sourceRoot, buildContext.root);
     // cypress creates a tsconfig if one isn't preset
     // that contains all the support required for angular and component tests
@@ -158,7 +158,7 @@ function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
     // then we don't want to have the assets/scripts/styles be included to
     // prevent inclusion of unintended stuff like tailwind
     if (buildContext.projectName === ctContext.projectName ||
-        (0, ct_helpers_1.isCtProjectUsingBuildProject)(ctContext.projectGraph, buildContext.projectName, ctContext.projectName)) {
+        (0, internal_1.isCtProjectUsingBuildProject)(ctContext.projectGraph, buildContext.projectName, ctContext.projectName)) {
         if (offset) {
             buildOptions.assets = buildOptions.assets.map((asset) => {
                 return typeof asset === 'string'
@@ -248,7 +248,7 @@ function getTempStylesForTailwind(ctExecutorContext) {
     const rootTailwindPath = (0, path_1.join)(ctExecutorContext.root, 'tailwind.config');
     const isTailWindInRoot = exts.some((ext) => (0, fs_1.existsSync)(`${rootTailwindPath}.${ext}`));
     if (isTailWindInRoot || isTailWindInCtProject) {
-        const pathToStyle = (0, ct_helpers_1.getTempTailwindPath)(ctExecutorContext);
+        const pathToStyle = (0, internal_1.getTempTailwindPath)(ctExecutorContext);
         try {
             (0, fs_1.mkdirSync)((0, path_1.dirname)(pathToStyle), { recursive: true });
             (0, fs_1.writeFileSync)(pathToStyle, `

package/src/generators/cypress-component-configuration/cypress-component-configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cypress-component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,iBAAiB,EAMjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAapB,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAiBxD;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,iBAAiB,CAAC,CAuD5B;AAkJD,eAAe,6BAA6B,CAAC"}
+{"version":3,"file":"cypress-component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,iBAAiB,EAMjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAapB,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAiBxD;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,iBAAiB,CAAC,CAqD5B;AAkJD,eAAe,6BAA6B,CAAC"}

package/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -75,7 +75,7 @@ async function cypressComponentConfiguration(tree, options) {
         isZoneless = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'zone.js') === null;
     }
     if (isZoneless) {
-        const { getInstalledCypressVersion } = await Promise.resolve().then(() => __importStar(require('@nx/cypress/src/utils/versions')));
+        const { getInstalledCypressVersion } = await Promise.resolve().then(() => __importStar(require('@nx/cypress/internal')));
         const installedCypressVersion = getInstalledCypressVersion(tree);
         // Zoneless support was introduced in Cypress 15.8.0
         // If Cypress is not yet installed, we'll install the latest version, which will have zoneless support
@@ -105,7 +105,7 @@ async function cypressComponentConfiguration(tree, options) {
 }
 async function addFiles(tree, projectConfig, options, isZoneless) {
     const componentFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
-    const { addMountDefinition } = require('@nx/cypress/src/utils/config');
+    const { addMountDefinition } = (require('@nx/cypress/internal'));
     const updatedCmpContents = await addMountDefinition(tree.read(componentFile, 'utf-8'));
     tree.write(componentFile, `import { mount } from '${isZoneless ? 'cypress/angular-zoneless' : 'cypress/angular'}';\n${updatedCmpContents}`);
     if (!options.generateTests) {
@@ -143,7 +143,7 @@ async function addFiles(tree, projectConfig, options, isZoneless) {
 async function configureCypressCT(tree, options) {
     let found = { target: options.buildTarget, config: undefined };
     if (!options.buildTarget) {
-        const { findBuildConfig } = require('@nx/cypress/src/utils/find-target-options');
+        const { findBuildConfig } = (require('@nx/cypress/internal'));
         found = await findBuildConfig(tree, {
             project: options.project,
             buildTarget: options.buildTarget,
@@ -181,7 +181,7 @@ async function configureCypressCT(tree, options) {
     else {
         ctConfigOptions.buildTarget = found.target;
     }
-    const { addDefaultCTConfig, getProjectCypressConfigPath } = require('@nx/cypress/src/utils/config');
+    const { addDefaultCTConfig, getProjectCypressConfigPath } = require('@nx/cypress/internal');
     const cypressConfigPath = getProjectCypressConfigPath(tree, projectConfig.root);
     const updatedCyConfig = await addDefaultCTConfig(tree.read(cypressConfigPath, 'utf-8'), ctConfigOptions, '@nx/angular/plugins/component-testing');
     tree.write(cypressConfigPath, updatedCyConfig);

package/src/generators/setup-mf/lib/add-cypress-workaround.js

@@ -26,7 +26,7 @@ function addCypressOnErrorWorkaround(tree, schema) {
     if (e2eProject.targets?.e2e?.executor !== '@nx/cypress:cypress') {
         try {
             // don't ensure package is installed, if it's not installed, we don't need to add the workaround
-            const { CYPRESS_CONFIG_FILE_NAME_PATTERN, } = require('@nx/cypress/src/utils/config');
+            const { CYPRESS_CONFIG_FILE_NAME_PATTERN, } = require('@nx/cypress/internal');
             if (!(0, devkit_1.glob)(tree, [`${e2eProject.root}/${CYPRESS_CONFIG_FILE_NAME_PATTERN}`])
                 .length) {
                 // Not a cypress e2e project, skip

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/plugins/plugin.ts"],"names":[],"mappings":"AAKA,OAAO,EAIL,KAAK,aAAa,EAOnB,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAOD,KAAK,0BAA0B,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AACF,MAAM,MAAM,2BAA2B,GAAG;IACxC,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;IACvD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;CACtD,CAAC;AAqCF,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,oBAAoB,CA+B7D,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/plugins/plugin.ts"],"names":[],"mappings":"AAKA,OAAO,EAML,KAAK,aAAa,EAOnB,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAOD,KAAK,0BAA0B,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AACF,MAAM,MAAM,2BAA2B,GAAG;IACxC,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;IACvD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;CACtD,CAAC;AAqCF,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,oBAAoB,CA6D7D,CAAC"}

package/src/plugins/plugin.js

@@ -55,21 +55,35 @@ exports.createNodesV2 = [
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
         const lockFileName = (0, js_1.getLockFileName)(packageManager);
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, projectsCache, pmc, lockFileName), configFiles, options, context);
+            const { entries, preErrors } = await filterAngularConfigs(configFiles, context);
+            const projectHashes = await (0, internal_1.calculateHashesForCreateNodes)(entries.map((e) => e.angularWorkspaceRoot), options ?? {}, context, entries.map(() => [lockFileName]));
+            let results = [];
+            let nodeErrors = [];
+            try {
+                results = await (0, devkit_1.createNodesFromFiles)((configFile, opts, ctx, idx) => createNodesInternal(configFile, opts, ctx, projectsCache, pmc, projectHashes[idx]), entries.map((e) => e.configFile), options, context);
+            }
+            catch (e) {
+                if (e instanceof devkit_1.AggregateCreateNodesError) {
+                    results = e.partialResults ?? [];
+                    nodeErrors = e.errors;
+                }
+                else {
+                    throw e;
+                }
+            }
+            const allErrors = [...preErrors, ...nodeErrors];
+            if (allErrors.length > 0) {
+                throw new devkit_1.AggregateCreateNodesError(allErrors, results);
+            }
+            return results;
         }
         finally {
             projectsCache.writeToDisk();
         }
     },
 ];
-async function createNodesInternal(configFilePath, options, context, projectsCache, pmc, lockFileName) {
+async function createNodesInternal(configFilePath, options, context, projectsCache, pmc, hash) {
     const angularWorkspaceRoot = (0, node_path_1.dirname)(configFilePath);
-    // Do not create a project if package.json isn't there
-    const siblingFiles = (0, node_fs_1.readdirSync)((0, node_path_1.join)(context.workspaceRoot, angularWorkspaceRoot));
-    if (!siblingFiles.includes('package.json')) {
-        return {};
-    }
-    const hash = await (0, internal_1.calculateHashForCreateNodes)(angularWorkspaceRoot, options, context, [lockFileName]);
     if (!projectsCache.has(hash)) {
         projectsCache.set(hash, await buildAngularProjects(configFilePath, options, angularWorkspaceRoot, context, pmc));
     }
@@ -522,3 +536,24 @@ function getOutput(path, workspaceRoot, angularWorkspaceRoot, projectRoot) {
 function getAngularJsonProjectTargets(project) {
     return project.architect ?? project.targets;
 }
+async function filterAngularConfigs(configFiles, context) {
+    const preErrors = [];
+    const candidates = await Promise.all(configFiles.map(async (configFile) => {
+        try {
+            const angularWorkspaceRoot = (0, node_path_1.dirname)(configFile);
+            const siblingFiles = (0, node_fs_1.readdirSync)((0, node_path_1.join)(context.workspaceRoot, angularWorkspaceRoot));
+            if (!siblingFiles.includes('package.json')) {
+                return null;
+            }
+            return { configFile, angularWorkspaceRoot };
+        }
+        catch (e) {
+            preErrors.push([configFile, e]);
+            return null;
+        }
+    }));
+    return {
+        entries: candidates.filter((c) => c !== null),
+        preErrors,
+    };
+}