Skip to content
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.

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

feat: allow additional handlers and durable objects #13207

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 7 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
6 changes: 6 additions & 0 deletions .changeset/thirty-ghosts-cover.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@sveltejs/adapter-cloudflare-workers': minor
'@sveltejs/adapter-cloudflare': minor
---

feat: allow additional handlers to be included in generated worker
5 changes: 5 additions & 0 deletions packages/adapter-cloudflare-workers/files/entry.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { Server } from 'SERVER';
import { manifest, prerendered, base_path } from 'MANIFEST';
import handlers from 'HANDLERS';
import { getAssetFromKV, mapRequestToAsset } from '@cloudflare/kv-asset-handler';
import static_asset_manifest_json from '__STATIC_CONTENT_MANIFEST';

export * from 'HANDLERS';
thomasfosterau marked this conversation as resolved.
Show resolved Hide resolved

const static_asset_manifest = JSON.parse(static_asset_manifest_json);

const server = new Server(manifest);
Expand All @@ -12,6 +16,7 @@ const immutable = `${app_path}/immutable/`;
const version_file = `${app_path}/version.json`;

export default {
...handlers,
/**
* @param {Request} req
* @param {any} env
Expand Down
4 changes: 4 additions & 0 deletions packages/adapter-cloudflare-workers/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ export default function plugin(options?: AdapterOptions): Adapter;

export interface AdapterOptions {
config?: string;
/**
* Path to a file with additional handlers which will be added to the generated worker.
*/
handlers?: string;
/**
* Config object passed to {@link https://developers.cloudflare.com/workers/wrangler/api/#getplatformproxy | getPlatformProxy}
* during development and preview.
Expand Down
20 changes: 17 additions & 3 deletions packages/adapter-cloudflare-workers/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { existsSync, readFileSync, writeFileSync } from 'node:fs';
import { posix, dirname } from 'node:path';
import { posix, dirname, resolve } from 'node:path';
import { execSync } from 'node:child_process';
import { cwd } from 'node:process';
import esbuild from 'esbuild';
import toml from '@iarna/toml';
import { fileURLToPath } from 'node:url';
Expand Down Expand Up @@ -32,7 +33,7 @@ const compatible_node_modules = [
];

/** @type {import('./index.js').default} */
export default function ({ config = 'wrangler.toml', platformProxy = {} } = {}) {
export default function ({ config = 'wrangler.toml', platformProxy = {}, handlers } = {}) {
return {
name: '@sveltejs/adapter-cloudflare-workers',

Expand All @@ -58,7 +59,8 @@ export default function ({ config = 'wrangler.toml', platformProxy = {} } = {})
builder.copy(`${files}/entry.js`, `${tmp}/entry.js`, {
replace: {
SERVER: `${relativePath}/index.js`,
MANIFEST: './manifest.js'
MANIFEST: './manifest.js',
HANDLERS: './_handlers.js'
}
});

Expand All @@ -78,6 +80,18 @@ export default function ({ config = 'wrangler.toml', platformProxy = {} } = {})
`export const base_path = ${JSON.stringify(builder.config.kit.paths.base)};\n`
);

if (handlers) {
const handlers_file = resolve(cwd(), handlers);
thomasfosterau marked this conversation as resolved.
Show resolved Hide resolved
writeFileSync(
`${tmp}/_handlers.js`,
`import handlers from "${handlers_file}";\n\n` +
`export * from "${handlers_file}"` +
'export default handlers;'
);
} else {
writeFileSync(`${tmp}/_handlers.js`, 'export default {};');
}

const external = ['__STATIC_CONTENT_MANIFEST', 'cloudflare:*'];
if (compatibility_flags && compatibility_flags.includes('nodejs_compat')) {
external.push(...compatible_node_modules.map((id) => `node:${id}`));
Expand Down
8 changes: 8 additions & 0 deletions packages/adapter-cloudflare-workers/placeholders.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,11 @@ declare module '__STATIC_CONTENT_MANIFEST' {
const json: string;
export default json;
}

declare module 'HANDLERS' {
import { ExportedHandler } from '@cloudflare/workers-types';

const handlers: Omit<ExportedHandler, 'fetch'>;

export default handlers;
}
Loading