@nx/angular 21.1.1 → 21.2.0-beta.1

package/src/executors/application/schema.json

@@ -19,7 +19,6 @@
       "description": "The full path for the browser entry point to the application, relative to the current workspace."
     },
     "server": {
-      "type": "string",
       "description": "The full path for the server entry point to the application, relative to the current workspace.",
       "oneOf": [
         {
@@ -48,7 +47,7 @@
     },
     "deployUrl": {
       "type": "string",
-      "description": "Customize the base path for the URLs of resources in 'index.html' and component stylesheets. This option is only necessary for specific deployment scenarios, such as with Angular Elements or when utilizing different CDN locations. _Note: this is only supported in Angular versions >= 17.3.0_."
+      "description": "Customize the base path for the URLs of resources in 'index.html' and component stylesheets. This option is only necessary for specific deployment scenarios, such as with Angular Elements or when utilizing different CDN locations."
     },
     "security": {
       "description": "Security features to protect against XSS and other common attacks. _Note: this is only supported in Angular versions >= 19.0.0_.",
@@ -206,7 +205,7 @@
     "clearScreen": {
       "type": "boolean",
       "default": false,
-      "description": "Automatically clear the terminal screen during rebuilds. _Note: this is only supported in Angular versions >= 17.2.0_."
+      "description": "Automatically clear the terminal screen during rebuilds."
     },
     "optimization": {
       "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking, dead-code elimination, inlining of critical CSS and fonts inlining. For more information, see https://angular.dev/reference/configs/workspace-config#optimization-configuration.",
@@ -239,7 +238,7 @@
                     },
                     "removeSpecialComments": {
                       "type": "boolean",
-                      "description": "Remove comments in global CSS that contains '@license' or '@preserve' or that starts with '//!' or '/*!'. _Note: this is only supported in Angular versions >= 17.1.0_.",
+                      "description": "Remove comments in global CSS that contains '@license' or '@preserve' or that starts with '//!' or '/*!'.",
                       "default": true
                     }
                   },
@@ -279,19 +278,26 @@
       ]
     },
     "loader": {
-      "description": "Defines the type of loader to use with a specified file extension when used with a JavaScript `import`. `text` inlines the content as a string; `binary` inlines the content as a Uint8Array; `file` emits the file and provides the runtime location of the file; `empty` considers the content to be empty and not include it in bundles. _Note: this is only supported in Angular versions >= 17.1.0_.",
+      "description": "Defines the type of loader to use with a specified file extension when used with a JavaScript `import`. `text` inlines the content as a string; `binary` inlines the content as a Uint8Array; `file` emits the file and provides the runtime location of the file; `empty` considers the content to be empty and not include it in bundles.",
       "type": "object",
       "patternProperties": {
         "^\\.\\S+$": { "enum": ["text", "binary", "file", "empty"] }
       }
     },
     "define": {
-      "description": "Defines global identifiers that will be replaced with a specified constant value when found in any JavaScript or TypeScript code including libraries. The value will be used directly. String values must be put in quotes. Identifiers within Angular metadata such as Component Decorators will not be replaced. _Note: this is only supported in Angular versions >= 17.2.0_.",
+      "description": "Defines global identifiers that will be replaced with a specified constant value when found in any JavaScript or TypeScript code including libraries. The value will be used directly. String values must be put in quotes. Identifiers within Angular metadata such as Component Decorators will not be replaced.",
       "type": "object",
       "additionalProperties": {
         "type": "string"
       }
     },
+    "conditions": {
+      "description": "Custom package resolution conditions used to resolve conditional exports/imports. Defaults to ['module', 'development'/'production']. The following special conditions are always present if the requirements are satisfied: 'default', 'import', 'require', 'browser', 'node'. _Note: this is only supported in Angular versions >= 20.0.0_.",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
     "fileReplacements": {
       "description": "Replace compilation source files with other compilation source files in the build.",
       "type": "array",
@@ -301,7 +307,7 @@
       "default": []
     },
     "outputPath": {
-      "description": "Specify the output path relative to workspace root. _Note: the object notation is only supported in Angular versions >= 17.1.0_.",
+      "description": "Specify the output path relative to workspace root.",
       "oneOf": [
         {
           "type": "object",
@@ -368,6 +374,11 @@
               "type": "boolean",
               "description": "Resolve vendor packages source maps.",
               "default": false
+            },
+            "sourcesContent": {
+              "type": "boolean",
+              "description": "Output original source content for files within the source map. _Note: this is only supported in Angular versions >= 20.0.0_.",
+              "default": true
             }
           },
           "additionalProperties": false
@@ -500,7 +511,7 @@
             "preloadInitial": {
               "type": "boolean",
               "default": true,
-              "description": "Generates 'preload', 'modulepreload', and 'preconnect' link elements for initial application files and resources. _Note: this is only supported in Angular versions >= 17.1.0_."
+              "description": "Generates 'preload', 'modulepreload', and 'preconnect' link elements for initial application files and resources."
             }
           },
           "required": ["input"]
@@ -636,12 +647,12 @@
       }
     },
     "indexHtmlTransformer": {
-      "description": "Path to a file exposing a default function to transform the `index.html` file. _Note: this is only supported in Angular versions >= 17.1.0_.",
+      "description": "Path to a file exposing a default function to transform the `index.html` file.",
       "type": "string"
     }
   },
   "additionalProperties": false,
-  "required": ["outputPath", "index", "browser", "tsConfig"],
+  "required": ["outputPath", "tsConfig"],
   "definitions": {
     "assetPattern": {
       "oneOf": [

package/src/executors/application/utils/normalize-options.js

@@ -30,5 +30,12 @@ function normalizeOptions(options) {
         appShell ??= false;
         prerender ??= false;
     }
-    return { ...options, appShell, prerender, security };
+    let sourceMap = options.sourceMap;
+    if (sourceMap &&
+        typeof sourceMap === 'object' &&
+        sourceMap.sourcesContent !== undefined &&
+        angularMajorVersion < 20) {
+        delete sourceMap.sourcesContent;
+    }
+    return { ...options, appShell, prerender, security, sourceMap };
 }

package/src/executors/application/utils/validate-options.js

@@ -5,46 +5,6 @@ const semver_1 = require("semver");
 const angular_version_utils_1 = require("../../utilities/angular-version-utils");
 function validateOptions(options) {
     const { version: angularVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
-    if ((0, semver_1.lt)(angularVersion, '17.1.0')) {
-        if (options.loader) {
-            throw new Error(`The "loader" option requires Angular version 17.1.0 or greater. You are currently using version ${angularVersion}.`);
-        }
-        if (options.indexHtmlTransformer) {
-            throw new Error(`The "indexHtmlTransformer" option requires Angular version 17.1.0 or greater. You are currently using version ${angularVersion}.`);
-        }
-        if (typeof options.index === 'object' &&
-            options.index.preloadInitial !== undefined) {
-            throw new Error(`The "index.preloadInitial" option requires Angular version 17.1.0 or greater. You are currently using version ${angularVersion}.`);
-        }
-        if (options.optimization &&
-            typeof options.optimization !== 'boolean' &&
-            options.optimization.styles &&
-            typeof options.optimization.styles !== 'boolean') {
-            if (options.optimization.styles.removeSpecialComments === false) {
-                throw new Error(`The "optimization.styles.removeSpecialComments" option requires Angular version 17.1.0 or greater. You are currently using version ${angularVersion}.`);
-            }
-            else if (options.optimization.styles.removeSpecialComments === true) {
-                // silently remove the option, as it was the default before 17.1.0
-                delete options.optimization.styles.removeSpecialComments;
-            }
-        }
-        if (typeof options.outputPath === 'object') {
-            throw new Error(`The "outputPath" option as an object requires Angular version 17.1.0 or greater. You are currently using version ${angularVersion}.`);
-        }
-    }
-    if ((0, semver_1.lt)(angularVersion, '17.2.0')) {
-        if (options.define) {
-            throw new Error(`The "define" option requires Angular version 17.2.0 or greater. You are currently using version ${angularVersion}.`);
-        }
-        if (options.clearScreen !== undefined) {
-            throw new Error(`The "clearScreen" option requires Angular version 17.2.0 or greater. You are currently using version ${angularVersion}.`);
-        }
-    }
-    if ((0, semver_1.lt)(angularVersion, '17.3.0')) {
-        if (options.deployUrl) {
-            throw new Error(`The "deployUrl" option requires Angular version 17.3.0 or greater. You are currently using version ${angularVersion}.`);
-        }
-    }
     if ((0, semver_1.lt)(angularVersion, '19.0.0')) {
         if (options.outputMode) {
             throw new Error(`The "outputMode" option requires Angular version 19.0.0 or greater. You are currently using version ${angularVersion}.`);
@@ -62,4 +22,14 @@ function validateOptions(options) {
             throw new Error(`The "false" value for the "server" option requires Angular version 19.0.0 or greater. You are currently using version ${angularVersion}.`);
         }
     }
+    if ((0, semver_1.lt)(angularVersion, '20.0.0')) {
+        if (options.sourceMap &&
+            typeof options.sourceMap === 'object' &&
+            options.sourceMap.sourcesContent === false) {
+            throw new Error(`The "sourceMap.sourcesContent" option requires Angular version 20.0.0 or greater. You are currently using version ${angularVersion}.`);
+        }
+        if (options.conditions) {
+            throw new Error(`The "conditions" option requires Angular version 20.0.0 or greater. You are currently using version ${angularVersion}.`);
+        }
+    }
 }

package/src/executors/extract-i18n/extract-i18n.impl.js

@@ -4,13 +4,14 @@ exports.default = extractI18nExecutor;
 const devkit_1 = require("@nx/devkit");
 const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 const project_graph_1 = require("nx/src/project-graph/project-graph");
-const angular_version_utils_1 = require("../utilities/angular-version-utils");
+const builder_package_1 = require("../utilities/builder-package");
 const patch_builder_context_1 = require("../utilities/patch-builder-context");
 async function* extractI18nExecutor(options, context) {
     const parsedBuildTarget = (0, devkit_1.parseTargetString)(options.buildTarget, context);
-    const browserTargetProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(parsedBuildTarget.project);
-    const buildTarget = browserTargetProjectConfiguration.targets[parsedBuildTarget.target];
+    const buildTargetProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(parsedBuildTarget.project);
+    const buildTarget = buildTargetProjectConfiguration.targets[parsedBuildTarget.target];
     const isUsingEsbuildBuilder = [
+        '@angular/build:application',
         '@angular-devkit/build-angular:application',
         '@angular-devkit/build-angular:browser-esbuild',
         '@nx/angular:application',
@@ -28,16 +29,7 @@ async function* extractI18nExecutor(options, context) {
      * handle `@nx/angular:*` executors.
      */
     (0, patch_builder_context_1.patchBuilderContext)(builderContext, isUsingEsbuildBuilder, parsedBuildTarget);
+    (0, builder_package_1.assertBuilderPackageIsInstalled)('@angular-devkit/build-angular');
     const { executeExtractI18nBuilder } = await import('@angular-devkit/build-angular');
-    const delegateBuilderOptions = getDelegateBuilderOptions(options);
-    return await executeExtractI18nBuilder(delegateBuilderOptions, builderContext);
-}
-function getDelegateBuilderOptions(options) {
-    const delegateBuilderOptions = { ...options };
-    const { major: angularMajorVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
-    if (angularMajorVersion <= 17) {
-        delegateBuilderOptions.browserTarget = delegateBuilderOptions.buildTarget;
-        delete delegateBuilderOptions.buildTarget;
-    }
-    return delegateBuilderOptions;
+    return await executeExtractI18nBuilder(options, builderContext);
 }

package/src/executors/extract-i18n/schema.d.ts

@@ -1,8 +1,3 @@
 import type { ExtractI18nBuilderOptions } from '@angular-devkit/build-angular';
 
-export type ExtractI18nExecutorOptions = Omit<
-  ExtractI18nBuilderOptions,
-  'browserTarget'
-> & {
-  buildTarget: string;
-};
+export type ExtractI18nExecutorOptions = ExtractI18nBuilderOptions;

package/src/executors/extract-i18n/schema.json

@@ -38,6 +38,11 @@
     "outFile": {
       "type": "string",
       "description": "Name of the file to output."
+    },
+    "i18nDuplicateTranslation": {
+      "type": "string",
+      "description": "How to handle duplicate translations. _Note: this is only available in Angular 20.0.0 and above._",
+      "enum": ["error", "warning", "ignore"]
     }
   },
   "additionalProperties": false,

package/src/executors/extract-i18n/utils/validate-options.d.ts

@@ -0,0 +1,2 @@
+import type { ExtractI18nExecutorOptions } from '../schema';
+export declare function validateOptions(options: ExtractI18nExecutorOptions): void;

package/src/executors/extract-i18n/utils/validate-options.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateOptions = validateOptions;
+const semver_1 = require("semver");
+const angular_version_utils_1 = require("../../utilities/angular-version-utils");
+function validateOptions(options) {
+    const { version: angularVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+    if ((0, semver_1.lt)(angularVersion, '20.0.0')) {
+        if (options.i18nDuplicateTranslation) {
+            throw new Error(`The "i18nDuplicateTranslation" option requires Angular version 20.0.0 or greater. You are currently using version ${angularVersion}.`);
+        }
+    }
+}

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

@@ -4,17 +4,11 @@ exports.normalizeOptions = normalizeOptions;
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 function normalizeOptions(schema) {
-    let buildTarget = schema.buildTarget;
-    if (schema.browserTarget) {
-        buildTarget ??= schema.browserTarget;
-        delete schema.browserTarget;
-    }
     schema.buildLibsFromSource ??= true;
     process.env.NX_BUILD_LIBS_FROM_SOURCE = `${schema.buildLibsFromSource}`;
-    process.env.NX_BUILD_TARGET = `${buildTarget}`;
+    process.env.NX_BUILD_TARGET = `${schema.buildTarget}`;
     return {
         ...schema,
-        buildTarget,
         devRemotes: schema.devRemotes ?? [],
         host: schema.host ?? 'localhost',
         port: schema.port ?? 4200,

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

@@ -1,6 +1,7 @@
 import type { DevRemoteDefinition } from '../../builders/utilities/module-federation';
 
-interface BaseSchema {
+interface Schema {
+  buildTarget: string;
   port?: number;
   host?: string;
   proxyConfig?: string;
@@ -28,20 +29,7 @@ interface BaseSchema {
   buildLibsFromSource?: boolean;
 }
 
-export type SchemaWithBrowserTarget = BaseSchema & {
-  /**
-   * @deprecated Use `buildTarget` instead. It will be removed when Angular v20 is released.
-   */
-  browserTarget: string;
-};
-
-export type SchemaWithBuildTarget = BaseSchema & {
-  buildTarget: string;
-};
-
-export type Schema = SchemaWithBrowserTarget | SchemaWithBuildTarget;
-
-export type NormalizedSchema = SchemaWithBuildTarget & {
+export type NormalizedSchema = Schema & {
   devRemotes: DevRemoteDefinition[];
   liveReload: boolean;
   open: boolean;

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

@@ -12,12 +12,6 @@
     }
   ],
   "properties": {
-    "browserTarget": {
-      "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 when Angular v20 is released."
-    },
     "buildTarget": {
       "type": "string",
       "description": "A build builder target to serve in the format of `project:target[:configuration]`.",
@@ -166,18 +160,11 @@
     },
     "buildLibsFromSource": {
       "type": "boolean",
-      "description": "Read buildable libraries from source instead of building them separately. If not set, it will take the value specified in the `browserTarget` options, or it will default to `true` if it's also not set in the `browserTarget` options.",
+      "description": "Read buildable libraries from source instead of building them separately. If not set, it will take the value specified in the `buildTarget` options, or it will default to `true` if it's also not set in the `buildTarget` options.",
       "x-priority": "important"
     }
   },
   "additionalProperties": false,
-  "anyOf": [
-    {
-      "required": ["buildTarget"]
-    },
-    {
-      "required": ["browserTarget"]
-    }
-  ],
+  "required": ["buildTarget"],
   "examplesFile": "../../../docs/module-federation-dev-server-examples.md"
 }

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

@@ -1,22 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.moduleFederationSsrDevServerExecutor = moduleFederationSsrDevServerExecutor;
-const build_angular_1 = require("@angular-devkit/build-angular");
 const devkit_1 = require("@nx/devkit");
+const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
+const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
+const utils_1 = require("@nx/module-federation/src/executors/utils");
+const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 const fs_1 = require("fs");
+const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 const project_graph_1 = require("nx/src/project-graph/project-graph");
 const path_1 = require("path");
 const module_federation_1 = require("../../builders/utilities/module-federation");
-const utils_1 = require("@nx/module-federation/src/executors/utils");
-const start_dev_remotes_1 = require("./lib/start-dev-remotes");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
-const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
+const builder_package_1 = require("../utilities/builder-package");
 const normalize_options_1 = require("./lib/normalize-options");
-const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
+const start_dev_remotes_1 = require("./lib/start-dev-remotes");
 async function* moduleFederationSsrDevServerExecutor(schema, context) {
     const options = (0, normalize_options_1.normalizeOptions)(schema);
-    const currIter = (0, rxjs_for_await_1.eachValueFrom)((0, build_angular_1.executeSSRDevServerBuilder)(options, await (0, ngcli_adapter_1.createBuilderContext)({
+    (0, builder_package_1.assertBuilderPackageIsInstalled)('@angular-devkit/build-angular');
+    const { executeSSRDevServerBuilder } = await import('@angular-devkit/build-angular');
+    const currIter = (0, rxjs_for_await_1.eachValueFrom)(executeSSRDevServerBuilder(options, await (0, ngcli_adapter_1.createBuilderContext)({
         builderName: '@nx/angular:webpack-server',
         description: 'Build a ssr application',
         optionSchema: require('../../builders/webpack-server/schema.json'),

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/entry-point.d.ts

@@ -1,3 +1,6 @@
-import type { NgEntryPoint as NgEntryPointBase } from 'ng-packagr/lib/ng-package/entry-point/entry-point';
-import type { NgPackageConfig } from 'ng-packagr/ng-package.schema';
-export declare function createNgEntryPoint(packageJson: Record<string, any>, ngPackageJson: NgPackageConfig, basePath: string, secondaryData?: Record<string, any>): NgEntryPointBase;
+import type { NgEntryPoint as NgEntryPointBase } from 'ng-packagr/src/lib/ng-package/entry-point/entry-point';
+import type { NgPackageConfig } from 'ng-packagr/src/ng-package.schema';
+export type NgEntryPointType = NgEntryPointBase & {
+    primaryDestinationPath?: string;
+};
+export declare function createNgEntryPoint(packageJson: Record<string, any>, ngPackageJson: NgPackageConfig, basePath: string, secondaryData?: Record<string, any>): NgEntryPointType;

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/entry-point.js

@@ -6,16 +6,54 @@ const ng_packagr_version_1 = require("../../../../utilities/ng-packagr/ng-packag
 const package_imports_1 = require("../../../../utilities/ng-packagr/package-imports");
 function createNgEntryPoint(packageJson, ngPackageJson, basePath, secondaryData) {
     const { major: ngPackagrMajorVersion } = (0, ng_packagr_version_1.getNgPackagrVersionInfo)();
-    const { NgEntryPoint: NgEntryPointBase } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/lib/ng-package/entry-point/entry-point', ngPackagrMajorVersion);
+    const { NgEntryPoint: NgEntryPointBase } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/src/lib/ng-package/entry-point/entry-point', ngPackagrMajorVersion);
+    if (ngPackagrMajorVersion < 20) {
+        class NgEntryPoint extends NgEntryPointBase {
+            /**
+             * Point the FESM2022 files to the ESM2022 files.
+             */
+            get destinationFiles() {
+                const result = super.destinationFiles;
+                result.fesm2022 = result.esm2022;
+                result.fesm2022Dir = (0, node_path_1.dirname)(result.esm2022);
+                return result;
+            }
+        }
+        return new NgEntryPoint(packageJson, ngPackageJson, basePath, secondaryData);
+    }
+    const { ensureUnixPath } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/src/lib/utils/path', ngPackagrMajorVersion);
     class NgEntryPoint extends NgEntryPointBase {
-        /**
-         * Point the FESM2022 files to the ESM2022 files.
-         */
+        constructor(packageJson, ngPackageJson, basePath, _secondaryData) {
+            super(packageJson, ngPackageJson, basePath, _secondaryData);
+            this.packageJson = packageJson;
+            this.ngPackageJson = ngPackageJson;
+            this.basePath = basePath;
+            this._secondaryData = _secondaryData;
+        }
+        get primaryDestinationPath() {
+            return (this._secondaryData?.primaryDestinationPath ?? this.destinationPath);
+        }
         get destinationFiles() {
-            const result = super.destinationFiles;
-            result.fesm2022 = result.esm2022;
-            result.fesm2022Dir = (0, node_path_1.dirname)(result.esm2022);
-            return result;
+            let primaryDestPath = this.destinationPath;
+            let secondaryDir = '';
+            if (this._secondaryData) {
+                primaryDestPath = this._secondaryData.primaryDestinationPath;
+                secondaryDir = (0, node_path_1.relative)(primaryDestPath, this._secondaryData.destinationPath);
+            }
+            const flatModuleFile = this.flatModuleFile;
+            const pathJoinWithDest = (...paths) => (0, node_path_1.join)(primaryDestPath, ...paths);
+            return {
+                directory: ensureUnixPath(secondaryDir),
+                declarations: pathJoinWithDest('tmp-typings', secondaryDir, `${flatModuleFile}.d.ts`),
+                // changed to use esm2022
+                declarationsBundled: pathJoinWithDest('esm2022', secondaryDir, `${flatModuleFile}.d.ts`),
+                declarationsDir: pathJoinWithDest(secondaryDir),
+                esm2022: pathJoinWithDest('tmp-esm2022', secondaryDir, `${flatModuleFile}.js`),
+                // changed to use esm2022
+                fesm2022: pathJoinWithDest('esm2022', secondaryDir, `${flatModuleFile}.js`),
+                // changed to use esm2022
+                fesm2022Dir: pathJoinWithDest('esm2022'),
+            };
         }
     }
     return new NgEntryPoint(packageJson, ngPackageJson, basePath, secondaryData);

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-bundles.di.d.ts

@@ -1,2 +1,2 @@
-import type { TransformProvider } from 'ng-packagr/lib/graph/transform.di';
+import type { TransformProvider } from 'ng-packagr/src/lib/graph/transform.di';
 export declare function getWriteBundlesTransformProvider(): TransformProvider;

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-bundles.di.js

@@ -6,9 +6,9 @@ const package_imports_1 = require("../../../../utilities/ng-packagr/package-impo
 const write_bundles_transform_1 = require("./write-bundles.transform");
 function getWriteBundlesTransformProvider() {
     const { major: ngPackagrMajorVersion } = (0, ng_packagr_version_1.getNgPackagrVersionInfo)();
-    const { provideTransform } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/lib/graph/transform.di', ngPackagrMajorVersion);
-    const { WRITE_BUNDLES_TRANSFORM_TOKEN } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/lib/ng-package/entry-point/write-bundles.di', ngPackagrMajorVersion);
-    const { OPTIONS_TOKEN } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/lib/ng-package/options.di', ngPackagrMajorVersion);
+    const { provideTransform } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/src/lib/graph/transform.di', ngPackagrMajorVersion);
+    const { WRITE_BUNDLES_TRANSFORM_TOKEN } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/src/lib/ng-package/entry-point/write-bundles.di', ngPackagrMajorVersion);
+    const { OPTIONS_TOKEN } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/src/lib/ng-package/options.di', ngPackagrMajorVersion);
     return provideTransform({
         provide: WRITE_BUNDLES_TRANSFORM_TOKEN,
         useFactory: write_bundles_transform_1.writeBundlesTransform,

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-bundles.transform.d.ts

@@ -6,5 +6,5 @@
  * - Write the ESM2022 outputs to the file system.
  * - Fake the FESM2022 outputs pointing them to the ESM2022 outputs.
  */
-import type { NgPackagrOptions } from 'ng-packagr/lib/ng-package/options.di';
-export declare const writeBundlesTransform: (_options: NgPackagrOptions) => import("ng-packagr/lib/graph/transform").Transform;
+import type { NgPackagrOptions } from 'ng-packagr/src/lib/ng-package/options.di';
+export declare const writeBundlesTransform: (_options: NgPackagrOptions) => import("ng-packagr/src/lib/graph/transform").Transform;

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-bundles.transform.js

@@ -16,10 +16,10 @@ const package_imports_1 = require("../../../../utilities/ng-packagr/package-impo
 const entry_point_1 = require("./entry-point");
 const writeBundlesTransform = (_options) => {
     const { major: ngPackagrMajorVersion } = (0, ng_packagr_version_1.getNgPackagrVersionInfo)();
-    const { BuildGraph } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/lib/graph/build-graph', ngPackagrMajorVersion);
-    const { transformFromPromise } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/lib/graph/transform', ngPackagrMajorVersion);
-    const { isEntryPoint, isPackage } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/lib/ng-package/nodes', ngPackagrMajorVersion);
-    const { NgPackage } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/lib/ng-package/package', ngPackagrMajorVersion);
+    const { BuildGraph } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/src/lib/graph/build-graph', ngPackagrMajorVersion);
+    const { transformFromPromise } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/src/lib/graph/transform', ngPackagrMajorVersion);
+    const { isEntryPoint, isPackage } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/src/lib/ng-package/nodes', ngPackagrMajorVersion);
+    const { NgPackage } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/src/lib/ng-package/package', ngPackagrMajorVersion);
     return transformFromPromise(async (graph) => {
         const updatedGraph = new BuildGraph();
         for (const entry of graph.entries()) {
@@ -28,9 +28,13 @@ const writeBundlesTransform = (_options) => {
                 entry.data.entryPoint = entryPoint;
                 entry.data.destinationFiles = entryPoint.destinationFiles;
                 for (const [path, outputCache] of entry.cache.outputCache.entries()) {
+                    const normalizedPath = normalizeEsm2022Path(path, entryPoint);
                     // write the outputs to the file system
-                    await (0, promises_1.mkdir)((0, node_path_1.dirname)(path), { recursive: true });
-                    await (0, promises_1.writeFile)(path, outputCache.content);
+                    await (0, promises_1.mkdir)((0, node_path_1.dirname)(normalizedPath), { recursive: true });
+                    await (0, promises_1.writeFile)(normalizedPath, outputCache.content);
+                }
+                if (!entry.cache.outputCache.size && entryPoint.isSecondaryEntryPoint) {
+                    await (0, promises_1.mkdir)(entryPoint.destinationPath, { recursive: true });
                 }
             }
             else if (isPackage(entry)) {
@@ -42,6 +46,18 @@ const writeBundlesTransform = (_options) => {
     });
 };
 exports.writeBundlesTransform = writeBundlesTransform;
+function normalizeEsm2022Path(path, entryPoint) {
+    if (!entryPoint.primaryDestinationPath) {
+        return path;
+    }
+    if (path.startsWith((0, node_path_1.join)(entryPoint.primaryDestinationPath, 'tmp-esm2022'))) {
+        return path.replace('tmp-esm2022', 'esm2022');
+    }
+    if (path.startsWith((0, node_path_1.join)(entryPoint.primaryDestinationPath, 'tmp-typings'))) {
+        return path.replace('tmp-typings', 'esm2022');
+    }
+    return path;
+}
 function toCustomNgEntryPoint(entryPoint) {
     return (0, entry_point_1.createNgEntryPoint)(entryPoint.packageJson, entryPoint.ngPackageJson, entryPoint.basePath, 
     // @ts-expect-error this is a TS private property, but it can be accessed at runtime

package/src/executors/ng-packagr-lite/schema.json

@@ -31,9 +31,8 @@
     },
     "poll": {
       "type": "number",
-      "description": "Enable and define the file watching poll time period in milliseconds. _Note: this is only supported in Angular versions >= 18.0.0_."
+      "description": "Enable and define the file watching poll time period in milliseconds."
     }
   },
-  "additionalProperties": false,
-  "required": ["project"]
+  "additionalProperties": false
 }

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

@@ -7,7 +7,6 @@ const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 const path_1 = require("path");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const angular_version_utils_1 = require("../utilities/angular-version-utils");
 const typescript_1 = require("../utilities/typescript");
 const ng_packagr_1 = require("./ng-packagr-adjustments/ng-packagr");
 async function initializeNgPackagr(options, context, projectDependencies) {
@@ -27,10 +26,7 @@ async function initializeNgPackagr(options, context, projectDependencies) {
  */
 function createLibraryExecutor(initializeNgPackagr) {
     return async function* (options, context) {
-        const { major: angularMajorVersion, version: angularVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
-        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}.`);
-        }
+        options.project ??= (0, path_1.join)(context.projectsConfigurations.projects[context.projectName].root, 'ng-package.json');
         const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
         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/executors/package/schema.d.ts

@@ -1,4 +1,6 @@
 import type { NgPackagrBuilderOptions } from '@angular-devkit/build-angular';
 
 export interface BuildAngularLibraryExecutorOptions
-  extends NgPackagrBuilderOptions {}
+  extends NgPackagrBuilderOptions {
+  project?: string;
+}

package/src/executors/package/schema.json

@@ -31,9 +31,8 @@
     },
     "poll": {
       "type": "number",
-      "description": "Enable and define the file watching poll time period in milliseconds. _Note: this is only supported in Angular versions >= 18.0.0_."
+      "description": "Enable and define the file watching poll time period in milliseconds."
     }
   },
-  "additionalProperties": false,
-  "required": ["project"]
+  "additionalProperties": false
 }

package/src/executors/utilities/builder-package.d.ts

@@ -0,0 +1 @@
+export declare function assertBuilderPackageIsInstalled(packageName: string): void;

package/src/executors/utilities/builder-package.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertBuilderPackageIsInstalled = assertBuilderPackageIsInstalled;
+function assertBuilderPackageIsInstalled(packageName) {
+    try {
+        require.resolve(packageName);
+    }
+    catch {
+        throw new Error(`This executor requires the package ${packageName} to be installed. Please make sure it is installed and try again.`);
+    }
+}

package/src/executors/utilities/esbuild-extensions.d.ts

@@ -1,4 +1,5 @@
-type Plugin = Parameters<typeof import('@angular-devkit/build-angular').buildApplication>[2]['codePlugins'][number];
+import type { buildApplication } from '@angular/build';
+type Plugin = Parameters<typeof buildApplication>[2]['codePlugins'][number];
 export type PluginSpec = {
     path: string;
     options: any;

package/src/executors/utilities/ng-packagr/package-imports.d.ts

@@ -1 +1,3 @@
-export declare function importNgPackagrPath<T>(path: string, ngPackagrMajorVersion: number): T;
+type NgPackagrImportPath = `ng-packagr/src/${string}`;
+export declare function importNgPackagrPath<T>(path: NgPackagrImportPath, ngPackagrMajorVersion: number): T;
+export {};