@acms-subir/core 0.3.1 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @acms-subir/core
 
+## 0.3.2
+
+### Patch Changes
+
+- 2c349c0: Fix blank admin editors in `astro dev` on sites that install core from npm. Browser-side dependencies (TipTap, prismjs, mammoth and others) are now pre-bundled by Vite, so islands no longer fail with "doesn't provide an export named …".
+
+  Also fixed:
+
+  - A first request storm after an upgrade could run a new migration twice and fail with `UNIQUE constraint failed: migrations.version`.
+  - File and bookmark cards reloaded as plain links when a post was reopened in the editor.
+  - YouTube embeds now keep their start time (`?t=` / `start=`) and accept `youtube.com/live/…` links.
+  - `@tiptap/core` is now a declared dependency instead of relying on hoisting.
+
 ## 0.3.1
 
 ### Patch Changes

package/integration.mjs

@@ -88,6 +88,19 @@ const ROUTES = [
   ['/api/restore', 'api/restore.ts'],
 ];
 
+// Packages imported by browser-side code (admin islands and the libs they
+// pull in). Keep in sync when a component gains a new dependency; the
+// integration test checks every entry is a declared dependency.
+export const CLIENT_DEPS = [
+  'react', 'react-dom', 'react-dom/client',
+  '@tiptap/core', '@tiptap/react', '@tiptap/react/menus', '@tiptap/pm/state', '@tiptap/pm/view', '@tiptap/pm/model',
+  '@tiptap/starter-kit', '@tiptap/extensions', '@tiptap/extension-table', '@tiptap/extension-highlight',
+  '@tiptap/extension-code-block-lowlight', '@tiptap/suggestion',
+  '@dnd-kit/core', '@dnd-kit/sortable', '@dnd-kit/utilities',
+  'prismjs', 'simple-icons', 'lowlight', 'hast-util-to-html', 'marked', 'turndown', 'zod',
+  'mammoth/mammoth.browser.js',
+];
+
 // First segments of the fixed routes above — a configured base landing on one
 // of these would shadow a real page, so it's a build-time error.
 const RESERVED_BASES = new Set([
@@ -515,6 +528,25 @@ export default function acms(options = {}) {
         }
         updateConfig({ vite: { plugins: [acmsVitePlugin(userConfig)] } });
 
+        // Installed from npm, core's admin islands are source files inside
+        // node_modules, so Vite's dev scanner never crawls them: their
+        // dependencies are found only at runtime and CommonJS ones
+        // (use-sync-external-store via @tiptap/react, prismjs, mammoth) are
+        // served raw, which breaks hydration ("doesn't provide an export
+        // named …"), and late discoveries force a mid-load reload. Pre-bundle
+        // the whole client graph up front. The `core > dep` form resolves
+        // each package from core's own location, so it also works when the
+        // package manager doesn't hoist them. Build output is unaffected.
+        if (command === 'dev') {
+          updateConfig({
+            vite: {
+              optimizeDeps: {
+                include: CLIENT_DEPS.map((dep) => `@acms-subir/core > ${dep}`),
+              },
+            },
+          });
+        }
+
         // "Project-local routes win" is enforced here: Astro registers
         // injected and file-based routes at equal priority (and the injected
         // one is served on a collision), so a route is only injected when the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acms-subir/core",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "publishConfig": {
     "access": "public"
   },
@@ -59,6 +59,7 @@
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
     "@libsql/client": "^0.15.0",
+    "@tiptap/core": "^3.30.1",
     "@tiptap/extension-code-block-lowlight": "^3.30.1",
     "@tiptap/extension-highlight": "3.30.1",
     "@tiptap/extension-table": "^3.30.1",

package/src/components/editor/extensions/cards.tsx

@@ -3,6 +3,9 @@ import { NodeViewWrapper, NodeViewContent, ReactNodeViewRenderer } from '@tiptap
 import type { NodeViewProps } from '@tiptap/react';
 import { useState } from 'react';
 import { cleanEventName } from '../../../lib/analytics';
+import { detectEmbed } from '../../../lib/embeds';
+
+export { detectEmbed, type EmbedInfo } from '../../../lib/embeds';
 
 // Card nodes shared by the post editor. renderHTML emits the public markup
 // (`.pc-*` classes, styled in src/styles/cards.css); parseHTML round-trips it
@@ -129,44 +132,6 @@ function ImageCardView({ node, updateAttributes, deleteNode, selected }: NodeVie
 
 // ---- embed ----------------------------------------------------------------
 
-export interface EmbedInfo {
-  provider: string;
-  embedSrc: string;
-  aspect: boolean; // true → 16:9, false → fixed height
-}
-
-export function detectEmbed(raw: string): EmbedInfo | null {
-  let url: URL;
-  try {
-    url = new URL(raw.trim());
-  } catch {
-    return null;
-  }
-  const host = url.hostname.replace(/^www\./, '');
-  if (host === 'youtube.com' || host === 'm.youtube.com' || host === 'youtu.be' || host === 'youtube-nocookie.com') {
-    const id =
-      host === 'youtu.be'
-        ? url.pathname.slice(1).split('/')[0]
-        : url.pathname.startsWith('/shorts/') || url.pathname.startsWith('/embed/')
-          ? url.pathname.split('/')[2]
-          : url.searchParams.get('v');
-    if (id) return { provider: 'youtube', embedSrc: `https://www.youtube-nocookie.com/embed/${id}`, aspect: true };
-  }
-  if (host === 'vimeo.com' || host === 'player.vimeo.com') {
-    const id = url.pathname.split('/').filter(Boolean).pop();
-    if (id && /^\d+$/.test(id)) return { provider: 'vimeo', embedSrc: `https://player.vimeo.com/video/${id}`, aspect: true };
-  }
-  if (host === 'loom.com' && url.pathname.startsWith('/share/')) {
-    return { provider: 'loom', embedSrc: `https://www.loom.com/embed/${url.pathname.split('/')[2]}`, aspect: true };
-  }
-  if (host === 'codepen.io' && url.pathname.includes('/pen/')) {
-    return { provider: 'codepen', embedSrc: raw.replace('/pen/', '/embed/'), aspect: false };
-  }
-  if (url.protocol === 'https:') {
-    return { provider: 'iframe', embedSrc: raw, aspect: false };
-  }
-  return null;
-}
 
 export const EmbedCard = Node.create({
   name: 'embedCard',

package/src/components/editor/extensions/mediaCards.tsx

@@ -40,6 +40,8 @@ export const FileCard = Node.create({
     return [
       {
         tag: 'a.pc-filecard',
+        // outrank the Link mark's a[href] rule, or the card reloads as a plain link
+        priority: 60,
         getAttrs: (el) => {
           const e = el as HTMLElement;
           return {
@@ -288,6 +290,8 @@ export const BookmarkCard = Node.create({
     return [
       {
         tag: 'a.pc-bookmark',
+        // outrank the Link mark's a[href] rule, or the card reloads as a plain link
+        priority: 60,
         getAttrs: (el) => {
           const e = el as HTMLElement;
           return {

package/src/lib/embeds.ts

@@ -0,0 +1,50 @@
+// Embeddable-URL detection shared by the editor's embed card (paste →
+// card) and the importers (a Ghost/WordPress embed → embedCard markup).
+export interface EmbedInfo {
+  provider: string;
+  embedSrc: string;
+  aspect: boolean; // true → 16:9, false → fixed height
+}
+
+export function detectEmbed(raw: string): EmbedInfo | null {
+  let url: URL;
+  try {
+    url = new URL(raw.trim());
+  } catch {
+    return null;
+  }
+  const host = url.hostname.replace(/^www\./, '');
+  if (host === 'youtube.com' || host === 'm.youtube.com' || host === 'youtu.be' || host === 'youtube-nocookie.com') {
+    const id =
+      host === 'youtu.be'
+        ? url.pathname.slice(1).split('/')[0]
+        : url.pathname.startsWith('/shorts/') || url.pathname.startsWith('/embed/') || url.pathname.startsWith('/live/')
+          ? url.pathname.split('/')[2]
+          : url.searchParams.get('v');
+    // keep a start offset (?start=90, ?t=1h2m3s) — sermon and talk links
+    // usually point into the middle of a stream
+    const start = youtubeStart(url.searchParams.get('start') ?? url.searchParams.get('t'));
+    if (id) return { provider: 'youtube', embedSrc: `https://www.youtube-nocookie.com/embed/${id}${start ? `?start=${start}` : ''}`, aspect: true };
+  }
+  if (host === 'vimeo.com' || host === 'player.vimeo.com') {
+    const id = url.pathname.split('/').filter(Boolean).pop();
+    if (id && /^\d+$/.test(id)) return { provider: 'vimeo', embedSrc: `https://player.vimeo.com/video/${id}`, aspect: true };
+  }
+  if (host === 'loom.com' && url.pathname.startsWith('/share/')) {
+    return { provider: 'loom', embedSrc: `https://www.loom.com/embed/${url.pathname.split('/')[2]}`, aspect: true };
+  }
+  if (host === 'codepen.io' && url.pathname.includes('/pen/')) {
+    return { provider: 'codepen', embedSrc: raw.replace('/pen/', '/embed/'), aspect: false };
+  }
+  if (url.protocol === 'https:') {
+    return { provider: 'iframe', embedSrc: raw, aspect: false };
+  }
+  return null;
+}
+
+function youtubeStart(raw: string | null): number {
+  if (!raw) return 0;
+  if (/^\d+s?$/.test(raw)) return parseInt(raw, 10);
+  const m = raw.match(/^(?:(\d+)h)?(?:(\d+)m)?(?:(\d+)s)?$/);
+  return m ? Number(m[1] ?? 0) * 3600 + Number(m[2] ?? 0) * 60 + Number(m[3] ?? 0) : 0;
+}

package/src/lib/repo/index.ts

@@ -1,23 +1,27 @@
 import type { ContentRepository } from './types';
 
-let repo: ContentRepository | null = null;
+// The promise (not the instance) is cached: concurrent first requests would
+// otherwise each create a repository and race to run pending migrations.
+let repo: Promise<ContentRepository> | null = null;
 
 // Adapter priority: Cloudflare D1 (when the Worker binding exists —
 // production on Workers and local wrangler/astro dev via platformProxy)
 // → libSQL file (plain Node self-hosting).
 // Pass Astro.locals (or the endpoint's `locals`) so the D1 binding is
 // reachable; the chosen adapter is cached for the isolate's lifetime.
-export async function getRepo(locals?: unknown): Promise<ContentRepository> {
-  if (repo) return repo;
+export function getRepo(locals?: unknown): Promise<ContentRepository> {
+  repo ??= create(locals).catch((e) => { repo = null; throw e; });
+  return repo;
+}
+
+async function create(locals?: unknown): Promise<ContentRepository> {
   const d1 = (locals as { runtime?: { env?: { DB?: unknown } } } | undefined)?.runtime?.env?.DB;
   if (d1) {
     const { D1Repository } = await import('./d1');
-    repo = new D1Repository(d1 as import('./d1').D1Database);
-  } else {
-    const { SqliteRepository } = await import('./sqlite');
-    repo = new SqliteRepository();
+    return new D1Repository(d1 as import('./d1').D1Database);
   }
-  return repo;
+  const { SqliteRepository } = await import('./sqlite');
+  return new SqliteRepository();
 }
 
 export type { ContentRepository };