@nx/js 20.5.0-rc.0 → 20.5.0-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "20.5.0-rc.0",
+  "version": "20.5.0-rc.1",
   "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.5.0-rc.0",
-    "@nx/workspace": "20.5.0-rc.0",
+    "@nx/devkit": "20.5.0-rc.1",
+    "@nx/workspace": "20.5.0-rc.1",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",

package/src/generators/library/library.js

@@ -719,9 +719,7 @@ function createProjectTsConfigs(tree, options) {
             .map(([k, v]) => `${JSON.stringify(k)}: ${JSON.stringify(v)}`)
             .join(',\n    '),
         tmpl: '',
-        outDir: options.bundler === 'tsc'
-            ? 'dist'
-            : `out-tsc/${options.projectRoot.split('/').pop()}`,
+        outDir: 'dist',
         emitDeclarationOnly: options.bundler === 'tsc' ? false : true,
     });
     // tsconfig.json
@@ -734,6 +732,12 @@ 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;
             });
         }
@@ -745,6 +749,12 @@ 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/plugins/typescript/plugin.js

@@ -178,7 +178,9 @@ function buildTscTargets(configFilePath, projectRoot, options, context) {
     const tsConfig = retrieveTsConfigFromCache(configFilePath, context.workspaceRoot);
     let internalProjectReferences;
     // Typecheck target
-    if ((0, node_path_1.basename)(configFilePath) === 'tsconfig.json' && options.typecheck) {
+    if ((0, node_path_1.basename)(configFilePath) === 'tsconfig.json' &&
+        options.typecheck &&
+        tsConfig.raw?.['nx']?.addTypecheckTarget !== false) {
         internalProjectReferences = resolveInternalProjectReferences(tsConfig, context.workspaceRoot, projectRoot);
         const externalProjectReferences = resolveShallowExternalProjectReferences(tsConfig, context.workspaceRoot, projectRoot);
         const targetName = options.typecheck.targetName;
@@ -737,6 +739,9 @@ function toAbsolutePaths(cache, workspaceRoot) {
         updatedCache[key] = {
             data: {
                 options: { noEmit: data.options.noEmit },
+                raw: {
+                    nx: { addTypecheckTarget: data.raw?.['nx']?.addTypecheckTarget },
+                },
                 extendedConfigFile: data.extendedConfigFile,
             },
             extendedFilesHash,
@@ -769,6 +774,9 @@ function toRelativePaths(cache, workspaceRoot) {
         updatedCache[key] = {
             data: {
                 options: { noEmit: data.options.noEmit },
+                raw: {
+                    nx: { addTypecheckTarget: data.raw?.['nx']?.addTypecheckTarget },
+                },
                 extendedConfigFile: data.extendedConfigFile,
             },
             extendedFilesHash,

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

@@ -90,9 +90,7 @@ function updateTsconfigFiles(tree, projectRoot, runtimeTsconfigFileName, compile
             json.extends = (0, devkit_1.joinPathFragments)(offset, 'tsconfig.base.json');
             json.compilerOptions = {
                 ...json.compilerOptions,
-                // 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)),
+                outDir: 'dist',
                 rootDir,
                 ...compilerOptions,
             };