@nx/js 0.0.0-pr-3-4212ebd → 0.0.0-pr-30457-3ca7e98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "0.0.0-pr-3-4212ebd",
+  "version": "0.0.0-pr-30457-3ca7e98",
   "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": "0.0.0-pr-3-4212ebd",
-    "@nx/workspace": "0.0.0-pr-3-4212ebd",
+    "@nx/devkit": "0.0.0-pr-30457-3ca7e98",
+    "@nx/workspace": "0.0.0-pr-30457-3ca7e98",
     "@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) {
@@ -732,12 +737,6 @@ function createProjectTsConfigs(tree, options) {
                 json.references.push({
                     path: './tsconfig.lib.json',
                 });
-                // If using `tsc` to build, then we do not want a typecheck target that duplicates the work, since both run `tsc`.
-                // This applies to `@nx/js/typescript` plugin only.
-                if (options.bundler === 'tsc') {
-                    json['nx'] ??= {};
-                    json['nx'].addTypecheckTarget = false;
-                }
                 return json;
             });
         }
@@ -749,12 +748,6 @@ function createProjectTsConfigs(tree, options) {
                 include: [],
                 references: [{ path: './tsconfig.lib.json' }],
             };
-            // If using `tsc` to build, then we do not want a typecheck target that duplicates the work, since both run `tsc`.
-            // This applies to `@nx/js/typescript` plugin only.
-            if (options.bundler === 'tsc') {
-                tsconfig['nx'] ??= {};
-                tsconfig['nx'].addTypecheckTarget = false;
-            }
             (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json'), tsconfig);
             // update root project tsconfig.json references with the new lib tsconfig
             (0, devkit_1.updateJson)(tree, 'tsconfig.json', (json) => {

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/plugin.js

@@ -3,15 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodes = exports.createNodesV2 = exports.PLUGIN_NAME = exports.createDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
-const picomatch = require("picomatch");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const posix = require("node:path/posix");
 const file_hasher_1 = require("nx/src/hasher/file-hasher");
+const picomatch = require("picomatch");
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 const lock_file_1 = require("nx/src/plugins/js/lock-file/lock-file");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const util_1 = require("./util");
+let ts;
 const pmc = (0, devkit_1.getPackageManagerCommand)();
 let tsConfigCache;
 const tsConfigCachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, 'tsconfig-files.hash');
@@ -144,6 +145,9 @@ async function getConfigFileHash(configFilePath, workspaceRoot, projectRoot, opt
         lockFileHash,
         optionsHash,
         ...(packageJson ? [(0, file_hasher_1.hashObject)(packageJson)] : []),
+        // change this to bust the cache when making changes that would yield
+        // different results for the same hash
+        (0, file_hasher_1.hashObject)({ bust: 1 }),
     ]);
 }
 function checkIfConfigFileShouldBeProject(configFilePath, projectRoot, context) {
@@ -260,10 +264,57 @@ function getInputs(namedInputs, configFilePath, tsConfig, internalProjectReferen
         ...Object.entries(internalProjectReferences),
     ];
     const absoluteProjectRoot = (0, node_path_1.join)(workspaceRoot, projectRoot);
+    if (!ts) {
+        ts = require('typescript');
+    }
+    // https://github.com/microsoft/TypeScript/blob/19b777260b26aac5707b1efd34202054164d4a9d/src/compiler/utilities.ts#L9869
+    const supportedTSExtensions = [
+        ts.Extension.Ts,
+        ts.Extension.Tsx,
+        ts.Extension.Dts,
+        ts.Extension.Cts,
+        ts.Extension.Dcts,
+        ts.Extension.Mts,
+        ts.Extension.Dmts,
+    ];
+    // https://github.com/microsoft/TypeScript/blob/19b777260b26aac5707b1efd34202054164d4a9d/src/compiler/utilities.ts#L9878
+    const allSupportedExtensions = [
+        ts.Extension.Ts,
+        ts.Extension.Tsx,
+        ts.Extension.Dts,
+        ts.Extension.Js,
+        ts.Extension.Jsx,
+        ts.Extension.Cts,
+        ts.Extension.Dcts,
+        ts.Extension.Cjs,
+        ts.Extension.Mts,
+        ts.Extension.Dmts,
+        ts.Extension.Mjs,
+    ];
+    const normalizeInput = (input, config) => {
+        const extensions = config.options.allowJs
+            ? [...allSupportedExtensions]
+            : [...supportedTSExtensions];
+        if (config.options.resolveJsonModule) {
+            extensions.push(ts.Extension.Json);
+        }
+        const segments = input.split('/');
+        // An "includes" path "foo" is implicitly a glob "foo/**/*" if its last
+        // segment has no extension, and does not contain any glob characters
+        // itself.
+        // https://github.com/microsoft/TypeScript/blob/19b777260b26aac5707b1efd34202054164d4a9d/src/compiler/utilities.ts#L9577-L9585
+        if (!/[.*?]/.test(segments.at(-1))) {
+            return extensions.map((ext) => `${segments.join('/')}/**/*${ext}`);
+        }
+        return [input];
+    };
     projectTsConfigFiles.forEach(([configPath, config]) => {
         configFiles.add(configPath);
         const offset = (0, node_path_1.relative)(absoluteProjectRoot, (0, node_path_1.dirname)(configPath));
-        (config.raw?.include ?? []).forEach((p) => includePaths.add((0, node_path_1.join)(offset, p)));
+        (config.raw?.include ?? []).forEach((p) => {
+            const normalized = normalizeInput((0, node_path_1.join)(offset, p), config);
+            normalized.forEach((input) => includePaths.add(input));
+        });
         if (config.raw?.exclude) {
             /**
              * We need to filter out the exclude paths that are already included in
@@ -563,7 +614,6 @@ function getExtendedFilesHash(extendedConfigFile, workspaceRoot) {
     }
     return hashes.join('|');
 }
-let ts;
 function readTsConfig(tsConfigPath, workspaceRoot) {
     if (!ts) {
         ts = require('typescript');

package/src/plugins/typescript/util.js

@@ -29,7 +29,6 @@ function addBuildAndWatchDepsTargets(workspaceRoot, projectRoot, targets, option
             dependsOn: ['^build'],
         };
         targets[options.watchDepsTargetName ?? 'watch-deps'] = {
-            continuous: true,
             dependsOn: [buildDepsTargetName],
             command: `${pmc.exec} nx watch --projects ${projectName} --includeDependentProjects -- ${pmc.exec} nx ${buildDepsTargetName} ${projectName}`,
         };
@@ -68,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/buildable-libs-utils.d.ts

@@ -33,8 +33,6 @@ export declare function calculateDependenciesFromTaskGraph(taskGraph: TaskGraph,
  */
 export declare function computeCompilerOptionsPaths(tsConfig: string | ts.ParsedCommandLine, dependencies: DependentBuildableProjectNode[]): ts.MapLike<string[]>;
 export declare function createTmpTsConfig(tsconfigPath: string, workspaceRoot: string, projectRoot: string, dependencies: DependentBuildableProjectNode[], useWorkspaceAsBaseUrl?: boolean): string;
-export declare function checkDependentProjectsHaveBeenBuilt(root: string, projectName: string, targetName: string, projectDependencies: DependentBuildableProjectNode[]): boolean;
-export declare function findMissingBuildDependencies(root: string, projectName: string, targetName: string, projectDependencies: DependentBuildableProjectNode[]): DependentBuildableProjectNode[];
 export declare function updatePaths(dependencies: DependentBuildableProjectNode[], paths: Record<string, string[]>): void;
 /**
  * Updates the peerDependencies section in the `dist/lib/xyz/package.json` with

package/src/utils/buildable-libs-utils.js

@@ -5,8 +5,6 @@ exports.calculateProjectDependencies = calculateProjectDependencies;
 exports.calculateDependenciesFromTaskGraph = calculateDependenciesFromTaskGraph;
 exports.computeCompilerOptionsPaths = computeCompilerOptionsPaths;
 exports.createTmpTsConfig = createTmpTsConfig;
-exports.checkDependentProjectsHaveBeenBuilt = checkDependentProjectsHaveBeenBuilt;
-exports.findMissingBuildDependencies = findMissingBuildDependencies;
 exports.updatePaths = updatePaths;
 exports.updateBuildableProjectPackageJsonDependencies = updateBuildableProjectPackageJsonDependencies;
 const devkit_1 = require("@nx/devkit");
@@ -252,36 +250,6 @@ function cleanupTmpTsConfigFile(tmpTsConfigPath) {
     }
     catch (e) { }
 }
-function checkDependentProjectsHaveBeenBuilt(root, projectName, targetName, projectDependencies) {
-    const missing = findMissingBuildDependencies(root, projectName, targetName, projectDependencies);
-    if (missing.length > 0) {
-        console.error((0, devkit_1.stripIndents) `
-      It looks like all of ${projectName}'s dependencies have not been built yet:
-      ${missing.map((x) => ` - ${x.node.name}`).join('\n')}
-
-      You might be missing a "targetDefaults" configuration in your root nx.json (https://nx.dev/reference/project-configuration#target-defaults),
-      or "dependsOn" configured in ${projectName}'s project.json (https://nx.dev/reference/project-configuration#dependson) 
-    `);
-        return false;
-    }
-    else {
-        return true;
-    }
-}
-function findMissingBuildDependencies(root, projectName, targetName, projectDependencies) {
-    const depLibsToBuildFirst = [];
-    // verify whether all dependent libraries have been built
-    projectDependencies.forEach((dep) => {
-        if (dep.node.type !== 'lib') {
-            return;
-        }
-        const paths = dep.outputs.map((p) => (0, path_1.join)(root, p));
-        if (!paths.some(fileutils_1.directoryExists)) {
-            depLibsToBuildFirst.push(dep);
-        }
-    });
-    return depLibsToBuildFirst;
-}
 function updatePaths(dependencies, paths) {
     const pathsKeys = Object.keys(paths);
     // For each registered dependency
@@ -291,7 +259,7 @@ function updatePaths(dependencies, paths) {
         // If there are outputs
         if (dep.outputs && dep.outputs.length > 0) {
             // Directly map the dependency name to the output paths (dist/packages/..., etc.)
-            paths[dep.name] = dep.outputs;
+            paths[dep.name] = dep.outputs.map((output) => output.replace(/(\*|\/[^\/]*\*).*$/, ''));
             // check for secondary entrypoints
             // For each registered path
             for (const path of pathsKeys) {

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 });
-    }
-}