@ampless/runtime 1.0.0-alpha.59 → 1.0.0-beta.61

package/README.ja.md

@@ -5,14 +5,14 @@
 
 [ampless](https://github.com/heavymoons/ampless) 向けパブリックサイドランタイム。投稿取得クライアント、サイト設定、テーマ解決、SEO メタデータ集約、ミドルウェア、パブリックルートハンドラーを `createAmpless()` ひとつのファクトリーにまとめます。
 
-> **プレリリース / アルファ版。** v1.0 まではマイナーバージョンでも破壊的変更が入る可能性があります。
+> **プレリリース / ベータ版。** v1.0 まではマイナーバージョンでも破壊的変更が入る可能性があります。
 
 テンプレートから切り出すことで、スキャフォールドされたファイルに触れずに `npm update @ampless/runtime` でアップデートできます — パブリックサイトの動作改善はスキャフォールダーの再実行ではなく、パッケージを通じて届きます。
 
 ## インストール
 
 ```bash
-npm install @ampless/runtime@alpha ampless@alpha
+npm install @ampless/runtime@beta ampless@beta
 ```
 
 `@ampless/runtime` は `next`（15+）、`react`（18/19）、`aws-amplify`（6+）、`@aws-amplify/adapter-nextjs`（1+）をピア依存として宣言します。CLI スキャフォールダーがテンプレートの `package.json` に互換バージョンをピン留めします。

package/README.md

@@ -5,14 +5,14 @@
 
 Public-side runtime for [ampless](https://github.com/heavymoons/ampless). Bundles the post-fetching client, site settings, theme resolution, SEO metadata aggregation, middleware, and public route handlers behind a single `createAmpless()` factory.
 
-> **Pre-release / alpha.** Breaking changes possible in any minor version until v1.0.
+> **Pre-release / beta.** Breaking changes possible in any minor version until v1.0.
 
 Splitting this out of the template lets you `npm update @ampless/runtime` without touching scaffolded files — public-site behaviour upgrades come in through the package, not by re-running the scaffolder.
 
 ## Install
 
 ```bash
-npm install @ampless/runtime@alpha ampless@alpha
+npm install @ampless/runtime@beta ampless@beta
 ```
 
 `@ampless/runtime` declares peer dependencies on `next` (15+), `react` (18/19), `aws-amplify` (6+), and `@aws-amplify/adapter-nextjs` (1+). The CLI scaffolder pins compatible versions in the template's `package.json`.

package/dist/chunk-BS7KLDDE.js

@@ -0,0 +1,10 @@
+// src/request-headers.ts
+var AMPLESS_PATHNAME_HEADER = "x-ampless-pathname";
+var PREVIEW_THEME_HEADER = "x-preview-theme";
+var PREVIEW_COLOR_SCHEME_HEADER = "x-preview-color-scheme";
+
+export {
+  AMPLESS_PATHNAME_HEADER,
+  PREVIEW_THEME_HEADER,
+  PREVIEW_COLOR_SCHEME_HEADER
+};

package/dist/index.d.ts

@@ -367,18 +367,6 @@ interface PublicHtmlForPostResult {
  *   U+2029   → '\u2029'
  */
 declare function escapeJsonLdInlineBody(value: string): string;
-/**
- * Create the head/body renderer for a `Config`. The constructor-time
- * pass logs a single dev warning when two plugins share an
- * `instanceId ?? name`; everything else happens at render time so
- * descriptors reflect per-request site config.
- *
- * `pluginSettings` (Phase 2) is the runtime accessor that pulls
- * admin-managed `settings.public` values from the S3 site-settings
- * cache. Within a single request we fetch once via `loadAll()` and
- * bind a per-plugin `ctx.setting(key)` accessor before invoking
- * either `publicHead` or `publicBodyEnd`.
- */
 declare function createPluginHead(cmsConfig: Config, pluginSettings: PluginSettingsApi): PluginHeadApi;
 
 interface ThemesRegistry {
@@ -461,9 +449,9 @@ declare function renderThemeCss(cssVars: Record<string, string>): string;
  * Failure modes that resolve to `null`:
  *   - Package not installed at this resolution root
  *     (`ERR_MODULE_NOT_FOUND`)
- *   - `package.json` not in the package's `exports`
- *     (`ERR_PACKAGE_PATH_NOT_EXPORTED`) — see the spec under
- *     `docs/tmp/plugin-extension-phase5.md` §B
+   *   - `package.json` not in the package's `exports`
+   *     (`ERR_PACKAGE_PATH_NOT_EXPORTED`) — see the package manifest
+   *     convention above
  *   - `readFileSync` throws (e.g. ENOENT, permissions)
  *   - JSON parse error
  *   - `amplessPlugin` field absent or not an object
@@ -629,7 +617,7 @@ interface Ampless {
      *
      *     <div>{await ampless.renderBody(post)}</div>
      *
-     * Phase 7 alpha breaking: this signature replaced the prior sync
+     * Phase 7 pre-1.0 breaking: this signature replaced the prior sync
      * `string` return shape. The sync string flavour is still available
      * via `renderBodyHtmlString` for routes (raw HTML response) that
      * cannot await — but those callsites bypass the `contentFields`

package/dist/index.js

@@ -1,3 +1,8 @@
+import {
+  AMPLESS_PATHNAME_HEADER,
+  PREVIEW_COLOR_SCHEME_HEADER,
+  PREVIEW_THEME_HEADER
+} from "./chunk-BS7KLDDE.js";
 import {
   _resetStreamS3Cache,
   streamS3Object,
@@ -238,6 +243,7 @@ function createSeo(cmsConfig, settingsApi) {
 }
 
 // src/plugin-head.ts
+import { headers } from "next/headers";
 import {
   Fragment as Fragment2,
   createElement as createElement2
@@ -1428,6 +1434,20 @@ function collectHtmlForPost(plugins, site, snapshot, post) {
     afterContent: toReactNode(after, "afterContent")
   };
 }
+async function isPublicRequest() {
+  let h;
+  try {
+    h = await headers();
+  } catch {
+    return false;
+  }
+  const p = h.get(AMPLESS_PATHNAME_HEADER);
+  if (!p) return false;
+  if (p === "/admin" || p.startsWith("/admin/")) return false;
+  if (p === "/login" || p.startsWith("/login/")) return false;
+  if (h.get(PREVIEW_THEME_HEADER) || h.get(PREVIEW_COLOR_SCHEME_HEADER)) return false;
+  return true;
+}
 function createPluginHead(cmsConfig, pluginSettings) {
   const plugins = (cmsConfig.plugins ?? []).filter(isPlugin2);
   const validPlugins = [];
@@ -1532,6 +1552,7 @@ function createPluginHead(cmsConfig, pluginSettings) {
   }
   return {
     async renderHead() {
+      if (!await isPublicRequest()) return null;
       const snapshot = await pluginSettings.loadAll();
       return collectFor(
         validPlugins,
@@ -1542,6 +1563,7 @@ function createPluginHead(cmsConfig, pluginSettings) {
       );
     },
     async renderBodyEnd() {
+      if (!await isPublicRequest()) return null;
       const snapshot = await pluginSettings.loadAll();
       return collectFor(
         validPlugins,
@@ -1664,7 +1686,7 @@ function createPluginSettings(storage) {
 }
 
 // src/theme-active.ts
-import { headers } from "next/headers";
+import { headers as headers2 } from "next/headers";
 function createThemeActive(registry, storage) {
   function settingsUrl() {
     if (!storage.isStorageConfigured()) return null;
@@ -1699,8 +1721,8 @@ function createThemeActive(registry, storage) {
     async resolveActiveTheme() {
       let previewOverride = null;
       try {
-        const h = await headers();
-        previewOverride = h.get("x-preview-theme");
+        const h = await headers2();
+        previewOverride = h.get(PREVIEW_THEME_HEADER);
       } catch {
       }
       if (previewOverride && previewOverride in registry.themes) {

package/dist/middleware.d.ts

@@ -37,6 +37,12 @@ declare function computeCacheControl(flags: {
  *  - `?previewTheme` / `?previewColorScheme` → `x-preview-theme` /
  *    `x-preview-color-scheme` header forwarding for the admin's
  *    iframe-based theme preview.
+ *  - `x-ampless-pathname` marker header set unconditionally on every
+ *    request this middleware handles (public routes only). Server
+ *    components such as `renderHead` / `renderBodyEnd` read this header
+ *    to confirm a public, non-preview request before emitting analytics
+ *    or consent scripts. Routes excluded from the matcher (admin / api /
+ *    login) never receive a runtime-set marker, so those layouts stay clean.
  */
 declare function createAmplessMiddleware(opts: CreateMiddlewareOpts): MiddlewareFn;
 /**

package/dist/middleware.js

@@ -1,3 +1,9 @@
+import {
+  AMPLESS_PATHNAME_HEADER,
+  PREVIEW_COLOR_SCHEME_HEADER,
+  PREVIEW_THEME_HEADER
+} from "./chunk-BS7KLDDE.js";
+
 // src/middleware.ts
 import { NextResponse } from "next/server";
 var runtime = "nodejs";
@@ -137,10 +143,13 @@ function createAmplessMiddleware(opts) {
     const previewTheme = url.searchParams.get("previewTheme");
     const previewColorScheme = url.searchParams.get("previewColorScheme");
     const requestHeaders = new Headers(request.headers);
-    if (previewTheme) requestHeaders.set("x-preview-theme", previewTheme);
+    requestHeaders.delete(PREVIEW_THEME_HEADER);
+    requestHeaders.delete(PREVIEW_COLOR_SCHEME_HEADER);
+    if (previewTheme) requestHeaders.set(PREVIEW_THEME_HEADER, previewTheme);
     if (previewColorScheme) {
-      requestHeaders.set("x-preview-color-scheme", previewColorScheme);
+      requestHeaders.set(PREVIEW_COLOR_SCHEME_HEADER, previewColorScheme);
     }
+    requestHeaders.set(AMPLESS_PATHNAME_HEADER, url.pathname);
     const passthrough = () => NextResponse.next({ request: { headers: requestHeaders } });
     const segments = url.pathname.split("/").filter(Boolean);
     if (segments.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampless/runtime",
-  "version": "1.0.0-alpha.59",
+  "version": "1.0.0-beta.61",
   "description": "Public-side runtime for ampless: post fetching, theme dispatch, middleware, public route handlers",
   "license": "MIT",
   "type": "module",
@@ -51,8 +51,8 @@
     "marked": "^18.0.4",
     "sanitize-html": "^2.17.4",
     "tailwind-merge": "^3.6.0",
-    "@ampless/plugin-og-image": "0.2.0-alpha.50",
-    "ampless": "1.0.0-alpha.50"
+    "@ampless/plugin-og-image": "0.2.0-beta.52",
+    "ampless": "1.0.0-beta.52"
   },
   "peerDependencies": {
     "@aws-amplify/adapter-nextjs": "^1",