@oselvar/sveltekit-add-worker-exports 2.0.0 → 2.1.1

package/README.md

@@ -2,6 +2,8 @@
 
 A Vite plugin that makes any class-based Cloudflare Worker export (Durable Objects, Workflows, `WorkerEntrypoint` RPC, voice agents, …) and any non-fetch handler (`scheduled`, `queue`, `email`, `tail`, `trace`) work with SvelteKit on Cloudflare, in both dev and production.
 
+Works with **SvelteKit 2 and SvelteKit 3** (see [`example/`](example) and [`example-v3/`](example-v3)).
+
 **Build mode:** SvelteKit's `adapter-cloudflare` generates `_worker.js` with only a default export (the fetch handler). Cloudflare Workers requires class-based bindings (Durable Objects, Workflows, `WorkerEntrypoint`, etc.) to be **named exports**, and non-fetch handlers (`scheduled`, `queue`, `email`, …) to be **methods on the default export**. This plugin post-processes the build output to merge both kinds onto SvelteKit's worker.
 
 **Dev mode:** `getPlatformProxy` (used by `adapter-cloudflare` in dev) can't run internal Durable Objects, Workflows, or other class-based bindings. This plugin starts a separate wrangler dev server that runs the real worker with hot-reload. SvelteKit `+server.ts` handlers call bindings through `platform.env.MY_BINDING.<rpc>()` as usual — the plugin rewrites those bindings to point at the sidecar via wrangler's dev registry, so cross-worker calls Just Work. WebSocket clients in dev connect to the sidecar directly on a separate port — see [WebSockets](#websockets) below. The sidecar also exposes `/__scheduled` so `scheduled` handlers can be fired manually in dev — see [Scheduled, queue, email, tail handlers](#scheduled-queue-email-tail-handlers).
@@ -228,7 +230,7 @@ declare global {
 
 ### Build mode
 
-The plugin runs in the `closeBundle` hook (after SvelteKit's adapter has generated `_worker.js`):
+The plugin runs after SvelteKit's adapter has generated `_worker.js`. SvelteKit v2 runs the adapter in Vite's `closeBundle` hook, while SvelteKit v3 moved it into the newer `buildApp` hook (which runs *after* every `closeBundle`). The plugin registers its patch step on **both** hooks (idempotent), so whichever one runs after the adapter does the work:
 
 1. Bundles your `entryPoint` with esbuild into `_extra_exports.js`
 2. Renames the original `_worker.js` to `_sveltekit_worker.js`
@@ -242,7 +244,9 @@ const { fetch: _ignored, ...extraHandlers } = extra.default ?? {};
 export default { ...sveltekitWorker, ...extraHandlers };
 ```
 
-The operation is idempotent -- if `_sveltekit_worker.js` already exists, the plugin skips.
+4. Appends its own outputs (`_sveltekit_worker.js`, `_extra_exports.js`, and their `.map` sidecars) to the adapter's `.assetsignore`. These are server-side / Durable Object bundles and source maps; the adapter's generated `.assetsignore` only excludes its own outputs, so without this Cloudflare would serve them as public static assets (the maps' `sourcesContent` would expose your original TypeScript). `.assetsignore` only controls public asset serving — the files stay on disk, so wrangler still bundles the worker and uploads its source maps.
+
+The operation is idempotent -- if `_sveltekit_worker.js` already exists, the second hook skips. Tested against SvelteKit v2 (see [`example/`](example)) and v3 (see [`example-v3/`](example-v3)).
 
 ### Dev mode
 

package/dist/index.d.ts

@@ -29,6 +29,23 @@ import type { Plugin } from 'vite';
  * Exported for tests; the dev plugin uses it via the configureServer hook.
  */
 export declare function parseWranglerConfig(path: string, contents: string): unknown;
+/**
+ * The build outputs this plugin writes into the adapter's output dir. They are
+ * server-side / Durable Object bundles and their source maps — never meant to
+ * be downloadable. adapter-cloudflare's generated `.assetsignore` only excludes
+ * its own outputs (`_worker.js`, `_routes.json`, `_headers`, `_redirects`), so
+ * without this Cloudflare would serve these as public static assets, leaking
+ * the bundled code and (via the maps' `sourcesContent`) the original
+ * TypeScript. See https://github.com/oselvar/sveltekit-add-worker-exports/issues/4
+ */
+export declare const PLUGIN_ASSETS_IGNORE_ENTRIES: string[];
+/**
+ * Returns `.assetsignore` content with `entries` appended, skipping any that
+ * are already present (trim-compared). Preserves existing lines and order,
+ * normalises to a trailing newline. Idempotent — `.assetsignore` controls only
+ * public asset serving, so the listed files stay on disk for wrangler to bundle.
+ */
+export declare function mergeAssetsIgnore(existing: string, entries: string[]): string;
 export interface AddWorkerExportsOptions {
     /** File that exports Durable Object and/or Workflow classes */
     entryPoint: string;
@@ -38,6 +55,17 @@ export interface AddWorkerExportsOptions {
     wranglerConfig?: string;
     /** Port for the dev worker server (default: 8787) */
     devPort?: number;
+    /**
+     * Handles each structured log line emitted by the sidecar worker (one entry
+     * per `console.log` / `console.error` / etc. call). When omitted, a default
+     * handler prints each line to the host's stdout (or stderr for `error`
+     * level) prefixed with the sidecar name. Pass `() => {}` to silence.
+     */
+    structuredLogsHandler?: (log: {
+        level: string;
+        message: string;
+        timestamp: number;
+    }) => void;
 }
 /**
  * Returns two Vite plugins: one for build (patches _worker.js) and one for

package/dist/index.js

@@ -40,6 +40,37 @@ export function parseWranglerConfig(path, contents) {
     return path.endsWith('.toml') ? parseToml(contents) : parseJsonc(contents);
 }
 const DEFAULT_DEV_PORT = 8787;
+/**
+ * The build outputs this plugin writes into the adapter's output dir. They are
+ * server-side / Durable Object bundles and their source maps — never meant to
+ * be downloadable. adapter-cloudflare's generated `.assetsignore` only excludes
+ * its own outputs (`_worker.js`, `_routes.json`, `_headers`, `_redirects`), so
+ * without this Cloudflare would serve these as public static assets, leaking
+ * the bundled code and (via the maps' `sourcesContent`) the original
+ * TypeScript. See https://github.com/oselvar/sveltekit-add-worker-exports/issues/4
+ */
+export const PLUGIN_ASSETS_IGNORE_ENTRIES = [
+    '_sveltekit_worker.js',
+    '_sveltekit_worker.js.map',
+    '_extra_exports.js',
+    '_extra_exports.js.map'
+];
+/**
+ * Returns `.assetsignore` content with `entries` appended, skipping any that
+ * are already present (trim-compared). Preserves existing lines and order,
+ * normalises to a trailing newline. Idempotent — `.assetsignore` controls only
+ * public asset serving, so the listed files stay on disk for wrangler to bundle.
+ */
+export function mergeAssetsIgnore(existing, entries) {
+    const lines = existing.split('\n');
+    const present = new Set(lines.map((l) => l.trim()));
+    const additions = entries.filter((e) => !present.has(e.trim()));
+    // Drop trailing blank lines so we append cleanly, then re-add one newline.
+    while (lines.length > 0 && lines[lines.length - 1].trim() === '') {
+        lines.pop();
+    }
+    return [...lines, ...additions].join('\n') + '\n';
+}
 /**
  * Mirrors wrangler's internal getRegistryPath() — wrangler doesn't export it.
  * Workers register themselves under this path so cross-worker `script_name`
@@ -76,66 +107,100 @@ function getWranglerRegistryPath() {
 export function addWorkerExports(options) {
     return [buildPlugin(options), devPlugin(options)];
 }
+/**
+ * Patches the adapter-generated `_worker.js`: bundles the named exports into
+ * `_extra_exports.js`, renames the original worker to `_sveltekit_worker.js`,
+ * and writes a merged `_worker.js`. Idempotent — safe to call from more than
+ * one Vite hook; the first call that finds `_worker.js` does the work, later
+ * calls see `_sveltekit_worker.js` and return.
+ *
+ * Returns `true` if it patched (or had already patched), `false` if the
+ * adapter hasn't written `_worker.js` yet.
+ */
+async function patchWorker(options) {
+    const outputDir = resolve(options.outputDir ?? '.svelte-kit/cloudflare');
+    const workerPath = resolve(outputDir, '_worker.js');
+    const sveltekitPath = resolve(outputDir, '_sveltekit_worker.js');
+    const exportsPath = resolve(outputDir, '_extra_exports.js');
+    // Skip if already patched (idempotent)
+    if (await exists(sveltekitPath)) {
+        return true;
+    }
+    // Skip if the adapter hasn't run yet (e.g. during the SSR build phase, or
+    // before SvelteKit v3's `buildApp` hook runs the adapter)
+    if (!(await exists(workerPath))) {
+        return false;
+    }
+    // Bundle the named exports.
+    //
+    // `conditions: ['workerd', 'worker', 'browser']` is the Cloudflare-
+    // recommended set for bundlers targeting Workers — it picks the
+    // workerd-specific or browser-shimmed variants of packages over
+    // their Node variants (e.g. nanoid's webcrypto-via-`globalThis.crypto`
+    // browser build instead of the `node:crypto`-importing main build).
+    //
+    // Node built-ins are externalised so transitive deps that do
+    // `require('path')` or `import 'node:async_hooks'` survive bundling;
+    // the Workers runtime resolves them when `nodejs_compat` is enabled
+    // in wrangler.jsonc.
+    await build({
+        entryPoints: [options.entryPoint],
+        bundle: true,
+        format: 'esm',
+        sourcemap: true,
+        target: 'esnext',
+        conditions: ['workerd', 'worker', 'browser'],
+        external: ['cloudflare:*', ...NODE_BUILTINS, ...NODE_BUILTINS.map((m) => `node:${m}`)],
+        outfile: exportsPath
+    });
+    // Rename original worker and create merged entry point.
+    //
+    // `export *` re-exports named exports only, so class-based bindings
+    // (DOs, Workflows, WorkerEntrypoint) from `_extra_exports.js` flow
+    // through. Non-fetch handlers (scheduled, queue, email, tail, trace)
+    // live on the user entry's `default` export — Cloudflare invokes
+    // them as methods on the worker's default object, not as named
+    // exports — so we spread them onto the SvelteKit default. `fetch`
+    // is dropped from the user default because SvelteKit owns request
+    // handling in production.
+    await rename(workerPath, sveltekitPath);
+    await writeFile(workerPath, `import sveltekitWorker from './_sveltekit_worker.js';\n` +
+        `import * as extra from './_extra_exports.js';\n` +
+        `export * from './_extra_exports.js';\n` +
+        `const { fetch: _ignored, ...extraHandlers } = extra.default ?? {};\n` +
+        `export default { ...sveltekitWorker, ...extraHandlers };\n`);
+    // Keep this plugin's server bundles and source maps out of the
+    // publicly-served assets. The adapter regenerates `.assetsignore` every
+    // build with only its own outputs; we append ours here, right after
+    // patching, so it survives each deploy regardless of which hook ran the
+    // patch (v2: `closeBundle`, v3: `buildApp`).
+    const assetsIgnorePath = resolve(outputDir, '.assetsignore');
+    const currentIgnore = (await exists(assetsIgnorePath))
+        ? await readFile(assetsIgnorePath, 'utf-8')
+        : '';
+    await writeFile(assetsIgnorePath, mergeAssetsIgnore(currentIgnore, PLUGIN_ASSETS_IGNORE_ENTRIES));
+    return true;
+}
 function buildPlugin(options) {
     return {
         name: 'add-worker-exports',
         apply: 'build',
         enforce: 'post',
+        // SvelteKit v2 runs the Cloudflare adapter inside `closeBundle`; our
+        // `enforce: 'post'` hook then runs after it and sees `_worker.js`.
         async closeBundle() {
-            const outputDir = resolve(options.outputDir ?? '.svelte-kit/cloudflare');
-            const workerPath = resolve(outputDir, '_worker.js');
-            const sveltekitPath = resolve(outputDir, '_sveltekit_worker.js');
-            const exportsPath = resolve(outputDir, '_extra_exports.js');
-            // Skip if already patched (idempotent)
-            if (await exists(sveltekitPath)) {
-                return;
-            }
-            // Skip if the adapter hasn't run yet (e.g. during SSR build phase)
-            if (!(await exists(workerPath))) {
-                return;
+            await patchWorker(options);
+        },
+        // SvelteKit v3 moved the adapter into Vite's `buildApp` hook, which runs
+        // *after* every `closeBundle`. By that point our `closeBundle` has
+        // already run and skipped (no `_worker.js` yet), so we patch here
+        // instead. `order: 'post'` ensures we run after SvelteKit's own
+        // `buildApp` that generates `_worker.js`. Harmless on v2 (idempotent).
+        buildApp: {
+            order: 'post',
+            async handler() {
+                await patchWorker(options);
             }
-            // Bundle the named exports.
-            //
-            // `conditions: ['workerd', 'worker', 'browser']` is the Cloudflare-
-            // recommended set for bundlers targeting Workers — it picks the
-            // workerd-specific or browser-shimmed variants of packages over
-            // their Node variants (e.g. nanoid's webcrypto-via-`globalThis.crypto`
-            // browser build instead of the `node:crypto`-importing main build).
-            //
-            // Node built-ins are externalised so transitive deps that do
-            // `require('path')` or `import 'node:async_hooks'` survive bundling;
-            // the Workers runtime resolves them when `nodejs_compat` is enabled
-            // in wrangler.jsonc.
-            await build({
-                entryPoints: [options.entryPoint],
-                bundle: true,
-                format: 'esm',
-                sourcemap: true,
-                target: 'esnext',
-                conditions: ['workerd', 'worker', 'browser'],
-                external: [
-                    'cloudflare:*',
-                    ...NODE_BUILTINS,
-                    ...NODE_BUILTINS.map((m) => `node:${m}`)
-                ],
-                outfile: exportsPath
-            });
-            // Rename original worker and create merged entry point.
-            //
-            // `export *` re-exports named exports only, so class-based bindings
-            // (DOs, Workflows, WorkerEntrypoint) from `_extra_exports.js` flow
-            // through. Non-fetch handlers (scheduled, queue, email, tail, trace)
-            // live on the user entry's `default` export — Cloudflare invokes
-            // them as methods on the worker's default object, not as named
-            // exports — so we spread them onto the SvelteKit default. `fetch`
-            // is dropped from the user default because SvelteKit owns request
-            // handling in production.
-            await rename(workerPath, sveltekitPath);
-            await writeFile(workerPath, `import sveltekitWorker from './_sveltekit_worker.js';\n` +
-                `import * as extra from './_extra_exports.js';\n` +
-                `export * from './_extra_exports.js';\n` +
-                `const { fetch: _ignored, ...extraHandlers } = extra.default ?? {};\n` +
-                `export default { ...sveltekitWorker, ...extraHandlers };\n`);
         }
     };
 }
@@ -210,6 +275,7 @@ function devPlugin(options) {
             delete activeScope.migrations;
             proxyConfigPath = resolve('.platform-proxy-wrangler.jsonc');
             await writeFile(proxyConfigPath, JSON.stringify(proxyConfig, null, '\t'));
+            const structuredLogsHandler = options.structuredLogsHandler ?? makeDefaultWorkerLogHandler(sidecarName);
             worker = await unstable_startWorker({
                 config: tempConfigPath,
                 // `testScheduled` mounts a `/__scheduled` endpoint on the sidecar
@@ -217,7 +283,19 @@ function devPlugin(options) {
                 // never auto-fires crons. Curl
                 // `http://localhost:<devPort>/__scheduled?cron=*+*+*+*+*` to
                 // trigger your `scheduled` handler.
-                dev: { registry: getWranglerRegistryPath(), testScheduled: true },
+                //
+                // `structuredLogsHandler` (added in wrangler 4.99) routes each
+                // worker log line through `onWorkerLog`. Without it, wrangler
+                // pipes worker logs through its own Logger which can get
+                // swallowed when `unstable_startWorker` is driven
+                // programmatically — `console.log` inside the worker
+                // disappears. Cast is needed because peer wrangler types may
+                // be older.
+                dev: {
+                    registry: getWranglerRegistryPath(),
+                    testScheduled: true,
+                    structuredLogsHandler
+                },
                 build: {
                     nodejsCompatMode: (parsedConfig) => getNodejsCompatMode(parsedConfig.compatibility_date, parsedConfig.compatibility_flags)
                 }
@@ -237,6 +315,18 @@ function devPlugin(options) {
         }
     };
 }
+/**
+ * Default handler for sidecar worker logs. Writes each line to stdout (or
+ * stderr for `error` level) tagged with the sidecar name so it's obvious
+ * which process produced it.
+ */
+function makeDefaultWorkerLogHandler(sidecarName) {
+    const prefix = `[${sidecarName}]`;
+    return ({ level, message }) => {
+        const stream = level === 'error' ? process.stderr : process.stdout;
+        stream.write(`${prefix} ${message}\n`);
+    };
+}
 async function exists(path) {
     try {
         await access(path);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oselvar/sveltekit-add-worker-exports",
-	"version": "2.0.0",
+	"version": "2.1.1",
 	"description": "Vite plugin that adds Durable Object and Workflow exports to SvelteKit Cloudflare workers",
 	"type": "module",
 	"publishConfig": {
@@ -37,15 +37,15 @@
 	},
 	"devDependencies": {
 		"@release-it/conventional-changelog": "^11.0.1",
-		"@sveltejs/kit": "^2.62.0",
-		"@types/node": "^25.9.1",
-		"esbuild": "^0.28.0",
-		"miniflare": "^4.20260601.0",
+		"@sveltejs/kit": "^2.66.0",
+		"@types/node": "^26.0.0",
+		"esbuild": "^0.28.1",
+		"miniflare": "^4.20260617.1",
 		"release-it": "^20.2.0",
 		"typescript": "^6.0.3",
 		"vite": "^8.0.16",
-		"vitest": "^4.1.8",
-		"wrangler": "^4.98.0"
+		"vitest": "^4.1.9",
+		"wrangler": "^4.103.0"
 	},
 	"scripts": {
 		"build": "tsc",