@nx/js 20.6.2 → 20.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "20.6.2",
+  "version": "20.6.4",
   "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.6.2",
-    "@nx/workspace": "20.6.2",
+    "@nx/devkit": "20.6.4",
+    "@nx/workspace": "20.6.4",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
@@ -60,8 +60,6 @@
     "semver": "^7.5.3",
     "source-map-support": "0.5.19",
     "tinyglobby": "^0.2.12",
-    "ts-node": "10.9.1",
-    "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0"
   },
   "peerDependencies": {

package/src/generators/init/files/ts-solution/tsconfig.base.json__tmpl__

@@ -17,6 +17,7 @@
     "noUnusedLocals": true,
     "skipLibCheck": true,
     "strict": true,
-    "target": "es2022"
+    "target": "es2022",
+    "customConditions": ["development"]
   }
 }

package/src/generators/library/library.js

@@ -425,6 +425,8 @@ function createFiles(tree, options) {
             };
             if (options.isUsingTsSolutionConfig &&
                 !['none', 'rollup', 'vite'].includes(options.bundler)) {
+                // the file must exist in the TS solution setup
+                const tsconfigBase = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
                 return (0, update_package_json_1.getUpdatedPackageJsonContent)(updatedPackageJson, {
                     main: (0, path_1.join)(options.projectRoot, 'src/index.ts'),
                     outputPath: (0, devkit_1.joinPathFragments)(options.projectRoot, 'dist'),
@@ -433,6 +435,7 @@ function createFiles(tree, options) {
                     generateExportsField: true,
                     packageJsonPath,
                     format: ['esm'],
+                    skipDevelopmentExports: !tsconfigBase.compilerOptions?.customConditions?.includes('development'),
                 });
             }
             return updatedPackageJson;
@@ -455,6 +458,7 @@ function createFiles(tree, options) {
         }
         if (options.isUsingTsSolutionConfig &&
             !['none', 'rollup', 'vite'].includes(options.bundler)) {
+            const tsconfigBase = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
             packageJson = (0, update_package_json_1.getUpdatedPackageJsonContent)(packageJson, {
                 main: (0, path_1.join)(options.projectRoot, 'src/index.ts'),
                 outputPath: (0, devkit_1.joinPathFragments)(options.projectRoot, 'dist'),
@@ -463,6 +467,7 @@ function createFiles(tree, options) {
                 generateExportsField: true,
                 packageJsonPath,
                 format: ['esm'],
+                skipDevelopmentExports: !tsconfigBase.compilerOptions?.customConditions?.includes('development'),
             });
         }
         if (!options.useProjectJson && options.name !== options.importPath) {

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

@@ -232,6 +232,9 @@ function updatePackageJson(tree, projectName, projectRoot, main, outputPath, roo
             version: '0.0.1',
         };
     }
+    // the file must exist in the TS solution setup, which is the only case this
+    // function is called
+    const tsconfigBase = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
     packageJson = (0, update_package_json_1.getUpdatedPackageJsonContent)(packageJson, {
         main,
         outputPath,
@@ -240,6 +243,7 @@ function updatePackageJson(tree, projectName, projectRoot, main, outputPath, roo
         packageJsonPath,
         rootDir,
         format,
+        skipDevelopmentExports: !tsconfigBase.compilerOptions?.customConditions?.includes('development'),
     });
     (0, devkit_1.writeJson)(tree, packageJsonPath, packageJson);
 }

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

@@ -29,17 +29,21 @@ function startLocalRegistry({ localRegistryTarget, storage, verbose, clearStorag
                 const port = parseInt(data.toString().match(new RegExp(`${listenAddress}:(?<port>\\d+)`))
                     ?.groups?.port);
                 const registry = `http://${listenAddress}:${port}`;
+                const authToken = 'secretVerdaccioToken';
                 console.log(`Local registry started on ${registry}`);
                 process.env.npm_config_registry = registry;
-                (0, child_process_1.execSync)(`npm config set //${listenAddress}:${port}/:_authToken "secretVerdaccioToken" --ws=false`, {
+                (0, child_process_1.execSync)(`npm config set //${listenAddress}:${port}/:_authToken "${authToken}" --ws=false`, {
                     windowsHide: false,
                 });
+                // bun
+                process.env.BUN_CONFIG_REGISTRY = registry;
+                process.env.BUN_CONFIG_TOKEN = authToken;
                 // yarnv1
                 process.env.YARN_REGISTRY = registry;
                 // yarnv2
                 process.env.YARN_NPM_REGISTRY_SERVER = registry;
                 process.env.YARN_UNSAFE_HTTP_WHITELIST = listenAddress;
-                console.log('Set npm and yarn config registry to ' + registry);
+                console.log('Set npm, bun, and yarn config registry to ' + registry);
                 resolve(() => {
                     childProcess.kill();
                     (0, child_process_1.execSync)(`npm config delete //${listenAddress}:${port}/:_authToken --ws=false`, {

package/src/plugins/typescript/util.js

@@ -67,8 +67,8 @@ function isValidPackageJsonBuildConfig(tsConfig, workspaceRoot, projectRoot) {
         }
         else if (typeof value === 'object') {
             return Object.entries(value).some(([currentKey, subValue]) => {
-                // Skip types field
-                if (currentKey === 'types') {
+                // Skip types and development conditions
+                if (currentKey === 'types' || currentKey === 'development') {
                     return false;
                 }
                 if (typeof subValue === 'string') {

package/src/utils/package-json/update-package-json.d.ts

@@ -19,6 +19,7 @@ export interface UpdatePackageJsonOption {
     buildableProjectDepsInPackageJsonType?: 'dependencies' | 'peerDependencies';
     generateLockfile?: boolean;
     packageJsonPath?: string;
+    skipDevelopmentExports?: boolean;
 }
 export declare function updatePackageJson(options: UpdatePackageJsonOption, context: ExecutorContext, target: ProjectGraphProjectNode, dependencies: DependentBuildableProjectNode[], fileMap?: ProjectFileMap): void;
 interface Exports {

package/src/utils/package-json/update-package-json.js

@@ -50,7 +50,10 @@ function updatePackageJson(options, context, target, dependencies, fileMap = nul
         options.format = ['cjs'];
     }
     // update package specific settings
-    packageJson = getUpdatedPackageJsonContent(packageJson, options);
+    packageJson = getUpdatedPackageJsonContent(packageJson, {
+        skipDevelopmentExports: true,
+        ...options,
+    });
     // save files
     (0, devkit_1.writeJsonFile)(`${options.outputPath}/package.json`, packageJson);
     if (options.generateLockfile) {
@@ -146,6 +149,19 @@ function getUpdatedPackageJsonContent(packageJson, options) {
         packageJson.exports ??=
             typeof packageJson.exports === 'string' ? {} : { ...packageJson.exports };
         packageJson.exports['./package.json'] ??= './package.json';
+        if (!options.skipDevelopmentExports && (hasCjsFormat || hasEsmFormat)) {
+            packageJson.exports['.'] ??= {};
+            const developmentExports = getDevelopmentExports(options);
+            for (const [exportEntry, filePath] of Object.entries(developmentExports)) {
+                if (!packageJson.exports[exportEntry]) {
+                    packageJson.exports[exportEntry] ??= {};
+                    packageJson.exports[exportEntry]['development'] ??= filePath;
+                }
+                else if (typeof packageJson.exports[exportEntry] === 'object') {
+                    packageJson.exports[exportEntry].development ??= filePath;
+                }
+            }
+        }
     }
     if (!options.skipTypings) {
         const mainFile = (0, path_1.basename)(options.main).replace(/\.[tj]s$/, '');
@@ -215,6 +231,31 @@ function getUpdatedPackageJsonContent(packageJson, options) {
     }
     return packageJson;
 }
+function getDevelopmentExports(options) {
+    const mainRelativeDir = (0, get_main_file_dir_1.getRelativeDirectoryToProjectRoot)(options.main, options.projectRoot);
+    const exports = {
+        '.': mainRelativeDir + (0, path_1.basename)(options.main),
+    };
+    if (options.additionalEntryPoints?.length) {
+        const jsRegex = /\.[jt]sx?$/;
+        for (const file of options.additionalEntryPoints) {
+            const { ext: fileExt, name: fileName, base: baseName } = (0, path_1.parse)(file);
+            if (!jsRegex.test(fileExt)) {
+                continue;
+            }
+            const relativeDir = (0, get_main_file_dir_1.getRelativeDirectoryToProjectRoot)(file, options.projectRoot);
+            const sourceFilePath = relativeDir + baseName;
+            const entryRelativeDir = relativeDir.replace(/^\.\/src\//, './');
+            const entryFilePath = entryRelativeDir + fileName;
+            if (fileName === 'index') {
+                const barrelEntry = entryRelativeDir.replace(/\/$/, '');
+                exports[barrelEntry] = sourceFilePath;
+            }
+            exports[entryFilePath] = sourceFilePath;
+        }
+    }
+    return exports;
+}
 function getOutputDir(options) {
     const packageJsonDir = options.packageJsonPath
         ? (0, path_1.dirname)(options.packageJsonPath)

package/src/utils/typescript/tsnode-register.d.ts

@@ -1 +0,0 @@
-export declare function tsNodeRegister(file: string, tsConfig?: string): void;

package/src/utils/typescript/tsnode-register.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsNodeRegister = tsNodeRegister;
-function tsNodeRegister(file, tsConfig) {
-    if (!file?.endsWith('.ts'))
-        return;
-    // Register TS compiler lazily
-    require('ts-node').register({
-        project: tsConfig,
-        compilerOptions: {
-            module: 'CommonJS',
-            types: ['node'],
-        },
-    });
-    if (!tsConfig)
-        return;
-    // Register paths in tsConfig
-    const tsconfigPaths = require('tsconfig-paths');
-    const { absoluteBaseUrl: baseUrl, paths } = tsconfigPaths.loadConfig(tsConfig);
-    if (baseUrl && paths) {
-        tsconfigPaths.register({ baseUrl, paths });
-    }
-}