From 02ccc8d98e9697bae2c3d33db3313304266dbd46 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Wed, 9 Aug 2023 18:09:19 +0200 Subject: [PATCH 1/3] fix: remove non-standard `module` export condition --- src/options.ts | 2 +- src/presets/bun.ts | 2 +- src/rollup/config.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/options.ts b/src/options.ts index c56a060a49..92b25b1368 100644 --- a/src/options.ts +++ b/src/options.ts @@ -498,7 +498,7 @@ function _resolveExportConditions( } // 4. Add default conditions - resolvedConditions.push("import", "module", "default"); + resolvedConditions.push("import", "require", "default"); // Dedup with preserving order return resolvedConditions.filter( diff --git a/src/presets/bun.ts b/src/presets/bun.ts index 4ff86a35ad..dc0a4f3fcd 100644 --- a/src/presets/bun.ts +++ b/src/presets/bun.ts @@ -5,7 +5,7 @@ export const bun = defineNitroPreset({ extends: "node-server", entry: "#internal/nitro/entries/bun", // https://bun.sh/docs/runtime/modules#resolution - exportConditions: ["bun", "worker", "module", "node", "default", "browser"], + exportConditions: ["bun", "worker", "node", "require", "import", "default"], commands: { preview: "bun run ./server/index.mjs", }, diff --git a/src/rollup/config.ts b/src/rollup/config.ts index d7671471b7..8d18fe0cc2 100644 --- a/src/rollup/config.ts +++ b/src/rollup/config.ts @@ -356,9 +356,9 @@ export const plugins = [ conditions: [ "default", nitro.options.dev ? "development" : "production", - "module", "node", "import", + "require", ], }).catch(() => null); if (_resolved) { From f6eb871fa8b11a39304a6d1f75c690ab9e300c83 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Wed, 9 Aug 2023 18:14:24 +0200 Subject: [PATCH 2/3] remove require from defaults --- src/options.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/options.ts b/src/options.ts index 92b25b1368..2743d923a9 100644 --- a/src/options.ts +++ b/src/options.ts @@ -498,7 +498,7 @@ function _resolveExportConditions( } // 4. Add default conditions - resolvedConditions.push("import", "require", "default"); + resolvedConditions.push("import", "default"); // Dedup with preserving order return resolvedConditions.filter( From fd9c76bb519731d4abe30c3212b3fb3936e319ee Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Wed, 9 Aug 2023 18:27:34 +0200 Subject: [PATCH 3/3] fix(bun): disable require for now --- src/presets/bun.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/presets/bun.ts b/src/presets/bun.ts index dc0a4f3fcd..649afb9cac 100644 --- a/src/presets/bun.ts +++ b/src/presets/bun.ts @@ -1,11 +1,10 @@ -import { resolvePathSync } from "mlly"; import { defineNitroPreset } from "../preset"; export const bun = defineNitroPreset({ extends: "node-server", entry: "#internal/nitro/entries/bun", // https://bun.sh/docs/runtime/modules#resolution - exportConditions: ["bun", "worker", "node", "require", "import", "default"], + exportConditions: ["bun", "worker", "node", "import", "default"], commands: { preview: "bun run ./server/index.mjs", },