create-ampless 1.0.0-alpha.133 → 1.0.0-alpha.137

package/dist/index.js

@@ -2156,6 +2156,38 @@ function detectIndent(jsonStr) {
   if (!m) return 2;
   return m[1].length;
 }
+async function bumpUserAmplessPlugins(destDir, projectPkg, templatePkg) {
+  const result = { bumped: [], warnings: [] };
+  const deps = projectPkg.dependencies ?? {};
+  const templateDeps = templatePkg.dependencies ?? {};
+  for (const pkgName of Object.keys(deps)) {
+    if (!pkgName.startsWith("@ampless/")) continue;
+    if (pkgName in templateDeps) continue;
+    let latest;
+    try {
+      const { stdout } = await execa4("npm", ["view", `${pkgName}@alpha`, "version"], {
+        cwd: destDir,
+        stdio: ["ignore", "pipe", "pipe"]
+      });
+      latest = stdout.trim();
+    } catch (e) {
+      result.warnings.push(
+        `${pkgName}: failed to resolve @alpha version (${e instanceof Error ? e.message : String(e)}). Leaving the existing pin in package.json.`
+      );
+      continue;
+    }
+    if (!latest) {
+      result.warnings.push(`${pkgName}: npm view returned empty version. Skipping bump.`);
+      continue;
+    }
+    const target = `^${latest}`;
+    const current = deps[pkgName];
+    if (current === target) continue;
+    deps[pkgName] = target;
+    result.bumped.push({ name: pkgName, from: current, to: target });
+  }
+  return result;
+}
 function djb2Hash(s) {
   let h = 5381;
   for (let i = 0; i < s.length; i++) {
@@ -2198,7 +2230,7 @@ async function regenerateEditorBootstrap(destDir, projectPkg) {
   lines.push("// editor extension, add / remove the corresponding @ampless/plugin-...");
   lines.push("// entry in your project's package.json (and register it in cms.config.ts");
   lines.push("// for runtime).", "");
-  lines.push("import { installAdminEditorExtensions } from '@ampless/admin/editor'");
+  lines.push("import { installAdminEditorExtensions, installAdminTiptapNodeMarkdown } from '@ampless/admin/editor'");
   const identifiers = [];
   const seen = /* @__PURE__ */ new Map();
   for (const p3 of installedPlugins) {
@@ -2211,16 +2243,20 @@ async function regenerateEditorBootstrap(destDir, projectPkg) {
     }
     seen.set(ident, p3.packageName);
     const importSubpath = p3.editorExports.startsWith("./") ? `${p3.packageName}/${p3.editorExports.slice(2)}` : `${p3.packageName}/${p3.editorExports}`;
-    lines.push(`import { editorExtension as ${ident} } from '${importSubpath}'`);
+    lines.push(`import * as ${ident} from '${importSubpath}'`);
     identifiers.push(ident);
   }
   lines.push("");
   lines.push("export function EditorBootstrap({ children }: { children: React.ReactNode }) {");
   if (identifiers.length === 0) {
     lines.push("  installAdminEditorExtensions([])");
+    lines.push("  installAdminTiptapNodeMarkdown([])");
   } else {
     lines.push("  installAdminEditorExtensions([");
-    for (const id of identifiers) lines.push(`    ${id},`);
+    for (const id of identifiers) lines.push(`    ${id}.editorExtension,`);
+    lines.push("  ])");
+    lines.push("  installAdminTiptapNodeMarkdown([");
+    for (const id of identifiers) lines.push(`    ${id}.tiptapNodeToMarkdown ?? {},`);
     lines.push("  ])");
   }
   lines.push("  return <>{children}</>");
@@ -2343,6 +2379,12 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
     projectPkg["scripts"] = projectScripts;
   }
   await writeFile3(projectPkgPath, JSON.stringify(projectPkg, null, indent) + "\n", "utf-8");
+  const templatePkgForBump = templatePkg;
+  const projectPkgForBump = projectPkg;
+  const userPluginBump = await bumpUserAmplessPlugins(destDir, projectPkgForBump, templatePkgForBump);
+  if (userPluginBump.bumped.length > 0) {
+    await writeFile3(projectPkgPath, JSON.stringify(projectPkg, null, indent) + "\n", "utf-8");
+  }
   if (!opts.noInstall) {
     const usePnpm = existsSync5(join3(destDir, "pnpm-lock.yaml"));
     const pm = usePnpm ? "pnpm" : "npm";
@@ -2356,6 +2398,11 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
     bootstrapResult.warnings.push(
       "_editor-bootstrap.tsx was generated without running npm install \u2014 node_modules may be stale. Run `npm run update-ampless` (without --no-install) to pick up newly added plugin editor extensions."
     );
+    if (userPluginBump.bumped.length > 0) {
+      userPluginBump.warnings.push(
+        `package.json was updated with ${userPluginBump.bumped.length} bumped @ampless/* plugin version(s) but npm install was skipped \u2014 run \`npm install\` (or \`npm run update-ampless\` without --no-install) to apply the new versions.`
+      );
+    }
   }
   for (const w of bootstrapResult.warnings) {
     log3.warn(w);
@@ -2363,6 +2410,15 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
   log3.info(
     `editor:  ${pc3.cyan(`auto-wired ${bootstrapResult.pluginCount} editor extension(s) in _editor-bootstrap.tsx`)}`
   );
+  if (userPluginBump.bumped.length > 0) {
+    log3.info(`plugins: ${pc3.cyan(`bumped ${userPluginBump.bumped.length} user-installed @ampless/* plugin(s) to latest @alpha:`)}`);
+    for (const { name, from, to } of userPluginBump.bumped) {
+      log3.info(`  ${name}: ${from} \u2192 ${to}`);
+    }
+  }
+  for (const w of userPluginBump.warnings) {
+    log3.warn(w);
+  }
   return {
     added: replaceNew,
     updated: replaceUpdate,
@@ -2373,7 +2429,8 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
     themesQuarantined: themeResult.quarantined,
     packageJsonMerged: true,
     obsoleteRemoved: obsoleteFiles,
-    editorExtensionsWired: bootstrapResult.pluginCount
+    editorExtensionsWired: bootstrapResult.pluginCount,
+    userPluginsBumped: userPluginBump.bumped.length
   };
 }
 async function runUpgrade(args) {

package/dist/templates/_shared/app/(admin)/admin/preview/route.tsx

@@ -6,7 +6,9 @@ import { admin } from '@/lib/admin'
  * POST a draft Post to this endpoint while the preview tab is open; we
  * render the body + page-level scripts via `ampless.renderBody` /
  * `publicPostScriptsForPage` and return a fully-rendered HTML string
- * that the admin shows in an iframe (`sandbox="allow-scripts"`).
+ * that the admin shows in an iframe (`sandbox="allow-scripts allow-same-origin"`,
+ * v1 trust boundary expansion — admin preview content / plugin script are
+ * explicitly treated as trusted; see the iframe comment in post-form.tsx).
  *
  * Why a Route Handler instead of a Server Action: Next.js 15+
  * refuses to compile Client Components that reach `react-dom/server`

package/dist/templates/_shared/docs/plugin-author-guide.ja.md

@@ -848,6 +848,12 @@ export default createAdminLayout(admin, { editorBootstrap: EditorBootstrap })
 
 `installAdminEditorExtensions` は idempotent で、render 時に client component 内で呼ばれる。admin の `<TiptapEditor>` は毎回 render 時に登録済みリストを built-in extensions の末尾に spread する。
 
+### markdown → tiptap の復元
+
+editor Node が markdown へ bare URL line として serialise される場合、逆方向の復元は paste rule ではなく `Node.parseHTML()` で扱う必要がある。admin の `markdown → tiptap` format switch は、まず markdown を HTML に変換する。GFM autolink により bare URL line は `<p><a href="https://...">https://...</a></p>` になり、その HTML を tiptap が document として parse する。paste rule は user paste / typing event 用なので、この HTML parse 経路では発火しない。
+
+embed 系 Node は、上記 paragraph shape 用の high-priority parse rule を追加し、必要に応じて他の HTML-to-tiptap 経路向けに `a[href]` rule も追加する。paragraph rule は「paragraph が単一 link だけを含み、その link text が `href` と同じ」場合だけ match させる。これにより parser は paragraph 全体を block embed Node に置換でき、embed の前に空 paragraph が残らない。`getAttrs` は URL を検証し、match しない link では `false` を返して通常の Link mark にフォールバックさせる。
+
 ### active source と完全無効化
 
 **エディタ配線の active source は `package.json#dependencies`**（= `node_modules`）であり、`cms.config.ts` ではない。
@@ -857,7 +863,7 @@ export default createAdminLayout(admin, { editorBootstrap: EditorBootstrap })
 
 ### エディタプレビューのパイプライン
 
-admin の edit / new post フォームは preview ペインを `<iframe sandbox="allow-scripts">` で表示する。`srcDoc` はテンプレート側 preview Route Handler が返す HTML。テンプレート scaffold は handler を `app/(admin)/admin/preview/route.tsx` に同梱する:
+admin の edit / new post フォームは preview ペインを `<iframe sandbox="allow-scripts allow-same-origin">` で表示する。`srcDoc` はテンプレート側 preview Route Handler が返す HTML。テンプレート scaffold は handler を `app/(admin)/admin/preview/route.tsx` に同梱する:
 
 ```tsx
 // templates/_shared/app/(admin)/admin/preview/route.tsx
@@ -911,7 +917,9 @@ export default createEditPostPage(admin, { previewEndpoint: '/cms/admin/preview'
 
 Server Action ではなく Route Handler を採用した理由: `'use server'` モジュール内部で `react-dom/server` 由来の rendering を行うと、Next.js 15+ が edit-post page の compile に失敗する。build 時に Client Component から Server Action モジュール経由で import graph を辿るため、その経路上で `react-dom/server` に到達した時点で「You're importing a component that imports react-dom/server」チェックが発火する。Route Handler に切り出すことで rendering を import graph から完全に切り離せる — `<PostForm>` は plain な HTTP endpoint を fetch するだけで、bundler は form から handler 側へ踏み込まない。さらに handler 自身が `admin.isEditor()` を明示的にチェックすることで、将来 `(admin)` route-group gate が誤設定された場合の安全側のフェールセーフになる。`react-dom/server` の import 自体を dynamic にしているのは Next.js 16 の Turbopack が、Route Handler を含む app router build 経路で reach できる top-level の `react-dom/server` static import を一律で flag するため。request 時に解決することで build-time import-graph walker から外しつつ、runtime では同じ Node.js subpath からロードする。
 
-iframe の `sandbox="allow-scripts"` は `allow-same-origin` を含まないので、preview の中身は opaque origin で動作する → widget script は admin の DOM に触れない。トレードオフ: widget が自身の origin の storage にアクセスできない場合に正しく動かない可能性がある。Phase 7 時点の dogfood では YouTube iframe / x.com widgets.js とも opaque origin で動作することを確認済み。将来 non-opaque origin が必要な widget が出てきた場合、escape hatch は別 subdomain の preview route + 適切な CSP — sandbox flag を緩めるのは取らない。
+**Preview iframe sandbox — v1 trust boundary 拡張:** iframe は `sandbox="allow-scripts allow-same-origin"` を使う。`srcDoc` とともに使用すると iframe は admin の origin を継承し、サードパーティ embed widget（YouTube SDK、x.com `widgets.js`）が動作できるようになる — opaque-origin（`allow-scripts` のみ）の iframe では動作を拒否する（非 HttpOnly storage / cache へのアクセスと real-origin requests が必要なため）。同時に same-origin により preview スクリプトは admin の auth state / 非 HttpOnly storage / DOM へのアクセスと authenticated same-origin XHR / fetch の発行が可能になる。
+
+これは単なる sandbox 緩和ではなく、**v1 の明示的な設計判断**です: **ampless v1 は admin preview content / plugin script を全部 trusted とみなす**。エンジニアは npm install 前に plugin を審査するし（カスタマイズベース CMS モデル）、body content はこのサイトの trusted editor が作成する。`<PostHistoryPanel>` では別の editor が作成した過去 revision（revision author ≠ preview viewer）をプレビューするケースも通常発生するが、v1 ではそれも明示的に trust ring 内と位置づける。より安全な代替案（別 origin preview route + CSP / COEP / COOP）は v2.0+ でリアルなプラグインマーケットプレイスが必要になった場合に再検討する。
 
 ---
 

package/dist/templates/_shared/docs/plugin-author-guide.md

@@ -1104,6 +1104,24 @@ export default createAdminLayout(admin, { editorBootstrap: EditorBootstrap })
 inside a client component. The admin's `<TiptapEditor>` spreads the
 registered list onto its built-in extensions on every render.
 
+### Markdown to tiptap restoration
+
+If an editor Node serializes to markdown as a bare URL line, the reverse
+direction must be handled by `Node.parseHTML()`, not by paste rules. The
+admin's `markdown → tiptap` format switch first converts markdown to HTML;
+GFM autolinks emit a bare URL line as
+`<p><a href="https://...">https://...</a></p>`, then tiptap parses that
+HTML into a document. Paste rules only run for user paste / typing events,
+so they do not fire on this HTML parse path.
+
+Embed-style Nodes should add a high-priority parse rule for the paragraph
+shape above, and may also add an `a[href]` rule for other HTML-to-tiptap
+paths. The paragraph rule should only match when the paragraph contains a
+single link whose text equals its `href`; that lets the parser replace the
+whole paragraph with the block embed Node instead of leaving an empty
+paragraph before the embed. `getAttrs` should validate the URL and return
+`false` for non-matching links so the normal Link mark remains in place.
+
 ### Active source and full disable
 
 **The active source for editor wiring is `package.json#dependencies`**
@@ -1120,7 +1138,7 @@ registered list onto its built-in extensions on every render.
 ### Editor preview pipeline
 
 The admin's edit / new post forms render the preview pane in an
-`<iframe sandbox="allow-scripts">` whose `srcDoc` is the HTML returned
+`<iframe sandbox="allow-scripts allow-same-origin">` whose `srcDoc` is the HTML returned
 by the template's preview Route Handler. The template scaffold ships
 the handler at `app/(admin)/admin/preview/route.tsx`:
 
@@ -1195,14 +1213,24 @@ included; deferring it to request time keeps the module outside the
 build-time import-graph walker while still loading it from the same
 Node.js subpath at runtime.
 
-The iframe's `sandbox="allow-scripts"` (without `allow-same-origin`)
-keeps preview content in an opaque origin so widget scripts cannot
-reach the admin's DOM. The trade-off is that some widgets may misbehave
-when they can't access their own origin's storage; the YouTube iframe
-embed and x.com widgets.js both work under these constraints in
-dogfood as of Phase 7. If a future widget needs a non-opaque preview
-origin, the escape hatch is a separate preview route on a different
-subdomain with appropriate CSP — not relaxing the sandbox flag.
+**Preview iframe sandbox — v1 trust boundary expansion:** The iframe uses
+`sandbox="allow-scripts allow-same-origin"`. With `srcDoc`, this gives
+the iframe the admin's origin, which 3rd-party embed widgets (YouTube SDK,
+x.com `widgets.js`) require — they refuse to initialise in an opaque-origin
+(`allow-scripts`-only) iframe because they need access to non-HttpOnly
+storage / cache and real-origin requests. Same-origin also gives the
+preview script access to the admin's auth state / non-HttpOnly storage /
+DOM and lets it issue authenticated same-origin XHR / fetch.
+
+This is an explicit v1 design decision, not a no-op sandbox relax:
+**ampless v1 treats admin preview content / plugin script as trusted**.
+The engineer audits plugins before npm-installing them (customization-based
+CMS model), and body content is produced by trusted editors of this site.
+`<PostHistoryPanel>` can also surface a past revision authored by a
+different editor (revision author ≠ preview viewer) — v1 explicitly puts
+both inside the trust ring. The safer alternative — separate-origin preview
+route + CSP / COEP / COOP — is parked for v2.0+ if/when a real plugin
+marketplace lands.
 
 ---
 

package/dist/templates/_shared/package.json

@@ -26,21 +26,21 @@
     "@tiptap/pm": "^3.23.6",
     "@tiptap/react": "^3.23.6",
     "@tiptap/starter-kit": "^3.23.6",
-    "@ampless/plugin-analytics-ga4": "^0.2.0-alpha.28",
-    "@ampless/plugin-cookie-consent": "^0.1.0-alpha.19",
-    "@ampless/plugin-gtm": "^0.2.0-alpha.27",
-    "@ampless/plugin-og-image": "^0.2.0-alpha.44",
-    "@ampless/plugin-plausible": "^0.2.0-alpha.27",
-    "@ampless/plugin-reading-time": "^0.1.0-alpha.17",
-    "@ampless/plugin-rss": "^0.2.0-alpha.44",
-    "@ampless/plugin-schema-jsonld": "^0.1.1-alpha.23",
-    "@ampless/plugin-seo": "^0.2.0-alpha.44",
-    "@ampless/plugin-webhook": "^0.2.0-alpha.45",
-    "@ampless/admin": "^1.0.0-alpha.77",
-    "@ampless/backend": "^1.0.0-alpha.66",
-    "@ampless/runtime": "^1.0.0-alpha.53",
+    "@ampless/plugin-analytics-ga4": "^0.2.0-alpha.30",
+    "@ampless/plugin-cookie-consent": "^0.1.0-alpha.21",
+    "@ampless/plugin-gtm": "^0.2.0-alpha.29",
+    "@ampless/plugin-og-image": "^0.2.0-alpha.46",
+    "@ampless/plugin-plausible": "^0.2.0-alpha.29",
+    "@ampless/plugin-reading-time": "^0.1.0-alpha.19",
+    "@ampless/plugin-rss": "^0.2.0-alpha.46",
+    "@ampless/plugin-schema-jsonld": "^0.1.1-alpha.25",
+    "@ampless/plugin-seo": "^0.2.0-alpha.46",
+    "@ampless/plugin-webhook": "^0.2.0-alpha.47",
+    "@ampless/admin": "^1.0.0-alpha.79",
+    "@ampless/backend": "^1.0.0-alpha.68",
+    "@ampless/runtime": "^1.0.0-alpha.55",
     "@digital-go-jp/tailwind-theme-plugin": "^0.3.4",
-    "ampless": "^1.0.0-alpha.44",
+    "ampless": "^1.0.0-alpha.46",
     "aws-amplify": "^6.17.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ampless",
-  "version": "1.0.0-alpha.133",
+  "version": "1.0.0-alpha.137",
   "description": "Create a new ampless project",
   "license": "MIT",
   "type": "module",