alinea 2.0.0-preview.4 → 2.0.0-preview.5

package/dist/.init/content/pages/welcome.json

@@ -1,5 +1,5 @@
 {
-  "_id": "3JJbJ2F3Dep25BJMlZoVBBFy25h",
+  "_id": "3JSRaU6nbvzZquWO5cyuADRWGRm",
   "_type": "Page",
   "_index": "a0",
   "_seeded": "welcome.json",

package/dist/.init/src/cms.ts

@@ -17,7 +17,6 @@ export const cms = createCMS({
     main: Config.workspace('Example', {
       source: 'content',
       mediaDir: 'public/media',
-      mediaUrl: '/media',
       roots: {
         pages: Config.root('Example site', {
           contains: ['Page']
@@ -39,7 +38,5 @@ export const cms = createCMS({
 
   // The handler route URL
   handlerUrl: '/api/cms',
-
-  // The admin dashboard will be bundled in this static file
-  dashboardFile: 'admin.html'
+  adminPath: '/admin'
 })

package/dist/LICENSES.md

@@ -55,7 +55,7 @@ SOFTWARE.
 
 ===
 
-# @internationalized/date@3.12.1 (Apache-2.0)
+# react-aria-components@1.17.0 (Apache-2.0)
 
                                  Apache License
                            Version 2.0, January 2004
@@ -262,11 +262,11 @@ SOFTWARE.
 
 ===
 
-# jotai-family@1.1.0 (MIT)
+# microcbor@1.2.1 (MIT)
 
 MIT License
 
-Copyright (c) 2025 Poimandres
+Copyright (c) 2021 Joel Gustafson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -287,6 +287,33 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+===
+
+# jotai-location@0.6.2 (MIT)
+
+The MIT License (MIT)
+
+Copyright (c) 2022 Daishi Kato
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
 ===
 
 # react-stately@3.46.0 (Apache-2.0)
@@ -496,61 +523,7 @@ SOFTWARE.
 
 ===
 
-# microcbor@1.2.1 (MIT)
-
-MIT License
-
-Copyright (c) 2021 Joel Gustafson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-===
-
-# @tiptap/core@3.30.5 (MIT)
-
-MIT License
-
-Copyright (c) 2025, Tiptap GmbH
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-===
-
-# react-aria-components@1.17.0 (Apache-2.0)
+# @internationalized/date@3.12.1 (Apache-2.0)
 
                                  Apache License
                            Version 2.0, January 2004
@@ -757,11 +730,11 @@ SOFTWARE.
 
 ===
 
-# jotai-location@0.6.2 (MIT)
+# jotai-family@1.1.0 (MIT)
 
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2022 Daishi Kato
+Copyright (c) 2025 Poimandres
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -770,17 +743,67 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+===
+
+# @tiptap/core@3.30.5 (MIT)
+
+MIT License
+
+Copyright (c) 2025, Tiptap GmbH
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+===
+
+# htmlparser2@9.1.0 (MIT)
 
+Copyright 2010, 2011, Chris Winberry <chris@winberry.net>. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
 
 ===
 
@@ -991,26 +1014,30 @@ THE SOFTWARE.
 
 ===
 
-# htmlparser2@9.1.0 (MIT)
+# @tiptap/extension-list@3.30.5 (MIT)
+
+MIT License
+
+Copyright (c) 2025, Tiptap GmbH
 
-Copyright 2010, 2011, Chris Winberry <chris@winberry.net>. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
- 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
- 
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
 
 ===
 
@@ -1092,11 +1119,11 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===
 
-# @tiptap/extension-list@3.30.5 (MIT)
+# use-sync-external-store@1.6.0 (MIT)
 
 MIT License
 
-Copyright (c) 2025, Tiptap GmbH
+Copyright (c) Meta Platforms, Inc. and affiliates.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1144,33 +1171,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-===
-
-# use-sync-external-store@1.6.0 (MIT)
-
-MIT License
-
-Copyright (c) Meta Platforms, Inc. and affiliates.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 ===
 
 # dom-serializer@2.0.0 (MIT)

package/dist/adapter/next/cms.js

@@ -19,6 +19,7 @@ import { getPreviewPayloadFromCookies } from "alinea/preview/PreviewCookies";
 import { Headers } from "@alinea/iso";
 import { cache } from "react";
 import { requestContext } from "./context.js";
+import { syncIfStale } from "./syncCheck.js";
 import { jsx } from "react/jsx-runtime";
 var NextCMS = class extends CMS {
   constructor(config) {
@@ -92,7 +93,10 @@ var NextCMS = class extends CMS {
     const db = await this.bundledDb;
     const syncInterval = request.disableSync ? Number.POSITIVE_INFINITY : request.syncInterval ?? this.config.syncInterval;
     if (hasPreview) return db.resolve(request);
-    if (!isBuild) await this.throttle(() => db.syncWith(client), syncInterval);
+    if (!isBuild) {
+      const settled = await syncIfStale(db, client, syncInterval);
+      if (!settled) await this.throttle(() => db.syncWith(client), syncInterval);
+    }
     return db.resolve(request);
   }
   async #authenticatedClient() {

package/dist/adapter/next/handler.js

@@ -19,6 +19,7 @@ import { trace } from "alinea/core/Trace";
 import { NextCMS } from "./cms.js";
 import { requestContext } from "./context.js";
 import { createDevRemote } from "./DevRemote.js";
+import { revalidateContentSha } from "./syncCheck.js";
 function createHandler(input) {
   const options = input instanceof NextCMS ? { cms: input } : input;
   const config = options.cms.config;
@@ -36,18 +37,34 @@ function createHandler(input) {
   const handleBackend = createCoreHandler({
     ...options,
     remote,
-    db
+    db,
+    // Revalidate the shared content sha before the user-provided hook so
+    // page revalidation triggered there already sees the fresh sha when
+    // RSC renders resolve. Invalidation never throws (failures are
+    // swallowed inside revalidateContentSha).
+    afterCommit: async (context) => {
+      await revalidateContentSha();
+      await options.afterCommit?.(context);
+    }
   });
   const handle = async (request) => {
     const url = new URL(request.url);
-    const { searchParams } = url;
     const context = await requestContext(config, request);
     const handlerPath = handlerPathname(config, url);
-    if (url.pathname !== handlerPath)
-      return new Response(`Expected handler to be served on ${handlerPath}`, {
-        status: 400
-      });
+    const rewrittenFile = rewrittenFilePath(config, request);
     try {
+      if (rewrittenFile !== void 0) {
+        const backendUrl = new URL(url);
+        backendUrl.pathname = handlerPath;
+        backendUrl.searchParams.set("file", rewrittenFile);
+        backendUrl.searchParams.set("delivery", "proxy");
+        return await handleBackend(new Request(backendUrl, request), context);
+      }
+      if (url.pathname !== handlerPath)
+        return new Response(`Expected handler to be served on ${handlerPath}`, {
+          status: 400
+        });
+      const { searchParams } = url;
       const previews = new JWTPreviews(context.apiKey);
       const previewToken = searchParams.get("preview");
       if (previewToken) {
@@ -79,6 +96,18 @@ function createHandler(input) {
 function handlerPathname(config, requestUrl) {
   return new URL(Config.handlerUrl(config), requestUrl).pathname;
 }
+function rewrittenFilePath(config, request) {
+  if (request.method !== "GET" && request.method !== "HEAD") return;
+  const url = new URL(request.url);
+  const fileRoot = new URL(Config.filePathname(config, ""), url).pathname;
+  const prefix = `${fileRoot}/`;
+  if (!url.pathname.startsWith(prefix)) return;
+  try {
+    return decodeURIComponent(url.pathname.slice(prefix.length));
+  } catch {
+    return;
+  }
+}
 export {
   createHandler,
   handlerPathname

package/dist/adapter/next/previews.js

@@ -19,12 +19,18 @@ function NextPreviews({
   const [previewDisabled, setPreviewDisabled] = useState(false);
   const pathname = usePathname();
   const adminUrl = new URL(dashboardUrl, location.origin);
+  const host = window.parent !== window ? window.parent : window.opener;
+  let hostOrigin = adminUrl.origin;
+  try {
+    if (host?.location.origin === location.origin) hostOrigin = location.origin;
+  } catch {
+  }
   const entryParams = new URLSearchParams({ url: pathname });
   if (workspace) entryParams.set("workspace", workspace);
   if (root) entryParams.set("root", root);
   const editUrl = new URL(`#/edit?${entryParams}`, adminUrl);
   const { isPreviewing } = usePreview({
-    hostOrigin: adminUrl.origin,
+    hostOrigin,
     async preview(update) {
       if (!update) return;
       const success = await setPreviewCookies(update.payload);

package/dist/adapter/next/syncCheck.d.ts

@@ -0,0 +1,12 @@
+import type { Client } from 'alinea/core/Client';
+import type { LocalDB } from 'alinea/core/db/LocalDB';
+export declare const CONTENT_SHA_TAG = "alinea-content-sha";
+export declare function revalidateContentSha(): Promise<void>;
+/**
+ * Sync the isolate-local db only when it is behind the shared content sha.
+ * Returns true when the freshness question is settled here (synced, forced,
+ * or explicitly disabled) and the caller can skip its throttled sync.
+ * Returns false when the sha could not be determined, so the caller falls
+ * back to its existing throttle behavior.
+ */
+export declare function syncIfStale(db: LocalDB, client: Client, syncInterval?: number): Promise<boolean>;

package/dist/adapter/next/syncCheck.js

@@ -0,0 +1,59 @@
+import "../../chunks/chunk-CQ52GEHY.js";
+
+// src/adapter/next/syncCheck.ts
+import { ReadonlyTree } from "alinea/core/source/Tree";
+var CONTENT_SHA_TAG = "alinea-content-sha";
+var SHA_REVALIDATE_SECONDS = 60;
+var SENTINEL_SHA = ReadonlyTree.EMPTY.sha;
+var inflight;
+function latestSha(client) {
+  if (inflight) return inflight;
+  inflight = loadLatestSha(client).finally(() => {
+    inflight = void 0;
+  });
+  return inflight;
+}
+async function loadLatestSha(client) {
+  try {
+    const { unstable_cache } = await import("next/cache.js");
+    const getSha = unstable_cache(
+      async () => {
+        const tree = await client.getTreeIfDifferent(SENTINEL_SHA);
+        return tree?.sha;
+      },
+      ["alinea-content-sha"],
+      { revalidate: SHA_REVALIDATE_SECONDS, tags: [CONTENT_SHA_TAG] }
+    );
+    return await getSha();
+  } catch {
+    try {
+      const tree = await client.getTreeIfDifferent(SENTINEL_SHA);
+      return tree?.sha;
+    } catch {
+      return void 0;
+    }
+  }
+}
+async function revalidateContentSha() {
+  try {
+    const { revalidateTag } = await import("next/cache.js");
+    revalidateTag(CONTENT_SHA_TAG, { expire: 0 });
+  } catch {
+  }
+}
+async function syncIfStale(db, client, syncInterval) {
+  if (syncInterval === Number.POSITIVE_INFINITY) return true;
+  if (syncInterval === 0) {
+    await db.syncWith(client);
+    return true;
+  }
+  const expected = await latestSha(client);
+  if (!expected) return false;
+  if (expected !== db.sha) await db.syncWith(client);
+  return true;
+}
+export {
+  CONTENT_SHA_TAG,
+  revalidateContentSha,
+  syncIfStale
+};

package/dist/adapter/next/with-alinea.d.ts

@@ -1,11 +1,3 @@
 import type { NextConfig } from 'next/dist/types.js';
-export interface WithAlineaOptions {
-    /**
-     * Base path where the dashboard is mounted.
-     *
-     * @default '/admin'
-     */
-    adminPath?: string;
-}
 export declare function createCMS(): void;
 export declare function withAlinea(config?: NextConfig): NextConfig;

package/dist/adapter/next/with-alinea.js

@@ -1,6 +1,7 @@
 import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/adapter/next/with-alinea.ts
+import { join } from "alinea/core/util/Paths";
 import { readFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import { resolve } from "node:path";
@@ -26,23 +27,13 @@ function withAlinea(config = {}) {
   } catch {
     console.warn("Alinea could not determine Next.js version, assuming 15+");
   }
-  const imagesConfig = config.images ?? {};
-  const remotePatterns = [
-    ...imagesConfig.remotePatterns ?? [],
-    {
-      protocol: "https",
-      hostname: "uploads.alinea.cloud"
-    }
-  ];
-  const images = {
-    ...imagesConfig,
-    remotePatterns
-  };
   const redirects = adminPath ? createRedirects(config, adminPath) : config.redirects;
-  const rewrites = adminPath ? createRewrites(config, adminPath) : config.rewrites;
+  const rewrites = adminPath ? createRewrites(config, adminPath, settings.handlerUrl) : config.rewrites;
+  const images = adminPath ? createImages(config, adminPath) : config.images;
   const env = settings ? {
     ...config.env,
-    ALINEA_ADMIN_PATH: settings.adminPath
+    ALINEA_ADMIN_PATH: settings.adminPath,
+    ALINEA_HANDLER_URL: settings.handlerUrl
   } : config.env;
   if (nextVersion < 15)
     return {
@@ -54,9 +45,9 @@ function withAlinea(config = {}) {
           "@alinea/generated"
         ]
       },
-      images,
       redirects,
       rewrites,
+      images,
       env
     };
   return {
@@ -65,12 +56,32 @@ function withAlinea(config = {}) {
       ...config.serverExternalPackages ?? [],
       "@alinea/generated"
     ],
-    images,
     redirects,
     rewrites,
+    images,
     env
   };
 }
+function createImages(config, adminPath) {
+  const filePattern = `${adminPath}/file/**`;
+  const localPatterns = config.images?.localPatterns;
+  if (!localPatterns)
+    return {
+      ...config.images,
+      localPatterns: [{ pathname: filePattern }, { pathname: "/**" }]
+    };
+  if (localPatterns.some((pattern) => pattern.pathname === filePattern))
+    return config.images;
+  return {
+    ...config.images,
+    localPatterns: [
+      ...localPatterns,
+      {
+        pathname: filePattern
+      }
+    ]
+  };
+}
 function createRedirects(config, adminPath) {
   const dev = process.env.ALINEA_DEV_SERVER;
   if (!dev) return config.redirects;
@@ -91,7 +102,7 @@ var emptyRewrites = {
   afterFiles: [],
   fallback: []
 };
-function createRewrites(config, adminPath) {
+function createRewrites(config, adminPath, handlerUrl) {
   return async () => {
     const devServer = process.env.ALINEA_DEV_SERVER;
     const nodeEnv = process.env.NODE_ENV;
@@ -112,6 +123,10 @@ function createRewrites(config, adminPath) {
         ...rewrites,
         beforeFiles: [
           ...rewrites.beforeFiles,
+          {
+            source: `${adminPath}/file/:file*`,
+            destination: `${devServer}/api?file=:file*&delivery=proxy`
+          },
           {
             source: `${adminPath}/:path*`,
             destination: `${devServer}${adminPath}/:path*`
@@ -121,6 +136,14 @@ function createRewrites(config, adminPath) {
     }
     return {
       ...rewrites,
+      beforeFiles: [
+        ...rewrites.beforeFiles,
+        {
+          source: `${adminPath}/file/:file*`,
+          // Next's internal image optimizer does not follow redirects.
+          destination: `${handlerUrl}?file=:file*&delivery=proxy`
+        }
+      ],
       afterFiles: [
         ...rewrites.afterFiles,
         {
@@ -135,11 +158,12 @@ function resolveSettings(config) {
   const adminPath = config.env?.ALINEA_ADMIN_PATH ?? process.env.ALINEA_ADMIN_PATH;
   if (!adminPath) return;
   return {
-    adminPath: normalizeBasePath(adminPath)
+    adminPath: normalizeBasePath(adminPath),
+    handlerUrl: config.env?.ALINEA_HANDLER_URL ?? process.env.ALINEA_HANDLER_URL ?? "/api/cms"
   };
 }
 function normalizeBasePath(value) {
-  return value.startsWith("/") ? value : `/${value}`;
+  return join("/", value, ".");
 }
 export {
   createCMS,