@nx/js 0.0.0-pr-28808-bceb02f → 0.0.0-pr-28808-ae8ea8d

package/package.json

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

package/src/executors/tsc/lib/get-tsconfig.js

@@ -47,7 +47,14 @@ function generateTaskProjectTsConfig(task, tasksOptions, context, taskInMemoryTs
     return tsConfigPath;
 }
 function getDependencyTasksInOtherProjects(task, project, context) {
-    return context.taskGraph.dependencies[task].filter((t) => t !== task && (0, devkit_1.parseTargetString)(t, context).project !== project);
+    const implicitDependencies = new Set(context.projectGraph.nodes[project].data.implicitDependencies ?? []);
+    return context.taskGraph.dependencies[task].filter((t) => {
+        const { project: dependencyProject } = (0, devkit_1.parseTargetString)(t, context);
+        // Tasks for implicit dependencies are skipped since incremental builds only apply to explicit dependencies
+        return (t !== task &&
+            dependencyProject !== project &&
+            !implicitDependencies.has(dependencyProject));
+    });
 }
 function getDependencyTasksInSameProject(task, context) {
     const { project: taskProject } = (0, devkit_1.parseTargetString)(task, context);

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

@@ -2,4 +2,4 @@ import { type Tree } from '@nx/devkit';
 export declare function isUsingTypeScriptPlugin(tree: Tree): boolean;
 export declare function isUsingTsSolutionSetup(tree?: Tree): boolean;
 export declare function assertNotUsingTsSolutionSetup(tree: Tree, pluginName: string, generatorName: string): void;
-export declare function updateTsconfigFiles(tree: Tree, projectRoot: string, runtimeTsconfigFileName: string, compilerOptions: Record<string, string | boolean | string[]>, exclude?: string[]): void;
+export declare function updateTsconfigFiles(tree: Tree, projectRoot: string, runtimeTsconfigFileName: string, compilerOptions: Record<string, string | boolean | string[]>, exclude?: string[], rootDir?: string): void;

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

@@ -7,7 +7,6 @@ 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'
@@ -67,7 +66,7 @@ function assertNotUsingTsSolutionSetup(tree, pluginName, generatorName) {
     });
     process.exit(1);
 }
-function updateTsconfigFiles(tree, projectRoot, runtimeTsconfigFileName, compilerOptions, exclude = []) {
+function updateTsconfigFiles(tree, projectRoot, runtimeTsconfigFileName, compilerOptions, exclude = [], rootDir = 'src') {
     if (!isUsingTsSolutionSetup(tree))
         return;
     const offset = (0, devkit_1.offsetFromRoot)(projectRoot);
@@ -83,6 +82,7 @@ function updateTsconfigFiles(tree, projectRoot, runtimeTsconfigFileName, compile
                 // Make sure d.ts files from typecheck does not conflict with bundlers.
                 // Other tooling like jest write to "out-tsc/jest" to we just default to "out-tsc/<project-name>".
                 outDir: (0, devkit_1.joinPathFragments)('out-tsc', projectRoot.split('/').at(-1)),
+                rootDir,
                 ...compilerOptions,
             };
             const excludeSet = json.exclude
@@ -107,11 +107,9 @@ function updateTsconfigFiles(tree, projectRoot, runtimeTsconfigFileName, compile
         });
     }
     if (tree.exists(tsconfigE2E)) {
+        // 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;
         });
     }