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

package/src/migrations/update-15-8-0/rename-swcrc-config.js

@@ -1,62 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let changesMade = false;
-        const projects = (0, devkit_1.getProjects)(tree);
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/js:swc', (_, projectName, target, configurationName) => {
-            const projectConfiguration = projects.get(projectName);
-            const executorOptions = configurationName
-                ? projectConfiguration.targets[target].configurations[configurationName]
-                : projectConfiguration.targets[target].options;
-            // if the project uses a custom path to swcrc file
-            // and only if it's the default name
-            if (executorOptions.swcrc &&
-                executorOptions.swcrc.includes('.lib.swcrc')) {
-                const newSwcrc = executorOptions.swcrc.replace('.lib.swcrc', '.swcrc');
-                // rename the swcrc file first
-                tree.rename(executorOptions.swcrc, newSwcrc);
-                // then update the executor options
-                executorOptions.swcrc = newSwcrc;
-                changesMade = true;
-            }
-            const libSwcrcPath = (0, devkit_1.joinPathFragments)(projectConfiguration.root, '.lib.swcrc') ||
-                (0, devkit_1.joinPathFragments)(projectConfiguration.sourceRoot, '.lib.swcrc');
-            const isLibSwcrcExist = tree.exists(libSwcrcPath);
-            if (isLibSwcrcExist) {
-                tree.rename(libSwcrcPath, libSwcrcPath.replace('.lib.swcrc', '.swcrc'));
-                changesMade = true;
-            }
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
-        });
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/jest:jest', (_, projectName, target, configurationName) => {
-            const projectConfiguration = projects.get(projectName);
-            const executorOptions = configurationName
-                ? projectConfiguration.targets[target].configurations[configurationName]
-                : projectConfiguration.targets[target].options;
-            const isJestConfigExist = executorOptions.jestConfig && tree.exists(executorOptions.jestConfig);
-            if (isJestConfigExist) {
-                const jestConfig = tree.read(executorOptions.jestConfig, 'utf-8');
-                const jsonParseNodes = tsquery_1.tsquery.query(jestConfig, ':matches(CallExpression:has(Identifier[name="JSON"]):has(Identifier[name="parse"]))');
-                if (jsonParseNodes.length) {
-                    // if we already assign false to swcrc, skip
-                    if (jestConfig.includes('.swcrc = false')) {
-                        return;
+async function default_1(tree) {
+    let changesMade = false;
+    const projects = (0, devkit_1.getProjects)(tree);
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/js:swc', (_, projectName, target, configurationName) => {
+        const projectConfiguration = projects.get(projectName);
+        const executorOptions = configurationName
+            ? projectConfiguration.targets[target].configurations[configurationName]
+            : projectConfiguration.targets[target].options;
+        // if the project uses a custom path to swcrc file
+        // and only if it's the default name
+        if (executorOptions.swcrc &&
+            executorOptions.swcrc.includes('.lib.swcrc')) {
+            const newSwcrc = executorOptions.swcrc.replace('.lib.swcrc', '.swcrc');
+            // rename the swcrc file first
+            tree.rename(executorOptions.swcrc, newSwcrc);
+            // then update the executor options
+            executorOptions.swcrc = newSwcrc;
+            changesMade = true;
+        }
+        const libSwcrcPath = (0, devkit_1.joinPathFragments)(projectConfiguration.root, '.lib.swcrc') ||
+            (0, devkit_1.joinPathFragments)(projectConfiguration.sourceRoot, '.lib.swcrc');
+        const isLibSwcrcExist = tree.exists(libSwcrcPath);
+        if (isLibSwcrcExist) {
+            tree.rename(libSwcrcPath, libSwcrcPath.replace('.lib.swcrc', '.swcrc'));
+            changesMade = true;
+        }
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
+    });
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/jest:jest', (_, projectName, target, configurationName) => {
+        const projectConfiguration = projects.get(projectName);
+        const executorOptions = configurationName
+            ? projectConfiguration.targets[target].configurations[configurationName]
+            : projectConfiguration.targets[target].options;
+        const isJestConfigExist = executorOptions.jestConfig && tree.exists(executorOptions.jestConfig);
+        if (isJestConfigExist) {
+            const jestConfig = tree.read(executorOptions.jestConfig, 'utf-8');
+            const jsonParseNodes = tsquery_1.tsquery.query(jestConfig, ':matches(CallExpression:has(Identifier[name="JSON"]):has(Identifier[name="parse"]))');
+            if (jsonParseNodes.length) {
+                // if we already assign false to swcrc, skip
+                if (jestConfig.includes('.swcrc = false')) {
+                    return;
+                }
+                let updatedJestConfig = tsquery_1.tsquery.replace(jestConfig, 'CallExpression:has(Identifier[name="JSON"]):has(Identifier[name="parse"]) TemplateSpan', (templateSpan) => {
+                    if (templateSpan.literal.text === '/.lib.swcrc') {
+                        return templateSpan
+                            .getFullText()
+                            .replace('.lib.swcrc', '.swcrc');
                     }
-                    let updatedJestConfig = tsquery_1.tsquery.replace(jestConfig, 'CallExpression:has(Identifier[name="JSON"]):has(Identifier[name="parse"]) TemplateSpan', (templateSpan) => {
-                        if (templateSpan.literal.text === '/.lib.swcrc') {
-                            return templateSpan
-                                .getFullText()
-                                .replace('.lib.swcrc', '.swcrc');
-                        }
-                        return '';
-                    });
-                    updatedJestConfig = tsquery_1.tsquery.replace(updatedJestConfig, ':matches(ExportAssignment, BinaryExpression:has(Identifier[name="module"]):has(Identifier[name="exports"]))', (node) => {
-                        return `
+                    return '';
+                });
+                updatedJestConfig = tsquery_1.tsquery.replace(updatedJestConfig, ':matches(ExportAssignment, BinaryExpression:has(Identifier[name="module"]):has(Identifier[name="exports"]))', (node) => {
+                    return `
 
 // disable .swcrc look-up by SWC core because we're passing in swcJestConfig ourselves.
 // If we do not disable this, SWC Core will read .swcrc and won't transform our test files due to "exclude"
@@ -66,15 +64,14 @@ if (swcJestConfig.swcrc === undefined) {
 
 ${node.getFullText()}
 `;
-                    });
-                    tree.write(executorOptions.jestConfig, updatedJestConfig);
-                    changesMade = true;
-                }
+                });
+                tree.write(executorOptions.jestConfig, updatedJestConfig);
+                changesMade = true;
             }
-        });
-        if (changesMade) {
-            yield (0, devkit_1.formatFiles)(tree);
         }
     });
+    if (changesMade) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.default = default_1;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-function replacePackage(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/js', '@nx/js');
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function replacePackage(tree) {
+    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/js', '@nx/js');
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = replacePackage;

package/src/migrations/update-16-6-0/explicitly-set-projects-to-update-buildable-deps.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executors = new Set([
     '@nx/js:swc',
@@ -8,32 +7,28 @@ const executors = new Set([
     '@nx/js:tsc',
     '@nrwl/js:tsc',
 ]);
-function default_1(tree) {
-    var _a;
-    var _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        // use project graph to get the expanded target configurations
-        const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
-        for (const [projectName, { data: projectData }] of Object.entries(projectGraph.nodes)) {
-            if (projectData.projectType !== 'library') {
+async function default_1(tree) {
+    // use project graph to get the expanded target configurations
+    const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
+    for (const [projectName, { data: projectData }] of Object.entries(projectGraph.nodes)) {
+        if (projectData.projectType !== 'library') {
+            continue;
+        }
+        for (const [targetName, target] of Object.entries(projectData.targets || {})) {
+            if (!executors.has(target.executor)) {
                 continue;
             }
-            for (const [targetName, target] of Object.entries(projectData.targets || {})) {
-                if (!executors.has(target.executor)) {
-                    continue;
-                }
-                if (!target.options ||
-                    target.options.updateBuildableProjectDepsInPackageJson === undefined) {
-                    // read the project configuration to write the explicit project configuration
-                    // and avoid writing the expanded target configuration
-                    const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-                    (_a = (_b = project.targets[targetName]).options) !== null && _a !== void 0 ? _a : (_b.options = {});
-                    project.targets[targetName].options.updateBuildableProjectDepsInPackageJson = true;
-                    (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
-                }
+            if (!target.options ||
+                target.options.updateBuildableProjectDepsInPackageJson === undefined) {
+                // read the project configuration to write the explicit project configuration
+                // and avoid writing the expanded target configuration
+                const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+                project.targets[targetName].options ??= {};
+                project.targets[targetName].options.updateBuildableProjectDepsInPackageJson = true;
+                (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
             }
         }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;

package/src/plugins/jest/start-local-registry.js

@@ -13,18 +13,16 @@ function startLocalRegistry({ localRegistryTarget, storage, verbose, }) {
         throw new Error(`localRegistryTarget is required`);
     }
     return new Promise((resolve, reject) => {
-        var _a, _b;
         const childProcess = (0, child_process_1.fork)(require.resolve('nx'), [
             ...`run ${localRegistryTarget} --location none --clear true`.split(' '),
             ...(storage ? [`--storage`, storage] : []),
         ], { stdio: 'pipe' });
         const listener = (data) => {
-            var _a, _b, _c;
             if (verbose) {
                 process.stdout.write(data);
             }
             if (data.toString().includes('http://localhost:')) {
-                const port = parseInt((_b = (_a = data.toString().match(/localhost:(?<port>\d+)/)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.port);
+                const port = parseInt(data.toString().match(/localhost:(?<port>\d+)/)?.groups?.port);
                 console.log('Local registry started on port ' + port);
                 const registry = `http://localhost:${port}`;
                 process.env.npm_config_registry = registry;
@@ -39,11 +37,11 @@ function startLocalRegistry({ localRegistryTarget, storage, verbose, }) {
                     childProcess.kill();
                     (0, child_process_1.execSync)(`npm config delete //localhost:${port}/:_authToken`);
                 });
-                (_c = childProcess === null || childProcess === void 0 ? void 0 : childProcess.stdout) === null || _c === void 0 ? void 0 : _c.off('data', listener);
+                childProcess?.stdout?.off('data', listener);
             }
         };
-        (_a = childProcess === null || childProcess === void 0 ? void 0 : childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', listener);
-        (_b = childProcess === null || childProcess === void 0 ? void 0 : childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
+        childProcess?.stdout?.on('data', listener);
+        childProcess?.stderr?.on('data', (data) => {
             process.stderr.write(data);
         });
         childProcess.on('error', (err) => {

package/src/plugins/rollup/type-definitions.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.typeDefinitions = void 0;
-const tslib_1 = require("tslib");
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 //NOTE: This is here so we can share between `@nx/rollup` and `@nx/vite`.
@@ -19,32 +18,30 @@ const devkit_1 = require("@nx/devkit");
 function typeDefinitions(options) {
     return {
         name: 'dts-bundle',
-        generateBundle(_opts, bundle) {
-            return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                for (const [name, file] of Object.entries(bundle)) {
-                    if (file.type === 'asset' ||
-                        !file.isEntry ||
-                        file.facadeModuleId == null) {
-                        continue;
-                    }
-                    const hasDefaultExport = file.exports.includes('default');
-                    const entrySourceFileName = (0, path_1.relative)(options.projectRoot, file.facadeModuleId);
-                    const entrySourceDtsName = entrySourceFileName.replace(/\.[cm]?[jt]sx?$/, '');
-                    const dtsFileName = file.fileName.replace(/\.[cm]?js$/, '.d.ts');
-                    const relativeSourceDtsName = JSON.stringify('./' + entrySourceDtsName);
-                    const dtsFileSource = hasDefaultExport
-                        ? (0, devkit_1.stripIndents) `
+        async generateBundle(_opts, bundle) {
+            for (const [name, file] of Object.entries(bundle)) {
+                if (file.type === 'asset' ||
+                    !file.isEntry ||
+                    file.facadeModuleId == null) {
+                    continue;
+                }
+                const hasDefaultExport = file.exports.includes('default');
+                const entrySourceFileName = (0, path_1.relative)(options.projectRoot, file.facadeModuleId);
+                const entrySourceDtsName = entrySourceFileName.replace(/\.[cm]?[jt]sx?$/, '');
+                const dtsFileName = file.fileName.replace(/\.[cm]?js$/, '.d.ts');
+                const relativeSourceDtsName = JSON.stringify('./' + entrySourceDtsName);
+                const dtsFileSource = hasDefaultExport
+                    ? (0, devkit_1.stripIndents) `
               export * from ${relativeSourceDtsName};
               export { default } from ${relativeSourceDtsName};
             `
-                        : `export * from ${relativeSourceDtsName};\n`;
-                    this.emitFile({
-                        type: 'asset',
-                        fileName: dtsFileName,
-                        source: dtsFileSource,
-                    });
-                }
-            });
+                    : `export * from ${relativeSourceDtsName};\n`;
+                this.emitFile({
+                    type: 'asset',
+                    fileName: dtsFileName,
+                    source: dtsFileSource,
+                });
+            }
         },
     };
 }

package/src/utils/add-babel-inputs.js

@@ -5,7 +5,6 @@ const devkit_1 = require("@nx/devkit");
 /** @deprecated Do not use this function as the root babel.config.json file is no longer needed */
 // TODO(jack): Remove This in Nx 17 once we don't need to support Nx 15 anymore. Currently this function is used in v15 migrations.
 function addBabelInputs(tree) {
-    var _a;
     const nxJson = (0, devkit_1.readNxJson)(tree);
     let globalBabelFile = ['babel.config.js', 'babel.config.json'].find((file) => tree.exists(file));
     if (!globalBabelFile) {
@@ -14,7 +13,7 @@ function addBabelInputs(tree) {
         });
         globalBabelFile = 'babel.config.json';
     }
-    if ((_a = nxJson.namedInputs) === null || _a === void 0 ? void 0 : _a.sharedGlobals) {
+    if (nxJson.namedInputs?.sharedGlobals) {
         const sharedGlobalFileset = new Set(nxJson.namedInputs.sharedGlobals);
         sharedGlobalFileset.add((0, devkit_1.joinPathFragments)('{workspaceRoot}', globalBabelFile));
         nxJson.namedInputs.sharedGlobals = Array.from(sharedGlobalFileset);

package/src/utils/assets/assets.js

@@ -14,7 +14,6 @@ function assetGlobsToFiles(assets, rootDir, outDir) {
         });
     };
     assets.forEach((asset) => {
-        var _a;
         if (typeof asset === 'string') {
             globbedFiles(asset, rootDir).forEach((globbedFile) => {
                 files.push({
@@ -24,7 +23,7 @@ function assetGlobsToFiles(assets, rootDir, outDir) {
             });
         }
         else {
-            globbedFiles(asset.glob, (0, path_1.join)(rootDir, asset.input), asset.ignore, (_a = asset.dot) !== null && _a !== void 0 ? _a : false).forEach((globbedFile) => {
+            globbedFiles(asset.glob, (0, path_1.join)(rootDir, asset.input), asset.ignore, asset.dot ?? false).forEach((globbedFile) => {
                 files.push({
                     input: (0, path_1.join)(rootDir, asset.input, globbedFile),
                     output: (0, path_1.join)(outDir, asset.output, globbedFile),

package/src/utils/assets/copy-assets-handler.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CopyAssetsHandler = exports.defaultFileEventHandler = void 0;
-const tslib_1 = require("tslib");
 const minimatch = require("minimatch");
 const path = require("path");
 const fse = require("fs-extra");
@@ -29,11 +28,10 @@ const defaultFileEventHandler = (events) => {
 exports.defaultFileEventHandler = defaultFileEventHandler;
 class CopyAssetsHandler {
     constructor(opts) {
-        var _a;
         this.rootDir = opts.rootDir;
         this.projectDir = opts.projectDir;
         this.outputDir = opts.outputDir;
-        this.callback = (_a = opts.callback) !== null && _a !== void 0 ? _a : exports.defaultFileEventHandler;
+        this.callback = opts.callback ?? exports.defaultFileEventHandler;
         // TODO(jack): Should handle nested .gitignore files
         this.ignore = (0, ignore_1.default)();
         const gitignore = path.join(opts.rootDir, '.gitignore');
@@ -71,18 +69,16 @@ class CopyAssetsHandler {
             };
         });
     }
-    processAllAssetsOnce() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield Promise.all(this.assetGlobs.map((ag) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                const pattern = this.normalizeAssetPattern(ag);
-                // fast-glob only supports Unix paths
-                const files = yield fg(pattern.replace(/\\/g, '/'), {
-                    cwd: this.rootDir,
-                    dot: true, // enable hidden files
-                });
-                this.callback(this.filesToEvent(files, ag));
-            })));
-        });
+    async processAllAssetsOnce() {
+        await Promise.all(this.assetGlobs.map(async (ag) => {
+            const pattern = this.normalizeAssetPattern(ag);
+            // fast-glob only supports Unix paths
+            const files = await fg(pattern.replace(/\\/g, '/'), {
+                cwd: this.rootDir,
+                dot: true, // enable hidden files
+            });
+            this.callback(this.filesToEvent(files, ag));
+        }));
     }
     processAllAssetsOnceSync() {
         this.assetGlobs.forEach((ag) => {
@@ -95,57 +91,50 @@ class CopyAssetsHandler {
             this.callback(this.filesToEvent(files, ag));
         });
     }
-    watchAndProcessOnAssetChange() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const unregisterFileWatcher = yield client_1.daemonClient.registerFileWatcher({
-                watchProjects: 'all',
-                includeGlobalWorkspaceFiles: true,
-            }, (err, data) => {
-                var _a;
-                if (err === 'closed') {
-                    devkit_1.logger.error(`Watch error: Daemon closed the connection`);
-                    process.exit(1);
-                }
-                else if (err) {
-                    devkit_1.logger.error(`Watch error: ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : 'Unknown'}`);
-                }
-                else {
-                    this.processWatchEvents(data.changedFiles);
-                }
-            });
-            return () => unregisterFileWatcher();
+    async watchAndProcessOnAssetChange() {
+        const unregisterFileWatcher = await client_1.daemonClient.registerFileWatcher({
+            watchProjects: 'all',
+            includeGlobalWorkspaceFiles: true,
+        }, (err, data) => {
+            if (err === 'closed') {
+                devkit_1.logger.error(`Watch error: Daemon closed the connection`);
+                process.exit(1);
+            }
+            else if (err) {
+                devkit_1.logger.error(`Watch error: ${err?.message ?? 'Unknown'}`);
+            }
+            else {
+                this.processWatchEvents(data.changedFiles);
+            }
         });
+        return () => unregisterFileWatcher();
     }
-    processWatchEvents(events) {
-        var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const fileEvents = [];
-            for (const event of events) {
-                const pathFromRoot = path.relative(this.rootDir, event.path);
-                for (const ag of this.assetGlobs) {
-                    if (minimatch(pathFromRoot, ag.pattern) &&
-                        !((_a = ag.ignore) === null || _a === void 0 ? void 0 : _a.some((ig) => minimatch(pathFromRoot, ig))) &&
-                        !this.ignore.ignores(pathFromRoot)) {
-                        const relPath = path.relative(ag.input, pathFromRoot);
-                        const destPath = relPath.startsWith('..') ? pathFromRoot : relPath;
-                        fileEvents.push({
-                            type: event.type,
-                            src: path.join(this.rootDir, pathFromRoot),
-                            dest: path.join(this.rootDir, ag.output, destPath),
-                        });
-                        // Match first entry and skip the rest for this file.
-                        break;
-                    }
+    async processWatchEvents(events) {
+        const fileEvents = [];
+        for (const event of events) {
+            const pathFromRoot = path.relative(this.rootDir, event.path);
+            for (const ag of this.assetGlobs) {
+                if (minimatch(pathFromRoot, ag.pattern) &&
+                    !ag.ignore?.some((ig) => minimatch(pathFromRoot, ig)) &&
+                    !this.ignore.ignores(pathFromRoot)) {
+                    const relPath = path.relative(ag.input, pathFromRoot);
+                    const destPath = relPath.startsWith('..') ? pathFromRoot : relPath;
+                    fileEvents.push({
+                        type: event.type,
+                        src: path.join(this.rootDir, pathFromRoot),
+                        dest: path.join(this.rootDir, ag.output, destPath),
+                    });
+                    // Match first entry and skip the rest for this file.
+                    break;
                 }
             }
-            if (fileEvents.length > 0)
-                this.callback(fileEvents);
-        });
+        }
+        if (fileEvents.length > 0)
+            this.callback(fileEvents);
     }
     filesToEvent(files, assetGlob) {
         return files.reduce((acc, src) => {
-            var _a;
-            if (!((_a = assetGlob.ignore) === null || _a === void 0 ? void 0 : _a.some((ig) => minimatch(src, ig))) &&
+            if (!assetGlob.ignore?.some((ig) => minimatch(src, ig)) &&
                 !this.ignore.ignores(src)) {
                 const relPath = path.relative(assetGlob.input, src);
                 const dest = relPath.startsWith('..') ? src : relPath;

package/src/utils/assets/index.js

@@ -1,30 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyAssets = void 0;
-const tslib_1 = require("tslib");
 const copy_assets_handler_1 = require("./copy-assets-handler");
-function copyAssets(options, context) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const assetHandler = new copy_assets_handler_1.CopyAssetsHandler({
-            projectDir: context.projectsConfigurations.projects[context.projectName].root,
-            rootDir: context.root,
-            outputDir: options.outputPath,
-            assets: options.assets,
-            callback: typeof (options === null || options === void 0 ? void 0 : options.watch) === 'object' ? options.watch.onCopy : undefined,
-        });
-        const result = {
-            success: true,
-        };
-        if (options.watch) {
-            result.stop = yield assetHandler.watchAndProcessOnAssetChange();
-        }
-        try {
-            yield assetHandler.processAllAssetsOnce();
-        }
-        catch (_a) {
-            result.success = false;
-        }
-        return result;
+async function copyAssets(options, context) {
+    const assetHandler = new copy_assets_handler_1.CopyAssetsHandler({
+        projectDir: context.projectsConfigurations.projects[context.projectName].root,
+        rootDir: context.root,
+        outputDir: options.outputPath,
+        assets: options.assets,
+        callback: typeof options?.watch === 'object' ? options.watch.onCopy : undefined,
     });
+    const result = {
+        success: true,
+    };
+    if (options.watch) {
+        result.stop = await assetHandler.watchAndProcessOnAssetChange();
+    }
+    try {
+        await assetHandler.processAllAssetsOnce();
+    }
+    catch {
+        result.success = false;
+    }
+    return result;
 }
 exports.copyAssets = copyAssets;

package/src/utils/buildable-libs-utils.js

@@ -115,7 +115,6 @@ function readTsConfigWithRemappedPaths(tsConfig, generatedTsConfigPath, dependen
     return generatedTsConfig;
 }
 function calculateDependenciesFromTaskGraph(taskGraph, projectGraph, root, projectName, targetName, configurationName, shallow) {
-    var _a;
     const target = projectGraph.nodes[projectName];
     const nonBuildableDependencies = [];
     const topLevelDependencies = [];
@@ -125,8 +124,8 @@ function calculateDependenciesFromTaskGraph(taskGraph, projectGraph, root, proje
     for (const [taskName, { isTopLevel }] of dependentTasks) {
         let project = null;
         const depTask = taskGraph.tasks[taskName];
-        const depProjectNode = (_a = projectGraph.nodes) === null || _a === void 0 ? void 0 : _a[depTask.target.project];
-        if ((depProjectNode === null || depProjectNode === void 0 ? void 0 : depProjectNode.type) !== 'lib') {
+        const depProjectNode = projectGraph.nodes?.[depTask.target.project];
+        if (depProjectNode?.type !== 'lib') {
             return null;
         }
         let outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)(depTask, depProjectNode);
@@ -165,9 +164,9 @@ exports.calculateDependenciesFromTaskGraph = calculateDependenciesFromTaskGraph;
 function collectNpmDependencies(projectName, projectGraph, dependentTasks, collectedPackages = new Set(), isTopLevel = true) {
     const dependencies = projectGraph.dependencies[projectName]
         .map((dep) => {
-        var _a, _b, _c;
-        const projectNode = (_b = (_a = projectGraph.nodes) === null || _a === void 0 ? void 0 : _a[dep.target]) !== null && _b !== void 0 ? _b : (_c = projectGraph.externalNodes) === null || _c === void 0 ? void 0 : _c[dep.target];
-        if ((projectNode === null || projectNode === void 0 ? void 0 : projectNode.type) !== 'npm' ||
+        const projectNode = projectGraph.nodes?.[dep.target] ??
+            projectGraph.externalNodes?.[dep.target];
+        if (projectNode?.type !== 'npm' ||
             collectedPackages.has(projectNode.data.packageName)) {
             return null;
         }
@@ -180,7 +179,7 @@ function collectNpmDependencies(projectName, projectGraph, dependentTasks, colle
         return { project, isTopLevel };
     })
         .filter((x) => !!x);
-    if (dependentTasks === null || dependentTasks === void 0 ? void 0 : dependentTasks.size) {
+    if (dependentTasks?.size) {
         for (const [, { project: projectName }] of dependentTasks) {
             dependencies.push(...collectNpmDependencies(projectName, projectGraph, undefined, collectedPackages, false));
         }
@@ -188,8 +187,7 @@ function collectNpmDependencies(projectName, projectGraph, dependentTasks, colle
     return dependencies;
 }
 function collectDependentTasks(project, task, taskGraph, projectGraph, shallow, areTopLevelDeps = true, dependentTasks = new Map()) {
-    var _a;
-    for (const depTask of (_a = taskGraph.dependencies[task]) !== null && _a !== void 0 ? _a : []) {
+    for (const depTask of taskGraph.dependencies[task] ?? []) {
         if (dependentTasks.has(depTask)) {
             if (!dependentTasks.get(depTask).isTopLevel && areTopLevelDeps) {
                 dependentTasks.get(depTask).isTopLevel = true;
@@ -275,7 +273,6 @@ function updatePaths(dependencies, paths) {
     const pathsKeys = Object.keys(paths);
     // For each registered dependency
     dependencies.forEach((dep) => {
-        var _a;
         // If there are outputs
         if (dep.outputs && dep.outputs.length > 0) {
             // Directly map the dependency name to the output paths (dist/packages/..., etc.)
@@ -290,7 +287,7 @@ function updatePaths(dependencies, paths) {
                     // Bind secondary endpoints for ng-packagr projects
                     let mappedPaths = dep.outputs.map((output) => `${output}/${nestedPart}`);
                     // Get the dependency's package name
-                    const { root } = (((_a = dep.node) === null || _a === void 0 ? void 0 : _a.data) || {});
+                    const { root } = (dep.node?.data || {});
                     if (root) {
                         // Update nested mappings to point to the dependency's output paths
                         mappedPaths = mappedPaths.concat(paths[path].flatMap((path) => dep.outputs.map((output) => path.replace(root, output))));
@@ -330,7 +327,6 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
     packageJson.peerDependencies = packageJson.peerDependencies || {};
     let updatePackageJson = false;
     dependencies.forEach((entry) => {
-        var _a;
         const packageName = (0, operators_1.isNpmProject)(entry.node)
             ? entry.node.data.packageName
             : entry.name;
@@ -354,7 +350,7 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
                 }
                 else if ((0, operators_1.isNpmProject)(entry.node)) {
                     // If an npm dep is part of the workspace devDependencies, do not include it the library
-                    if (!!((_a = workspacePackageJson.devDependencies) === null || _a === void 0 ? void 0 : _a[entry.node.data.packageName])) {
+                    if (!!workspacePackageJson.devDependencies?.[entry.node.data.packageName]) {
                         return;
                     }
                     depVersion = entry.node.data.version;