@nx/js 19.5.3 → 19.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "19.5.3",
+  "version": "19.5.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": {
@@ -58,9 +58,9 @@
     "semver": "^7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "19.5.3",
-    "@nx/workspace": "19.5.3",
-    "@nrwl/js": "19.5.3"
+    "@nx/devkit": "19.5.4",
+    "@nx/workspace": "19.5.4",
+    "@nrwl/js": "19.5.4"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/executors/swc/swc.impl.js

@@ -102,9 +102,6 @@ async function* swcExecutor(_options, context) {
                 format: [
                     determineModuleFormatFromSwcrc(options.swcCliOptions.swcrcPath),
                 ],
-                // As long as d.ts files match their .js counterparts, we don't need to emit them.
-                // TSC can match them correctly based on file names.
-                skipTypings: true,
             }, context);
             removeTmpSwcrc(options.swcCliOptions.swcrcPath);
             disposeFn = () => {
@@ -122,9 +119,6 @@ async function* swcExecutor(_options, context) {
                 format: [
                     determineModuleFormatFromSwcrc(options.swcCliOptions.swcrcPath),
                 ],
-                // As long as d.ts files match their .js counterparts, we don't need to emit them.
-                // TSC can match them correctly based on file names.
-                skipTypings: true,
                 extraDependencies: swcHelperDependency ? [swcHelperDependency] : [],
             }, context);
             removeTmpSwcrc(options.swcCliOptions.swcrcPath);

package/src/executors/tsc/schema.json

@@ -38,6 +38,11 @@
       "x-completion-type": "directory",
       "x-priority": "important"
     },
+    "outputFileName": {
+      "type": "string",
+      "description": "The path to the main file relative to the outputPath",
+      "x-completion-type": "file"
+    },
     "tsConfig": {
       "type": "string",
       "description": "The path to the Typescript configuration file.",

package/src/executors/tsc/tsc.batch-impl.js

@@ -51,9 +51,6 @@ async function* tscBatchExecutor(taskGraph, inputs, overrides, context) {
                 ...taskInfo.options,
                 additionalEntryPoints: (0, create_entry_points_1.createEntryPoints)(taskInfo.options.additionalEntryPoints, context.root),
                 format: [(0, tsc_impl_1.determineModuleFormatFromTsConfig)(tsConfig)],
-                // As long as d.ts files match their .js counterparts, we don't need to emit them.
-                // TSC can match them correctly based on file names.
-                skipTypings: true,
             }, taskInfo.context, taskInfo.projectGraphNode, taskInfo.buildableProjectNodeDependencies);
             taskInfo.endTime = Date.now();
         }
@@ -80,9 +77,6 @@ async function* tscBatchExecutor(taskGraph, inputs, overrides, context) {
                     ...t.options,
                     additionalEntryPoints: (0, create_entry_points_1.createEntryPoints)(t.options.additionalEntryPoints, context.root),
                     format: [(0, tsc_impl_1.determineModuleFormatFromTsConfig)(t.options.tsConfig)],
-                    // As long as d.ts files match their .js counterparts, we don't need to emit them.
-                    // TSC can match them correctly based on file names.
-                    skipTypings: true,
                 }, t.context, t.projectGraphNode, t.buildableProjectNodeDependencies);
             }
         });

package/src/executors/tsc/tsc.impl.js

@@ -67,9 +67,6 @@ async function* tscExecutor(_options, context) {
             ...options,
             additionalEntryPoints: (0, create_entry_points_1.createEntryPoints)(options.additionalEntryPoints, context.root),
             format: [determineModuleFormatFromTsConfig(options.tsConfig)],
-            // As long as d.ts files match their .js counterparts, we don't need to emit them.
-            // TSC can match them correctly based on file names.
-            skipTypings: true,
         }, context, target, dependencies);
         (0, inline_1.postProcessInlinedDependencies)(tsCompilationOptions.outputPath, tsCompilationOptions.projectRoot, inlineProjectGraph);
     });
@@ -83,9 +80,6 @@ async function* tscExecutor(_options, context) {
         const disposePackageJsonChanges = await (0, watch_for_single_file_changes_1.watchForSingleFileChanges)(context.projectName, options.projectRoot, 'package.json', () => (0, update_package_json_1.updatePackageJson)({
             ...options,
             additionalEntryPoints: (0, create_entry_points_1.createEntryPoints)(options.additionalEntryPoints, context.root),
-            // As long as d.ts files match their .js counterparts, we don't need to emit them.
-            // TSC can match them correctly based on file names.
-            skipTypings: true,
             format: [determineModuleFormatFromTsConfig(options.tsConfig)],
         }, context, target, dependencies));
         const handleTermination = async (exitCode) => {

package/src/executors/verdaccio/schema.d.ts

@@ -2,6 +2,7 @@ export interface VerdaccioExecutorSchema {
   location: 'global' | 'user' | 'project' | 'none';
   storage?: string;
   port?: number;
+  listenAddress?: string;
   config?: string;
   clear?: boolean;
   scopes?: string[];

package/src/executors/verdaccio/schema.json

@@ -20,6 +20,10 @@
       "type": "number",
       "description": "Port of local registry that Verdaccio should listen to"
     },
+    "listenAddress": {
+      "type": "string",
+      "description": "Listen address that Verdaccio should listen to"
+    },
     "config": {
       "type": "string",
       "description": "Path to the custom Verdaccio config file"

package/src/executors/verdaccio/verdaccio.impl.js

@@ -104,7 +104,10 @@ function createVerdaccioOptions(options, workspaceRoot) {
         options.port ??= 4873; // set default port if config is not provided
     }
     if (options.port) {
-        verdaccioArgs.push('--listen', options.port.toString());
+        const listenAddress = options.listenAddress
+            ? `${options.listenAddress}:${options.port.toString()}`
+            : options.port.toString();
+        verdaccioArgs.push('--listen', listenAddress);
     }
     return verdaccioArgs;
 }

package/src/plugins/typescript/plugin.js

@@ -13,7 +13,9 @@ const lock_file_1 = require("nx/src/plugins/js/lock-file/lock-file");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const ts_config_1 = require("../../utils/typescript/ts-config");
 function readTargetsCache(cachePath) {
-    return (0, node_fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
+    return process.env.NX_CACHE_PROJECT_GRAPH !== 'false' && (0, node_fs_1.existsSync)(cachePath)
+        ? (0, devkit_1.readJsonFile)(cachePath)
+        : {};
 }
 function writeTargetsToCache(cachePath, results) {
     (0, devkit_1.writeJsonFile)(cachePath, results);
@@ -90,7 +92,7 @@ function buildTscTargets(configFilePath, projectRoot, options, context) {
     let internalProjectReferences;
     // Typecheck target
     if ((0, node_path_1.basename)(configFilePath) === 'tsconfig.json' && options.typecheck) {
-        internalProjectReferences = resolveInternalProjectReferences(configFilePath, tsConfig);
+        internalProjectReferences = resolveInternalProjectReferences(tsConfig, context.workspaceRoot, projectRoot);
         const targetName = options.typecheck.targetName;
         if (!targets[targetName]) {
             let command = `tsc --build --emitDeclarationOnly --pretty --verbose`;
@@ -112,7 +114,7 @@ function buildTscTargets(configFilePath, projectRoot, options, context) {
     }
     // Build target
     if (options.build && (0, node_path_1.basename)(configFilePath) === options.build.configName) {
-        internalProjectReferences ??= resolveInternalProjectReferences(configFilePath, tsConfig);
+        internalProjectReferences ??= resolveInternalProjectReferences(tsConfig, context.workspaceRoot, projectRoot);
         const targetName = options.build.targetName;
         targets[targetName] = {
             dependsOn: [`^${targetName}`],
@@ -137,9 +139,11 @@ function getInputs(namedInputs, configFilePath, tsConfig, internalProjectReferen
         [configFilePath, tsConfig],
         ...Object.entries(internalProjectReferences),
     ];
+    const absoluteProjectRoot = (0, node_path_1.join)(workspaceRoot, projectRoot);
     projectTsConfigFiles.forEach(([configPath, config]) => {
         configFiles.add(configPath);
-        (config.raw?.include ?? []).forEach((p) => includePaths.add(p));
+        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)));
         if (config.raw?.exclude) {
             /**
              * We need to filter out the exclude paths that are already included in
@@ -173,7 +177,7 @@ function getInputs(namedInputs, configFilePath, tsConfig, internalProjectReferen
     if (excludePaths.size) {
         inputs.push(...Array.from(excludePaths).map((p) => `!${pathToInputOrOutput((0, devkit_1.joinPathFragments)(projectRoot, p), workspaceRoot, projectRoot)}`));
     }
-    if (hasExternalProjectReferences(configFilePath, tsConfig)) {
+    if (hasExternalProjectReferences(configFilePath, tsConfig, workspaceRoot, projectRoot)) {
         // Importing modules from a referenced project will load its output declaration files (d.ts)
         // https://www.typescriptlang.org/docs/handbook/project-references.html#what-is-a-project-reference
         inputs.push({ dependentTasksOutputFiles: '**/*.d.ts' });
@@ -251,18 +255,17 @@ function getExtendedConfigFiles(tsConfigPath, tsConfig) {
     }
     return Array.from(extendedConfigFiles);
 }
-function resolveInternalProjectReferences(configFilePath, tsConfig, projectReferences = {}) {
+function resolveInternalProjectReferences(tsConfig, workspaceRoot, projectRoot, projectReferences = {}) {
     if (!tsConfig.projectReferences?.length) {
         return projectReferences;
     }
-    const basePath = getTsConfigBasePath(configFilePath);
     for (const ref of tsConfig.projectReferences) {
         let refConfigPath = ref.path;
         if (projectReferences[refConfigPath]) {
             // Already resolved
             continue;
         }
-        if (isExternalProjectReference(refConfigPath, basePath)) {
+        if (isExternalProjectReference(refConfigPath, workspaceRoot, projectRoot)) {
             continue;
         }
         if (!refConfigPath.endsWith('.json')) {
@@ -270,51 +273,58 @@ function resolveInternalProjectReferences(configFilePath, tsConfig, projectRefer
         }
         const refTsConfig = readCachedTsConfig(refConfigPath);
         projectReferences[refConfigPath] = refTsConfig;
-        resolveInternalProjectReferences(refConfigPath, refTsConfig, projectReferences);
+        resolveInternalProjectReferences(refTsConfig, workspaceRoot, projectRoot, projectReferences);
     }
     return projectReferences;
 }
-function hasExternalProjectReferences(tsConfigPath, tsConfig, seen = new Set()) {
+function hasExternalProjectReferences(tsConfigPath, tsConfig, workspaceRoot, projectRoot, seen = new Set()) {
     if (!tsConfig.projectReferences?.length) {
         return false;
     }
     seen.add(tsConfigPath);
-    const basePath = getTsConfigBasePath(tsConfigPath);
     for (const ref of tsConfig.projectReferences) {
         let refConfigPath = ref.path;
         if (seen.has(refConfigPath)) {
             // Already seen
             continue;
         }
-        if (isExternalProjectReference(refConfigPath, basePath)) {
+        if (isExternalProjectReference(refConfigPath, workspaceRoot, projectRoot)) {
             return true;
         }
         if (!refConfigPath.endsWith('.json')) {
             refConfigPath = (0, node_path_1.join)(refConfigPath, 'tsconfig.json');
         }
         const refTsConfig = readCachedTsConfig(refConfigPath);
-        const result = hasExternalProjectReferences(refConfigPath, refTsConfig);
+        const result = hasExternalProjectReferences(refConfigPath, refTsConfig, workspaceRoot, projectRoot, seen);
         if (result) {
             return true;
         }
     }
     return false;
 }
-function isExternalProjectReference(refTsConfigPath, basePath) {
-    const refBasePath = getTsConfigBasePath(refTsConfigPath);
-    // TODO: there could be internal project references in nested dirs (e.g.
-    // our storybook generator generates a nested `.storybook/tsconfig.json`),
-    // which would be considered an external project reference but it's not.
-    // We could instead check if the referenced tsconfig is outside the project
-    // root, but that would cause issues with standalone workspaces with nested
-    // projects.
-    return refBasePath !== basePath;
+function isExternalProjectReference(refTsConfigPath, workspaceRoot, projectRoot) {
+    const absoluteProjectRoot = (0, node_path_1.join)(workspaceRoot, projectRoot);
+    let currentPath = getTsConfigDirName(refTsConfigPath);
+    if ((0, node_path_1.relative)(absoluteProjectRoot, currentPath).startsWith('..')) {
+        // it's outside of the project root, so it's an external project reference
+        return true;
+    }
+    while (currentPath !== absoluteProjectRoot) {
+        if ((0, node_fs_1.existsSync)((0, node_path_1.join)(currentPath, 'package.json')) ||
+            (0, node_fs_1.existsSync)((0, node_path_1.join)(currentPath, 'project.json'))) {
+            // it's inside a nested project root, so it's and external project reference
+            return true;
+        }
+        currentPath = (0, node_path_1.dirname)(currentPath);
+    }
+    // it's inside the project root, so it's an internal project reference
+    return false;
 }
-function getTsConfigBasePath(tsConfigPath) {
-    return (0, node_fs_1.statSync)(tsConfigPath).isFile() ? (0, node_path_1.dirname)(tsConfigPath) : tsConfigPath;
+function getTsConfigDirName(tsConfigPath) {
+    return (0, node_fs_1.statSync)(tsConfigPath).isFile()
+        ? (0, node_path_1.dirname)(tsConfigPath)
+        : (0, node_path_1.normalize)(tsConfigPath);
 }
-// TODO: we could probably persist this to disk to avoid reading the same
-// tsconfig files over multiple runs
 const tsConfigCache = new Map();
 function readCachedTsConfig(tsConfigPath) {
     const cacheKey = getTsConfigCacheKey(tsConfigPath);

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

@@ -37,6 +37,18 @@ function updatePackageJson(options, context, target, dependencies, fileMap = nul
             ? (0, devkit_1.readJsonFile)(pathToPackageJson)
             : { name: context.projectName, version: '0.0.1' };
     }
+    if (packageJson.type === 'module') {
+        if (options.format?.includes('cjs')) {
+            devkit_1.logger.warn(`Package type is set to "module" but "cjs" format is included. Going to use "esm" format instead. You can change the package type to "commonjs" or remove type in the package.json file.`);
+        }
+        options.format = ['esm'];
+    }
+    else if (packageJson.type === 'commonjs') {
+        if (options.format?.includes('esm')) {
+            devkit_1.logger.warn(`Package type is set to "commonjs" but "esm" format is included. Going to use "cjs" format instead. You can change the package type to "module" or remove type in the package.json file.`);
+        }
+        options.format = ['cjs'];
+    }
     // update package specific settings
     packageJson = getUpdatedPackageJsonContent(packageJson, options);
     // save files
@@ -115,8 +127,13 @@ function getExports(options) {
             const { ext: fileExt, name: fileName } = (0, path_1.parse)(file);
             const relativeDir = (0, get_main_file_dir_1.getRelativeDirectoryToProjectRoot)(file, options.projectRoot);
             const sourceFilePath = relativeDir + fileName;
-            const entryFilepath = sourceFilePath.replace(/^\.\/src\//, './');
+            const entryRelativeDir = relativeDir.replace(/^\.\/src\//, './');
+            const entryFilepath = entryRelativeDir + fileName;
             const isJsFile = jsRegex.test(fileExt);
+            if (isJsFile && fileName === 'index') {
+                const barrelEntry = entryRelativeDir.replace(/\/$/, '');
+                exports[barrelEntry] = sourceFilePath + options.fileExt;
+            }
             exports[isJsFile ? entryFilepath : entryFilepath + fileExt] =
                 sourceFilePath + (isJsFile ? options.fileExt : fileExt);
         }
@@ -139,7 +156,7 @@ function getUpdatedPackageJsonContent(packageJson, options) {
         });
         packageJson.module ??= esmExports['.'];
         if (!hasCjsFormat) {
-            packageJson.type = 'module';
+            packageJson.type ??= 'module';
             packageJson.main ??= esmExports['.'];
         }
         if (options.generateExportsField) {
@@ -160,7 +177,7 @@ function getUpdatedPackageJsonContent(packageJson, options) {
         });
         packageJson.main ??= cjsExports['.'];
         if (!hasEsmFormat) {
-            packageJson.type = 'commonjs';
+            packageJson.type ??= 'commonjs';
         }
         if (options.generateExportsField) {
             for (const [exportEntry, filePath] of Object.entries(cjsExports)) {