@nx/js 19.8.0 → 20.0.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "19.8.0",
+  "version": "20.0.0-beta.0",
   "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,14 +39,15 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "19.8.0",
-    "@nx/workspace": "19.8.0",
+    "@nx/devkit": "20.0.0-beta.0",
+    "@nx/workspace": "20.0.0-beta.0",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.1",
     "chalk": "^4.1.0",
     "columnify": "^1.6.0",
     "detect-port": "^1.5.1",
+    "enquirer": "~2.3.6",
     "fast-glob": "3.2.7",
     "ignore": "^5.0.4",
     "js-tokens": "^4.0.0",
@@ -60,7 +61,7 @@
     "ts-node": "10.9.1",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nrwl/js": "19.8.0"
+    "@nrwl/js": "20.0.0-beta.0"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/generators/library/files/lib/tsconfig.lib.json__tmpl__

@@ -5,10 +5,5 @@
     "declaration": true,
     "types": ["node"]
   },
-  "include": ["src/**/*.ts"<% if (js) { %>, "src/**/*.js"<% } %>],
-  "exclude": [
-    <% if (hasUnitTestRunner && unitTestRunner === 'jest') { %>"jest.config.ts", 
-    <% } else if (hasUnitTestRunner) { %>"vite.config.ts", 
-    <% } %>"src/**/*.spec.ts", "src/**/*.test.ts"<% if (js) { %>, "src/**/*.spec.js", "src/**/*.test.js"<% } %>
-  ]
+  "include": ["src/**/*.ts"<% if (js) { %>, "src/**/*.js"<% } %>]
 }

package/src/generators/library/library.js

@@ -20,9 +20,6 @@ const defaultOutputDirectory = 'dist';
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
         addPlugin: false,
-        // provide a default projectNameAndRootFormat to avoid breaking changes
-        // to external generators invoking this one
-        projectNameAndRootFormat: 'derived',
         ...schema,
     });
 }
@@ -91,6 +88,7 @@ async function libraryGeneratorInternal(tree, schema) {
             coverageProvider: 'v8',
             skipFormat: true,
             testEnvironment: options.testEnvironment,
+            runtimeTsconfigFileName: 'tsconfig.lib.json',
         });
         tasks.push(vitestTask);
         createOrEditViteConfig(tree, {
@@ -423,6 +421,7 @@ async function addJest(tree, options) {
             : options.bundler === 'rollup'
                 ? 'swc'
                 : undefined,
+        runtimeTsconfigFileName: 'tsconfig.lib.json',
     });
 }
 function replaceJestConfig(tree, options) {
@@ -513,15 +512,11 @@ async function normalizeOptions(tree, options) {
         importPath: options.importPath,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
-        callingGenerator: '@nx/js:library',
     });
     options.rootProject = projectRoot === '.';
-    const fileName = getCaseAwareFileName({
-        fileName: options.simpleName
-            ? projectNames.projectSimpleName
-            : projectNames.projectFileName,
-        pascalCaseFiles: options.pascalCaseFiles,
-    });
+    const fileName = (0, devkit_1.names)(options.simpleName
+        ? projectNames.projectSimpleName
+        : projectNames.projectFileName).fileName;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
@@ -536,10 +531,6 @@ async function normalizeOptions(tree, options) {
         importPath,
     };
 }
-function getCaseAwareFileName(options) {
-    const normalized = (0, devkit_1.names)(options.fileName);
-    return options.pascalCaseFiles ? normalized.className : normalized.fileName;
-}
 function addProjectDependencies(tree, options) {
     if (options.bundler == 'esbuild') {
         return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {

package/src/generators/library/schema.json

@@ -70,12 +70,6 @@
       "description": "The test environment to use if unitTestRunner is set to jest or vitest.",
       "default": "node"
     },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case file names.",
-      "alias": "P",
-      "default": false
-    },
     "js": {
       "type": "boolean",
       "description": "Generate JavaScript files rather than TypeScript files.",

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.releaseVersionGenerator = releaseVersionGenerator;
 const devkit_1 = require("@nx/devkit");
 const chalk = require("chalk");
+const enquirer_1 = require("enquirer");
 const node_child_process_1 = require("node:child_process");
 const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
@@ -134,9 +135,23 @@ To fix this you will either need to add a package.json file at that location, or
                         catch (e) {
                             spinner.stop();
                             if (options.fallbackCurrentVersionResolver === 'disk') {
-                                logger.buffer(`📄 Unable to resolve the current version from the registry ${registry}. Falling back to the version on disk of ${currentVersionFromDisk}`);
-                                currentVersion = currentVersionFromDisk;
-                                currentVersionResolvedFromFallback = true;
+                                if (!currentVersionFromDisk &&
+                                    (options.specifierSource === 'conventional-commits' ||
+                                        options.specifierSource === 'version-plans')) {
+                                    currentVersion = await handleNoAvailableDiskFallback({
+                                        logger,
+                                        projectName,
+                                        packageJsonPath,
+                                        specifierSource: options.specifierSource,
+                                        currentVersionSourceMessage: `from the registry ${registry}`,
+                                        resolutionSuggestion: `you should publish an initial version to the registry`,
+                                    });
+                                }
+                                else {
+                                    logger.buffer(`📄 Unable to resolve the current version from the registry ${registry}. Falling back to the version on disk of ${currentVersionFromDisk}`);
+                                    currentVersion = currentVersionFromDisk;
+                                    currentVersionResolvedFromFallback = true;
+                                }
                             }
                             else {
                                 throw new Error(`Unable to resolve the current version from the registry ${registry}. Please ensure that the package exists in the registry in order to use the "registry" currentVersionResolver. Alternatively, you can use the --first-release option or set "release.version.generatorOptions.fallbackCurrentVersionResolver" to "disk" in order to fallback to the version on disk when the registry lookup fails.`);
@@ -156,7 +171,7 @@ To fix this you will either need to add a package.json file at that location, or
                 case 'disk':
                     currentVersion = currentVersionFromDisk;
                     if (!currentVersion) {
-                        throw new Error(`Unable to determine the current version for project "${project.name}" from ${packageJsonPath}`);
+                        throw new Error(`Unable to determine the current version for project "${project.name}" from ${packageJsonPath}, please ensure that the "version" field is set within the file`);
                     }
                     logger.buffer(`📄 Resolved the current version as ${currentVersion} from ${packageJsonPath}`);
                     break;
@@ -170,9 +185,23 @@ To fix this you will either need to add a package.json file at that location, or
                         });
                         if (!latestMatchingGitTag) {
                             if (options.fallbackCurrentVersionResolver === 'disk') {
-                                logger.buffer(`📄 Unable to resolve the current version from git tag using pattern "${releaseTagPattern}". Falling back to the version on disk of ${currentVersionFromDisk}`);
-                                currentVersion = currentVersionFromDisk;
-                                currentVersionResolvedFromFallback = true;
+                                if (!currentVersionFromDisk &&
+                                    (options.specifierSource === 'conventional-commits' ||
+                                        options.specifierSource === 'version-plans')) {
+                                    currentVersion = await handleNoAvailableDiskFallback({
+                                        logger,
+                                        projectName,
+                                        packageJsonPath,
+                                        specifierSource: options.specifierSource,
+                                        currentVersionSourceMessage: `from git tag using pattern "${releaseTagPattern}"`,
+                                        resolutionSuggestion: `you should set an initial git tag on a relevant commit`,
+                                    });
+                                }
+                                else {
+                                    logger.buffer(`📄 Unable to resolve the current version from git tag using pattern "${releaseTagPattern}". Falling back to the version on disk of ${currentVersionFromDisk}`);
+                                    currentVersion = currentVersionFromDisk;
+                                    currentVersionResolvedFromFallback = true;
+                                }
                             }
                             else {
                                 throw new Error(`No git tags matching pattern "${releaseTagPattern}" for project "${project.name}" were found. You will need to create an initial matching tag to use as a base for determining the next version. Alternatively, you can use the --first-release option or set "release.version.generatorOptions.fallbackCurrentVersionResolver" to "disk" in order to fallback to the version on disk when no matching git tags are found.`);
@@ -675,3 +704,35 @@ class ProjectLogger {
         });
     }
 }
+/**
+ * Allow users to be unblocked when locally running releases for the very first time with certain combinations that require an initial
+ * version in order to function (e.g. a relative semver bump derived via conventional commits or version plans) by providing an interactive
+ * prompt to let them opt into using 0.0.0 as the implied current version.
+ */
+async function handleNoAvailableDiskFallback({ logger, projectName, packageJsonPath, specifierSource, currentVersionSourceMessage, resolutionSuggestion, }) {
+    const unresolvableCurrentVersionError = new Error(`Unable to resolve the current version ${currentVersionSourceMessage} and there is no version on disk to fall back to. This is invalid with ${specifierSource} because the new version is determined by relatively bumping the current version. To resolve this, ${resolutionSuggestion}, or set an appropriate value for "version" in ${packageJsonPath}`);
+    if (process.env.CI === 'true') {
+        // We can't prompt in CI, so error immediately
+        throw unresolvableCurrentVersionError;
+    }
+    try {
+        const reply = await (0, enquirer_1.prompt)([
+            {
+                name: 'useZero',
+                message: `\n${chalk.yellow(`Warning: Unable to resolve the current version for "${projectName}" ${currentVersionSourceMessage} and there is no version on disk to fall back to. This is invalid with ${specifierSource} because the new version is determined by relatively bumping the current version.\n\nTo resolve this, ${resolutionSuggestion}, or set an appropriate value for "version" in ${packageJsonPath}`)}. \n\nAlternatively, would you like to continue now by using 0.0.0 as the current version?`,
+                type: 'confirm',
+                initial: false,
+            },
+        ]);
+        if (!reply.useZero) {
+            // Throw any error to skip the fallback to 0.0.0, may as well use the one we already have
+            throw unresolvableCurrentVersionError;
+        }
+        const currentVersion = '0.0.0';
+        logger.buffer(`📄 Forcibly resolved the current version as "${currentVersion}" based on your response to the prompt above.`);
+        return currentVersion;
+    }
+    catch {
+        throw unresolvableCurrentVersionError;
+    }
+}

package/src/utils/schema.d.ts

@@ -21,7 +21,6 @@ export interface LibraryGeneratorSchema {
   testEnvironment?: 'jsdom' | 'node';
   importPath?: string;
   js?: boolean;
-  pascalCaseFiles?: boolean;
   strict?: boolean;
   publishable?: boolean;
   buildable?: boolean;