@nx/js 20.0.0-beta.5 → 20.0.0-beta.6

package/migrations.json

@@ -1,23 +1,5 @@
 {
   "generators": {
-    "update-16-0-0-add-nx-packages": {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/js with @nx/js",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
-    },
-    "explicitly-set-projects-to-update-buildable-deps": {
-      "cli": "nx",
-      "version": "16.6.0-beta.0",
-      "description": "Explicitly set 'updateBuildableProjectDepsInPackageJson' to 'true' in targets that rely on that value as the default.",
-      "factory": "./src/migrations/update-16-6-0/explicitly-set-projects-to-update-buildable-deps"
-    },
-    "16-8-2-update-swcrc": {
-      "cli": "nx",
-      "version": "16.8.2-beta.0",
-      "description": "Remove invalid options (strict, noInterop) for ES6 type modules.",
-      "factory": "./src/migrations/update-16-8-2/update-swcrc"
-    },
     "update-17-0-0-remove-deprecated-build-options": {
       "cli": "nx",
       "version": "17.0.2",
@@ -26,65 +8,6 @@
     }
   },
   "packageJsonUpdates": {
-    "16.0.0": {
-      "version": "16.0.0-beta.3",
-      "packages": {
-        "@swc/cli": {
-          "version": "~0.1.62",
-          "alwaysAddToPackageJson": false
-        },
-        "@swc/helpers": {
-          "version": "~0.5.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "16.1.0": {
-      "version": "16.1.0-beta.0",
-      "x-prompt": "Do you want to update to TypeScript v5.0?",
-      "requires": {
-        "typescript": ">=4.9.5 <5.0.0"
-      },
-      "packages": {
-        "typescript": {
-          "version": "~5.0.2"
-        }
-      }
-    },
-    "16.4.0": {
-      "version": "16.4.0-beta.11",
-      "x-prompt": "Do you want to update to TypeScript v5.1?",
-      "requires": {
-        "typescript": ">=5.0.0 <5.1.0"
-      },
-      "packages": {
-        "typescript": {
-          "version": "~5.1.3"
-        }
-      }
-    },
-    "16.8.2": {
-      "version": "16.8.2-beta.0",
-      "packages": {
-        "@swc/core": {
-          "version": "~1.3.85",
-          "alwaysAddToPackageJson": false
-        },
-        "@swc/helpers": {
-          "version": "~0.5.2",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "16.9.2": {
-      "version": "16.9.2-beta.0",
-      "packages": {
-        "@swc-node/register": {
-          "version": "~1.6.7",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
     "17.0.0": {
       "version": "17.0.0-rc.2",
       "packages": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "20.0.0-beta.5",
+  "version": "20.0.0-beta.6",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "20.0.0-beta.5",
-    "@nx/workspace": "20.0.0-beta.5",
+    "@nx/devkit": "20.0.0-beta.6",
+    "@nx/workspace": "20.0.0-beta.6",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",

package/src/generators/init/init.js

@@ -55,7 +55,7 @@ async function initGeneratorInternal(tree, schema) {
         process.env.NX_ADD_PLUGINS !== 'false' &&
             nxJson.useInferencePlugins !== false;
     schema.addTsPlugin ??=
-        schema.addPlugin && process.env.NX_ADD_TS_PLUGIN === 'true';
+        schema.addPlugin && process.env.NX_ADD_TS_PLUGIN !== 'false';
     if (schema.addTsPlugin) {
         await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/js/typescript', plugin_1.createNodesV2, {
             typecheck: [

package/src/generators/library/library.js

@@ -100,6 +100,7 @@ async function libraryGeneratorInternal(tree, schema) {
             skipFormat: true,
             testEnvironment: options.testEnvironment,
             runtimeTsconfigFileName: 'tsconfig.lib.json',
+            compiler: options.compiler === 'swc' ? 'swc' : 'babel',
         });
         tasks.push(vitestTask);
         createOrEditViteConfig(tree, {
@@ -157,14 +158,22 @@ async function configureProject(tree, options) {
         (0, devkit_1.updateNxJson)(tree, nxJson);
     }
     if (!options.useProjectJson) {
+        // we create a cleaner project configuration for the package.json file
+        const projectConfiguration = {
+            root: options.projectRoot,
+        };
         if (options.name !== options.importPath) {
             // if the name is different than the package.json name, we need to set
             // the proper name in the configuration
-            (0, devkit_1.updateProjectConfiguration)(tree, options.name, {
-                name: options.name,
-                root: options.projectRoot,
-            });
+            projectConfiguration.name = options.name;
+        }
+        if (options.parsedTags?.length) {
+            projectConfiguration.tags = options.parsedTags;
+        }
+        if (options.publishable) {
+            await addProjectToNxReleaseConfig(tree, options, projectConfiguration);
         }
+        (0, devkit_1.updateProjectConfiguration)(tree, options.name, projectConfiguration);
         return;
     }
     const projectConfiguration = {
@@ -471,6 +480,7 @@ async function promptWhenInteractive(questions, defaultValue) {
     return await (0, enquirer_1.prompt)(questions);
 }
 async function normalizeOptions(tree, options) {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'library');
     const nxJson = (0, devkit_1.readNxJson)(tree);
     options.addPlugin ??=
         process.env.NX_ADD_PLUGINS !== 'false' &&
@@ -581,7 +591,7 @@ async function normalizeOptions(tree, options) {
             throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
         }
         if (options.bundler === 'none') {
-            options.bundler = 'tsc';
+            throw new Error(`Publishable libraries can't be generated with "--bundler=none". Please select a valid bundler.`);
         }
     }
     // This is to preserve old behavior, buildable: false
@@ -602,7 +612,6 @@ async function normalizeOptions(tree, options) {
         projectType: 'library',
         directory: options.directory,
         importPath: options.importPath,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
     });
     options.rootProject = projectRoot === '.';

package/src/generators/library/schema.d.ts

@@ -10,8 +10,8 @@ export type Compiler = 'tsc' | 'swc';
 export type Bundler = 'swc' | 'tsc' | 'rollup' | 'vite' | 'esbuild' | 'none';
 
 export interface LibraryGeneratorSchema {
-  name: string;
-  directory?: string;
+  directory: string;
+  name?: string;
   projectNameAndRootFormat?: ProjectNameAndRootFormat;
   skipFormat?: boolean;
   tags?: string;

package/src/generators/library/schema.json

@@ -6,19 +6,18 @@
   "description": "Create a TypeScript Library.",
   "type": "object",
   "properties": {
-    "name": {
+    "directory": {
       "type": "string",
-      "description": "Library name.",
+      "description": "A directory where the lib is placed.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the library?",
-      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$"
+      "x-prompt": "Which directory do you want to create the library in?"
     },
-    "directory": {
+    "name": {
       "type": "string",
-      "description": "A directory where the lib is placed.",
+      "description": "Library name.",
       "x-priority": "important"
     },
     "bundler": {
@@ -39,11 +38,6 @@
       "enum": ["none", "jest", "vitest"],
       "x-priority": "important"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "tags": {
       "type": "string",
       "description": "Add tags to the library (used for linting)."
@@ -141,6 +135,6 @@
       "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
-  "required": ["name"],
+  "required": ["directory"],
   "examplesFile": "../../../docs/library-examples.md"
 }

package/src/generators/release-version/release-version.js

@@ -45,7 +45,7 @@ Valid values are: ${version_1.validReleaseVersionPrefixes
             options.fallbackCurrentVersionResolver = 'disk';
         }
         // Set default for updateDependents
-        const updateDependents = options.updateDependents ?? 'never';
+        const updateDependents = options.updateDependents ?? 'auto';
         const updateDependentsBump = 'patch';
         // Sort the projects topologically if update dependents is enabled
         // TODO: maybe move this sorting to the command level?
@@ -395,7 +395,7 @@ To fix this you will either need to add a package.json file at that location, or
                 .filter((localPackageDependency) => {
                 return localPackageDependency.target === project.name;
             });
-            const includeTransitiveDependents = updateDependents === 'auto';
+            const includeTransitiveDependents = updateDependents !== 'never';
             const transitiveLocalPackageDependents = [];
             if (includeTransitiveDependents) {
                 for (const directDependent of allDependentProjects) {
@@ -453,7 +453,7 @@ To fix this you will either need to add a package.json file at that location, or
                     logMsg += `\n${dependentProjectsOutsideCurrentBatch
                         .map((dependentProject) => `${indent}- ${dependentProject.source}`)
                         .join('\n')}`;
-                    logMsg += `\n${indent}=> You can adjust this behavior by setting \`version.generatorOptions.updateDependents\` to "auto"`;
+                    logMsg += `\n${indent}=> You can adjust this behavior by removing the usage of \`version.generatorOptions.updateDependents\` with "never"`;
                     logger.buffer(logMsg);
                 }
             }

package/src/utils/typescript/ts-solution-setup.d.ts

@@ -1,3 +1,4 @@
 import { type Tree } from '@nx/devkit';
 export declare function isUsingTypeScriptPlugin(tree: Tree): boolean;
 export declare function isUsingTsSolutionSetup(tree: Tree): boolean;
+export declare function assertNotUsingTsSolutionSetup(tree: Tree, pluginName: string, generatorName: string): void;

package/src/utils/typescript/ts-solution-setup.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isUsingTypeScriptPlugin = isUsingTypeScriptPlugin;
 exports.isUsingTsSolutionSetup = isUsingTsSolutionSetup;
+exports.assertNotUsingTsSolutionSetup = assertNotUsingTsSolutionSetup;
 const devkit_1 = require("@nx/devkit");
 const package_manager_workspaces_1 = require("../package-manager-workspaces");
 function isUsingTypeScriptPlugin(tree) {
@@ -46,3 +47,19 @@ function isWorkspaceSetupWithTsSolution(tree) {
     }
     return true;
 }
+function assertNotUsingTsSolutionSetup(tree, pluginName, generatorName) {
+    if (process.env.NX_IGNORE_UNSUPPORTED_TS_SETUP === 'true' ||
+        !isUsingTsSolutionSetup(tree)) {
+        return;
+    }
+    const artifactString = generatorName === 'init'
+        ? `"@nx/${pluginName}" plugin`
+        : `"@nx/${pluginName}:${generatorName}" generator`;
+    devkit_1.output.error({
+        title: `The ${artifactString} doesn't yet support the existing TypeScript setup`,
+        bodyLines: [
+            `We're working hard to support the existing TypeScript setup with the ${artifactString}. We'll soon release a new version of Nx with support for it.`,
+        ],
+    });
+    process.exit(1);
+}

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

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function replacePackage(tree: Tree): Promise<void>;

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

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

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

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function (tree: Tree): Promise<void>;

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

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const devkit_1 = require("@nx/devkit");
-const executors = new Set([
-    '@nx/js:swc',
-    '@nrwl/js:swc',
-    '@nx/js:tsc',
-    '@nrwl/js:tsc',
-]);
-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;
-            }
-            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);
-            }
-        }
-    }
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-16-8-2/update-swcrc.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-16-8-2/update-swcrc.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
-async function update(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    for (const config of projects.values()) {
-        const swcrcPath = (0, path_1.join)(config.root, '.swcrc');
-        if (!tree.exists(swcrcPath))
-            continue;
-        const json = (0, devkit_1.readJson)(tree, swcrcPath);
-        // No longer need strict or noInterop for es6 modules
-        // See: https://github.com/swc-project/swc/commit/7e8d72d
-        if (json.module?.type === 'es6' &&
-            (json.module?.strict || json.module?.noInterop)) {
-            delete json.module.noInterop;
-            delete json.module.strict;
-            (0, devkit_1.writeJson)(tree, swcrcPath, json);
-        }
-    }
-    await (0, devkit_1.formatFiles)(tree);
-}