@nx/esbuild 17.0.2 → 17.0.4

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2023 Narwhal Technologies Inc.
+Copyright (c) 2017-2024 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -1,4 +1,9 @@
-<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
+<p style="text-align: center;">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
+    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
+  </picture>
+</p>
 
 <div style="text-align: center;">
 
@@ -15,9 +20,9 @@
 
 <hr>
 
-# Nx: Smart, Fast and Extensible Build System
+# Nx: Smart Monorepos · Fast CI
 
-Nx is a next generation build system with first class monorepo support and powerful integrations.
+Nx is a build system with built-in tooling and advanced CI capabilities. It helps you maintain and scale monorepos, both locally and on CI.
 
 This package is a [EsBuild plugin for Nx](https://nx.dev/packages/esbuild).
 
@@ -59,5 +64,5 @@ npx nx@latest init
 - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
+width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/esbuild",
-  "version": "17.0.2",
+  "version": "17.0.4",
   "private": false,
   "description": "The Nx Plugin for esbuild contains executors and generators that support building applications using esbuild",
   "repository": {
@@ -34,9 +34,9 @@
     "fs-extra": "^11.1.0",
     "tslib": "^2.3.0",
     "tsconfig-paths": "^4.1.2",
-    "@nx/devkit": "17.0.2",
-    "@nx/js": "17.0.2",
-    "@nrwl/esbuild": "17.0.2"
+    "@nx/devkit": "17.0.4",
+    "@nx/js": "17.0.4",
+    "@nrwl/esbuild": "17.0.4"
   },
   "peerDependencies": {
     "esbuild": "~0.19.2"

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

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

package/src/executors/esbuild/schema.json

@@ -130,12 +130,6 @@
       "type": "boolean",
       "description": "Includes third-party packages in the bundle (i.e. npm packages)."
     },
-    "dependenciesFieldType": {
-      "type": "string",
-      "description": "When `bundleInternalProjectsOnly` is true, this option determines whether external packages should be in 'dependencies' or 'peerDependencies' field in the generated package.json file.",
-      "enum": ["dependencies", "peerDependencies"],
-      "default": "dependencies"
-    },
     "esbuildOptions": {
       "type": "object",
       "description": "Additional options to pass to esbuild. See https://esbuild.github.io/api/. Cannot be used with 'esbuildConfig' option.",

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

@@ -1,4 +1,4 @@
-import type { Tree } from '@nx/devkit';
+import { Tree } from '@nx/devkit';
 import { EsBuildProjectSchema } from './schema';
 export declare function configurationGenerator(tree: Tree, options: EsBuildProjectSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default configurationGenerator;

package/src/generators/configuration/configuration.js

@@ -4,6 +4,7 @@ exports.configurationGenerator = void 0;
 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");
+const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
 async function configurationGenerator(tree, options) {
     const task = await (0, init_1.esbuildInitGenerator)(tree, {
         ...options,
@@ -25,6 +26,7 @@ function checkForTargetConflicts(tree, options) {
     }
 }
 function addBuildTarget(tree, options) {
+    (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, '@nx/esbuild:esbuild', options.buildTarget);
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const packageJsonPath = (0, devkit_1.joinPathFragments)(project.root, 'package.json');
     if (!tree.exists(packageJsonPath)) {

package/src/generators/configuration/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxEsBuildProject",
   "cli": "nx",
   "title": "Add esbuild configuration to a project",

package/src/generators/init/init.d.ts

@@ -1,4 +1,4 @@
-import { Tree } from '@nx/devkit';
+import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
-export declare function esbuildInitGenerator(tree: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function esbuildInitGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default esbuildInitGenerator;

package/src/generators/init/init.js

@@ -5,14 +5,17 @@ const devkit_1 = require("@nx/devkit");
 const versions_1 = require("@nx/js/src/utils/versions");
 const versions_2 = require("../../utils/versions");
 async function esbuildInitGenerator(tree, schema) {
-    const task = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-        '@nx/esbuild': versions_2.nxVersion,
-        esbuild: versions_1.esbuildVersion,
-    });
+    let installTask = () => { };
+    if (!schema.skipPackageJson) {
+        installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@nx/esbuild': versions_2.nxVersion,
+            esbuild: versions_1.esbuildVersion,
+        }, undefined, schema.keepExistingVersions);
+    }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return task;
+    return installTask;
 }
 exports.esbuildInitGenerator = esbuildInitGenerator;
 exports.default = esbuildInitGenerator;

package/src/generators/init/schema.d.ts

@@ -1,4 +1,5 @@
 export interface Schema {
-  compiler?: 'babel' | 'swc' | 'tsc';
   skipFormat?: boolean;
+  skipPackageJson?: boolean;
+  keepExistingVersions?: boolean;
 }

package/src/generators/init/schema.json

@@ -1,21 +1,26 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "$id": "NxWebpackInit",
+  "$schema": "https://json-schema.org/schema",
+  "$id": "NxEsbuildInit",
   "cli": "nx",
-  "title": "Init Webpack Plugin",
-  "description": "Init Webpack Plugin.",
+  "title": "Init Esbuild Plugin",
+  "description": "Init Esbuild Plugin.",
   "type": "object",
   "properties": {
-    "compiler": {
-      "type": "string",
-      "enum": ["babel", "swc", "tsc"],
-      "description": "The compiler to initialize for.",
-      "default": "babel"
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
       "default": false
+    },
+    "skipPackageJson": {
+      "description": "Do not add dependencies to `package.json`.",
+      "type": "boolean",
+      "default": false
+    },
+    "keepExistingVersions": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Keep existing dependencies versions",
+      "default": false
     }
   },
   "required": []

package/src/utils/environment-variables.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getClientEnvironment = void 0;
+// Prevent sensitive keys from being bundled when source code uses entire `process.env` object rather than individual keys (e.g. `process.env.NX_FOO`).
+// TODO(v19): Only env vars prefixed with NX_PUBLIC should be bundled. This is a breaking change so we won't do it in v18.
+const excludedKeys = ['NX_CLOUD_ACCESS_TOKEN', 'NX_CLOUD_ENCRYPTION_KEY'];
 function getClientEnvironment() {
     const NX_APP = /^NX_/i;
     return Object.keys(process.env)
-        .filter((key) => NX_APP.test(key) || key === 'NODE_ENV')
+        .filter((key) => !excludedKeys.includes(key) && (NX_APP.test(key) || key === 'NODE_ENV'))
         .reduce((env, key) => {
         env[`process.env.${key}`] = JSON.stringify(process.env[key]);
         return env;