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

package/src/executors/tsc/tsc.batch-impl.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tscBatchExecutor = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const async_iterator_1 = require("nx/src/utils/async-iterator");
@@ -9,152 +8,154 @@ const update_package_json_1 = require("../../utils/package-json/update-package-j
 const tsc_impl_1 = require("./tsc.impl");
 const lib_1 = require("./lib");
 const batch_1 = require("./lib/batch");
-function tscBatchExecutor(taskGraph, inputs, overrides, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* tscBatchExecutor_1() {
-        const tasksOptions = (0, batch_1.normalizeTasksOptions)(inputs, context);
-        let shouldWatch = false;
-        Object.values(tasksOptions).forEach((taskOptions) => {
-            if (taskOptions.clean) {
-                (0, fs_1.rmSync)(taskOptions.outputPath, { force: true, recursive: true });
+async function* tscBatchExecutor(taskGraph, inputs, overrides, context) {
+    const tasksOptions = (0, batch_1.normalizeTasksOptions)(inputs, context);
+    let shouldWatch = false;
+    Object.values(tasksOptions).forEach((taskOptions) => {
+        if (taskOptions.clean) {
+            (0, fs_1.rmSync)(taskOptions.outputPath, { force: true, recursive: true });
+        }
+        if (taskOptions.watch) {
+            shouldWatch = true;
+        }
+    });
+    const taskInMemoryTsConfigMap = (0, lib_1.getProcessedTaskTsConfigs)(Object.keys(taskGraph.tasks), tasksOptions, context);
+    const tsConfigTaskInfoMap = (0, batch_1.createTaskInfoPerTsConfigMap)(tasksOptions, context, Object.keys(taskGraph.tasks), taskInMemoryTsConfigMap);
+    const tsCompilationContext = createTypescriptCompilationContext(tsConfigTaskInfoMap, taskInMemoryTsConfigMap, context);
+    const logger = {
+        error: (message, tsConfig) => {
+            process.stderr.write(message);
+            if (tsConfig) {
+                tsConfigTaskInfoMap[tsConfig].terminalOutput += message;
             }
-            if (taskOptions.watch) {
-                shouldWatch = true;
+        },
+        info: (message, tsConfig) => {
+            process.stdout.write(message);
+            if (tsConfig) {
+                tsConfigTaskInfoMap[tsConfig].terminalOutput += message;
             }
-        });
-        const taskInMemoryTsConfigMap = (0, lib_1.getProcessedTaskTsConfigs)(Object.keys(taskGraph.tasks), tasksOptions, context);
-        const tsConfigTaskInfoMap = (0, batch_1.createTaskInfoPerTsConfigMap)(tasksOptions, context, Object.keys(taskGraph.tasks), taskInMemoryTsConfigMap);
-        const tsCompilationContext = createTypescriptCompilationContext(tsConfigTaskInfoMap, taskInMemoryTsConfigMap, context);
-        const logger = {
-            error: (message, tsConfig) => {
-                process.stderr.write(message);
-                if (tsConfig) {
-                    tsConfigTaskInfoMap[tsConfig].terminalOutput += message;
-                }
-            },
-            info: (message, tsConfig) => {
-                process.stdout.write(message);
-                if (tsConfig) {
-                    tsConfigTaskInfoMap[tsConfig].terminalOutput += message;
-                }
-            },
-            warn: (message, tsConfig) => {
-                process.stdout.write(message);
-                if (tsConfig) {
-                    tsConfigTaskInfoMap[tsConfig].terminalOutput += message;
-                }
-            },
-        };
-        const processTaskPostCompilation = (tsConfig) => {
+        },
+        warn: (message, tsConfig) => {
+            process.stdout.write(message);
+            if (tsConfig) {
+                tsConfigTaskInfoMap[tsConfig].terminalOutput += message;
+            }
+        },
+    };
+    const processTaskPostCompilation = (tsConfig) => {
+        if (tsConfigTaskInfoMap[tsConfig]) {
+            const taskInfo = tsConfigTaskInfoMap[tsConfig];
+            taskInfo.assetsHandler.processAllAssetsOnceSync();
+            (0, update_package_json_1.updatePackageJson)({
+                ...taskInfo.options,
+                additionalEntryPoints: (0, tsc_impl_1.createEntryPoints)(taskInfo.options, context),
+                format: [(0, tsc_impl_1.determineModuleFormatFromTsConfig)(tsConfig)],
+                // As long as d.ts files match their .js counterparts, we don't need to emit them.
+                // TSC can match them correctly based on file names.
+                skipTypings: true,
+            }, taskInfo.context, taskInfo.projectGraphNode, taskInfo.buildableProjectNodeDependencies);
+            taskInfo.endTime = Date.now();
+        }
+    };
+    const typescriptCompilation = (0, lib_1.compileTypescriptSolution)(tsCompilationContext, shouldWatch, logger, {
+        beforeProjectCompilationCallback: (tsConfig) => {
             if (tsConfigTaskInfoMap[tsConfig]) {
-                const taskInfo = tsConfigTaskInfoMap[tsConfig];
-                taskInfo.assetsHandler.processAllAssetsOnceSync();
-                (0, update_package_json_1.updatePackageJson)(Object.assign(Object.assign({}, taskInfo.options), { additionalEntryPoints: (0, tsc_impl_1.createEntryPoints)(taskInfo.options, context), format: [(0, tsc_impl_1.determineModuleFormatFromTsConfig)(tsConfig)], 
+                tsConfigTaskInfoMap[tsConfig].startTime = Date.now();
+            }
+        },
+        afterProjectCompilationCallback: processTaskPostCompilation,
+    });
+    if (shouldWatch) {
+        const taskInfos = Object.values(tsConfigTaskInfoMap);
+        const watchAssetsChangesDisposer = await (0, batch_1.watchTaskProjectsFileChangesForAssets)(taskInfos);
+        const watchProjectsChangesDisposer = await (0, batch_1.watchTaskProjectsPackageJsonFileChanges)(taskInfos, (changedTaskInfos) => {
+            for (const t of changedTaskInfos) {
+                (0, update_package_json_1.updatePackageJson)({
+                    ...t.options,
+                    additionalEntryPoints: (0, tsc_impl_1.createEntryPoints)(t.options, context),
+                    format: [(0, tsc_impl_1.determineModuleFormatFromTsConfig)(t.options.tsConfig)],
                     // As long as d.ts files match their .js counterparts, we don't need to emit them.
                     // TSC can match them correctly based on file names.
-                    skipTypings: true }), taskInfo.context, taskInfo.projectGraphNode, taskInfo.buildableProjectNodeDependencies);
-                taskInfo.endTime = Date.now();
+                    skipTypings: true,
+                }, t.context, t.projectGraphNode, t.buildableProjectNodeDependencies);
             }
+        });
+        const handleTermination = async (exitCode) => {
+            watchAssetsChangesDisposer();
+            watchProjectsChangesDisposer();
+            process.exit(exitCode);
         };
-        const typescriptCompilation = (0, lib_1.compileTypescriptSolution)(tsCompilationContext, shouldWatch, logger, {
-            beforeProjectCompilationCallback: (tsConfig) => {
-                if (tsConfigTaskInfoMap[tsConfig]) {
-                    tsConfigTaskInfoMap[tsConfig].startTime = Date.now();
-                }
-            },
-            afterProjectCompilationCallback: processTaskPostCompilation,
+        process.on('SIGINT', () => handleTermination(128 + 2));
+        process.on('SIGTERM', () => handleTermination(128 + 15));
+        return yield* mapAsyncIterable(typescriptCompilation, async (iterator) => {
+            // drain the iterator, we don't use the results
+            await (0, async_iterator_1.getLastValueFromAsyncIterableIterator)(iterator);
+            return { value: undefined, done: true };
         });
-        if (shouldWatch) {
-            const taskInfos = Object.values(tsConfigTaskInfoMap);
-            const watchAssetsChangesDisposer = yield tslib_1.__await((0, batch_1.watchTaskProjectsFileChangesForAssets)(taskInfos));
-            const watchProjectsChangesDisposer = yield tslib_1.__await((0, batch_1.watchTaskProjectsPackageJsonFileChanges)(taskInfos, (changedTaskInfos) => {
-                for (const t of changedTaskInfos) {
-                    (0, update_package_json_1.updatePackageJson)(Object.assign(Object.assign({}, t.options), { additionalEntryPoints: (0, tsc_impl_1.createEntryPoints)(t.options, context), format: [(0, tsc_impl_1.determineModuleFormatFromTsConfig)(t.options.tsConfig)], 
-                        // As long as d.ts files match their .js counterparts, we don't need to emit them.
-                        // TSC can match them correctly based on file names.
-                        skipTypings: true }), t.context, t.projectGraphNode, t.buildableProjectNodeDependencies);
-                }
-            }));
-            const handleTermination = (exitCode) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                watchAssetsChangesDisposer();
-                watchProjectsChangesDisposer();
-                process.exit(exitCode);
-            });
-            process.on('SIGINT', () => handleTermination(128 + 2));
-            process.on('SIGTERM', () => handleTermination(128 + 15));
-            return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(mapAsyncIterable(typescriptCompilation, (iterator) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                // drain the iterator, we don't use the results
-                yield (0, async_iterator_1.getLastValueFromAsyncIterableIterator)(iterator);
-                return { value: undefined, done: true };
-            }))))));
+    }
+    const toBatchExecutorTaskResult = (tsConfig, success) => ({
+        task: tsConfigTaskInfoMap[tsConfig].task,
+        result: {
+            success: success,
+            terminalOutput: tsConfigTaskInfoMap[tsConfig].terminalOutput,
+            startTime: tsConfigTaskInfoMap[tsConfig].startTime,
+            endTime: tsConfigTaskInfoMap[tsConfig].endTime,
+        },
+    });
+    let isCompilationDone = false;
+    const taskTsConfigsToReport = new Set(Object.keys(taskGraph.tasks).map((t) => taskInMemoryTsConfigMap[t].path));
+    let tasksToReportIterator;
+    const processSkippedTasks = () => {
+        const { value: tsConfig, done } = tasksToReportIterator.next();
+        if (done) {
+            return { value: undefined, done: true };
         }
-        const toBatchExecutorTaskResult = (tsConfig, success) => ({
-            task: tsConfigTaskInfoMap[tsConfig].task,
-            result: {
-                success: success,
-                terminalOutput: tsConfigTaskInfoMap[tsConfig].terminalOutput,
-                startTime: tsConfigTaskInfoMap[tsConfig].startTime,
-                endTime: tsConfigTaskInfoMap[tsConfig].endTime,
-            },
-        });
-        let isCompilationDone = false;
-        const taskTsConfigsToReport = new Set(Object.keys(taskGraph.tasks).map((t) => taskInMemoryTsConfigMap[t].path));
-        let tasksToReportIterator;
-        const processSkippedTasks = () => {
-            const { value: tsConfig, done } = tasksToReportIterator.next();
-            if (done) {
-                return { value: undefined, done: true };
-            }
-            tsConfigTaskInfoMap[tsConfig].startTime = Date.now();
-            processTaskPostCompilation(tsConfig);
-            return { value: toBatchExecutorTaskResult(tsConfig, true), done: false };
-        };
-        return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(mapAsyncIterable(typescriptCompilation, (iterator) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (isCompilationDone) {
+        tsConfigTaskInfoMap[tsConfig].startTime = Date.now();
+        processTaskPostCompilation(tsConfig);
+        return { value: toBatchExecutorTaskResult(tsConfig, true), done: false };
+    };
+    return yield* mapAsyncIterable(typescriptCompilation, async (iterator) => {
+        if (isCompilationDone) {
+            return processSkippedTasks();
+        }
+        const { value, done } = await iterator.next();
+        if (done) {
+            if (taskTsConfigsToReport.size > 0) {
+                /**
+                 * TS compilation is done but we still have tasks to report. This can
+                 * happen if, for example, a project is identified as affected, but
+                 * no file in the TS project is actually changed or if running a
+                 * task with `--skip-nx-cache` and the outputs are already there. There
+                 * can still be changes to assets or other files we need to process.
+                 *
+                 * Switch to handle the iterator for the tasks we still need to report.
+                 */
+                isCompilationDone = true;
+                tasksToReportIterator = taskTsConfigsToReport.values();
                 return processSkippedTasks();
             }
-            const { value, done } = yield iterator.next();
-            if (done) {
-                if (taskTsConfigsToReport.size > 0) {
-                    /**
-                     * TS compilation is done but we still have tasks to report. This can
-                     * happen if, for example, a project is identified as affected, but
-                     * no file in the TS project is actually changed or if running a
-                     * task with `--skip-nx-cache` and the outputs are already there. There
-                     * can still be changes to assets or other files we need to process.
-                     *
-                     * Switch to handle the iterator for the tasks we still need to report.
-                     */
-                    isCompilationDone = true;
-                    tasksToReportIterator = taskTsConfigsToReport.values();
-                    return processSkippedTasks();
-                }
-                return { value: undefined, done: true };
-            }
-            taskTsConfigsToReport.delete(value.tsConfig);
-            return {
-                value: toBatchExecutorTaskResult(value.tsConfig, value.success),
-                done: false,
-            };
-        }))))));
+            return { value: undefined, done: true };
+        }
+        taskTsConfigsToReport.delete(value.tsConfig);
+        return {
+            value: toBatchExecutorTaskResult(value.tsConfig, value.success),
+            done: false,
+        };
     });
 }
 exports.tscBatchExecutor = tscBatchExecutor;
 exports.default = tscBatchExecutor;
-function mapAsyncIterable(iterable, nextFn) {
-    return tslib_1.__asyncGenerator(this, arguments, function* mapAsyncIterable_1() {
-        return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues({
-            [Symbol.asyncIterator]() {
-                const iterator = iterable[Symbol.asyncIterator].call(iterable);
-                return {
-                    next() {
-                        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                            return yield nextFn(iterator);
-                        });
-                    },
-                };
-            },
-        }))));
-    });
+async function* mapAsyncIterable(iterable, nextFn) {
+    return yield* {
+        [Symbol.asyncIterator]() {
+            const iterator = iterable[Symbol.asyncIterator].call(iterable);
+            return {
+                async next() {
+                    return await nextFn(iterator);
+                },
+            };
+        },
+    };
 }
 function createTypescriptCompilationContext(tsConfigTaskInfoMap, taskInMemoryTsConfigMap, context) {
     const tsCompilationContext = Object.entries(tsConfigTaskInfoMap).reduce((acc, [tsConfig, taskInfo]) => {

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEntryPoints = exports.tscExecutor = exports.createTypeScriptCompilationOptions = exports.determineModuleFormatFromTsConfig = void 0;
-const tslib_1 = require("tslib");
 const ts = require("typescript");
 const fast_glob_1 = require("fast-glob");
 const copy_assets_handler_1 = require("../../utils/assets/copy-assets-handler");
@@ -39,59 +38,64 @@ function createTypeScriptCompilationOptions(normalizedOptions, context) {
     };
 }
 exports.createTypeScriptCompilationOptions = createTypeScriptCompilationOptions;
-function tscExecutor(_options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* tscExecutor_1() {
-        const { sourceRoot, root } = context.projectsConfigurations.projects[context.projectName];
-        const options = (0, lib_1.normalizeOptions)(_options, context.root, sourceRoot, root);
-        const { projectRoot, tmpTsConfig, target, dependencies } = (0, check_dependencies_1.checkDependencies)(context, _options.tsConfig);
-        if (tmpTsConfig) {
-            options.tsConfig = tmpTsConfig;
-        }
-        const tsLibDependency = (0, compiler_helper_dependency_1.getHelperDependency)(compiler_helper_dependency_1.HelperDependency.tsc, options.tsConfig, dependencies, context.projectGraph);
-        if (tsLibDependency) {
-            dependencies.push(tsLibDependency);
-        }
-        const assetHandler = new copy_assets_handler_1.CopyAssetsHandler({
-            projectDir: projectRoot,
-            rootDir: context.root,
-            outputDir: _options.outputPath,
-            assets: _options.assets,
-        });
-        const tsCompilationOptions = createTypeScriptCompilationOptions(options, context);
-        const inlineProjectGraph = (0, inline_1.handleInliningBuild)(context, options, tsCompilationOptions.tsConfig);
-        if (!(0, inline_1.isInlineGraphEmpty)(inlineProjectGraph)) {
-            tsCompilationOptions.rootDir = '.';
-        }
-        const typescriptCompilation = (0, compile_typescript_files_1.compileTypeScriptFiles)(options, tsCompilationOptions, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield assetHandler.processAllAssetsOnce();
-            (0, update_package_json_1.updatePackageJson)(Object.assign(Object.assign({}, options), { additionalEntryPoints: createEntryPoints(options, context), format: [determineModuleFormatFromTsConfig(options.tsConfig)], 
-                // As long as d.ts files match their .js counterparts, we don't need to emit them.
-                // TSC can match them correctly based on file names.
-                skipTypings: true }), context, target, dependencies);
-            (0, inline_1.postProcessInlinedDependencies)(tsCompilationOptions.outputPath, tsCompilationOptions.projectRoot, inlineProjectGraph);
-        }));
-        if (options.watch) {
-            const disposeWatchAssetChanges = yield tslib_1.__await(assetHandler.watchAndProcessOnAssetChange());
-            const disposePackageJsonChanges = yield tslib_1.__await((0, watch_for_single_file_changes_1.watchForSingleFileChanges)(context.projectName, options.projectRoot, 'package.json', () => (0, update_package_json_1.updatePackageJson)(Object.assign(Object.assign({}, options), { additionalEntryPoints: createEntryPoints(options, context), 
-                // As long as d.ts files match their .js counterparts, we don't need to emit them.
-                // TSC can match them correctly based on file names.
-                skipTypings: true, format: [determineModuleFormatFromTsConfig(options.tsConfig)] }), context, target, dependencies)));
-            const handleTermination = (exitCode) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                yield typescriptCompilation.close();
-                disposeWatchAssetChanges();
-                disposePackageJsonChanges();
-                process.exit(exitCode);
-            });
-            process.on('SIGINT', () => handleTermination(128 + 2));
-            process.on('SIGTERM', () => handleTermination(128 + 15));
-        }
-        return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(typescriptCompilation.iterator))));
+async function* tscExecutor(_options, context) {
+    const { sourceRoot, root } = context.projectsConfigurations.projects[context.projectName];
+    const options = (0, lib_1.normalizeOptions)(_options, context.root, sourceRoot, root);
+    const { projectRoot, tmpTsConfig, target, dependencies } = (0, check_dependencies_1.checkDependencies)(context, _options.tsConfig);
+    if (tmpTsConfig) {
+        options.tsConfig = tmpTsConfig;
+    }
+    const tsLibDependency = (0, compiler_helper_dependency_1.getHelperDependency)(compiler_helper_dependency_1.HelperDependency.tsc, options.tsConfig, dependencies, context.projectGraph);
+    if (tsLibDependency) {
+        dependencies.push(tsLibDependency);
+    }
+    const assetHandler = new copy_assets_handler_1.CopyAssetsHandler({
+        projectDir: projectRoot,
+        rootDir: context.root,
+        outputDir: _options.outputPath,
+        assets: _options.assets,
     });
+    const tsCompilationOptions = createTypeScriptCompilationOptions(options, context);
+    const inlineProjectGraph = (0, inline_1.handleInliningBuild)(context, options, tsCompilationOptions.tsConfig);
+    if (!(0, inline_1.isInlineGraphEmpty)(inlineProjectGraph)) {
+        tsCompilationOptions.rootDir = '.';
+    }
+    const typescriptCompilation = (0, compile_typescript_files_1.compileTypeScriptFiles)(options, tsCompilationOptions, async () => {
+        await assetHandler.processAllAssetsOnce();
+        (0, update_package_json_1.updatePackageJson)({
+            ...options,
+            additionalEntryPoints: createEntryPoints(options, context),
+            format: [determineModuleFormatFromTsConfig(options.tsConfig)],
+            // As long as d.ts files match their .js counterparts, we don't need to emit them.
+            // TSC can match them correctly based on file names.
+            skipTypings: true,
+        }, context, target, dependencies);
+        (0, inline_1.postProcessInlinedDependencies)(tsCompilationOptions.outputPath, tsCompilationOptions.projectRoot, inlineProjectGraph);
+    });
+    if (options.watch) {
+        const disposeWatchAssetChanges = await assetHandler.watchAndProcessOnAssetChange();
+        const disposePackageJsonChanges = await (0, watch_for_single_file_changes_1.watchForSingleFileChanges)(context.projectName, options.projectRoot, 'package.json', () => (0, update_package_json_1.updatePackageJson)({
+            ...options,
+            additionalEntryPoints: createEntryPoints(options, context),
+            // As long as d.ts files match their .js counterparts, we don't need to emit them.
+            // TSC can match them correctly based on file names.
+            skipTypings: true,
+            format: [determineModuleFormatFromTsConfig(options.tsConfig)],
+        }, context, target, dependencies));
+        const handleTermination = async (exitCode) => {
+            await typescriptCompilation.close();
+            disposeWatchAssetChanges();
+            disposePackageJsonChanges();
+            process.exit(exitCode);
+        };
+        process.on('SIGINT', () => handleTermination(128 + 2));
+        process.on('SIGTERM', () => handleTermination(128 + 15));
+    }
+    return yield* typescriptCompilation.iterator;
 }
 exports.tscExecutor = tscExecutor;
 function createEntryPoints(options, context) {
-    var _a;
-    if (!((_a = options.additionalEntryPoints) === null || _a === void 0 ? void 0 : _a.length))
+    if (!options.additionalEntryPoints?.length)
         return [];
     return (0, fast_glob_1.sync)(options.additionalEntryPoints, {
         cwd: context.root,

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verdaccioExecutor = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const fs_extra_1 = require("fs-extra");
 const child_process_1 = require("child_process");
@@ -14,54 +13,52 @@ let childProcess;
  * - start verdaccio
  * - stop local registry when done
  */
-function verdaccioExecutor(options, context) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        try {
-            require.resolve('verdaccio');
-        }
-        catch (e) {
-            throw new Error('Verdaccio is not installed. Please run `npm install verdaccio` or `yarn add verdaccio`');
-        }
-        if (options.storage) {
-            options.storage = (0, path_1.resolve)(context.root, options.storage);
-            if (options.clear && (0, fs_extra_1.existsSync)(options.storage)) {
-                (0, fs_extra_1.rmSync)(options.storage, { recursive: true, force: true });
-                console.log(`Cleared local registry storage folder ${options.storage}`);
-            }
-        }
-        const port = yield detectPort(options.port);
-        if (port !== options.port) {
-            devkit_1.logger.info(`Port ${options.port} was occupied. Using port ${port}.`);
-            options.port = port;
+async function verdaccioExecutor(options, context) {
+    try {
+        require.resolve('verdaccio');
+    }
+    catch (e) {
+        throw new Error('Verdaccio is not installed. Please run `npm install verdaccio` or `yarn add verdaccio`');
+    }
+    if (options.storage) {
+        options.storage = (0, path_1.resolve)(context.root, options.storage);
+        if (options.clear && (0, fs_extra_1.existsSync)(options.storage)) {
+            (0, fs_extra_1.rmSync)(options.storage, { recursive: true, force: true });
+            console.log(`Cleared local registry storage folder ${options.storage}`);
         }
-        const cleanupFunctions = options.location === 'none' ? [] : [setupNpm(options), setupYarn(options)];
-        const processExitListener = (signal) => {
-            if (childProcess) {
-                childProcess.kill(signal);
-            }
-            for (const fn of cleanupFunctions) {
-                fn();
-            }
-        };
-        process.on('exit', processExitListener);
-        process.on('SIGTERM', processExitListener);
-        process.on('SIGINT', processExitListener);
-        process.on('SIGHUP', processExitListener);
-        try {
-            yield startVerdaccio(options, context.root);
+    }
+    const port = await detectPort(options.port);
+    if (port !== options.port) {
+        devkit_1.logger.info(`Port ${options.port} was occupied. Using port ${port}.`);
+        options.port = port;
+    }
+    const cleanupFunctions = options.location === 'none' ? [] : [setupNpm(options), setupYarn(options)];
+    const processExitListener = (signal) => {
+        if (childProcess) {
+            childProcess.kill(signal);
         }
-        catch (e) {
-            devkit_1.logger.error('Failed to start verdaccio: ' + (e === null || e === void 0 ? void 0 : e.toString()));
-            return {
-                success: false,
-                port: options.port,
-            };
+        for (const fn of cleanupFunctions) {
+            fn();
         }
+    };
+    process.on('exit', processExitListener);
+    process.on('SIGTERM', processExitListener);
+    process.on('SIGINT', processExitListener);
+    process.on('SIGHUP', processExitListener);
+    try {
+        await startVerdaccio(options, context.root);
+    }
+    catch (e) {
+        devkit_1.logger.error('Failed to start verdaccio: ' + e?.toString());
         return {
-            success: true,
+            success: false,
             port: options.port,
         };
-    });
+    }
+    return {
+        success: true,
+        port: options.port,
+    };
 }
 exports.verdaccioExecutor = verdaccioExecutor;
 /**
@@ -70,9 +67,13 @@ exports.verdaccioExecutor = verdaccioExecutor;
 function startVerdaccio(options, workspaceRoot) {
     return new Promise((resolve, reject) => {
         childProcess = (0, child_process_1.fork)(require.resolve('verdaccio/bin/verdaccio'), createVerdaccioOptions(options, workspaceRoot), {
-            env: Object.assign(Object.assign(Object.assign({}, process.env), { VERDACCIO_HANDLE_KILL_SIGNALS: 'true' }), (options.storage
-                ? { VERDACCIO_STORAGE_PATH: options.storage }
-                : {})),
+            env: {
+                ...process.env,
+                VERDACCIO_HANDLE_KILL_SIGNALS: 'true',
+                ...(options.storage
+                    ? { VERDACCIO_STORAGE_PATH: options.storage }
+                    : {}),
+            },
             stdio: 'inherit',
         });
         childProcess.on('error', (err) => {
@@ -102,7 +103,6 @@ function createVerdaccioOptions(options, workspaceRoot) {
     return verdaccioArgs;
 }
 function setupNpm(options) {
-    var _a, _b, _c;
     try {
         (0, child_process_1.execSync)('npm --version');
     }
@@ -111,7 +111,10 @@ function setupNpm(options) {
     }
     let npmRegistryPath;
     try {
-        npmRegistryPath = (_c = (_b = (_a = (0, child_process_1.execSync)(`npm config get registry --location ${options.location}`)) === null || _a === void 0 ? void 0 : _a.toString()) === null || _b === void 0 ? void 0 : _b.trim()) === null || _c === void 0 ? void 0 : _c.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
+        npmRegistryPath = (0, child_process_1.execSync)(`npm config get registry --location ${options.location}`)
+            ?.toString()
+            ?.trim()
+            ?.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
         (0, child_process_1.execSync)(`npm config set registry http://localhost:${options.port}/ --location ${options.location}`);
         (0, child_process_1.execSync)(`npm config set //localhost:${options.port}/:_authToken="secretVerdaccioToken" --location ${options.location}`);
         devkit_1.logger.info(`Set npm registry to http://localhost:${options.port}/`);
@@ -120,9 +123,11 @@ function setupNpm(options) {
         throw new Error(`Failed to set npm registry to http://localhost:${options.port}/: ${e.message}`);
     }
     return () => {
-        var _a, _b, _c;
         try {
-            const currentNpmRegistryPath = (_c = (_b = (_a = (0, child_process_1.execSync)(`npm config get registry --location ${options.location}`)) === null || _a === void 0 ? void 0 : _a.toString()) === null || _b === void 0 ? void 0 : _b.trim()) === null || _c === void 0 ? void 0 : _c.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
+            const currentNpmRegistryPath = (0, child_process_1.execSync)(`npm config get registry --location ${options.location}`)
+                ?.toString()
+                ?.trim()
+                ?.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
             if (npmRegistryPath && currentNpmRegistryPath.includes('localhost')) {
                 (0, child_process_1.execSync)(`npm config set registry ${npmRegistryPath} --location ${options.location}`);
                 devkit_1.logger.info(`Reset npm registry to ${npmRegistryPath}`);
@@ -152,18 +157,20 @@ function setYarnUnsafeHttpWhitelist(currentWhitelist, options) {
     }
 }
 function setupYarn(options) {
-    var _a, _b, _c;
     let isYarnV1;
     try {
         isYarnV1 = (0, semver_1.major)((0, child_process_1.execSync)('yarn --version').toString().trim()) === 1;
     }
-    catch (_d) {
+    catch {
         // This would fail if yarn is not installed which is okay
         return () => { };
     }
     try {
         const registryConfigName = isYarnV1 ? 'registry' : 'npmRegistryServer';
-        const yarnRegistryPath = (_c = (_b = (_a = (0, child_process_1.execSync)(`yarn config get ${registryConfigName}`)) === null || _a === void 0 ? void 0 : _a.toString()) === null || _b === void 0 ? void 0 : _b.trim()) === null || _c === void 0 ? void 0 : _c.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
+        const yarnRegistryPath = (0, child_process_1.execSync)(`yarn config get ${registryConfigName}`)
+            ?.toString()
+            ?.trim()
+            ?.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
         (0, child_process_1.execSync)(`yarn config set ${registryConfigName} http://localhost:${options.port}/` +
             (options.location === 'user' ? ' --home' : ''));
         devkit_1.logger.info(`Set yarn registry to http://localhost:${options.port}/`);
@@ -176,9 +183,11 @@ function setupYarn(options) {
             devkit_1.logger.info(`Whitelisted http://localhost:${options.port}/ as an unsafe http server`);
         }
         return () => {
-            var _a, _b, _c;
             try {
-                const currentYarnRegistryPath = (_c = (_b = (_a = (0, child_process_1.execSync)(`yarn config get ${registryConfigName}`)) === null || _a === void 0 ? void 0 : _a.toString()) === null || _b === void 0 ? void 0 : _b.trim()) === null || _c === void 0 ? void 0 : _c.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
+                const currentYarnRegistryPath = (0, child_process_1.execSync)(`yarn config get ${registryConfigName}`)
+                    ?.toString()
+                    ?.trim()
+                    ?.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
                 if (yarnRegistryPath && currentYarnRegistryPath.includes('localhost')) {
                     (0, child_process_1.execSync)(`yarn config set ${registryConfigName} ${yarnRegistryPath}` +
                         (options.location === 'user' ? ' --home' : ''));