@nx/esbuild 23.0.0-beta.12 → 23.0.0-beta.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/esbuild",
-  "version": "23.0.0-beta.12",
+  "version": "23.0.0-beta.14",
   "private": false,
   "description": "The Nx Plugin for esbuild contains executors and generators that support building applications using esbuild",
   "repository": {
@@ -32,15 +32,15 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.12",
-    "@nx/js": "23.0.0-beta.12",
+    "@nx/devkit": "23.0.0-beta.14",
+    "@nx/js": "23.0.0-beta.14",
     "tinyglobby": "^0.2.12",
     "picocolors": "^1.1.0",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.12"
+    "nx": "23.0.0-beta.14"
   },
   "peerDependencies": {
     "esbuild": ">=0.19.2 <1.0.0"

package/src/executors/esbuild/lib/build-esbuild-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-esbuild-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/esbuild/src/executors/esbuild/lib/build-esbuild-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAGnC,OAAO,EACL,eAAe,EAGf,uBAAuB,EAGxB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,gCAAgC,EAAE,MAAM,WAAW,CAAC;AAO7D,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,KAAK,GAAG,KAAK,EACrB,OAAO,EAAE,gCAAgC,EACzC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,YAAY,CAgHtB;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,eAAe,GACvB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAmE1B;AAoDD,wBAAgB,eAAe,CAC7B,MAAM,EAAE,KAAK,GAAG,KAAK,EACrB,OAAO,EAAE,IAAI,CAAC,gCAAgC,EAAE,yBAAyB,CAAC,EAC1E,OAAO,CAAC,EAAE,eAAe,GACxB,MAAM,GAAG,MAAM,GAAG,KAAK,CAazB;AAED,wBAAgB,UAAU,CACxB,MAAM,EAAE,KAAK,GAAG,KAAK,EACrB,OAAO,EAAE,gCAAgC,EACzC,OAAO,EAAE,eAAe,UASzB;AAkDD,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAC/B,QAAQ,EAAE,MAAM,EAChB,YAAY,SAAQ,EACpB,MAAM,GAAE,KAAK,GAAG,KAAa,UAyI9B"}
+{"version":3,"file":"build-esbuild-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/esbuild/src/executors/esbuild/lib/build-esbuild-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAGnC,OAAO,EACL,eAAe,EAGf,uBAAuB,EAGxB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,gCAAgC,EAAE,MAAM,WAAW,CAAC;AAO7D,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,KAAK,GAAG,KAAK,EACrB,OAAO,EAAE,gCAAgC,EACzC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,YAAY,CAgHtB;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,eAAe,GACvB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAiE1B;AAoDD,wBAAgB,eAAe,CAC7B,MAAM,EAAE,KAAK,GAAG,KAAK,EACrB,OAAO,EAAE,IAAI,CAAC,gCAAgC,EAAE,yBAAyB,CAAC,EAC1E,OAAO,CAAC,EAAE,eAAe,GACxB,MAAM,GAAG,MAAM,GAAG,KAAK,CAazB;AAED,wBAAgB,UAAU,CACxB,MAAM,EAAE,KAAK,GAAG,KAAK,EACrB,OAAO,EAAE,gCAAgC,EACzC,OAAO,EAAE,eAAe,UASzB;AAkDD,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAC/B,QAAQ,EAAE,MAAM,EAChB,YAAY,SAAQ,EACpB,MAAM,GAAE,KAAK,GAAG,KAAa,UAyI9B"}

package/src/executors/esbuild/lib/build-esbuild-options.js

@@ -115,9 +115,8 @@ function buildEsbuildOptions(format, options, context) {
  */
 function createPathsFromTsConfigReferences(context) {
     const { findAllProjectNodeDependencies, } = require('nx/src/utils/project-graph-utils');
-    const { isValidPackageJsonBuildConfig, } = require('@nx/js/src/plugins/typescript/util');
+    const { isValidPackageJsonBuildConfig, findRuntimeTsConfigName, } = require('@nx/js/internal');
     const { readTsConfig } = require('@nx/js');
-    const { findRuntimeTsConfigName, } = require('@nx/js/src/utils/typescript/ts-solution-setup');
     const deps = findAllProjectNodeDependencies(context.projectName, context.projectGraph);
     const tsConfig = (0, devkit_1.readJsonFile)((0, devkit_1.joinPathFragments)(context.root, 'tsconfig.json'));
     const referencesAsPaths = new Set(tsConfig.references.reduce((acc, ref) => {

package/src/executors/esbuild/lib/get-extra-dependencies.d.ts

@@ -1,4 +1,4 @@
 import { ProjectGraph } from '@nx/devkit';
-import { DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
+import { DependentBuildableProjectNode } from '@nx/js/internal';
 export declare function getExtraDependencies(projectName: string, graph: ProjectGraph): DependentBuildableProjectNode[];
 //# sourceMappingURL=get-extra-dependencies.d.ts.map

package/src/executors/esbuild/lib/get-extra-dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-extra-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/esbuild/src/executors/esbuild/lib/get-extra-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,6BAA6B,EAAE,MAAM,uCAAuC,CAAC;AAEtF,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,YAAY,GAClB,6BAA6B,EAAE,CAoCjC"}
+{"version":3,"file":"get-extra-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/esbuild/src/executors/esbuild/lib/get-extra-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAEhE,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,YAAY,GAClB,6BAA6B,EAAE,CAoCjC"}

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

@@ -4,12 +4,12 @@ exports.normalizeOptions = normalizeOptions;
 const tslib_1 = require("tslib");
 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 internal_1 = require("@nx/js/internal");
 const fs = tslib_1.__importStar(require("fs"));
 const path = tslib_1.__importStar(require("path"));
 const pc = tslib_1.__importStar(require("picocolors"));
 function normalizeOptions(options, context) {
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+    const isTsSolutionSetup = (0, internal_1.isUsingTsSolutionSetup)();
     if (isTsSolutionSetup && options.generatePackageJson) {
         throw new Error(`Setting 'generatePackageJson: true' is not supported with the current TypeScript setup. Update the 'package.json' file at the project root as needed and unset the 'generatePackageJson' option. See https://nx.dev/docs/technologies/node/guides/deploying-node-projects for the recommended pruned package.json workflow.`);
     }

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

@@ -1,4 +1,4 @@
-import { AssetGlob } from '@nx/js/src/utils/assets/assets';
+import { AssetGlob } from '@nx/js/internal';
 import * as esbuild from 'esbuild';
 
 type Compiler = 'babel' | 'swc';

package/src/generators/configuration/configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/esbuild/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AACA,OAAO,EAML,IAAI,EAGL,MAAM,YAAY,CAAC;AAepB,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,oBAAoB,mDAa9B;AAoMD,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/esbuild/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,IAAI,EAGL,MAAM,YAAY,CAAC;AAepB,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,oBAAoB,mDAa9B;AAsMD,eAAe,sBAAsB,CAAC"}

package/src/generators/configuration/configuration.js

@@ -4,8 +4,7 @@ exports.configurationGenerator = configurationGenerator;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const posix_1 = require("node:path/posix");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const build_esbuild_options_1 = require("../../executors/esbuild/lib/build-esbuild-options");
@@ -16,7 +15,7 @@ async function configurationGenerator(tree, options) {
         skipFormat: true,
     });
     options.buildTarget ??= 'build';
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(tree);
     checkForTargetConflicts(tree, options);
     addBuildTarget(tree, options, isTsSolutionSetup);
     updatePackageJson(tree, options, isTsSolutionSetup);
@@ -33,7 +32,7 @@ function checkForTargetConflicts(tree, options) {
 }
 function addBuildTarget(tree, options, isTsSolutionSetup) {
     (0, internal_1.addBuildTargetDefaults)(tree, '@nx/esbuild:esbuild', options.buildTarget, [
-        ts_solution_setup_1.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
+        internal_2.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
     ]);
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const prevBuildOptions = project.targets?.[options.buildTarget]?.options;
@@ -53,7 +52,7 @@ function addBuildTarget(tree, options, isTsSolutionSetup) {
         format: options.format,
     };
     if (isTsSolutionSetup) {
-        buildOptions.declarationRootDir = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+        buildOptions.declarationRootDir = (0, internal_2.getProjectSourceRoot)(project, tree);
     }
     else {
         buildOptions.assets = [];
@@ -102,16 +101,14 @@ function updatePackageJson(tree, options, isTsSolutionSetup) {
     }
     else {
         packageJson = {
-            name: (0, get_import_path_1.getImportPath)(tree, options.project),
+            name: (0, internal_2.getImportPath)(tree, options.project),
             version: '0.0.1',
         };
     }
     if (isTsSolutionSetup) {
         const nxJson = (0, devkit_1.readNxJson)(tree);
         const projectTarget = project.targets[options.buildTarget];
-        const mergedTarget = (0, devkit_internals_1.mergeTargetConfigurations)(projectTarget, (projectTarget.executor
-            ? nxJson.targetDefaults?.[projectTarget.executor]
-            : undefined) ?? nxJson.targetDefaults?.[options.buildTarget]);
+        const mergedTarget = (0, devkit_internals_1.mergeTargetConfigurations)(projectTarget, (0, internal_1.readTargetDefaultsForTarget)(options.buildTarget, nxJson.targetDefaults, projectTarget.executor));
         const { declarationRootDir = '.', main, outputPath, outputFileName, 
         // the executor option defaults to [esm]
         format = ['esm'], esbuildOptions, } = mergedTarget.options;
@@ -136,7 +133,7 @@ function updatePackageJson(tree, options, isTsSolutionSetup) {
             outputFileExtensionForEsm: (0, build_esbuild_options_1.getOutExtension)('esm', {
                 userDefinedBuildOptions: esbuildOptions,
             }),
-            developmentConditionName: (0, ts_solution_setup_1.getDefinedCustomConditionName)(tree),
+            developmentConditionName: (0, internal_2.getDefinedCustomConditionName)(tree),
         });
         if (declarationRootDir !== (0, posix_1.dirname)(main)) {
             // the declaration file entry point will be output to a location

package/src/generators/init/init.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.esbuildInitGenerator = esbuildInitGenerator;
 const devkit_1 = require("@nx/devkit");
-const versions_1 = require("@nx/js/src/utils/versions");
-const versions_2 = require("../../utils/versions");
+const internal_1 = require("@nx/js/internal");
+const versions_1 = require("../../utils/versions");
 async function esbuildInitGenerator(tree, schema) {
     let installTask = () => { };
     if (!schema.skipPackageJson) {
         installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@nx/esbuild': versions_2.nxVersion,
+            '@nx/esbuild': versions_1.nxVersion,
             esbuild: (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'esbuild') ??
-                versions_1.esbuildVersion,
+                internal_1.esbuildVersion,
         }, undefined, schema.keepExistingVersions);
     }
     if (!schema.skipFormat) {