@nx/js 0.0.0-pr-28808-ae8ea8d → 0.0.0-pr-28808-41aa4e0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "0.0.0-pr-28808-ae8ea8d",
+  "version": "0.0.0-pr-28808-41aa4e0",
   "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-28808-ae8ea8d",
-    "@nx/workspace": "0.0.0-pr-28808-ae8ea8d",
+    "@nx/devkit": "0.0.0-pr-28808-41aa4e0",
+    "@nx/workspace": "0.0.0-pr-28808-41aa4e0",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",

package/src/plugins/typescript/plugin.js

@@ -76,7 +76,8 @@ async function createNodesInternal(configFilePath, options, context, lockFileNam
     // project references and typecheck will fail.
     if (siblingFiles.includes('next.config.js') ||
         siblingFiles.includes('next.config.cjs') ||
-        siblingFiles.includes('next.config.mjs')) {
+        siblingFiles.includes('next.config.mjs') ||
+        siblingFiles.includes('next.config.ts')) {
         return {};
     }
     /**
@@ -84,7 +85,7 @@ async function createNodesInternal(configFilePath, options, context, lockFileNam
      * - hashes of the content of the relevant files that can affect what's inferred by the plugin:
      *   - current config file
      *   - config files extended by the current config file (recursively up to the root config file)
-     *   - referenced config files that are internal to the owning Nx project of the current config file
+     *   - referenced config files that are internal to the owning Nx project of the current config file, or is a shallow external reference of the owning Nx project
      *   - lock file
      * - hash of the plugin options
      * - current config file path
@@ -92,11 +93,13 @@ async function createNodesInternal(configFilePath, options, context, lockFileNam
     const tsConfig = readCachedTsConfig(fullConfigPath);
     const extendedConfigFiles = getExtendedConfigFiles(fullConfigPath, tsConfig);
     const internalReferencedFiles = resolveInternalProjectReferences(tsConfig, context.workspaceRoot, projectRoot);
+    const externalProjectReferences = resolveShallowExternalProjectReferences(tsConfig, context.workspaceRoot, projectRoot);
     const nodeHash = (0, file_hasher_1.hashArray)([
         ...[
             fullConfigPath,
             ...extendedConfigFiles.files,
             ...Object.keys(internalReferencedFiles),
+            ...Object.keys(externalProjectReferences),
             (0, node_path_1.join)(context.workspaceRoot, lockFileName),
         ].map(file_hasher_1.hashFile),
         (0, file_hasher_1.hashObject)(options),
@@ -126,14 +129,15 @@ function buildTscTargets(configFilePath, projectRoot, options, context) {
     // Typecheck target
     if ((0, node_path_1.basename)(configFilePath) === 'tsconfig.json' && options.typecheck) {
         internalProjectReferences = resolveInternalProjectReferences(tsConfig, context.workspaceRoot, projectRoot);
+        const externalProjectReferences = resolveShallowExternalProjectReferences(tsConfig, context.workspaceRoot, projectRoot);
         const targetName = options.typecheck.targetName;
         if (!targets[targetName]) {
             let command = `tsc --build --emitDeclarationOnly --pretty --verbose`;
             if (tsConfig.options.noEmit ||
-                Object.values(internalProjectReferences).some((ref) => ref.options.noEmit)) {
-                // `--emitDeclarationOnly` and `--noEmit` are mutually exclusive, so
-                // we remove `--emitDeclarationOnly` if `--noEmit` is set.
-                command = `tsc --build --pretty --verbose`;
+                Object.values(internalProjectReferences).some((ref) => ref.options.noEmit) ||
+                Object.values(externalProjectReferences).some((ref) => ref.options.noEmit)) {
+                // `tsc --build` does not work with `noEmit: true`
+                command = `echo "The 'typecheck' target is disabled because one or more project references set 'noEmit: true' in their tsconfig. Remove this property to resolve this issue."`;
             }
             targets[targetName] = {
                 dependsOn: [`^${targetName}`],
@@ -328,6 +332,27 @@ function getExtendedConfigFiles(tsConfigPath, tsConfig) {
     };
 }
 function resolveInternalProjectReferences(tsConfig, workspaceRoot, projectRoot, projectReferences = {}) {
+    walkProjectReferences(tsConfig, workspaceRoot, projectRoot, (configPath, config) => {
+        if (isExternalProjectReference(configPath, workspaceRoot, projectRoot)) {
+            return false;
+        }
+        else {
+            projectReferences[configPath] = config;
+        }
+    });
+    return projectReferences;
+}
+function resolveShallowExternalProjectReferences(tsConfig, workspaceRoot, projectRoot, projectReferences = {}) {
+    walkProjectReferences(tsConfig, workspaceRoot, projectRoot, (configPath, config) => {
+        if (isExternalProjectReference(configPath, workspaceRoot, projectRoot)) {
+            projectReferences[configPath] = config;
+        }
+        return false;
+    });
+    return projectReferences;
+}
+function walkProjectReferences(tsConfig, workspaceRoot, projectRoot, visitor, // false stops recursion
+projectReferences = {}) {
     if (!tsConfig.projectReferences?.length) {
         return projectReferences;
     }
@@ -341,15 +366,14 @@ function resolveInternalProjectReferences(tsConfig, workspaceRoot, projectRoot,
             // the referenced tsconfig doesn't exist, ignore it
             continue;
         }
-        if (isExternalProjectReference(refConfigPath, workspaceRoot, projectRoot)) {
-            continue;
-        }
         if (!refConfigPath.endsWith('.json')) {
             refConfigPath = (0, node_path_1.join)(refConfigPath, 'tsconfig.json');
         }
         const refTsConfig = readCachedTsConfig(refConfigPath);
-        projectReferences[refConfigPath] = refTsConfig;
-        resolveInternalProjectReferences(refTsConfig, workspaceRoot, projectRoot, projectReferences);
+        const result = visitor(refConfigPath, refTsConfig);
+        if (result !== false) {
+            walkProjectReferences(refTsConfig, workspaceRoot, projectRoot, visitor);
+        }
     }
     return projectReferences;
 }

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

@@ -7,6 +7,7 @@ exports.updateTsconfigFiles = updateTsconfigFiles;
 const devkit_1 = require("@nx/devkit");
 const tree_1 = require("nx/src/generators/tree");
 const package_manager_workspaces_1 = require("../package-manager-workspaces");
+const posix_1 = require("node:path/posix");
 function isUsingTypeScriptPlugin(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     return (nxJson?.plugins?.some((p) => typeof p === 'string'
@@ -110,6 +111,9 @@ function updateTsconfigFiles(tree, projectRoot, runtimeTsconfigFileName, compile
         // tsconfig.json for e2e projects need to have references array
         (0, devkit_1.updateJson)(tree, tsconfigE2E, (json) => {
             json.references ??= [];
+            const projectPath = (0, posix_1.relative)(e2eRoot, projectRoot);
+            if (!json.references.some((x) => x.path === projectPath))
+                json.references.push({ path: projectPath });
             return json;
         });
     }