@nx/angular 16.8.0-beta.4 → 16.8.0-beta.5

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

@@ -8,7 +8,6 @@
  */
 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");
@@ -18,8 +17,7 @@ const glob_1 = require("ng-packagr/lib/utils/glob");
 const path_1 = require("ng-packagr/lib/utils/path");
 const path = require("path");
 const angular_version_utils_1 = require("../../../../utilities/angular-version-utils");
-const nxWritePackageTransform = (options) => (0, transform_1.transformFromPromise)((graph) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    var _a;
+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);
@@ -29,7 +27,7 @@ const nxWritePackageTransform = (options) => (0, transform_1.transformFromPromis
     if (!ngEntryPoint.isSecondaryEntryPoint) {
         devkit_1.logger.log('Copying assets');
         try {
-            yield copyAssets(graph, entryPoint, ngPackageNode, angularVersion);
+            await copyAssets(graph, entryPoint, ngPackageNode, angularVersion);
         }
         catch (error) {
             throw error;
@@ -41,17 +39,22 @@ const nxWritePackageTransform = (options) => (0, transform_1.transformFromPromis
         try {
             devkit_1.logger.info('Writing package manifest');
             const relativeUnixFromDestPath = (filePath) => (0, path_1.ensureUnixPath)(path.relative(ngEntryPoint.destinationPath, filePath));
-            yield writePackageJson(ngEntryPoint, ngPackage, Object.assign(Object.assign({}, (angularVersion.major < 16
-                ? {
-                    module: relativeUnixFromDestPath(destinationFiles.esm2020),
-                    es2020: relativeUnixFromDestPath(destinationFiles.esm2020),
-                    esm2020: relativeUnixFromDestPath(destinationFiles.esm2020),
-                }
-                : {
-                    module: relativeUnixFromDestPath(destinationFiles.esm2022),
-                })), { typings: relativeUnixFromDestPath(destinationFiles.declarations), exports: generatePackageExports(ngEntryPoint, graph, angularVersion), 
+            await writePackageJson(ngEntryPoint, ngPackage, {
+                // backward compat for Angular < 16
+                ...(angularVersion.major < 16
+                    ? {
+                        module: relativeUnixFromDestPath(destinationFiles.esm2020),
+                        es2020: relativeUnixFromDestPath(destinationFiles.esm2020),
+                        esm2020: relativeUnixFromDestPath(destinationFiles.esm2020),
+                    }
+                    : {
+                        module: relativeUnixFromDestPath(destinationFiles.esm2022),
+                    }),
+                typings: relativeUnixFromDestPath(destinationFiles.declarations),
+                exports: generatePackageExports(ngEntryPoint, graph, angularVersion),
                 // webpack v4+ specific flag to enable advanced optimizations and code splitting
-                sideEffects: (_a = ngEntryPoint.packageJson.sideEffects) !== null && _a !== void 0 ? _a : false }), !!options.watch);
+                sideEffects: ngEntryPoint.packageJson.sideEffects ?? false,
+            }, !!options.watch);
         }
         catch (error) {
             throw error;
@@ -63,94 +66,91 @@ const nxWritePackageTransform = (options) => (0, transform_1.transformFromPromis
         // https://github.com/ng-packagr/ng-packagr/issues/2069
         const primary = ngPackageNode.data.primary;
         const packageJsonPath = path.join(primary.destinationPath, 'package.json');
-        if (yield (0, fs_1.exists)(packageJsonPath)) {
-            const packageJson = JSON.parse(yield (0, fs_1.readFile)(packageJsonPath, { encoding: 'utf8' }));
+        if (await (0, fs_1.exists)(packageJsonPath)) {
+            const packageJson = JSON.parse(await (0, fs_1.readFile)(packageJsonPath, { encoding: 'utf8' }));
             packageJson.version = generateWatchVersion();
-            yield (0, fs_1.writeFile)(path.join(primary.destinationPath, 'package.json'), JSON.stringify(packageJson, undefined, 2));
+            await (0, fs_1.writeFile)(path.join(primary.destinationPath, 'package.json'), JSON.stringify(packageJson, undefined, 2));
         }
     }
     devkit_1.logger.info(`Built ${ngEntryPoint.moduleId}`);
     return graph;
-}));
+});
 exports.nxWritePackageTransform = nxWritePackageTransform;
-function copyAssets(graph, entryPointNode, ngPackageNode, angularVersion) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        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 = Object.assign({}, assetPath);
-            }
-            else {
-                const [isDir, isFile] = yield (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);
+async function copyAssets(graph, entryPointNode, ngPackageNode, angularVersion) {
+    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 };
         }
-        for (const asset of assets) {
-            const globOptions = {
-                cwd: asset.input,
-                ignore: [...((_a = asset.ignore) !== null && _a !== void 0 ? _a : []), ...globsForceIgnored],
-                dot: true,
-            };
-            if (angularVersion.major < 16) {
-                // versions lower than v16 support these properties
-                globOptions.cache = ngPackageNode.cache.globCache;
-                globOptions.nodir = true;
-                globOptions.follow = asset.followSymlinks;
+        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 {
-                // starting in v16 these properties are supported
-                globOptions.onlyFiles = true;
-                globOptions.followSymbolicLinks = asset.followSymlinks;
+                asset = { glob: assetPath, input: '/', output: '/' };
             }
-            const filePaths = yield (0, glob_1.globFiles)(asset.glob, globOptions);
-            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);
-                yield (0, fs_1.copyFile)(fileSrcFullPath, fileDestFullPath);
+        }
+        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 globOptions = {
+            cwd: asset.input,
+            ignore: [...(asset.ignore ?? []), ...globsForceIgnored],
+            dot: true,
+        };
+        if (angularVersion.major < 16) {
+            // versions lower than v16 support these properties
+            globOptions.cache = ngPackageNode.cache.globCache;
+            globOptions.nodir = true;
+            globOptions.follow = asset.followSymlinks;
+        }
+        else {
+            // starting in v16 these properties are supported
+            globOptions.onlyFiles = true;
+            globOptions.followSymbolicLinks = asset.followSymlinks;
+        }
+        const filePaths = await (0, glob_1.globFiles)(asset.glob, globOptions);
+        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`
@@ -167,74 +167,77 @@ function copyAssets(graph, entryPointNode, ngPackageNode, angularVersion) {
  * @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`
  */
-function writePackageJson(entryPoint, pkg, additionalProperties, isWatchMode) {
-    var _a, _b, _c;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        // set additional properties
-        const packageJson = Object.assign(Object.assign({}, 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 (!((_a = packageJson.peerDependencies) === null || _a === void 0 ? void 0 : _a.tslib) &&
-            !((_b = packageJson.dependencies) === null || _b === void 0 ? void 0 : _b.tslib)) {
-            const { peerDependencies: angularPeerDependencies = {}, dependencies: angularDependencies = {}, } = require('@angular/compiler/package.json');
-            const tsLibVersion = angularPeerDependencies.tslib || angularDependencies.tslib;
-            if (tsLibVersion) {
-                packageJson.dependencies = Object.assign(Object.assign({}, packageJson.dependencies), { tslib: tsLibVersion });
-            }
-        }
-        else if ((_c = packageJson.peerDependencies) === null || _c === void 0 ? void 0 : _c.tslib) {
-            devkit_1.logger.warn(`'tslib' is no longer recommended to be used as a 'peerDependencies'. Moving it to 'dependencies'.`);
-            packageJson.dependencies = Object.assign(Object.assign({}, (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);
+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,
+            };
         }
-        catch (e) {
-            yield (0, fs_1.rmdir)(entryPoint.destinationPath, { recursive: true });
-            throw e;
+    }
+    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;
         }
-        // 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.`);
-            }
+        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.`);
-            }
+    }
+    // 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;
-        yield (0, fs_1.writeFile)(path.join(entryPoint.destinationPath, 'package.json'), JSON.stringify(packageJson, undefined, 2));
-    });
+    }
+    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]) {
@@ -256,8 +259,7 @@ function generatePackageExports({ destinationPath, packageJson }, graph, angular
         ? JSON.parse(JSON.stringify(packageJson.exports))
         : {};
     const insertMappingOrError = (subpath, mapping) => {
-        var _a;
-        (_a = exports[subpath]) !== null && _a !== void 0 ? _a : (exports[subpath] = {});
+        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

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

@@ -20,10 +20,13 @@ exports.nxProvideOptions = nxProvideOptions;
 exports.NX_DEFAULT_OPTIONS_PROVIDER = (0, exports.nxProvideOptions)();
 function normalizeOptions(options = {}) {
     const ciEnv = process.env['CI'];
-    const isCI = (ciEnv === null || ciEnv === void 0 ? void 0 : ciEnv.toLowerCase()) === 'true' || ciEnv === '1';
+    const isCI = ciEnv?.toLowerCase() === 'true' || ciEnv === '1';
     const { cacheEnabled = !isCI, cacheDirectory = findCachePath() } = options;
-    return Object.assign(Object.assign({}, options), { cacheEnabled,
-        cacheDirectory });
+    return {
+        ...options,
+        cacheEnabled,
+        cacheDirectory,
+    };
 }
 function findCachePath() {
     const name = 'ng-packagr';