Skip to content

fix(deploy): keep SvelteKit job bundles out of uploaded assets #737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
morinokami wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(deploy): keep SvelteKit job bundles out of uploaded assets #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions packages/void/src/cli/deploy-cloudflare-static.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ export async function prepareCloudflareFrameworkArtifact(options: {
'_routes.json',
'__original.js',
'__original.mjs',
// Vite names the job bundle `.js` in an ES module package, `.mjs` otherwise.
'__void_handlers.js',
'__void_handlers.mjs',
'__void_isr*.mjs',
'__void_migration_handler*.mjs',
Expand Down
43 changes: 43 additions & 0 deletions packages/void/test/unit/cloudflare-deploy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
readFileSync,
readdirSync,
rmSync,
statSync,
symlinkSync,
writeFileSync,
} from 'node:fs';
Expand All @@ -20,6 +21,7 @@ import {
type CloudflareOperation,
} from '@void/deploy-cloudflare';
import { log } from '@voidzero-dev/vite-plus-prompts';
import ignore from 'ignore';
import { toSlash } from 'pathslash';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vite-plus/test';
import { activateCloudflareVersion as activateCloudflareVersionPrimitive } from '../../../deploy-cloudflare/src/index.ts';
Expand Down Expand Up @@ -7784,6 +7786,47 @@ describe('runCloudflareDeploy — framework artifact guard', () => {
expect(readFileSync(join(root, 'wrangler.jsonc'), 'utf-8')).toContain('// keep this comment');
});

// SvelteKit's Worker directory is also its asset directory. In an ES module package, which is
// what `sv create` makes, Vite names the cron and queue bundle `__void_handlers.js`.
it('keeps the modules it adds to an ES module SvelteKit Worker out of its assets', async () => {
const root = makeProject({
'package.json': JSON.stringify({
name: 'skapp',
type: 'module',
dependencies: { '@sveltejs/kit': '2.0.0' },
}),
'void.json': JSON.stringify({}),
'wrangler.jsonc': JSON.stringify({ name: 'skapp', account_id: 'acc123' }),
'.svelte-kit/cloudflare/_worker.js':
'export default { fetch() { return new Response("ok") } };\n',
'.svelte-kit/cloudflare/_app/immutable/app.js': 'console.log("client");\n',
'crons/hourly.ts': [
'import { defineScheduled } from "void";',
'export const cron = "0 * * * *";',
'export default defineScheduled(async function hourly() {});',
].join('\n'),
});

await prepareCloudflareFrameworkArtifact({
root,
configPath: join(root, 'wrangler.jsonc'),
accountId: 'acc123',
workerName: 'skapp',
voidConfig: readConfig(root),
framework: { name: 'sveltekit', class: 'b' },
preset: FRAMEWORK_PRESETS.sveltekit,
});

const directory = join(root, '.svelte-kit/cloudflare');
expect(existsSync(join(directory, '__void_handlers.js'))).toBe(true);
const ignored = ignore().add(readFileSync(join(directory, '.assetsignore'), 'utf-8'));
const assets = readdirSync(directory, { recursive: true, encoding: 'utf8' })
.map((file) => toSlash(file))
.filter((file) => statSync(join(directory, file)).isFile())
.filter((file) => file !== '.assetsignore' && !ignored.ignores(file));
expect(assets).toEqual(['_app/immutable/app.js']);
});

it('prepares Class A wrapper handlers without replacing its generated config pointer', async () => {
const root = makeProject({
'package.json': JSON.stringify({
Expand Down