@nx/esbuild 23.0.0-beta.2 → 23.0.0-beta.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/esbuild",
-  "version": "23.0.0-beta.2",
+  "version": "23.0.0-beta.20",
   "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.2",
-    "@nx/js": "23.0.0-beta.2",
+    "@nx/devkit": "23.0.0-beta.20",
+    "@nx/js": "23.0.0-beta.20",
     "tinyglobby": "^0.2.12",
     "picocolors": "^1.1.0",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.2"
+    "nx": "23.0.0-beta.20"
   },
   "peerDependencies": {
     "esbuild": ">=0.19.2 <1.0.0"

package/src/executors/esbuild/esbuild.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"esbuild.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/esbuild/src/executors/esbuild/esbuild.impl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAmBlD,OAAO,EACL,sBAAsB,EAEvB,MAAM,UAAU,CAAC;AAwBlB,wBAAuB,eAAe,CACpC,QAAQ,EAAE,sBAAsB,EAChC,OAAO,EAAE,eAAe;aAqEuB,OAAO;cAAY,MAAM;aAgHzE;AAkED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"esbuild.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/esbuild/src/executors/esbuild/esbuild.impl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAoBlD,OAAO,EACL,sBAAsB,EAEvB,MAAM,UAAU,CAAC;AAuBlB,wBAAuB,eAAe,CACpC,QAAQ,EAAE,sBAAsB,EAChC,OAAO,EAAE,eAAe;aAqEuB,OAAO;cAAY,MAAM;aAgHzE;AAkED,eAAe,eAAe,CAAC"}

package/src/executors/esbuild/esbuild.impl.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.esbuildExecutor = esbuildExecutor;
 const tslib_1 = require("tslib");
 const pc = tslib_1.__importStar(require("picocolors"));
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const esbuild = tslib_1.__importStar(require("esbuild"));
 const normalize_1 = require("./lib/normalize");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const build_esbuild_options_1 = require("./lib/build-esbuild-options");
 const get_extra_dependencies_1 = require("./lib/get-extra-dependencies");
 const node_fs_1 = require("node:fs");
@@ -68,7 +68,7 @@ async function* esbuildExecutor(_options, context) {
         packageJsonResult = await (0, js_1.copyPackageJson)(cpjOptions, context);
     }
     if (options.watch) {
-        return yield* (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+        return yield* (0, internal_1.createAsyncIterable)(async ({ next, done }) => {
             let hasTypeErrors = false;
             const disposeFns = await Promise.all(options.format.map(async (format, idx) => {
                 const esbuildOptions = (0, build_esbuild_options_1.buildEsbuildOptions)(format, options, context);

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":"AAAA,OAAO,EAML,IAAI,EAGL,MAAM,YAAY,CAAC;AAgBpB,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;AAgBpB,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,oBAAoB,mDAe9B;AAsMD,eAAe,sBAAsB,CAAC"}

package/src/generators/configuration/configuration.js

@@ -1,22 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configurationGenerator = configurationGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 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");
+const assert_supported_esbuild_version_1 = require("../../utils/assert-supported-esbuild-version");
 const init_1 = require("../init/init");
 async function configurationGenerator(tree, options) {
+    (0, assert_supported_esbuild_version_1.assertSupportedEsbuildVersion)(tree);
     const task = await (0, init_1.esbuildInitGenerator)(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);
@@ -32,8 +33,8 @@ function checkForTargetConflicts(tree, options) {
     }
 }
 function addBuildTarget(tree, options, isTsSolutionSetup) {
-    (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, '@nx/esbuild:esbuild', options.buildTarget, [
-        ts_solution_setup_1.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
+    (0, internal_1.addBuildTargetDefaults)(tree, '@nx/esbuild:esbuild', options.buildTarget, [
+        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 +54,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 +103,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 +135,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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/esbuild/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAEjB,IAAI,EACL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAsBpE;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/esbuild/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAEjB,IAAI,EACL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAwBpE;AAED,eAAe,oBAAoB,CAAC"}

package/src/generators/init/init.js

@@ -2,16 +2,18 @@
 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 assert_supported_esbuild_version_1 = require("../../utils/assert-supported-esbuild-version");
+const versions_1 = require("../../utils/versions");
 async function esbuildInitGenerator(tree, schema) {
+    (0, assert_supported_esbuild_version_1.assertSupportedEsbuildVersion)(tree);
     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,
-        }, undefined, schema.keepExistingVersions);
+                internal_1.esbuildVersion,
+        }, undefined, schema.keepExistingVersions ?? true);
     }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/src/generators/init/schema.json

@@ -20,7 +20,7 @@
       "type": "boolean",
       "x-priority": "internal",
       "description": "Keep existing dependencies versions",
-      "default": false
+      "default": true
     }
   },
   "required": []

package/src/utils/assert-supported-esbuild-version.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export declare function assertSupportedEsbuildVersion(tree: Tree): void;
+//# sourceMappingURL=assert-supported-esbuild-version.d.ts.map

package/src/utils/assert-supported-esbuild-version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"assert-supported-esbuild-version.d.ts","sourceRoot":"","sources":["../../../../../packages/esbuild/src/utils/assert-supported-esbuild-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAE9D"}

package/src/utils/assert-supported-esbuild-version.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertSupportedEsbuildVersion = assertSupportedEsbuildVersion;
+const internal_1 = require("@nx/devkit/internal");
+const versions_1 = require("./versions");
+function assertSupportedEsbuildVersion(tree) {
+    (0, internal_1.assertSupportedPackageVersion)(tree, 'esbuild', versions_1.minSupportedEsbuildVersion);
+}

package/src/utils/versions.d.ts

@@ -1,3 +1,4 @@
 export declare const nxVersion: any;
 export declare const tsLibVersion = "^2.3.0";
+export declare const minSupportedEsbuildVersion = "0.19.2";
 //# sourceMappingURL=versions.d.ts.map

package/src/utils/versions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/esbuild/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,YAAY,WAAW,CAAC"}
+{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/esbuild/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,YAAY,WAAW,CAAC;AAErC,eAAO,MAAM,0BAA0B,WAAW,CAAC"}

package/src/utils/versions.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsLibVersion = exports.nxVersion = void 0;
+exports.minSupportedEsbuildVersion = exports.tsLibVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.tsLibVersion = '^2.3.0';
+exports.minSupportedEsbuildVersion = '0.19.2';