fimo-sveltekit 2.8.0 → 2.9.0-staging.2

package/dist/config.js

@@ -1,4 +1,7 @@
+import { copyFileSync, mkdirSync, readFileSync, readdirSync, realpathSync, writeFileSync } from 'node:fs';
+import { join, relative } from 'node:path';
 import adapter from '@sveltejs/adapter-vercel';
+import { loadEnv } from 'vite';
 /**
  * Configure a SvelteKit project for Fimo hosting without exposing the hosting
  * provider in the generated application: `kit: { adapter: fimo() }`.
@@ -7,5 +10,43 @@ import adapter from '@sveltejs/adapter-vercel';
  * only installed by SvelteKit projects (FIMO-1635).
  */
 export function fimo() {
-    return adapter({ runtime: 'nodejs24.x' });
+    const provider = adapter({ runtime: 'nodejs24.x' });
+    return {
+        ...provider,
+        async adapt(builder) {
+            await provider.adapt(builder);
+            // Fimo's hosted build passes deployment env through .env. Read it at
+            // build time; an explicit empty process value keeps publication unchanged.
+            const studioOrigin = process.env.FIMO_PREVIEW_PARENT_ORIGIN ??
+                loadEnv('production', builder.config.kit.env.dir, 'FIMO_PREVIEW_PARENT_ORIGIN').FIMO_PREVIEW_PARENT_ORIGIN;
+            if (!studioOrigin)
+                return;
+            // FIMO-2910: wrap the adapter's final Web Response, after hooks and native
+            // CSP. Production builds retain the unmodified provider output.
+            const functions = '.vercel/output/functions';
+            const wrapped = new Set();
+            for (const entry of readdirSync(functions, { recursive: true, withFileTypes: true })) {
+                if (!entry.isFile() || entry.name !== '.vc-config.json')
+                    continue;
+                const directory = realpathSync(entry.parentPath);
+                // Several route aliases can point at the same provider function.
+                if (wrapped.has(directory))
+                    continue;
+                wrapped.add(directory);
+                const configFile = join(directory, entry.name);
+                const config = JSON.parse(readFileSync(configFile, 'utf8'));
+                const entrypoint = config.runtime === 'edge' ? 'entrypoint' : 'handler';
+                const wrapper = join(directory, '.fimo-preview');
+                mkdirSync(wrapper, { recursive: true });
+                copyFileSync(new URL('./frame-headers.js', import.meta.resolve('fimo/preview')), join(wrapper, 'frame-headers.mjs'));
+                writeFileSync(join(wrapper, 'handler.mjs'), `import handler from ${JSON.stringify('../' + config[entrypoint])};
+import { adaptPreviewFrameResponse } from './frame-headers.mjs';
+const fetch = async (...args) => adaptPreviewFrameResponse(
+  await ${config.runtime === 'edge' ? 'handler' : 'handler.fetch'}(...args), ${JSON.stringify(studioOrigin)});
+export default ${config.runtime === 'edge' ? 'fetch' : '{ ...handler, fetch }'};\n`);
+                config[entrypoint] = relative(directory, join(wrapper, 'handler.mjs'));
+                writeFileSync(configFile, JSON.stringify(config));
+            }
+        },
+    };
 }

package/dist/vite.d.ts

@@ -1,4 +1,4 @@
-import type { PluginOption } from 'vite';
+import { type PluginOption } from 'vite';
 /**
  * Narrow SvelteKit build connector. Points dev and production builds at the
  * git branch's Fimo env (`PUBLIC_FIMO_API_URL`, `FIMO_ENV`), and tags native Svelte

package/dist/vite.js

@@ -1,4 +1,6 @@
+import { adaptPreviewFrameHeaders } from 'fimo/preview';
 import runtimeEnvPlugin from 'fimo/vite/runtime-env';
+import { loadEnv } from 'vite';
 import svelteDataIdPlugin from './data-id.js';
 /**
  * Narrow SvelteKit build connector. Points dev and production builds at the
@@ -10,5 +12,59 @@ import svelteDataIdPlugin from './data-id.js';
  * Usage in the app's vite.config.ts: `plugins: [fimo(), sveltekit()]`.
  */
 export function fimo() {
-    return [runtimeEnvPlugin(), svelteDataIdPlugin()];
+    return [
+        runtimeEnvPlugin(),
+        svelteDataIdPlugin(),
+        {
+            name: 'fimo:sveltekit-preview-frame-headers',
+            apply: 'serve',
+            configureServer(server) {
+                const studioOrigin = process.env.FIMO_PREVIEW_PARENT_ORIGIN ??
+                    loadEnv(server.config.mode, server.config.envDir, 'FIMO_PREVIEW_PARENT_ORIGIN').FIMO_PREVIEW_PARENT_ORIGIN;
+                if (!studioOrigin)
+                    return;
+                server.middlewares.use((_req, res, next) => {
+                    // FIMO-2910: SvelteKit writes native CSP after rendering. Adapt at the
+                    // response boundary, after application hooks and before bytes are sent.
+                    const writeHead = res.writeHead;
+                    res.writeHead = function (statusCode, reasonOrHeaders, headers) {
+                        const supplied = typeof reasonOrHeaders === 'string' ? headers : reasonOrHeaders;
+                        if (supplied) {
+                            if (Array.isArray(supplied)) {
+                                const replaced = new Set();
+                                for (let i = 0; i < supplied.length; i += 2) {
+                                    const key = String(supplied[i]).toLowerCase();
+                                    if (!replaced.has(key))
+                                        this.removeHeader(key);
+                                    replaced.add(key);
+                                    const value = supplied[i + 1];
+                                    this.appendHeader(key, typeof value === 'number' ? String(value) : value);
+                                }
+                            }
+                            else {
+                                for (const [key, value] of Object.entries(supplied))
+                                    if (value !== undefined)
+                                        this.setHeader(key, value);
+                            }
+                        }
+                        const original = Object.entries(this.getHeaders()).flatMap(([key, value]) => (Array.isArray(value) ? value : value === undefined ? [] : [String(value)]).map((value) => ({
+                            key,
+                            value,
+                        })));
+                        const adapted = adaptPreviewFrameHeaders(original, studioOrigin);
+                        if (adapted !== original) {
+                            this.removeHeader('x-frame-options');
+                            const policies = adapted.filter((header) => header.key.toLowerCase() === 'content-security-policy');
+                            if (policies.length)
+                                this.setHeader('content-security-policy', policies.map((header) => header.value));
+                        }
+                        if (typeof reasonOrHeaders === 'string')
+                            this.statusMessage = reasonOrHeaders;
+                        return writeHead.call(this, statusCode);
+                    };
+                    next();
+                });
+            },
+        },
+    ];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fimo-sveltekit",
-  "version": "2.8.0",
+  "version": "2.9.0-staging.2",
   "description": "Fimo runtime and hosting adapter for SvelteKit projects. Pairs with the fimo package at the same version.",
   "files": [
     "dist/",
@@ -48,16 +48,16 @@
     "@sveltejs/adapter-vercel": "6.3.4"
   },
   "devDependencies": {
-    "@fimo/tsconfig": "2.8.0",
+    "@fimo/tsconfig": "2.9.0-staging.2",
     "@types/node": "22.18.6",
-    "fimo": "2.8.0",
+    "fimo": "2.9.0-staging.2",
     "typescript": "7.0.2",
     "vite": "8.3.4",
     "vitest": "5.0.4"
   },
   "peerDependencies": {
     "@sveltejs/kit": "^2.0.0",
-    "fimo": ">=2.0.1",
+    "fimo": "2.9.0-staging.2",
     "svelte": "^5.0.0",
     "vite": "^7.0.0 || ^8.0.0"
   },