Pro 9551 apos astro v2

.changeset/six-socks-design.md

@@ -0,0 +1,16 @@
+---
+"@apostrophecms/apostrophe-astro": minor
+---
+
+- Replace vite-plugin-apostrophe-config and vite-plugin-apostrophe-doctype with
+  vite/vite-plugin-apostrophe-generated-config.js, which writes real files to
+  node_modules/.apostrophe-astro-config/ (config.js, doctypes.js)
+- Register Vite aliases for apostrophe-astro-config/config and /doctypes
+- Update all internal virtual: imports to alias specifiers
+- Rename static build cache dir to node_modules/.apostrophe-astro-static/
+- Add helpers/server/ (aposFetch, getAposHost, isStaticBuild)
+- Add helpers/universal/ (URL, slug, styles, attachment helpers)
+- Keep lib/aposPageFetch.js as the internal implementation (starter kit entrypoint only)
+- Reduce lib/util.js, lib/aposSetQueryParameter.js, lib/static.js to deprecated shims
+- Add MIGRATION.md
+- Bump undici to ^7.x for Node.js 24+ compatibility

packages/apostrophe-astro/MIGRATION.md

@@ -0,0 +1,62 @@
+# Migrating to @apostrophecms/apostrophe-astro v1.13
+
+## Astro v6 support
+
+v1.13 adds support for Astro v6 (Vite 7). Astro v5 continues to work.
+
+---
+
+## Astro v6: remove `security.allowedDomains` from static builds
+
+If your project uses `security.allowedDomains` in `astro.config.mjs` **and** runs static builds, guard it to SSR-only. In a static build Astro v6 reads `request.headers` to validate forwarded headers even during prerendering, producing a spurious warning for every page:
+
+```
+[WARN] `Astro.request.headers` was used when rendering the route `src/pages/[...slug].astro`
+```
+
+`allowedDomains` has no effect during prerendering (there are no real HTTP headers at build time), so the fix is straightforward:
+
+```js
+// astro.config.mjs
+const isStatic = process.env.APOS_BUILD === 'static'; // or however you detect it
+
+export default defineConfig({
+  output: isStatic ? 'static' : 'server',
+  // Only configure allowedDomains for SSR — it is meaningless during
+  // static prerendering and triggers a spurious headers warning in Astro v6.
+  ...(!isStatic && {
+    security: { allowedDomains }
+  }),
+  // ...
+});
+```
+
+---
+
+## Deprecated: direct `lib/` imports for public helpers
+
+Some `lib/` paths are deprecated in favour of the stable helper entry points. Note that `lib/aposPageFetch.js` is **not** deprecated — it is an internal function used by the starter kit's `[...slug].astro` entrypoint and is not part of the public API.
+
+| Old import | New import |
+|---|---|
+| `@apostrophecms/apostrophe-astro/lib/static.js` | `@apostrophecms/apostrophe-astro/helpers/server` (`getAllStaticPaths`, `getAllUrlMetadata`, `getLocales`) |
+| `@apostrophecms/apostrophe-astro/lib/aposSetQueryParameter.js` | `@apostrophecms/apostrophe-astro/helpers/universal` (`aposSetQueryParameter`) |
+| `@apostrophecms/apostrophe-astro/lib/util.js` | `@apostrophecms/apostrophe-astro/helpers/universal` (`slugify`, etc.) |
+| `@apostrophecms/apostrophe-astro/lib/aposStyles.js` | `@apostrophecms/apostrophe-astro/helpers/universal` (`stylesAttributes`, `stylesElements`) |
+| `@apostrophecms/apostrophe-astro/lib/attachment.js` | `@apostrophecms/apostrophe-astro/helpers/universal` (`getAttachmentUrl`, `getAttachmentSrcset`, etc.) |
+
+Example:
+
+```js
+// Before
+import { getAllStaticPaths } from '@apostrophecms/apostrophe-astro/lib/static.js';
+
+// After
+import { getAllStaticPaths } from '@apostrophecms/apostrophe-astro/helpers/server';
+```
+
+---
+
+## Removed: Vite virtual modules
+
+`virtual:apostrophe-config` and `virtual:apostrophe-doctypes` were private implementation details and are no longer available. If you were importing either of these directly, remove those imports — there is no public replacement, as they were never part of the supported API.

packages/apostrophe-astro/README.md

@@ -331,7 +331,7 @@ Your `[...slug].astro` component should look like this:
 
 ```js
 ---
-import aposPageFetch from '@apostrophecms/apostrophe-astro/lib/aposPageFetch.js';
+import { aposPageFetch } from '@apostrophecms/apostrophe-astro/helpers/server';
 import AposLayout from '@apostrophecms/apostrophe-astro/components/layouts/AposLayout.astro';
 import AposTemplate from '@apostrophecms/apostrophe-astro/components/AposTemplate.astro';
 
@@ -651,7 +651,7 @@ links to each page of blog posts:
 
 ```js
 ---
-import setParameter from '@apostrophecms/apostrophe-astro/lib/aposSetQueryParameter.js';
+import { aposSetQueryParameter as setParameter } from '@apostrophecms/apostrophe-astro/helpers/universal';
 
 const {
   pieces,

packages/apostrophe-astro/components/AposTemplate.astro

@@ -1,5 +1,5 @@
 ---
-import { templates } from 'virtual:apostrophe-doctypes';
+import { templates } from 'apostrophe-astro-config/doctypes';
 
 const { aposData } = Astro.props;
 

packages/apostrophe-astro/components/AposWidget.astro

@@ -1,5 +1,5 @@
 ---
-import { widgets } from "virtual:apostrophe-doctypes";
+import { widgets } from 'apostrophe-astro-config/doctypes';
 
 const { widget, options, ...props } = Astro.props;
 const isEdit = widget._edit && Astro.url.searchParams.get("aposEdit");

packages/apostrophe-astro/components/layouts/AposEditLayout.astro

@@ -1,5 +1,5 @@
 ---
-import config from "virtual:apostrophe-config";
+import config from 'apostrophe-astro-config/config';
 
 const { title, bodyClass, aposData } = Astro.props;
 const { viewTransitionWorkaround } = config;

packages/apostrophe-astro/components/layouts/AposLayout.astro

@@ -2,7 +2,7 @@
 import AposRunLayout from "./AposRunLayout.astro";
 import AposEditLayout from "./AposEditLayout.astro";
 import AposRefreshLayout from "./AposRefreshLayout.astro";
-import config from 'virtual:apostrophe-config';
+import config from 'apostrophe-astro-config/config';
 
 const { aposData } = Astro.props;
 
@@ -13,7 +13,10 @@ if (!headersToInclude && config.forwardHeaders) {
   headersToInclude = config.forwardHeaders;
 }
 
-if (headersToInclude && Array.isArray(headersToInclude)) {
+// Response headers are only meaningful in SSR — prerendered static pages
+// have no per-request HTTP response, and accessing Astro.response.headers
+// in that context triggers a warning in Astro v6.
+if (!config.staticBuild && headersToInclude && Array.isArray(headersToInclude)) {
   const headers = aposData.aposResponseHeaders;
   if (headers) {
     for (const header of headersToInclude) {

packages/apostrophe-astro/endpoints/renderWidget.astro

@@ -2,7 +2,7 @@
 import AposWidget from "../components/AposWidget.astro";
 import aposRequest from "../lib/aposRequest.js";
 import aposResponse from "../lib/aposResponse.js";
-import { onBeforeWidgetRenderHook } from "virtual:apostrophe-doctypes";
+import { onBeforeWidgetRenderHook } from 'apostrophe-astro-config/doctypes';
 
 const request = aposRequest(Astro.request);
 const response = await aposResponse(request);

packages/apostrophe-astro/helpers/index.js

@@ -1,3 +1,14 @@
-export { getAposHost, isStaticBuild, buildPageUrl, getFilterBaseUrl, aposSetQueryParameter } from './url.js';
-export { slugify } from './slug.js';
-export { aposFetch } from './fetch.js';
+/**
+ * @deprecated Import from the scoped sub-paths instead:
+ *
+ * ```js
+ * // Server-side helpers (Astro frontmatter, endpoints, prerendering)
+ * import { aposFetch, getAposHost, isStaticBuild, getAllStaticPaths } from '@apostrophecms/apostrophe-astro/helpers/server';
+ *
+ * // Universal helpers (server + client)
+ * import { slugify, getAttachmentUrl, aposSetQueryParameter } from '@apostrophecms/apostrophe-astro/helpers/universal';
+ * ```
+ */
+
+export { aposFetch, getAposHost, isStaticBuild, getAllStaticPaths, getAllUrlMetadata, getLocales } from './server/index.js';
+export { buildPageUrl, getFilterBaseUrl, aposSetQueryParameter, slugify, stylesElements, stylesAttributes, getFocalPoint, getAttachmentUrl, getAttachmentSrcset, getWidth, getHeight } from './universal/index.js';

packages/apostrophe-astro/helpers/fetch.js → packages/apostrophe-astro/helpers/server/fetch.js

@@ -1,12 +1,12 @@
-import config from 'virtual:apostrophe-config';
+import config from 'apostrophe-astro-config/config';
 import { getAposHost } from './url.js';
 
 /**
  * A transparent proxy around the native `fetch` API for **server-side
  * Astro code only** (`.astro` frontmatter, server endpoints, etc.).
  *
  * **Do NOT use in client-side code** — it depends on
- * `virtual:apostrophe-config` and exposes the internal backend host.
+ * `apostrophe-astro-config/config` and exposes the internal backend host.
  * For browser requests use plain `fetch` with relative URLs
  * (e.g. `/api/v1/...`).
  *
@@ -28,7 +28,7 @@ import { getAposHost } from './url.js';
  * @example
  * ```astro
  * ---
- * import { aposFetch } from '@apostrophecms/apostrophe-astro/helpers';
+ * import { aposFetch } from '@apostrophecms/apostrophe-astro/helpers/server';
  * const response = await aposFetch('/api/v1/article?perPage=5');
  * const data = await response.json();
  * ---
@@ -50,3 +50,4 @@ export async function aposFetch(input, init) {
     headers
   });
 }
+

packages/apostrophe-astro/helpers/server/index.js

@@ -0,0 +1,14 @@
+/**
+ * Server-only public helpers for @apostrophecms/apostrophe-astro.
+ *
+ * Use these in Astro frontmatter, server endpoints, prerendering routes,
+ * and any other server-side code. Do not import this module from
+ * client-side scripts — it depends on generated integration config and
+ * Node.js internals unavailable in browsers.
+ *
+ * @module @apostrophecms/apostrophe-astro/helpers/server
+ */
+
+export { aposFetch } from './fetch.js';
+export { getAposHost, isStaticBuild } from './url.js';
+export { getAllStaticPaths, getAllUrlMetadata, getLocales } from './static.js';

packages/apostrophe-astro/helpers/server/static.js

@@ -0,0 +1,9 @@
+/**
+ * Static build helpers — server-only.
+ *
+ * Re-exports the public static-build functions from `lib/static.js`.
+ * Use these in `getStaticPaths()` inside your `[...slug].astro` page
+ * to fetch all page paths and props from the Apostrophe backend.
+ */
+
+export { getAllStaticPaths, getAllUrlMetadata, getLocales } from '../../lib/static.js';

packages/apostrophe-astro/helpers/server/url.js

@@ -0,0 +1,55 @@
+import config from 'apostrophe-astro-config/config';
+
+/**
+ * Get the Apostrophe backend base URL, including the prefix when
+ * configured.
+ *
+ * Returns `config.aposHost + config.aposPrefix` — the full base URL
+ * for reaching the Apostrophe backend (e.g.
+ * `http://localhost:3000/my-repo`). Environment variable overrides
+ * (`APOS_HOST`, `APOS_PREFIX`) are resolved once at config time in
+ * the integration's `astro:config:setup` hook and stored in the
+ * generated config module — this function does no env lookups.
+ *
+ * Prefer `aposFetch` for API calls — use `getAposHost()` only when
+ * you need the raw URL string (e.g. for building non-fetch URLs).
+ *
+ * WARNING: not to be confused with "Public Host" — this is meant to
+ * be used only in Astro server-side code. Use relative URLs for
+ * client-side requests `/api/v1/...`.
+ *
+ * @returns {string} The backend base URL (e.g. `http://localhost:3000`
+ *   or `http://localhost:3000/my-repo`).
+ *
+ * @example
+ * ```astro
+ * ---
+ * import { getAposHost } from '@apostrophecms/apostrophe-astro/helpers/server';
+ * const host = getAposHost();
+ * // e.g. 'http://localhost:3000' or 'http://localhost:3000/my-repo'
+ * ---
+ * ```
+ */
+export function getAposHost() {
+  return config.aposHost + (config.aposPrefix || '');
+}
+
+/**
+ * Check whether the current build is a static build.
+ *
+ * Returns `true` when the Astro integration is configured for
+ * static output (e.g. `output: 'static'`).
+ *
+ * @returns {boolean}
+ *
+ * @example
+ * ```astro
+ * ---
+ * import { isStaticBuild } from '@apostrophecms/apostrophe-astro/helpers/server';
+ * ---
+ * <html data-static={isStaticBuild()}>
+ * ```
+ */
+export function isStaticBuild() {
+  return process.env.APOS_ASTRO_STATIC_BUILD === '1' || Boolean(config.staticBuild);
+}