@nx/esbuild 16.4.0-beta.6 → 16.4.0-beta.7

package/index.d.ts

@@ -1,3 +1,3 @@
-export type { EsBuildExecutorOptions, NormalizedEsBuildExecutorOptions, } from './src/executors/esbuild/schema';
-export * from './src/executors/esbuild/esbuild.impl';
+export * from './src/generators/init/init';
+export * from './src/generators/esbuild-project/esbuild-project';
 export * from './src/utils/versions';

package/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./src/executors/esbuild/esbuild.impl"), exports);
+tslib_1.__exportStar(require("./src/generators/init/init"), exports);
+tslib_1.__exportStar(require("./src/generators/esbuild-project/esbuild-project"), exports);
 tslib_1.__exportStar(require("./src/utils/versions"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/esbuild",
-  "version": "16.4.0-beta.6",
+  "version": "16.4.0-beta.7",
   "private": false,
   "description": "The Nx Plugin for esbuild contains executors and generators that support building applications using esbuild",
   "repository": {
@@ -29,9 +29,9 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/esbuild": "16.4.0-beta.6",
-    "@nx/devkit": "16.4.0-beta.6",
-    "@nx/js": "16.4.0-beta.6",
+    "@nrwl/esbuild": "16.4.0-beta.7",
+    "@nx/devkit": "16.4.0-beta.7",
+    "@nx/js": "16.4.0-beta.7",
     "chalk": "^4.1.0",
     "dotenv": "~10.0.0",
     "fast-glob": "3.2.7",
@@ -51,5 +51,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "6eda3ff725a1e5ee973e71cb711b065dcc3f2a16"
+  "gitHead": "847d3a45b61cd2c267acb66c4165a5bb875aff4f"
 }

package/src/generators/esbuild-project/esbuild-project.js

@@ -6,8 +6,10 @@ const devkit_1 = require("@nx/devkit");
 const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 const init_1 = require("../init/init");
 function esbuildProjectGenerator(tree, options) {
+    var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const task = yield (0, init_1.esbuildInitGenerator)(tree, Object.assign(Object.assign({}, options), { skipFormat: true }));
+        (_a = options.buildTarget) !== null && _a !== void 0 ? _a : (options.buildTarget = 'build');
         checkForTargetConflicts(tree, options);
         addBuildTarget(tree, options);
         yield (0, devkit_1.formatFiles)(tree);
@@ -20,8 +22,8 @@ function checkForTargetConflicts(tree, options) {
     if (options.skipValidation)
         return;
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    if ((_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) {
-        throw new Error(`Project "${options.project}" already has a build target. Pass --skipValidation to ignore this error.`);
+    if ((_a = project.targets) === null || _a === void 0 ? void 0 : _a[options.buildTarget]) {
+        throw new Error(`Project "${options.project}" already has a ${options.buildTarget} target. Pass --skipValidation to ignore this error.`);
     }
 }
 function addBuildTarget(tree, options) {
@@ -37,7 +39,7 @@ function addBuildTarget(tree, options) {
     const tsConfig = getTsConfigFile(tree, options);
     const buildOptions = {
         main: getMainFile(tree, options),
-        outputPath: (0, devkit_1.joinPathFragments)('dist', project.root),
+        outputPath: (0, devkit_1.joinPathFragments)('dist', project.root === '.' ? options.project : project.root),
         outputFileName: 'main.js',
         tsConfig,
         assets: [],
@@ -56,7 +58,7 @@ function addBuildTarget(tree, options) {
             },
         ];
     }
-    (0, devkit_1.updateProjectConfiguration)(tree, options.project, Object.assign(Object.assign({}, project), { targets: Object.assign(Object.assign({}, project.targets), { build: {
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, Object.assign(Object.assign({}, project), { targets: Object.assign(Object.assign({}, project.targets), { [options.buildTarget]: {
                 executor: '@nx/esbuild:esbuild',
                 outputs: ['{options.outputPath}'],
                 defaultConfiguration: 'production',

package/src/generators/esbuild-project/schema.d.ts

@@ -9,4 +9,5 @@ export interface EsBuildProjectSchema {
   importPath?: string;
   esbuildConfig?: string;
   platform?: 'node' | 'browser' | 'neutral';
+  buildTarget?: string;
 }

package/src/generators/esbuild-project/schema.json

@@ -55,6 +55,11 @@
       "description": "Platform target for outputs.",
       "enum": ["browser", "node", "neutral"],
       "default": "node"
+    },
+    "buildTarget": {
+      "description": "The build target to add.",
+      "type": "string",
+      "default": "build"
     }
   },
   "required": [],

package/src/generators/init/init.js

@@ -4,9 +4,11 @@ exports.esbuildInitSchematic = exports.esbuildInitGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("@nx/js/src/utils/versions");
+const versions_2 = require("../../utils/versions");
 function esbuildInitGenerator(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const task = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@nx/esbuild': versions_2.nxVersion,
             esbuild: versions_1.esbuildVersion,
         });
         if (!schema.skipFormat) {