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

package/src/generators/setup-build/generator.js

@@ -1,132 +1,139 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupBuildSchematic = exports.setupBuildGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const add_swc_config_1 = require("../../utils/swc/add-swc-config");
 const add_swc_dependencies_1 = require("../../utils/swc/add-swc-dependencies");
 const versions_1 = require("../../utils/versions");
-function setupBuildGenerator(tree, options) {
-    var _a, _b, _c;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-        const buildTarget = (_a = options.buildTarget) !== null && _a !== void 0 ? _a : 'build';
-        (_b = project.targets) !== null && _b !== void 0 ? _b : (project.targets = {});
-        let mainFile;
-        if (options.main) {
-            mainFile = options.main;
-        }
-        else {
-            const root = (_c = project.sourceRoot) !== null && _c !== void 0 ? _c : project.root;
-            for (const f of [
-                (0, devkit_1.joinPathFragments)(root, 'main.ts'),
-                (0, devkit_1.joinPathFragments)(root, 'main.js'),
-                (0, devkit_1.joinPathFragments)(root, 'index.ts'),
-                (0, devkit_1.joinPathFragments)(root, 'index.js'),
-            ]) {
-                if (tree.exists(f)) {
-                    mainFile = f;
-                    break;
-                }
+async function setupBuildGenerator(tree, options) {
+    const tasks = [];
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const buildTarget = options.buildTarget ?? 'build';
+    const prevBuildOptions = project.targets?.[buildTarget]?.options;
+    project.targets ??= {};
+    let mainFile;
+    if (prevBuildOptions?.main) {
+        mainFile = prevBuildOptions.main;
+    }
+    else if (options.main) {
+        mainFile = options.main;
+    }
+    else {
+        const root = project.sourceRoot ?? project.root;
+        for (const f of [
+            (0, devkit_1.joinPathFragments)(root, 'main.ts'),
+            (0, devkit_1.joinPathFragments)(root, 'main.js'),
+            (0, devkit_1.joinPathFragments)(root, 'index.ts'),
+            (0, devkit_1.joinPathFragments)(root, 'index.js'),
+        ]) {
+            if (tree.exists(f)) {
+                mainFile = f;
+                break;
             }
         }
-        if (!mainFile || !tree.exists(mainFile)) {
-            throw new Error(`Cannot locate a main file for ${options.project}. Please specify one using --main=<file-path>.`);
+    }
+    if (!mainFile || !tree.exists(mainFile)) {
+        throw new Error(`Cannot locate a main file for ${options.project}. Please specify one using --main=<file-path>.`);
+    }
+    let tsConfigFile;
+    if (prevBuildOptions?.tsConfig) {
+        tsConfigFile = prevBuildOptions.tsConfig;
+    }
+    else if (options.tsConfig) {
+        tsConfigFile = options.tsConfig;
+    }
+    else {
+        for (const f of [
+            'tsconfig.lib.json',
+            'tsconfig.app.json',
+            'tsconfig.json',
+        ]) {
+            const candidate = (0, devkit_1.joinPathFragments)(project.root, f);
+            if (tree.exists(candidate)) {
+                tsConfigFile = candidate;
+                break;
+            }
         }
-        let tsConfigFile;
-        if (options.tsConfig) {
-            tsConfigFile = options.tsConfig;
+    }
+    if (!tsConfigFile || !tree.exists(tsConfigFile)) {
+        throw new Error(`Cannot locate a tsConfig file for ${options.project}. Please specify one using --tsConfig=<file-path>.`);
+    }
+    switch (options.bundler) {
+        case 'vite': {
+            const { viteConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+            const task = await viteConfigurationGenerator(tree, {
+                buildTarget: options.buildTarget,
+                project: options.project,
+                newProject: true,
+                uiFramework: 'none',
+                includeVitest: false,
+                includeLib: true,
+                skipFormat: true,
+            });
+            tasks.push(task);
+            break;
         }
-        else {
-            for (const f of [
-                'tsconfig.lib.json',
-                'tsconfig.app.json',
-                'tsconfig.json',
-            ]) {
-                const candidate = (0, devkit_1.joinPathFragments)(project.root, f);
-                if (tree.exists(candidate)) {
-                    tsConfigFile = candidate;
-                    break;
-                }
-            }
+        case 'esbuild': {
+            const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/esbuild', versions_1.nxVersion);
+            const task = await configurationGenerator(tree, {
+                main: mainFile,
+                buildTarget: options.buildTarget,
+                project: options.project,
+                skipFormat: true,
+                skipValidation: true,
+            });
+            tasks.push(task);
+            break;
         }
-        if (!tsConfigFile || !tree.exists(tsConfigFile)) {
-            throw new Error(`Cannot locate a tsConfig file for ${options.project}. Please specify one using --tsConfig=<file-path>.`);
+        case 'rollup': {
+            const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
+            const task = await configurationGenerator(tree, {
+                buildTarget: options.buildTarget,
+                main: mainFile,
+                tsConfig: tsConfigFile,
+                project: options.project,
+                compiler: 'tsc',
+                format: ['cjs', 'esm'],
+                skipFormat: true,
+                skipValidation: true,
+            });
+            tasks.push(task);
+            break;
         }
-        switch (options.bundler) {
-            case 'vite': {
-                const { viteConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
-                const task = yield viteConfigurationGenerator(tree, {
-                    buildTarget: options.buildTarget,
-                    project: options.project,
-                    newProject: true,
-                    uiFramework: 'none',
-                    includeVitest: false,
-                    includeLib: true,
-                    skipFormat: true,
-                });
-                tasks.push(task);
-                break;
-            }
-            case 'esbuild': {
-                const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/esbuild', versions_1.nxVersion);
-                const task = yield configurationGenerator(tree, {
+        case 'tsc': {
+            const outputPath = (0, devkit_1.joinPathFragments)('dist', project.root);
+            project.targets[buildTarget] = {
+                executor: `@nx/js:tsc`,
+                outputs: ['{options.outputPath}'],
+                options: {
+                    outputPath,
                     main: mainFile,
-                    buildTarget: options.buildTarget,
-                    project: options.project,
-                    skipFormat: true,
-                });
-                tasks.push(task);
-                break;
-            }
-            case 'rollup': {
-                const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
-                const task = yield configurationGenerator(tree, {
-                    buildTarget: options.buildTarget,
+                    tsConfig: tsConfigFile,
+                    assets: [],
+                },
+            };
+            (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
+            break;
+        }
+        case 'swc': {
+            const outputPath = (0, devkit_1.joinPathFragments)('dist', project.root);
+            project.targets[buildTarget] = {
+                executor: `@nx/js:swc`,
+                outputs: ['{options.outputPath}'],
+                options: {
+                    outputPath,
                     main: mainFile,
-                    project: options.project,
-                    skipFormat: true,
-                    compiler: 'tsc',
-                });
-                tasks.push(task);
-                break;
-            }
-            case 'tsc': {
-                const outputPath = (0, devkit_1.joinPathFragments)('dist', project.root);
-                project.targets[buildTarget] = {
-                    executor: `@nx/js:tsc`,
-                    outputs: ['{options.outputPath}'],
-                    options: {
-                        outputPath,
-                        main: mainFile,
-                        tsConfig: tsConfigFile,
-                        assets: [],
-                    },
-                };
-                (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
-                break;
-            }
-            case 'swc': {
-                const outputPath = (0, devkit_1.joinPathFragments)('dist', project.root);
-                project.targets[buildTarget] = {
-                    executor: `@nx/js:swc`,
-                    outputs: ['{options.outputPath}'],
-                    options: {
-                        outputPath,
-                        main: mainFile,
-                        tsConfig: tsConfigFile,
-                        assets: [],
-                    },
-                };
-                (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
-                (0, add_swc_dependencies_1.addSwcDependencies)(tree);
-                (0, add_swc_config_1.addSwcConfig)(tree, project.root, 'es6');
-            }
+                    tsConfig: tsConfigFile,
+                    assets: [],
+                },
+            };
+            (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
+            (0, add_swc_dependencies_1.addSwcDependencies)(tree);
+            (0, add_swc_config_1.addSwcConfig)(tree, project.root, 'es6');
         }
-        yield (0, devkit_1.formatFiles)(tree);
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+    }
+    await (0, devkit_1.formatFiles)(tree);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.setupBuildGenerator = setupBuildGenerator;
 exports.default = setupBuildGenerator;

package/src/generators/setup-verdaccio/generator.js

@@ -1,61 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupVerdaccioSchematic = exports.setupVerdaccio = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const versions_1 = require("../../utils/versions");
 const child_process_1 = require("child_process");
-function setupVerdaccio(tree, options) {
-    var _a, _b, _c;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (!tree.exists('.verdaccio/config.yml')) {
-            (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files'), '.verdaccio', {
-                npmUplinkRegistry: (_c = (_b = (_a = (0, child_process_1.execSync)('npm config get registry')) === null || _a === void 0 ? void 0 : _a.toString()) === null || _b === void 0 ? void 0 : _b.trim()) !== null && _c !== void 0 ? _c : 'https://registry.npmjs.org',
-            });
-        }
-        const verdaccioTarget = {
-            executor: '@nx/js:verdaccio',
-            options: {
-                port: 4873,
-                config: '.verdaccio/config.yml',
-                storage: 'tmp/local-registry/storage',
+async function setupVerdaccio(tree, options) {
+    if (!tree.exists('.verdaccio/config.yml')) {
+        (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files'), '.verdaccio', {
+            npmUplinkRegistry: (0, child_process_1.execSync)('npm config get registry')?.toString()?.trim() ??
+                'https://registry.npmjs.org',
+        });
+    }
+    const verdaccioTarget = {
+        executor: '@nx/js:verdaccio',
+        options: {
+            port: 4873,
+            config: '.verdaccio/config.yml',
+            storage: 'tmp/local-registry/storage',
+        },
+    };
+    if (!tree.exists('project.json')) {
+        const { name } = (0, devkit_1.readJson)(tree, 'package.json');
+        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+            if (!json.nx) {
+                json.nx = {
+                    includedScripts: [],
+                };
+            }
+            return json;
+        });
+        (0, devkit_1.addProjectConfiguration)(tree, name, {
+            root: '.',
+            targets: {
+                ['local-registry']: verdaccioTarget,
             },
-        };
-        if (!tree.exists('project.json')) {
-            const { name } = (0, devkit_1.readJson)(tree, 'package.json');
-            (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
-                if (!json.nx) {
-                    json.nx = {
-                        includedScripts: [],
-                    };
-                }
-                return json;
-            });
-            (0, devkit_1.addProjectConfiguration)(tree, name, {
-                root: '.',
-                targets: {
-                    ['local-registry']: verdaccioTarget,
-                },
-            });
-        }
-        else {
-            // use updateJson instead of updateProjectConfiguration due to unknown project name
-            (0, devkit_1.updateJson)(tree, 'project.json', (json) => {
-                var _a;
-                var _b;
-                if (!json.targets) {
-                    json.targets = {};
-                }
-                (_a = (_b = json.targets)['local-registry']) !== null && _a !== void 0 ? _a : (_b['local-registry'] = verdaccioTarget);
-                return json;
-            });
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { verdaccio: versions_1.verdaccioVersion });
-    });
+        });
+    }
+    else {
+        // use updateJson instead of updateProjectConfiguration due to unknown project name
+        (0, devkit_1.updateJson)(tree, 'project.json', (json) => {
+            if (!json.targets) {
+                json.targets = {};
+            }
+            json.targets['local-registry'] ??= verdaccioTarget;
+            return json;
+        });
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { verdaccio: versions_1.verdaccioVersion });
 }
 exports.setupVerdaccio = setupVerdaccio;
 exports.default = setupVerdaccio;

package/src/migrations/update-13-8-5/update-node-executor.js

@@ -1,27 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("@nx/workspace/src/utils/versions");
-function update(host) {
-    var _a, _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(host);
-        let installNeeded = false;
-        for (const [name, config] of projects.entries()) {
-            if (((_b = (_a = config === null || config === void 0 ? void 0 : config.targets) === null || _a === void 0 ? void 0 : _a.serve) === null || _b === void 0 ? void 0 : _b.executor) !== '@nrwl/js:node')
-                continue;
-            config.targets.serve.executor = '@nrwl/node:node';
-            installNeeded = true;
-            (0, devkit_1.updateProjectConfiguration)(host, name, config);
-        }
-        const task = installNeeded
-            ? (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
-                '@nrwl/node': versions_1.nxVersion,
-            })
-            : undefined;
-        yield (0, devkit_1.formatFiles)(host);
-        return task;
-    });
+async function update(host) {
+    const projects = (0, devkit_1.getProjects)(host);
+    let installNeeded = false;
+    for (const [name, config] of projects.entries()) {
+        if (config?.targets?.serve?.executor !== '@nrwl/js:node')
+            continue;
+        config.targets.serve.executor = '@nrwl/node:node';
+        installNeeded = true;
+        (0, devkit_1.updateProjectConfiguration)(host, name, config);
+    }
+    const task = installNeeded
+        ? (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
+            '@nrwl/node': versions_1.nxVersion,
+        })
+        : undefined;
+    await (0, devkit_1.formatFiles)(host);
+    return task;
 }
 exports.default = update;

package/src/migrations/update-13-8-5/update-swcrc.js

@@ -1,34 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const add_swc_config_1 = require("../../utils/swc/add-swc-config");
-function update(host) {
-    var _a, _b, _c, _d, _e;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(host);
-        for (const config of projects.values()) {
-            if (((_b = (_a = config === null || config === void 0 ? void 0 : config.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) !== '@nrwl/js:swc')
-                continue;
-            const swcrcPath = (0, path_1.join)(config.root, '.swcrc');
-            if (!host.exists(swcrcPath))
-                continue;
-            // rename
-            const libSwcrcPath = (0, path_1.join)(config.root, '.lib.swcrc');
-            host.rename(swcrcPath, libSwcrcPath);
-            const swcrcContent = (0, devkit_1.readJson)(host, libSwcrcPath);
-            // skip if swcrc already has "exclude" field
-            if (swcrcContent['exclude'])
-                continue;
-            // check swcExclude build options
-            const exclude = ((_e = (_d = (_c = config === null || config === void 0 ? void 0 : config.targets) === null || _c === void 0 ? void 0 : _c.build) === null || _d === void 0 ? void 0 : _d.options) === null || _e === void 0 ? void 0 : _e['swcExclude']) || add_swc_config_1.defaultExclude;
-            (0, devkit_1.updateJson)(host, libSwcrcPath, (swcrc) => {
-                swcrc['exclude'] = exclude;
-                return swcrc;
-            });
-        }
-        yield (0, devkit_1.formatFiles)(host);
-    });
+async function update(host) {
+    const projects = (0, devkit_1.getProjects)(host);
+    for (const config of projects.values()) {
+        if (config?.targets?.build?.executor !== '@nrwl/js:swc')
+            continue;
+        const swcrcPath = (0, path_1.join)(config.root, '.swcrc');
+        if (!host.exists(swcrcPath))
+            continue;
+        // rename
+        const libSwcrcPath = (0, path_1.join)(config.root, '.lib.swcrc');
+        host.rename(swcrcPath, libSwcrcPath);
+        const swcrcContent = (0, devkit_1.readJson)(host, libSwcrcPath);
+        // skip if swcrc already has "exclude" field
+        if (swcrcContent['exclude'])
+            continue;
+        // check swcExclude build options
+        const exclude = config?.targets?.build?.options?.['swcExclude'] || add_swc_config_1.defaultExclude;
+        (0, devkit_1.updateJson)(host, libSwcrcPath, (swcrc) => {
+            swcrc['exclude'] = exclude;
+            return swcrc;
+        });
+    }
+    await (0, devkit_1.formatFiles)(host);
 }
 exports.default = update;

package/src/migrations/update-14-1-5/update-swcrc-path.js

@@ -1,29 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateSwcrcPath = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-function updateSwcrcPath(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let changesMade = false;
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/js:swc', (_, projectName, targetName, configurationName) => {
-            const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-            const executorOptions = configurationName
-                ? projectConfig.targets[targetName].configurations[configurationName]
-                : projectConfig.targets[targetName].options;
-            if (!executorOptions.swcrcPath)
-                return;
-            const newSwcrcPath = (0, devkit_1.joinPathFragments)(projectConfig.root, executorOptions.swcrcPath);
-            delete executorOptions.swcrcPath;
-            executorOptions.swcrc = newSwcrcPath;
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-            changesMade = true;
-        });
-        if (changesMade) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
+async function updateSwcrcPath(tree) {
+    let changesMade = false;
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/js:swc', (_, projectName, targetName, configurationName) => {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        const executorOptions = configurationName
+            ? projectConfig.targets[targetName].configurations[configurationName]
+            : projectConfig.targets[targetName].options;
+        if (!executorOptions.swcrcPath)
+            return;
+        const newSwcrcPath = (0, devkit_1.joinPathFragments)(projectConfig.root, executorOptions.swcrcPath);
+        delete executorOptions.swcrcPath;
+        executorOptions.swcrc = newSwcrcPath;
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
+        changesMade = true;
     });
+    if (changesMade) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.updateSwcrcPath = updateSwcrcPath;
 exports.default = updateSwcrcPath;