Skip to content
Merged
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
3 changes: 2 additions & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ export default [
ignores: [
'packages/adapter-cloudflare/test/apps/**/*',
'packages/adapter-netlify/test/apps/**/*',
'packages/adapter-node/tests/smoke.spec_disabled.js',
'packages/adapter-node/rollup.config.js',
'packages/adapter-node/smoke.spec_disabled.js',
'packages/adapter-static/test/apps/**/*',
'packages/adapter-vercel/test/apps/**/*',
'packages/kit/src/core/sync/create_manifest_data/test/samples/**/*',
Expand Down
14 changes: 0 additions & 14 deletions packages/adapter-node/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { readFileSync } from 'node:fs';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { rollup } from 'rollup';
import { nodeResolve } from '@rollup/plugin-node-resolve';
Expand Down Expand Up @@ -85,19 +84,6 @@ export default function (opts = {}) {
if (id === 'MANIFEST') return `${server}/manifest.js`;
}
},
// ensure our entries that use `import.meta.url` resolve to the root
// even if their code has been moved to a shared chunk directory
// see https://rollupjs.org/plugin-development/#resolveimportmeta
{
name: 'adapter-node:import-meta-url-current-module',
resolveImportMeta(property, { moduleId }) {
if (property === 'url' && moduleId.startsWith(entries)) {
const module_dir = path.dirname(moduleId);
return `new URL('${path.relative(module_dir, entries)}', import.meta.url)`;
}
return null;
}
},
nodeResolve({
preferBuiltins: true,
exportConditions: ['node']
Expand Down
4 changes: 3 additions & 1 deletion packages/adapter-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@
"scripts": {
"dev": "rollup -cw",
"build": "rollup -c",
"test": "vitest run",
"test:unit": "vitest run",
"test:e2e": "pnpm build && pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test",
"test": "pnpm test:unit && pnpm test:e2e",
"check": "tsc",
"lint": "prettier --check .",
"format": "pnpm lint --write",
Expand Down
5 changes: 5 additions & 0 deletions packages/adapter-node/src/env.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import path from 'node:path';
import process from 'node:process';
import { fileURLToPath } from 'node:url';

// since env.js is an entrypoint, `dir` will point to the output directory
export const dir = path.dirname(fileURLToPath(import.meta.url));

const expected = new Set([
'SOCKET_PATH',
Expand Down
5 changes: 1 addition & 4 deletions packages/adapter-node/src/handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ import fs from 'node:fs';
import path from 'node:path';
import process from 'node:process';
import sirv from 'sirv';
import { fileURLToPath } from 'node:url';
import { parse as polka_url_parser } from '@polka/url';
import { getRequest, setResponse, createReadableStream } from '@sveltejs/kit/node';
import { Server } from 'SERVER';
import { manifest } from 'MANIFEST';
import { env, env_prefix } from './env.js';
import { dir, env, env_prefix } from './env.js';
import { parse_as_bytes, parse_origin } from '../utils.js';

const prerendered = PRERENDERED;
Expand All @@ -32,8 +31,6 @@ if (isNaN(body_size_limit)) {
);
}

const dir = path.dirname(fileURLToPath(import.meta.url));

const asset_dir = `${dir}/client${BASE}`;

await server.init({
Expand Down
1 change: 1 addition & 0 deletions packages/adapter-node/test/apps/basic/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
20 changes: 20 additions & 0 deletions packages/adapter-node/test/apps/basic/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "test-node-basic",
"version": "0.0.1",
"private": true,
"scripts": {
"dev": "vite dev",
"build": "vite build",
"preview": "MY_CUSTOM_PORT=5173 node build",
"prepare": "svelte-kit sync || echo ''",
"test": "playwright test"
},
"devDependencies": {
"@playwright/test": "catalog:",
"@sveltejs/kit": "workspace:^",
"@sveltejs/vite-plugin-svelte": "catalog:",
"svelte": "catalog:",
"vite": "catalog:"
},
"type": "module"
}
1 change: 1 addition & 0 deletions packages/adapter-node/test/apps/basic/playwright.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { config as default } from '../../utils.js';
11 changes: 11 additions & 0 deletions packages/adapter-node/test/apps/basic/src/app.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
%sveltekit.head%
</head>
<body>
<div>%sveltekit.body%</div>
</body>
</html>
9 changes: 9 additions & 0 deletions packages/adapter-node/test/apps/basic/src/hooks.server.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// importing $env in the server hook can cause a cyclical import that crashes the app start up
// see https://github.com/sveltejs/kit/issues/16092
import { env } from '$env/dynamic/private';

/** @type {import('@sveltejs/kit').Handle} */
export function handle({ event, resolve }) {
if (!env) throw new Error('env should be defined');
return resolve(event);
}
7 changes: 7 additions & 0 deletions packages/adapter-node/test/apps/basic/src/routes/+page.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<script>
let toggle = $state(false);
</script>

<h1>Hello world!</h1>

<button onclick={() => (toggle = !toggle)}>Toggle: {toggle}</button>
13 changes: 13 additions & 0 deletions packages/adapter-node/test/apps/basic/test/test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { expect, test } from '@playwright/test';

test('SSR', async ({ page }) => {
await page.goto('/');
await expect(page.locator('h1')).toContainText('Hello world!');
});

test('CSR', async ({ page }) => {
await page.goto('/');
await expect(page.locator('button')).toContainText('Toggle: false');
await page.locator('button').click();
await expect(page.locator('button')).toContainText('Toggle: true');
});
13 changes: 13 additions & 0 deletions packages/adapter-node/test/apps/basic/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"compilerOptions": {
"allowJs": true,
"checkJs": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"moduleResolution": "bundler"
},
"extends": "./.svelte-kit/tsconfig.json"
}
23 changes: 23 additions & 0 deletions packages/adapter-node/test/apps/basic/vite.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { sveltekit } from '@sveltejs/kit/vite';
import adapter from '../../../index.js';

/** @type {import('vite').UserConfig} */
const config = {
build: {
minify: false
},
plugins: [
sveltekit({
adapter: adapter({
envPrefix: 'MY_CUSTOM_'
}),
typescript: {
config(config) {
config.include.push('../playwright.config.js');
}
}
})
]
};

export default config;
30 changes: 30 additions & 0 deletions packages/adapter-node/test/utils.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { devices } from '@playwright/test';
import process from 'node:process';
import { number_from_env } from '../../../test-utils/index.js';

/** @type {import('@playwright/test').PlaywrightTestConfig} */
export const config = {
forbidOnly: !!process.env.CI,
// generous timeouts on CI
timeout: process.env.CI ? 45000 : 15000,
webServer: {
command: 'pnpm build && pnpm preview',
port: 5173
},
retries: process.env.CI ? 2 : number_from_env('KIT_E2E_RETRIES', 0),
projects: [
{
name: 'chromium'
}
],
use: {
...devices['Desktop Chrome'],
screenshot: 'only-on-failure',
trace: 'retain-on-failure',
channel: 'chromium'
},
workers: process.env.CI ? 2 : number_from_env('KIT_E2E_WORKERS', undefined),
reporter: 'list',
testDir: 'test',
testMatch: /(.+\.)?(test|spec)\.[jt]s/
};
7 changes: 5 additions & 2 deletions packages/adapter-node/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
"include": [
"index.js",
"src/**/*.js",
"src/**/*.ts",
"test/utils.js",
"tests/**/*.js",
"tests/**/*.ts",
"internal.d.ts",
"utils.js",
"./internal.d.ts",
"./*.spec.ts",
"rollup.config.js"
],
"exclude": ["tests/smoke.spec_disabled.js"]
"exclude": ["smoke.spec_disabled.js"]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect, test, describe } from 'vitest';
import { format_listening_address, parse_as_bytes, parse_origin } from '../utils.js';
import { format_listening_address, parse_as_bytes, parse_origin } from './utils.js';

describe('parse_as_bytes', () => {
test.each([
Expand Down
47 changes: 41 additions & 6 deletions pnpm-lock.yaml

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

1 change: 1 addition & 0 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ packages:
- packages/*
- packages/adapter-cloudflare/test/apps/*
- packages/adapter-netlify/test/apps/*
- packages/adapter-node/test/apps/*
- packages/adapter-vercel/test/apps/*
- packages/adapter-static/test/apps/*
- packages/enhanced-img/test/apps/*
Expand Down
Loading