@cmssy/astro 11.3.1 → 11.3.2

package/dist/index.cjs

@@ -6,6 +6,7 @@ var react = require('@cmssy/react');
 
 // src/middleware.ts
 var CMSSY_EDIT_PATH_PREFIX = "/cmssy-edit";
+var withoutDuplicateSlashes = (pathname) => pathname.replace(/\/{2,}/g, "/") || "/";
 function cmssyMiddleware(config, options = {}) {
   return async function onRequest(context, next) {
     const { pathname } = context.url;
@@ -14,12 +15,13 @@ function cmssyMiddleware(config, options = {}) {
     const locale = await internal.localeForPathname(config, pathname);
     context.request.headers.set(internal.CMSSY_LOCALE_HEADER, locale);
     const editRequested = context.url.searchParams.getAll(core.CMSSY_EDIT_QUERY_PARAM).includes("1");
+    const underEditRoute = pathname === CMSSY_EDIT_PATH_PREFIX || pathname.startsWith(`${CMSSY_EDIT_PATH_PREFIX}/`);
     if (editRequested) {
       const verified = await core.isVerifiedEditUrl(context.url, config);
-      if (verified && !pathname.startsWith(CMSSY_EDIT_PATH_PREFIX)) {
+      if (verified && !underEditRoute) {
         context.request.headers.set(core.CMSSY_EDIT_HEADER, "1");
         const target = `${CMSSY_EDIT_PATH_PREFIX}${pathname === "/" ? "" : pathname}${context.url.search}`;
-        const response = await context.rewrite(
+        const response = await next(
           new Request(new URL(target, context.url), context.request)
         );
         core.applyCmssyCsp(response, { editorOrigin: config.editorOrigin });
@@ -34,17 +36,24 @@ function cmssyMiddleware(config, options = {}) {
           ),
           devOrigin: context.url.origin
         });
-        return new Response(renderEditDiagnosticsDocument(diagnostics), {
+        const page = new Response(renderEditDiagnosticsDocument(diagnostics), {
           status: 200,
           headers: { "content-type": "text/html; charset=utf-8" }
         });
+        try {
+          core.applyCmssyCsp(page, { editorOrigin: config.editorOrigin });
+        } catch {
+        }
+        return page;
       }
     }
-    if (options.stripLocalePrefix && pathname.startsWith(`/${locale}`)) {
+    const prefix = `/${locale}`;
+    const prefixed = pathname === prefix || pathname.startsWith(`${prefix}/`);
+    if (options.stripLocalePrefix && prefixed) {
       const { defaultLocale } = await internal.resolveSiteLocales(config);
       if (locale !== defaultLocale) {
-        const stripped = pathname.slice(locale.length + 1) || "/";
-        return context.rewrite(`${stripped}${context.url.search}`);
+        const stripped = withoutDuplicateSlashes(pathname.slice(prefix.length));
+        return next(`${stripped}${context.url.search}`);
       }
     }
     return next();
@@ -124,6 +133,10 @@ Object.defineProperty(exports, "localizeHref", {
   enumerable: true,
   get: function () { return core.localizeHref; }
 });
+Object.defineProperty(exports, "resolveEditorOrigin", {
+  enumerable: true,
+  get: function () { return core.resolveEditorOrigin; }
+});
 exports.CMSSY_EDIT_PATH_PREFIX = CMSSY_EDIT_PATH_PREFIX;
 exports.cmssyMiddleware = cmssyMiddleware;
 exports.loadCmssyPage = loadCmssyPage;

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { CmssyConfig, CmssyPageData, CmssyLayoutGroup } from '@cmssy/core';
-export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CmssyBlockContext, CmssyConfig, CmssyEnvConfig, CmssyLayoutGroup, CmssyPageData, createCmssyClient, defineCmssyConfig, localizeHref } from '@cmssy/core';
+export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CmssyBlockContext, CmssyConfig, CmssyEnvConfig, CmssyLayoutGroup, CmssyPageData, createCmssyClient, defineCmssyConfig, localizeHref, resolveEditorOrigin } from '@cmssy/core';
 import { BlockDefinition } from '@cmssy/react';
 
 declare const CMSSY_EDIT_PATH_PREFIX = "/cmssy-edit";
@@ -14,8 +14,15 @@ interface CmssyMiddlewareOptions {
 interface AstroContextLike {
     url: URL;
     request: Request;
-    rewrite: (target: string | URL | Request) => Promise<Response> | Response;
 }
+/**
+ * The rewrite payload goes to `next`, not to `context.rewrite`. Both reach
+ * `applyRewriteToState`, but `context.rewrite` builds a fresh `AstroMiddleware`
+ * and runs this whole chain again on the rewritten URL - where the language
+ * prefix it just removed is gone, so a second pass resolved the default
+ * language and overwrote the first pass's answer.
+ */
+type CmssyNext = (payload?: string | URL | Request) => Promise<Response> | Response;
 /**
  * The whole middleware a cmssy Astro app needs, in the order it has to happen:
  *
@@ -28,10 +35,9 @@ interface AstroContextLike {
  * The order is not a detail. Resolve the locale after the rewrite and the editor
  * preview renders in the wrong language; drop the edit flag and the header and
  * footer become markup the editor can select but not fill. Both mistakes shipped
- * in the Next app before this sequence existed - Astro gets it right the first
- * time by reusing it.
+ * in the Next app before this sequence existed.
  */
-declare function cmssyMiddleware(config: CmssyConfig, options?: CmssyMiddlewareOptions): (context: AstroContextLike, next: () => Promise<Response>) => Promise<Response>;
+declare function cmssyMiddleware(config: CmssyConfig, options?: CmssyMiddlewareOptions): (context: AstroContextLike, next: CmssyNext) => Promise<Response>;
 
 interface CmssyPageResult {
     page: CmssyPageData | null;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { CmssyConfig, CmssyPageData, CmssyLayoutGroup } from '@cmssy/core';
-export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CmssyBlockContext, CmssyConfig, CmssyEnvConfig, CmssyLayoutGroup, CmssyPageData, createCmssyClient, defineCmssyConfig, localizeHref } from '@cmssy/core';
+export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CmssyBlockContext, CmssyConfig, CmssyEnvConfig, CmssyLayoutGroup, CmssyPageData, createCmssyClient, defineCmssyConfig, localizeHref, resolveEditorOrigin } from '@cmssy/core';
 import { BlockDefinition } from '@cmssy/react';
 
 declare const CMSSY_EDIT_PATH_PREFIX = "/cmssy-edit";
@@ -14,8 +14,15 @@ interface CmssyMiddlewareOptions {
 interface AstroContextLike {
     url: URL;
     request: Request;
-    rewrite: (target: string | URL | Request) => Promise<Response> | Response;
 }
+/**
+ * The rewrite payload goes to `next`, not to `context.rewrite`. Both reach
+ * `applyRewriteToState`, but `context.rewrite` builds a fresh `AstroMiddleware`
+ * and runs this whole chain again on the rewritten URL - where the language
+ * prefix it just removed is gone, so a second pass resolved the default
+ * language and overwrote the first pass's answer.
+ */
+type CmssyNext = (payload?: string | URL | Request) => Promise<Response> | Response;
 /**
  * The whole middleware a cmssy Astro app needs, in the order it has to happen:
  *
@@ -28,10 +35,9 @@ interface AstroContextLike {
  * The order is not a detail. Resolve the locale after the rewrite and the editor
  * preview renders in the wrong language; drop the edit flag and the header and
  * footer become markup the editor can select but not fill. Both mistakes shipped
- * in the Next app before this sequence existed - Astro gets it right the first
- * time by reusing it.
+ * in the Next app before this sequence existed.
  */
-declare function cmssyMiddleware(config: CmssyConfig, options?: CmssyMiddlewareOptions): (context: AstroContextLike, next: () => Promise<Response>) => Promise<Response>;
+declare function cmssyMiddleware(config: CmssyConfig, options?: CmssyMiddlewareOptions): (context: AstroContextLike, next: CmssyNext) => Promise<Response>;
 
 interface CmssyPageResult {
     page: CmssyPageData | null;

package/dist/index.js

@@ -1,10 +1,11 @@
 import { CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM, isVerifiedEditUrl, applyCmssyCsp, CMSSY_SECRET_QUERY_PARAM } from '@cmssy/core';
-export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, createCmssyClient, defineCmssyConfig, localizeHref } from '@cmssy/core';
+export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, createCmssyClient, defineCmssyConfig, localizeHref, resolveEditorOrigin } from '@cmssy/core';
 import { CMSSY_LOCALE_HEADER, localeForPathname, isDevelopment, resolveSiteLocales, fetchPage } from '@cmssy/core/internal';
 import { resolveCmssyLayoutSlot } from '@cmssy/react';
 
 // src/middleware.ts
 var CMSSY_EDIT_PATH_PREFIX = "/cmssy-edit";
+var withoutDuplicateSlashes = (pathname) => pathname.replace(/\/{2,}/g, "/") || "/";
 function cmssyMiddleware(config, options = {}) {
   return async function onRequest(context, next) {
     const { pathname } = context.url;
@@ -13,12 +14,13 @@ function cmssyMiddleware(config, options = {}) {
     const locale = await localeForPathname(config, pathname);
     context.request.headers.set(CMSSY_LOCALE_HEADER, locale);
     const editRequested = context.url.searchParams.getAll(CMSSY_EDIT_QUERY_PARAM).includes("1");
+    const underEditRoute = pathname === CMSSY_EDIT_PATH_PREFIX || pathname.startsWith(`${CMSSY_EDIT_PATH_PREFIX}/`);
     if (editRequested) {
       const verified = await isVerifiedEditUrl(context.url, config);
-      if (verified && !pathname.startsWith(CMSSY_EDIT_PATH_PREFIX)) {
+      if (verified && !underEditRoute) {
         context.request.headers.set(CMSSY_EDIT_HEADER, "1");
         const target = `${CMSSY_EDIT_PATH_PREFIX}${pathname === "/" ? "" : pathname}${context.url.search}`;
-        const response = await context.rewrite(
+        const response = await next(
           new Request(new URL(target, context.url), context.request)
         );
         applyCmssyCsp(response, { editorOrigin: config.editorOrigin });
@@ -33,17 +35,24 @@ function cmssyMiddleware(config, options = {}) {
           ),
           devOrigin: context.url.origin
         });
-        return new Response(renderEditDiagnosticsDocument(diagnostics), {
+        const page = new Response(renderEditDiagnosticsDocument(diagnostics), {
           status: 200,
           headers: { "content-type": "text/html; charset=utf-8" }
         });
+        try {
+          applyCmssyCsp(page, { editorOrigin: config.editorOrigin });
+        } catch {
+        }
+        return page;
       }
     }
-    if (options.stripLocalePrefix && pathname.startsWith(`/${locale}`)) {
+    const prefix = `/${locale}`;
+    const prefixed = pathname === prefix || pathname.startsWith(`${prefix}/`);
+    if (options.stripLocalePrefix && prefixed) {
       const { defaultLocale } = await resolveSiteLocales(config);
       if (locale !== defaultLocale) {
-        const stripped = pathname.slice(locale.length + 1) || "/";
-        return context.rewrite(`${stripped}${context.url.search}`);
+        const stripped = withoutDuplicateSlashes(pathname.slice(prefix.length));
+        return next(`${stripped}${context.url.search}`);
       }
     }
     return next();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/astro",
-  "version": "11.3.1",
+  "version": "11.3.2",
   "description": "Astro bindings for cmssy headless sites: middleware, page loader, sitemap and robots.",
   "keywords": [
     "cmssy",
@@ -39,7 +39,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "astro": ">=4",
+    "astro": ">=4.16",
     "@cmssy/react": "^11.3.0"
   },
   "devDependencies": {
@@ -47,10 +47,10 @@
     "tsup": "^8.3.0",
     "typescript": "^5.6.0",
     "vitest": "^2.1.0",
-    "@cmssy/react": "11.3.1"
+    "@cmssy/react": "11.3.2"
   },
   "dependencies": {
-    "@cmssy/core": "11.3.1"
+    "@cmssy/core": "11.3.2"
   },
   "scripts": {
     "build": "tsup",