Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ jobs:
with: { deno-version: v2.x }
- run: pnpm install
- run: pnpm build
- run: pnpm vitest run
- run: pnpm vitest run test/presets
env: { NITRO_BUILDER: rolldown }
- run: pnpm vitest run test/examples
env: { NITRO_BUILDER: rolldown }
publish-pkg-pr-new:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"db0": "^0.3.4",
"h3": "2.0.1-rc.5",
"jiti": "^2.6.1",
"nf3": "^0.1.10",
"nf3": "^0.2.0",
"ofetch": "^2.0.0-alpha.3",
"ohash": "^2.0.11",
"oxc-minify": "^0.97.0",
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion src/build/plugins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,12 @@ export function baseBuildPlugins(nitro: Nitro, base: BaseBuildConfig) {
defu(nitro.options.externals, {
outDir: nitro.options.output.serverDir,
moduleDirectories: nitro.options.nodeModulesDirs,
external: nitro.options.nodeModulesDirs,
external: [
// Externalize more aggressively in dev
nitro.options.dev
? (id) => id.includes("node_modules")
: /node_modules/,
],
inline: [...base.noExternal],
traceOptions: {
base: "/",
Expand Down
11 changes: 4 additions & 7 deletions src/config/resolvers/paths.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { prettyPath, resolveNitroPath } from "../../utils/fs.ts";
import { pkgDir, runtimeDir } from "nitro/meta";
import { runtimeDir } from "nitro/meta";
import type { NitroOptions } from "nitro/types";
import { join, resolve } from "pathe";
import { findWorkspaceDir } from "pkg-types";
Expand Down Expand Up @@ -64,14 +64,11 @@ export async function resolvePathOptions(options: NitroOptions) {
options.rootDir
) + "/";

options.nodeModulesDirs.push(resolve(options.rootDir, "node_modules"));
options.nodeModulesDirs.push(resolve(options.workspaceDir, "node_modules"));
options.nodeModulesDirs.push(resolve(pkgDir, "dist/node_modules"));
options.nodeModulesDirs.push(resolve(pkgDir, "node_modules"));
options.nodeModulesDirs.push(resolve(pkgDir, "..")); // pnpm
if (options.nodeModulesDirs.length === 0) {
options.nodeModulesDirs.push(resolve(options.rootDir, "node_modules"));
}
options.nodeModulesDirs = [
...new Set(
// Adding trailing slash to optimize resolve performance (path is explicitly a dir)
options.nodeModulesDirs.map((dir) => resolve(options.rootDir, dir) + "/")
),
];
Expand Down
Loading