@nx/angular 0.0.0-pr-30457-0ed97e4 → 0.0.0-pr-30516-4c8bfff

package/migrations.json

@@ -1341,10 +1341,6 @@
           "version": "~19.0.0",
           "alwaysAddToPackageJson": false
         },
-        "@angular/google-maps": {
-          "version": "~19.0.0",
-          "alwaysAddToPackageJson": false
-        },
         "ng-packagr": {
           "version": "~19.0.0",
           "alwaysAddToPackageJson": false
@@ -1541,10 +1537,6 @@
           "version": "~19.1.0",
           "alwaysAddToPackageJson": false
         },
-        "@angular/google-maps": {
-          "version": "~19.1.0",
-          "alwaysAddToPackageJson": false
-        },
         "ng-packagr": {
           "version": "~19.1.0",
           "alwaysAddToPackageJson": false
@@ -1606,10 +1598,6 @@
           "version": "~19.2.1",
           "alwaysAddToPackageJson": false
         },
-        "@angular/google-maps": {
-          "version": "~19.2.1",
-          "alwaysAddToPackageJson": false
-        },
         "ng-packagr": {
           "version": "~19.2.0",
           "alwaysAddToPackageJson": false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "0.0.0-pr-30457-0ed97e4",
+  "version": "0.0.0-pr-30516-4c8bfff",
   "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": {
@@ -72,14 +72,14 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "0.0.0-pr-30457-0ed97e4",
-    "@nx/js": "0.0.0-pr-30457-0ed97e4",
-    "@nx/eslint": "0.0.0-pr-30457-0ed97e4",
-    "@nx/webpack": "0.0.0-pr-30457-0ed97e4",
-    "@nx/rspack": "0.0.0-pr-30457-0ed97e4",
-    "@nx/module-federation": "0.0.0-pr-30457-0ed97e4",
-    "@nx/web": "0.0.0-pr-30457-0ed97e4",
-    "@nx/workspace": "0.0.0-pr-30457-0ed97e4",
+    "@nx/devkit": "0.0.0-pr-30516-4c8bfff",
+    "@nx/js": "0.0.0-pr-30516-4c8bfff",
+    "@nx/eslint": "0.0.0-pr-30516-4c8bfff",
+    "@nx/webpack": "0.0.0-pr-30516-4c8bfff",
+    "@nx/rspack": "0.0.0-pr-30516-4c8bfff",
+    "@nx/module-federation": "0.0.0-pr-30516-4c8bfff",
+    "@nx/web": "0.0.0-pr-30516-4c8bfff",
+    "@nx/workspace": "0.0.0-pr-30516-4c8bfff",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

package/src/builders/dev-server/dev-server.impl.js

@@ -118,7 +118,9 @@ function executeDevServerBuilder(rawOptions, context) {
                     // run the target for all projects.
                     // This will occur when workspaceDependencies = []
                     if (workspaceDependencies.length > 0) {
-                        baseWebpackConfig.plugins.push(new webpack_nx_build_coordination_plugin_1.WebpackNxBuildCoordinationPlugin(`nx run-many --target=${parsedBuildTarget.target} --projects=${workspaceDependencies.join(',')}`, { skipWatchingDeps: !options.watchDependencies }));
+                        baseWebpackConfig.plugins.push(
+                        // @ts-expect-error - difference between angular and webpack plugin definitions bc of webpack versions
+                        new webpack_nx_build_coordination_plugin_1.WebpackNxBuildCoordinationPlugin(`nx run-many --target=${parsedBuildTarget.target} --projects=${workspaceDependencies.join(',')}`, { skipWatchingDeps: !options.watchDependencies }));
                     }
                 }
                 if (!pathToWebpackConfig) {

package/src/executors/delegate-build/delegate-build.impl.d.ts

@@ -2,5 +2,7 @@ import type { ExecutorContext } from '@nx/devkit';
 import type { DelegateBuildExecutorSchema } from './schema';
 export declare function delegateBuildExecutor(options: DelegateBuildExecutorSchema, context: ExecutorContext): AsyncGenerator<{
     success: boolean;
-}, void, any>;
+}, {
+    success: boolean;
+}, any>;
 export default delegateBuildExecutor;

package/src/executors/delegate-build/delegate-build.impl.js

@@ -6,6 +6,9 @@ const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 async function* delegateBuildExecutor(options, context) {
     const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
     options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)((0, devkit_1.joinPathFragments)(context.root, options.tsConfig), context.root, target.data.root, dependencies);
+    if (!(0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies)) {
+        return { success: false };
+    }
     const { buildTarget, ...targetOptions } = options;
     const delegateTarget = (0, devkit_1.parseTargetString)(buildTarget, context);
     yield* await (0, devkit_1.runExecutor)(delegateTarget, targetOptions, context);

package/src/executors/package/package.impl.js

@@ -31,7 +31,10 @@ function createLibraryExecutor(initializeNgPackagr) {
         if (angularMajorVersion < 18 && options.poll !== undefined) {
             throw new Error(`The "poll" option requires Angular version 18.0.0 or greater. You are currently using version ${angularVersion}.`);
         }
-        const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
+        const { target, dependencies, topLevelDependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
+        if (!(0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies)) {
+            return Promise.resolve({ success: false });
+        }
         if (options.watch) {
             return yield* (0, rxjs_for_await_1.eachValueFrom)((0, rxjs_1.from)(initializeNgPackagr(options, context, dependencies)).pipe((0, operators_1.switchMap)((packagr) => packagr.watch()), (0, operators_1.mapTo)({ success: true })));
         }

package/src/generators/application/application.js

@@ -6,17 +6,12 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
 const js_1 = require("@nx/js");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const init_1 = require("../init/init");
-const convert_to_rspack_1 = require("../convert-to-rspack/convert-to-rspack");
 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");
 async function applicationGenerator(tree, schema) {
     (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'application');
-    const isRspack = schema.bundler === 'rspack';
-    if (isRspack) {
-        schema.bundler = 'webpack';
-    }
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
     const rootOffset = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
     await (0, js_1.initGenerator)(tree, {
@@ -69,13 +64,6 @@ async function applicationGenerator(tree, schema) {
             serverRouting: options.serverRouting,
         });
     }
-    if (isRspack) {
-        await (0, convert_to_rspack_1.convertToRspack)(tree, {
-            project: options.name,
-            skipInstall: options.skipPackageJson,
-            skipFormat: true,
-        });
-    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

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

@@ -27,7 +27,7 @@ export interface Schema {
   standalone?: boolean;
   rootProject?: boolean;
   minimal?: boolean;
-  bundler?: 'webpack' | 'esbuild' | 'rspack';
+  bundler?: 'webpack' | 'esbuild';
   ssr?: boolean;
   serverRouting?: boolean;
   nxCloudToken?: string;

package/src/generators/application/schema.json

@@ -171,7 +171,7 @@
     "bundler": {
       "description": "Bundler to use to build the application.",
       "type": "string",
-      "enum": ["esbuild", "rspack", "webpack"],
+      "enum": ["esbuild", "webpack"],
       "default": "esbuild",
       "x-prompt": "Which bundler do you want to use to build the application?",
       "x-priority": "important"

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

@@ -307,7 +307,6 @@ async function convertToRspack(tree, schema) {
     if (!schema.skipInstall) {
         const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
             '@nx/angular-rspack': versions_1.angularRspackVersion,
-            'ts-node': versions_1.tsNodeVersion,
         });
         tasks.push(installTask);
     }

package/src/generators/library/lib/add-project.js

@@ -4,7 +4,6 @@ exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
-const use_legacy_versioning_1 = require("nx/src/command-line/release/config/use-legacy-versioning");
 async function addProject(tree, libraryOptions) {
     const project = {
         name: libraryOptions.name,
@@ -37,8 +36,7 @@ async function addProject(tree, libraryOptions) {
             defaultConfiguration: 'production',
         };
         if (libraryOptions.publishable) {
-            const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
-            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)((0, use_legacy_versioning_1.shouldUseLegacyVersioning)(nxJson.release), tree, libraryOptions.name, project);
+            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)(tree, libraryOptions.name, project);
         }
     }
     (0, devkit_1.addProjectConfiguration)(tree, libraryOptions.name, project);