@nx/angular 20.4.0-canary.20250115-0ae8665 → 20.4.0-canary.20250116-a127177

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "20.4.0-canary.20250115-0ae8665",
+  "version": "20.4.0-canary.20250116-a127177",
   "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": {
@@ -71,13 +71,13 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "20.4.0-canary.20250115-0ae8665",
-    "@nx/js": "20.4.0-canary.20250115-0ae8665",
-    "@nx/eslint": "20.4.0-canary.20250115-0ae8665",
-    "@nx/webpack": "20.4.0-canary.20250115-0ae8665",
-    "@nx/module-federation": "20.4.0-canary.20250115-0ae8665",
-    "@nx/web": "20.4.0-canary.20250115-0ae8665",
-    "@nx/workspace": "20.4.0-canary.20250115-0ae8665",
+    "@nx/devkit": "20.4.0-canary.20250116-a127177",
+    "@nx/js": "20.4.0-canary.20250116-a127177",
+    "@nx/eslint": "20.4.0-canary.20250116-a127177",
+    "@nx/webpack": "20.4.0-canary.20250116-a127177",
+    "@nx/module-federation": "20.4.0-canary.20250116-a127177",
+    "@nx/web": "20.4.0-canary.20250116-a127177",
+    "@nx/workspace": "20.4.0-canary.20250116-a127177",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

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

@@ -0,0 +1,7 @@
+import { type DestinationFiles, NgEntryPoint as NgEntryPointBase } from 'ng-packagr/lib/ng-package/entry-point/entry-point';
+export declare class NgEntryPoint extends NgEntryPointBase {
+    /**
+     * Point the FESM2022 files to the ESM2022 files.
+     */
+    get destinationFiles(): DestinationFiles;
+}

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

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NgEntryPoint = void 0;
+const entry_point_1 = require("ng-packagr/lib/ng-package/entry-point/entry-point");
+const node_path_1 = require("node:path");
+class NgEntryPoint extends entry_point_1.NgEntryPoint {
+    /**
+     * 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;
+    }
+}
+exports.NgEntryPoint = NgEntryPoint;

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v19/ng-package → ng-package}/entry-point/write-bundles.transform.d.ts

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

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

@@ -0,0 +1,44 @@
+"use strict";
+/**
+ * Adapted from the original ng-packagr.
+ *
+ * Changes made:
+ * - Removed bundling altogether.
+ * - Write the ESM2022 outputs to the file system.
+ * - Fake the FESM2022 outputs pointing them to the ESM2022 outputs.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeBundlesTransform = void 0;
+const build_graph_1 = require("ng-packagr/lib/graph/build-graph");
+const transform_1 = require("ng-packagr/lib/graph/transform");
+const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
+const package_1 = require("ng-packagr/lib/ng-package/package");
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+const entry_point_1 = require("./entry-point");
+const writeBundlesTransform = (_options) => (0, transform_1.transformFromPromise)(async (graph) => {
+    const updatedGraph = new build_graph_1.BuildGraph();
+    for (const entry of graph.entries()) {
+        if ((0, nodes_1.isEntryPoint)(entry)) {
+            const entryPoint = toCustomNgEntryPoint(entry.data.entryPoint);
+            entry.data.entryPoint = entryPoint;
+            entry.data.destinationFiles = entryPoint.destinationFiles;
+            for (const [path, outputCache] of entry.cache.outputCache.entries()) {
+                // 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);
+            }
+        }
+        else if ((0, nodes_1.isPackage)(entry)) {
+            entry.data = new package_1.NgPackage(entry.data.src, toCustomNgEntryPoint(entry.data.primary), entry.data.secondaries.map((secondary) => toCustomNgEntryPoint(secondary)));
+        }
+        updatedGraph.put(entry);
+    }
+    return updatedGraph;
+});
+exports.writeBundlesTransform = writeBundlesTransform;
+function toCustomNgEntryPoint(entryPoint) {
+    return new entry_point_1.NgEntryPoint(entryPoint.packageJson, entryPoint.ngPackageJson, entryPoint.basePath, 
+    // @ts-expect-error this is a TS private property, but it can be accessed at runtime
+    entryPoint.secondaryData);
+}

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

@@ -2,23 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNgPackagrInstance = getNgPackagrInstance;
 const ng_packagr_1 = require("ng-packagr");
-const angular_version_utils_1 = require("../../utilities/angular-version-utils");
 async function getNgPackagrInstance() {
-    const { major: angularMajorVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
-    if (angularMajorVersion >= 19) {
-        const { STYLESHEET_PROCESSOR } = await import('../../utilities/ng-packagr/stylesheet-processor.di.js');
-        const packagr = (0, ng_packagr_1.ngPackagr)();
-        packagr.withProviders([STYLESHEET_PROCESSOR]);
-        return packagr;
-    }
-    const { WRITE_BUNDLES_TRANSFORM } = await import('./pre-v19/ng-package/entry-point/write-bundles.di.js');
-    const { WRITE_PACKAGE_TRANSFORM } = await import('./pre-v19/ng-package/entry-point/write-package.di.js');
+    const { WRITE_BUNDLES_TRANSFORM } = await import('./ng-package/entry-point/write-bundles.di.js');
     const { STYLESHEET_PROCESSOR } = await import('../../utilities/ng-packagr/stylesheet-processor.di.js');
     const packagr = (0, ng_packagr_1.ngPackagr)();
-    packagr.withProviders([
-        WRITE_BUNDLES_TRANSFORM,
-        WRITE_PACKAGE_TRANSFORM,
-        STYLESHEET_PROCESSOR,
-    ]);
+    packagr.withProviders([WRITE_BUNDLES_TRANSFORM, STYLESHEET_PROCESSOR]);
     return packagr;
 }

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

@@ -1,12 +0,0 @@
-"use strict";
-/**
- * Adapted from the original ng-packagr.
- *
- * Changes made:
- * - Removed bundling altogether.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeBundlesTransform = void 0;
-const transform_1 = require("ng-packagr/lib/graph/transform");
-const writeBundlesTransform = (_options) => (0, transform_1.transformFromPromise)(async (graph) => graph);
-exports.writeBundlesTransform = writeBundlesTransform;

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

@@ -1,8 +0,0 @@
-/**
- * Adapted from the original ng-packagr source.
- *
- * Changes made:
- * - Provide our own writePackageTransform function.
- */
-import { TransformProvider } from 'ng-packagr/lib/graph/transform.di';
-export declare const WRITE_PACKAGE_TRANSFORM: TransformProvider;

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

@@ -1,18 +0,0 @@
-"use strict";
-/**
- * Adapted from the original ng-packagr source.
- *
- * Changes made:
- * - Provide our own writePackageTransform function.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WRITE_PACKAGE_TRANSFORM = void 0;
-const transform_di_1 = require("ng-packagr/lib/graph/transform.di");
-const write_package_di_1 = require("ng-packagr/lib/ng-package/entry-point/write-package.di");
-const options_di_1 = require("ng-packagr/lib/ng-package/options.di");
-const write_package_transform_1 = require("./write-package.transform");
-exports.WRITE_PACKAGE_TRANSFORM = (0, transform_di_1.provideTransform)({
-    provide: write_package_di_1.WRITE_PACKAGE_TRANSFORM_TOKEN,
-    useFactory: write_package_transform_1.nxWritePackageTransform,
-    deps: [options_di_1.OPTIONS_TOKEN],
-});

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

@@ -1,8 +0,0 @@
-/**
- * Adapted from the original ng-packagr.
- *
- * Changes made:
- * - Change the package.json metadata to only use the ESM2022 output.
- */
-import { NgPackagrOptions } from 'ng-packagr/lib/ng-package/options.di';
-export declare const nxWritePackageTransform: (options: NgPackagrOptions) => import("ng-packagr/lib/graph/transform").Transform;

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

@@ -1,286 +0,0 @@
-"use strict";
-/**
- * Adapted from the original ng-packagr.
- *
- * Changes made:
- * - Change the package.json metadata to only use the ESM2022 output.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.nxWritePackageTransform = void 0;
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const node_1 = require("ng-packagr/lib/graph/node");
-const transform_1 = require("ng-packagr/lib/graph/transform");
-const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
-const fs_1 = require("ng-packagr/lib/utils/fs");
-const glob_1 = require("ng-packagr/lib/utils/glob");
-const path_1 = require("ng-packagr/lib/utils/path");
-const path = tslib_1.__importStar(require("path"));
-const nxWritePackageTransform = (options) => (0, transform_1.transformFromPromise)(async (graph) => {
-    const entryPoint = graph.find((0, nodes_1.isEntryPointInProgress)());
-    const ngEntryPoint = entryPoint.data.entryPoint;
-    const ngPackageNode = graph.find(nodes_1.isPackage);
-    const ngPackage = ngPackageNode.data;
-    const { destinationFiles } = entryPoint.data;
-    if (!ngEntryPoint.isSecondaryEntryPoint) {
-        devkit_1.logger.log('Copying assets');
-        try {
-            await copyAssets(graph, entryPoint, ngPackageNode);
-        }
-        catch (error) {
-            throw error;
-        }
-    }
-    // 6. WRITE PACKAGE.JSON
-    const relativeUnixFromDestPath = (filePath) => (0, path_1.ensureUnixPath)(path.relative(ngEntryPoint.destinationPath, filePath));
-    if (!ngEntryPoint.isSecondaryEntryPoint) {
-        try {
-            devkit_1.logger.info('Writing package manifest');
-            if (!options.watch) {
-                const primary = ngPackageNode.data.primary;
-                await (0, fs_1.writeFile)(path.join(primary.destinationPath, '.npmignore'), `# Nested package.json's are only needed for development.\n**/package.json`);
-            }
-            await writePackageJson(ngEntryPoint, ngPackage, {
-                module: relativeUnixFromDestPath(destinationFiles.esm2022),
-                typings: relativeUnixFromDestPath(destinationFiles.declarations),
-                exports: generatePackageExports(ngEntryPoint, graph),
-                // webpack v4+ specific flag to enable advanced optimizations and code splitting
-                sideEffects: ngEntryPoint.packageJson.sideEffects ?? false,
-            }, !!options.watch);
-        }
-        catch (error) {
-            throw error;
-        }
-    }
-    else if (ngEntryPoint.isSecondaryEntryPoint) {
-        if (options.watch) {
-            // Update the watch version of the primary entry point `package.json` file.
-            // this is needed because of Webpack's 5 `cachemanagedpaths`
-            // https://github.com/ng-packagr/ng-packagr/issues/2069
-            const primary = ngPackageNode.data.primary;
-            const packageJsonPath = path.join(primary.destinationPath, 'package.json');
-            if (await (0, fs_1.exists)(packageJsonPath)) {
-                const packageJson = JSON.parse(await (0, fs_1.readFile)(packageJsonPath, { encoding: 'utf8' }));
-                packageJson.version = generateWatchVersion();
-                await (0, fs_1.writeFile)(path.join(primary.destinationPath, 'package.json'), JSON.stringify(packageJson, undefined, 2));
-            }
-        }
-        // Write a package.json in each secondary entry-point
-        // This is need for esbuild to secondary entry-points in dist correctly.
-        await (0, fs_1.writeFile)(path.join(ngEntryPoint.destinationPath, 'package.json'), JSON.stringify({ module: relativeUnixFromDestPath(destinationFiles.esm2022) }, undefined, 2));
-    }
-    devkit_1.logger.info(`Built ${ngEntryPoint.moduleId}`);
-    return graph;
-});
-exports.nxWritePackageTransform = nxWritePackageTransform;
-async function copyAssets(graph, entryPointNode, ngPackageNode) {
-    const ngPackage = ngPackageNode.data;
-    const globsForceIgnored = [
-        '.gitkeep',
-        '**/.DS_Store',
-        '**/Thumbs.db',
-        `${ngPackage.dest}/**`,
-    ];
-    const assets = [];
-    for (const assetPath of ngPackage.assets) {
-        let asset;
-        if (typeof assetPath === 'object') {
-            asset = { ...assetPath };
-        }
-        else {
-            const [isDir, isFile] = await (0, fs_1.stat)(path.join(ngPackage.src, assetPath))
-                .then((stats) => [stats.isDirectory(), stats.isFile()])
-                .catch(() => [false, false]);
-            if (isDir) {
-                asset = { glob: '**/*', input: assetPath, output: assetPath };
-            }
-            else if (isFile) {
-                // filenames are their own glob
-                asset = {
-                    glob: path.basename(assetPath),
-                    input: path.dirname(assetPath),
-                    output: path.dirname(assetPath),
-                };
-            }
-            else {
-                asset = { glob: assetPath, input: '/', output: '/' };
-            }
-        }
-        asset.input = path.join(ngPackage.src, asset.input);
-        asset.output = path.join(ngPackage.dest, asset.output);
-        const isAncestorPath = (target, datum) => path.relative(datum, target).startsWith('..');
-        if (isAncestorPath(asset.input, ngPackage.src)) {
-            throw new Error('Cannot read assets from a location outside of the project root.');
-        }
-        if (isAncestorPath(asset.output, ngPackage.dest)) {
-            throw new Error('Cannot write assets to a location outside of the output path.');
-        }
-        assets.push(asset);
-    }
-    for (const asset of assets) {
-        const filePaths = await (0, glob_1.globFiles)(asset.glob, {
-            cwd: asset.input,
-            ignore: [...(asset.ignore ?? []), ...globsForceIgnored],
-            dot: true,
-            onlyFiles: true,
-            followSymbolicLinks: asset.followSymlinks,
-        });
-        for (const filePath of filePaths) {
-            const fileSrcFullPath = path.join(asset.input, filePath);
-            const fileDestFullPath = path.join(asset.output, filePath);
-            const nodeUri = (0, nodes_1.fileUrl)((0, path_1.ensureUnixPath)(fileSrcFullPath));
-            let node = graph.get(nodeUri);
-            if (!node) {
-                node = new node_1.Node(nodeUri);
-                graph.put(node);
-            }
-            entryPointNode.dependsOn(node);
-            await (0, fs_1.copyFile)(fileSrcFullPath, fileDestFullPath);
-        }
-    }
-}
-/**
- * Creates and writes a `package.json` file of the entry point used by the `node_module`
- * resolution strategies.
- *
- * #### Example
- *
- * A consumer of the entry point depends on it by `import {..} from '@my/module/id';`.
- * The module id `@my/module/id` will be resolved to the `package.json` file that is written by
- * this build step.
- * The properties `main`, `module`, `typings` (and so on) in the `package.json` point to the
- * flattened JavaScript bundles, type definitions, (...).
- *
- * @param entryPoint An entry point of an Angular package / library
- * @param additionalProperties Additional properties, e.g. binary artefacts (bundle files), to merge into `package.json`
- */
-async function writePackageJson(entryPoint, pkg, additionalProperties, isWatchMode) {
-    // set additional properties
-    const packageJson = { ...entryPoint.packageJson, ...additionalProperties };
-    // read tslib version from `@angular/compiler` so that our tslib
-    // version at least matches that of angular if we use require('tslib').version
-    // it will get what installed and not the minimum version nor if it is a `~` or `^`
-    // this is only required for primary
-    if (isWatchMode) {
-        // Needed because of Webpack's 5 `cachemanagedpaths`
-        // https://github.com/angular/angular-cli/issues/20962
-        packageJson.version = generateWatchVersion();
-    }
-    if (!packageJson.peerDependencies?.tslib &&
-        !packageJson.dependencies?.tslib) {
-        const { peerDependencies: angularPeerDependencies = {}, dependencies: angularDependencies = {}, } = require('@angular/compiler/package.json');
-        const tsLibVersion = angularPeerDependencies.tslib || angularDependencies.tslib;
-        if (tsLibVersion) {
-            packageJson.dependencies = {
-                ...packageJson.dependencies,
-                tslib: tsLibVersion,
-            };
-        }
-    }
-    else if (packageJson.peerDependencies?.tslib) {
-        devkit_1.logger.warn(`'tslib' is no longer recommended to be used as a 'peerDependencies'. Moving it to 'dependencies'.`);
-        packageJson.dependencies = {
-            ...(packageJson.dependencies || {}),
-            tslib: packageJson.peerDependencies.tslib,
-        };
-        delete packageJson.peerDependencies.tslib;
-    }
-    // Verify non-peerDependencies as they can easily lead to duplicate installs or version conflicts
-    // in the node_modules folder of an application
-    const allowedList = pkg.allowedNonPeerDependencies.map((value) => new RegExp(value));
-    try {
-        checkNonPeerDependencies(packageJson, 'dependencies', allowedList);
-    }
-    catch (e) {
-        await (0, fs_1.rmdir)(entryPoint.destinationPath, { recursive: true });
-        throw e;
-    }
-    // Removes scripts from package.json after build
-    if (packageJson.scripts) {
-        if (pkg.keepLifecycleScripts !== true) {
-            devkit_1.logger.info(`Removing scripts section in package.json as it's considered a potential security vulnerability.`);
-            delete packageJson.scripts;
-        }
-        else {
-            devkit_1.logger.warn(`You enabled keepLifecycleScripts explicitly. The scripts section in package.json will be published to npm.`);
-        }
-    }
-    // keep the dist package.json clean
-    // this will not throw if ngPackage field does not exist
-    delete packageJson.ngPackage;
-    const packageJsonPropertiesToDelete = [
-        'stylelint',
-        'prettier',
-        'browserslist',
-        'devDependencies',
-        'jest',
-        'workspaces',
-        'husky',
-    ];
-    for (const prop of packageJsonPropertiesToDelete) {
-        if (prop in packageJson) {
-            delete packageJson[prop];
-            devkit_1.logger.info(`Removing ${prop} section in package.json.`);
-        }
-    }
-    packageJson.name = entryPoint.moduleId;
-    await (0, fs_1.writeFile)(path.join(entryPoint.destinationPath, 'package.json'), JSON.stringify(packageJson, undefined, 2));
-}
-function checkNonPeerDependencies(packageJson, property, allowed) {
-    if (!packageJson[property]) {
-        return;
-    }
-    for (const dep of Object.keys(packageJson[property])) {
-        if (!allowed.some((regex) => regex.test(dep))) {
-            devkit_1.logger.warn(`Distributing npm packages with '${property}' is not recommended. Please consider adding ${dep} to 'peerDependencies' or remove it from '${property}'.`);
-            throw new Error(`Dependency ${dep} must be explicitly allowed using the "allowedNonPeerDependencies" option.`);
-        }
-    }
-}
-/**
- * Generates the `package.json` package exports following APF v13.
- * This is supposed to match with: https://github.com/angular/angular/blob/e0667efa6eada64d1fb8b143840689090fc82e52/packages/bazel/src/ng_package/packager.ts#L415.
- */
-function generatePackageExports({ destinationPath, packageJson }, graph) {
-    const exports = packageJson.exports
-        ? JSON.parse(JSON.stringify(packageJson.exports))
-        : {};
-    const insertMappingOrError = (subpath, mapping) => {
-        exports[subpath] ??= {};
-        const subpathExport = exports[subpath];
-        // Go through all conditions that should be inserted. If the condition is already
-        // manually set of the subpath export, we throw an error. In general, we allow for
-        // additional conditions to be set. These will always precede the generated ones.
-        for (const conditionName of Object.keys(mapping)) {
-            if (subpathExport[conditionName] !== undefined) {
-                devkit_1.logger.warn(`Found a conflicting export condition for "${subpath}". The "${conditionName}" ` +
-                    `condition would be overridden by ng-packagr. Please unset it.`);
-            }
-            // **Note**: The order of the conditions is preserved even though we are setting
-            // the conditions once at a time (the latest assignment will be at the end).
-            subpathExport[conditionName] = mapping[conditionName];
-        }
-    };
-    const relativeUnixFromDestPath = (filePath) => './' + (0, path_1.ensureUnixPath)(path.relative(destinationPath, filePath));
-    insertMappingOrError('./package.json', { default: './package.json' });
-    const entryPoints = graph.filter(nodes_1.isEntryPoint);
-    for (const entryPoint of entryPoints) {
-        const { destinationFiles, isSecondaryEntryPoint } = entryPoint.data.entryPoint;
-        const subpath = isSecondaryEntryPoint
-            ? `./${destinationFiles.directory}`
-            : '.';
-        insertMappingOrError(subpath, {
-            types: relativeUnixFromDestPath(destinationFiles.declarations),
-            esm2022: relativeUnixFromDestPath(destinationFiles.esm2022),
-            esm: relativeUnixFromDestPath(destinationFiles.esm2022),
-            default: relativeUnixFromDestPath(destinationFiles.esm2022),
-        });
-    }
-    return exports;
-}
-/**
- * Generates a new version for the package `package.json` when runing in watch mode.
- */
-function generateWatchVersion() {
-    return `0.0.0-watch+${Date.now()}`;
-}