@nx/esbuild 20.1.0-canary.20241012-37a7eb1 → 20.1.0-canary.20241015-1badac8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/esbuild",
-  "version": "20.1.0-canary.20241012-37a7eb1",
+  "version": "20.1.0-canary.20241015-1badac8",
   "private": false,
   "description": "The Nx Plugin for esbuild contains executors and generators that support building applications using esbuild",
   "repository": {
@@ -31,8 +31,8 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "20.1.0-canary.20241012-37a7eb1",
-    "@nx/js": "20.1.0-canary.20241012-37a7eb1",
+    "@nx/devkit": "20.1.0-canary.20241015-1badac8",
+    "@nx/js": "20.1.0-canary.20241015-1badac8",
     "fast-glob": "3.2.7",
     "picocolors": "^1.1.0",
     "tsconfig-paths": "^4.1.2",

package/src/executors/esbuild/lib/normalize.d.ts

@@ -1,3 +1,3 @@
-import { EsBuildExecutorOptions, NormalizedEsBuildExecutorOptions } from '../schema';
-import { ExecutorContext } from '@nx/devkit';
+import { type ExecutorContext } from '@nx/devkit';
+import type { EsBuildExecutorOptions, NormalizedEsBuildExecutorOptions } from '../schema';
 export declare function normalizeOptions(options: EsBuildExecutorOptions, context: ExecutorContext): NormalizedEsBuildExecutorOptions;

package/src/executors/esbuild/lib/normalize.js

@@ -1,25 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
+const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const fs = require("fs");
 const path = require("path");
-const devkit_1 = require("@nx/devkit");
 const pc = require("picocolors");
-const js_1 = require("@nx/js");
 function normalizeOptions(options, context) {
+    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+    if (isTsSolutionSetup && options.generatePackageJson) {
+        throw new Error(`Setting 'generatePackageJson: true' is not allowed with the current TypeScript setup. Please update the 'package.json' file at the project root as needed and don't set the 'generatePackageJson' option.`);
+    }
     const tsConfig = (0, js_1.readTsConfig)(options.tsConfig);
-    // If we're not generating package.json file, then copy it as-is as an asset.
-    const assets = options.generatePackageJson
+    // If we're not generating package.json file, then copy it as-is as an asset when not using ts solution setup.
+    const assets = options.generatePackageJson || isTsSolutionSetup
         ? options.assets
         : [
             ...options.assets,
             (0, devkit_1.joinPathFragments)(context.projectGraph.nodes[context.projectName].data.root, 'package.json'),
         ];
     if (!options.bundle && options.thirdParty) {
-        devkit_1.logger.info(pc.yellow(`Your build has conflicting options, ${pc.bold('bundle:false')} and ${pc.bold('thirdParty:true')}. Your package.json depedencies might not be generated correctly so we added an update ${pc.bold('thirdParty:false')}`));
+        devkit_1.logger.info(pc.yellow(`Your build has conflicting options, ${pc.bold('bundle:false')} and ${pc.bold('thirdParty:true')}. Your package.json dependencies might not be generated correctly so we added an update ${pc.bold('thirdParty:false')}`));
     }
     const thirdParty = !options.bundle ? false : options.thirdParty;
-    const { root: projectRoot } = context.projectsConfigurations.projects[context.projectName];
     const declarationRootDir = options.declarationRootDir
         ? path.join(context.root, options.declarationRootDir)
         : undefined;