@nx/esbuild 19.0.4 → 19.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/esbuild",
-  "version": "19.0.4",
+  "version": "19.0.6",
   "private": false,
   "description": "The Nx Plugin for esbuild contains executors and generators that support building applications using esbuild",
   "repository": {
@@ -14,7 +14,7 @@
     "Web",
     "CLI"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
@@ -34,9 +34,9 @@
     "fs-extra": "^11.1.0",
     "tslib": "^2.3.0",
     "tsconfig-paths": "^4.1.2",
-    "@nx/devkit": "19.0.4",
-    "@nx/js": "19.0.4",
-    "@nrwl/esbuild": "19.0.4"
+    "@nx/devkit": "19.0.6",
+    "@nx/js": "19.0.6",
+    "@nrwl/esbuild": "19.0.6"
   },
   "peerDependencies": {
     "esbuild": "~0.19.2"

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

@@ -145,12 +145,17 @@ exports.esbuildExecutor = esbuildExecutor;
 function getTypeCheckOptions(options, context) {
     const { watch, tsConfig, outputPath } = options;
     const typeCheckOptions = {
-        // TODO(jack): Add support for d.ts declaration files -- once the `@nx/js:tsc` changes are in we can use the same logic.
-        mode: 'noEmit',
+        ...(options.declaration
+            ? {
+                mode: 'emitDeclarationOnly',
+                outDir: outputPath,
+            }
+            : {
+                mode: 'noEmit',
+            }),
         tsConfigPath: tsConfig,
-        // outDir: outputPath,
         workspaceRoot: context.root,
-        rootDir: context.root,
+        rootDir: options.declarationRootDir ?? context.root,
     };
     if (watch) {
         typeCheckOptions.incremental = true;

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

@@ -5,7 +5,9 @@ const fs = require("fs");
 const path = require("path");
 const devkit_1 = require("@nx/devkit");
 const chalk = require("chalk");
+const js_1 = require("@nx/js");
 function normalizeOptions(options, context) {
+    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
         ? options.assets
@@ -17,6 +19,17 @@ function normalizeOptions(options, context) {
         devkit_1.logger.info(chalk.yellow(`Your build has conflicting options, ${chalk.bold('bundle:false')} and ${chalk.bold('thirdParty:true')}. Your package.json depedencies might not be generated correctly so we added an update ${chalk.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;
+    // if option declaration is defined, then it takes precedence over the tsconfig option
+    const declaration = options.declaration ??
+        (tsConfig.options.declaration || tsConfig.options.composite);
+    if (options.skipTypeCheck && declaration) {
+        devkit_1.logger.info(chalk.yellow(`Your build has conflicting options, ${chalk.bold('skipTypeCheck:true')} and ${chalk.bold('declaration:true')}. Your declarations won't be generated so we added an update ${chalk.bold('skipTypeCheck:false')}`));
+    }
+    const skipTypeCheck = declaration ? false : options.skipTypeCheck;
     let userDefinedBuildOptions;
     if (options.esbuildConfig) {
         const userDefinedConfig = path.resolve(context.root, options.esbuildConfig);
@@ -38,6 +51,9 @@ function normalizeOptions(options, context) {
             ...rest,
             thirdParty,
             assets,
+            declaration,
+            declarationRootDir,
+            skipTypeCheck,
             userDefinedBuildOptions,
             external: options.external ?? [],
             singleEntry: false,
@@ -52,6 +68,9 @@ function normalizeOptions(options, context) {
             ...options,
             thirdParty,
             assets,
+            declaration,
+            declarationRootDir,
+            skipTypeCheck,
             userDefinedBuildOptions,
             external: options.external ?? [],
             singleEntry: true,

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

@@ -7,6 +7,8 @@ export interface EsBuildExecutorOptions {
   additionalEntryPoints?: string[];
   assets: (AssetGlob | string)[];
   bundle?: boolean;
+  declaration?: boolean;
+  declarationRootDir?: string;
   deleteOutputPath?: boolean;
   esbuildOptions?: Record<string, any>;
   esbuildConfig?: string;

package/src/executors/esbuild/schema.json

@@ -2,7 +2,7 @@
   "version": 2,
   "outputCapture": "direct-nodejs",
   "title": "esbuild (experimental)",
-  "description": "Bundle a package for different platforms. Note: declaration (*.d.ts) file are not currently generated.",
+  "description": "Bundle a package for different platforms.",
   "cli": "nx",
   "type": "object",
   "properties": {
@@ -54,6 +54,14 @@
       },
       "default": ["esm"]
     },
+    "declaration": {
+      "type": "boolean",
+      "description": "Generate declaration (*.d.ts) files for every TypeScript or JavaScript file inside your project. Should be used for libraries that are published to an npm repository."
+    },
+    "declarationRootDir": {
+      "type": "string",
+      "description": "Sets the rootDir for the declaration (*.d.ts) files."
+    },
     "watch": {
       "type": "boolean",
       "description": "Enable re-building when files change.",