fix(node): ensure that bundlers for node is webpack/esbuild (nrwl#16702)

AgentEnder · May 3, 2023 · b7ecd81 · b7ecd81
1 parent a425f5b
commit b7ecd81
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/docs/generated/packages/workspace/generators/preset.json b/docs/generated/packages/workspace/generators/preset.json
@@ -73,7 +73,7 @@
       "bundler": {
         "description": "The bundler to use for building the application.",
         "type": "string",
-        "enum": ["webpack", "vite", "rspack"],
+        "enum": ["webpack", "vite", "rspack", "esbuild"],
         "default": "vite"
       },
       "docker": {

diff --git a/packages/node/src/generators/application/application.ts b/packages/node/src/generators/application/application.ts
@@ -306,11 +306,9 @@ function addProjectDependencies(
   const frameworkDependencies = {
     express: {
       express: expressVersion,
-      '@types/express': expressTypingsVersion,
     },
     koa: {
       koa: koaVersion,
-      '@types/koa': koaTypingsVersion,
     },
     fastify: {
       fastify: fastifyVersion,

diff --git a/packages/workspace/src/generators/new/generate-preset.ts b/packages/workspace/src/generators/new/generate-preset.ts
@@ -150,7 +150,13 @@ function getPresetDependencies({
       };
 
     case Preset.NodeStandalone:
-      return { dependencies: {}, dev: { '@nx/node': nxVersion } };
+      return {
+        dependencies: {},
+        dev: {
+          '@nx/node': nxVersion,
+          '@nx/webpack': bundler === 'webpack' ? nxVersion : undefined,
+        },
+      };
 
     default: {
       return {

diff --git a/packages/workspace/src/generators/preset/preset.ts b/packages/workspace/src/generators/preset/preset.ts
@@ -150,8 +150,9 @@ async function createPreset(tree: Tree, options: Schema) {
   } else if (options.preset === Preset.NodeStandalone) {
     const { applicationGenerator: nodeApplicationGenerator } = require('@nx' +
       '/node');
+    const bundler = options.bundler === 'webpack' ? 'webpack' : 'esbuild';
     return nodeApplicationGenerator(tree, {
-      bundler: options.bundler,
+      bundler,
       name: options.name,
       linter: options.linter,
       standaloneConfig: options.standaloneConfig,

diff --git a/packages/workspace/src/generators/preset/schema.d.ts b/packages/workspace/src/generators/preset/schema.d.ts
@@ -10,7 +10,7 @@ export interface Schema {
   standaloneConfig?: boolean;
   framework?: string;
   packageManager?: PackageManager;
-  bundler?: 'vite' | 'webpack' | 'rspack';
+  bundler?: 'vite' | 'webpack' | 'rspack' | 'esbuild';
   docker?: boolean;
   nextAppDir?: boolean;
   routing?: boolean;

diff --git a/packages/workspace/src/generators/preset/schema.json b/packages/workspace/src/generators/preset/schema.json
@@ -76,7 +76,7 @@
     "bundler": {
       "description": "The bundler to use for building the application.",
       "type": "string",
-      "enum": ["webpack", "vite", "rspack"],
+      "enum": ["webpack", "vite", "rspack", "esbuild"],
       "default": "vite"
     },
     "docker": {