Skip to content
Closed
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
5 changes: 5 additions & 0 deletions .changeset/calm-nodes-bundle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/adapter-node': patch
---

fix: bundle SvelteKit when listed as an adapter-node production dependency
9 changes: 5 additions & 4 deletions packages/adapter-node/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,13 @@ export default function (opts = {}) {
'adapter-env': `${src}/env.js`,
handler: `${src}/handler.js`
},
// only production dependencies (and their deep imports) stay external
// only ordinary production dependencies (and their deep imports) stay external;
// Kit must be bundled even if the app lists it as a production dependency
external: [
handoff,
...Object.keys(pkg.dependencies || {}).map(
(d) => new RegExp(`^${d}(\\/.*)?$`)
)
...Object.keys(pkg.dependencies || {})
.filter((d) => d !== '@sveltejs/kit')
.map((d) => new RegExp(`^${d}(\\/.*)?$`))
],
output: {
paths: { [handoff]: '../adapter-node.js' },
Expand Down
33 changes: 33 additions & 0 deletions packages/adapter-node/test/apps/basic/build.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import fs from 'node:fs';
import os from 'node:os';
import path from 'node:path';
import { pathToFileURL } from 'node:url';
import { afterEach, expect, test, vi } from 'vitest';

afterEach(() => vi.unstubAllEnvs());
Expand All @@ -11,6 +13,37 @@ test('exports the handler', async () => {
expect(handler).toBeDefined();
});

test('framework dependencies are bundled when listed as production dependencies', async () => {
vi.stubEnv('MY_CUSTOM_PORT', '5173');
vi.stubEnv('INSTRUMENTATION_ENV', 'available');
const directory = fs.mkdtempSync(path.join(os.tmpdir(), 'adapter-node-'));

try {
fs.cpSync(path.resolve(import.meta.dirname, 'build'), directory, { recursive: true });
await expect(
import(pathToFileURL(path.join(directory, 'handler.js')).href)
).resolves.toBeDefined();
} finally {
fs.rmSync(directory, { recursive: true });
}
});

test('Kit imports remain bundled in lazy route chunks', async () => {
const directory = fs.mkdtempSync(path.join(os.tmpdir(), 'adapter-node-'));

try {
fs.cpSync(path.resolve(import.meta.dirname, 'build'), directory, { recursive: true });
const endpoint = path.join(
directory,
'server/entries/endpoints/instrumentation-env/_server.js'
);
const { GET } = await import(pathToFileURL(endpoint).href);
expect(await GET().text()).toBe('{}');
} finally {
fs.rmSync(directory, { recursive: true });
}
});

test('dependencies are not bundled', () => {
const build = path.resolve(import.meta.dirname, 'build');
const marker = 'server-side-dep implementation';
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-node/test/apps/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
},
"devDependencies": {
"@playwright/test": "catalog:",
"@sveltejs/kit": "workspace:^",
"@sveltejs/vite-plugin-svelte": "catalog:",
"svelte": "catalog:",
"vite": "catalog:",
"vitest": "catalog:"
},
"dependencies": {
"@sveltejs/kit": "workspace:^",
"server-side-dep": "file:server-side-dep"
},
"type": "module"
Expand Down
6 changes: 3 additions & 3 deletions pnpm-lock.yaml

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

Loading