emdash 0.28.1 → 0.30.0

package/dist/astro/index.mjs

@@ -1,7 +1,7 @@
-import { t as INTERNAL_MEDIA_PREFIX } from "../normalize-CeglrBT9.mjs";
-import { t as defaultSeed } from "../default-CM_D83Mg.mjs";
-import { n as validateAllowedOrigins, r as validateOriginShape } from "../allowed-origins-CRsJ6BPM.mjs";
-import { n as VERSION, t as COMMIT } from "../version-qmeO1XZY.mjs";
+import { t as INTERNAL_MEDIA_PREFIX } from "../normalize-C-SHXmra.mjs";
+import { t as defaultSeed } from "../default-C4v9KP56.mjs";
+import { n as validateAllowedOrigins, r as validateOriginShape } from "../allowed-origins-CCEi9bPI.mjs";
+import { n as VERSION, t as COMMIT } from "../version-907opKac.mjs";
 import { createRequire } from "node:module";
 import { fontProviders } from "astro/config";
 import { existsSync, readFileSync } from "node:fs";
@@ -380,6 +380,10 @@ function injectCoreRoutes(injectRoute, options = {}) {
 		pattern: "/_emdash/api/media/[id]",
 		entrypoint: resolveRoute("api/media/[id].ts")
 	});
+	injectRoute({
+		pattern: "/_emdash/api/media/[id]/usage",
+		entrypoint: resolveRoute("api/media/[id]/usage.ts")
+	});
 	injectRoute({
 		pattern: "/_emdash/api/media/[id]/confirm",
 		entrypoint: resolveRoute("api/media/[id]/confirm.ts")
@@ -396,6 +400,10 @@ function injectCoreRoutes(injectRoute, options = {}) {
 		pattern: "/_emdash/api/media/providers/[providerId]/[itemId]",
 		entrypoint: resolveRoute("api/media/providers/[providerId]/[itemId].ts")
 	});
+	injectRoute({
+		pattern: "/_emdash/api/admin/media-usage/repair",
+		entrypoint: resolveRoute("api/admin/media-usage/repair.ts")
+	});
 	injectRoute({
 		pattern: "/_emdash/api/import/probe",
 		entrypoint: resolveRoute("api/import/probe.ts")
@@ -476,6 +484,22 @@ function injectCoreRoutes(injectRoute, options = {}) {
 		pattern: "/_emdash/api/settings/email",
 		entrypoint: resolveRoute("api/settings/email.ts")
 	});
+	injectRoute({
+		pattern: "/_emdash/api/settings/backups",
+		entrypoint: resolveRoute("api/settings/backups/index.ts")
+	});
+	injectRoute({
+		pattern: "/_emdash/api/settings/backups/export",
+		entrypoint: resolveRoute("api/settings/backups/export.ts")
+	});
+	injectRoute({
+		pattern: "/_emdash/api/settings/backups/archives",
+		entrypoint: resolveRoute("api/settings/backups/archives/index.ts")
+	});
+	injectRoute({
+		pattern: "/_emdash/api/settings/backups/archives/[name]",
+		entrypoint: resolveRoute("api/settings/backups/archives/[name].ts")
+	});
 	injectRoute({
 		pattern: "/_emdash/api/snapshot",
 		entrypoint: resolveRoute("api/snapshot.ts")
@@ -516,6 +540,14 @@ function injectCoreRoutes(injectRoute, options = {}) {
 		pattern: "/_emdash/api/admin/plugins/[id]/disable",
 		entrypoint: resolveRoute("api/admin/plugins/[id]/disable.ts")
 	});
+	injectRoute({
+		pattern: "/_emdash/api/admin/plugins/[id]/mcp",
+		entrypoint: resolveRoute("api/admin/plugins/[id]/mcp.ts")
+	});
+	injectRoute({
+		pattern: "/_emdash/api/admin/plugins/[id]/settings",
+		entrypoint: resolveRoute("api/admin/plugins/[id]/settings.ts")
+	});
 	injectRoute({
 		pattern: "/_emdash/api/admin/plugins/marketplace",
 		entrypoint: resolveRoute("api/admin/plugins/marketplace/index.ts")
@@ -1010,6 +1042,8 @@ const VIRTUAL_WAIT_UNTIL_ID = "virtual:emdash/wait-until";
 const RESOLVED_VIRTUAL_WAIT_UNTIL_ID = "\0" + VIRTUAL_WAIT_UNTIL_ID;
 const VIRTUAL_SCHEDULER_ID = "virtual:emdash/scheduler";
 const RESOLVED_VIRTUAL_SCHEDULER_ID = "\0" + VIRTUAL_SCHEDULER_ID;
+const VIRTUAL_ENV_ID = "virtual:emdash/env";
+const RESOLVED_VIRTUAL_ENV_ID = "\0" + VIRTUAL_ENV_ID;
 /**
 * Generates the config virtual module.
 */
@@ -1024,9 +1058,13 @@ function generateConfigModule(serializableConfig) {
 * the generator re-exports it so middleware can ask for a per-request Kysely
 * (used for D1 Sessions API, bookmark cookies, read-replica routing). Other
 * adapters get a stub that returns null.
+*
+* Adapters independently opt into the cold-start coalescing dialect. Keeping
+* this capability explicit prevents bundlers from probing exports that do not
+* exist on SQLite, libSQL, PostgreSQL, or other adapters.
 */
 function generateDialectModule(opts) {
-	const { entrypoint, supportsRequestScope } = opts;
+	const { entrypoint, supportsRequestScope, supportsCoalescing } = opts;
 	if (!entrypoint) return [
 		`export const createDialect = undefined;`,
 		`export const dialectType = "sqlite";`,
@@ -1034,18 +1072,18 @@ function generateDialectModule(opts) {
 		`export const createCoalescingDialect = undefined;`
 	].join("\n");
 	const type = opts.type ?? "sqlite";
-	const coalescingReExport = `import * as _dialectModule from "${entrypoint}";
-export const createCoalescingDialect = _dialectModule.createCoalescingDialect;`;
+	const coalescingExport = supportsCoalescing ? `import { createCoalescingDialect as _createCoalescingDialect } from "${entrypoint}";
+export const createCoalescingDialect = _createCoalescingDialect;` : `export const createCoalescingDialect = undefined;`;
 	if (supportsRequestScope) return `
 import { createDialect as _createDialect } from "${entrypoint}";
 export { createRequestScopedDb } from "${entrypoint}";
-${coalescingReExport}
+${coalescingExport}
 export const createDialect = _createDialect;
 export const dialectType = ${JSON.stringify(type)};
 `;
 	return `
 import { createDialect as _createDialect } from "${entrypoint}";
-${coalescingReExport}
+${coalescingExport}
 export const createDialect = _createDialect;
 export const dialectType = ${JSON.stringify(type)};
 export const createRequestScopedDb = (_opts) => null;
@@ -1151,6 +1189,7 @@ function generatePluginsModule(descriptors) {
 				storage: descriptor.storage,
 				adminPages: descriptor.adminPages,
 				adminWidgets: descriptor.adminWidgets,
+				settingsSchema: descriptor.settingsSchema,
 				portableTextBlocks: descriptor.portableTextBlocks,
 				fieldWidgets: descriptor.fieldWidgets
 			})})`);
@@ -1299,6 +1338,22 @@ function generateWaitUntilModule(adapterName) {
 	return `export const waitUntil = undefined;`;
 }
 /**
+* Generates the env virtual module.
+*
+* Under @astrojs/cloudflare, re-exports `env` from `cloudflare:workers` so
+* routes can read Worker bindings/secrets without touching
+* `Astro.locals.runtime.env`, which Astro 6+ removed (accessing it throws
+* rather than returning undefined, so `locals.runtime?.env` optional-chaining
+* doesn't help -- see #1736). For any other adapter, exports `undefined` so
+* callers fall back to `import.meta.env`. Mirrors generateWaitUntilModule:
+* core stays adapter-agnostic, with no direct `cloudflare:workers` import
+* that would fail to resolve under a Node build.
+*/
+function generateEnvModule(adapterName) {
+	if (adapterName === "@astrojs/cloudflare") return `export { env } from "cloudflare:workers";`;
+	return `export const env = undefined;`;
+}
+/**
 * Generates the scheduler virtual module.
 *
 * Decides — at build time, from the Astro adapter — whether the runtime gets a
@@ -1378,10 +1433,11 @@ function resolveModulePathFromProject(specifier, projectRoot) {
 /**
 * Generates the sandboxed plugins module.
 * Resolves plugin entrypoints to files, reads them, and embeds the code.
+* Notifies the caller about each resolved entry so build tools can watch it.
 *
 * At runtime, middleware uses SandboxRunner to load these into isolates.
 */
-function generateSandboxedPluginsModule(sandboxed, projectRoot) {
+function generateSandboxedPluginsModule(sandboxed, projectRoot, onEntryResolved) {
 	if (sandboxed.length === 0) return `
 // No sandboxed plugins configured
 export const sandboxedPlugins = [];
@@ -1392,6 +1448,7 @@ export const sandboxedPlugins = [];
 		const filePath = resolveModulePathFromProject(bundleSpecifier, projectRoot);
 		const ext = filePath.slice(filePath.lastIndexOf("."));
 		if (TS_SOURCE_EXT_RE.test(ext)) throw new Error(`Sandboxed plugin "${descriptor.id}" entrypoint "${bundleSpecifier}" resolves to unbuilt source (${filePath}). Sandbox entries must be pre-built JavaScript. Ensure the plugin's package.json exports point to built files (e.g. dist/*.mjs) and run the plugin's build step before building the site.`);
+		onEntryResolved?.(filePath);
 		const code = readFileSync(filePath, "utf-8");
 		pluginEntries.push(`{
     id: ${JSON.stringify(descriptor.id)},
@@ -1400,8 +1457,10 @@ export const sandboxedPlugins = [];
     capabilities: ${JSON.stringify(descriptor.capabilities ?? [])},
     allowedHosts: ${JSON.stringify(descriptor.allowedHosts ?? [])},
     storage: ${JSON.stringify(descriptor.storage ?? {})},
+    mcp: ${JSON.stringify(descriptor.mcp)},
     adminPages: ${JSON.stringify(descriptor.adminPages ?? [])},
     adminWidgets: ${JSON.stringify(descriptor.adminWidgets ?? [])},
+    settingsSchema: ${JSON.stringify(descriptor.settingsSchema)},
     portableTextBlocks: ${JSON.stringify(descriptor.portableTextBlocks ?? [])},
     fieldWidgets: ${JSON.stringify(descriptor.fieldWidgets ?? [])},
     adminEntry: ${JSON.stringify(descriptor.adminEntry)},
@@ -1525,13 +1584,15 @@ function createVirtualModulesPlugin(options, astroCommand) {
 			if (id === VIRTUAL_SEED_ID) return RESOLVED_VIRTUAL_SEED_ID;
 			if (id === VIRTUAL_WAIT_UNTIL_ID) return RESOLVED_VIRTUAL_WAIT_UNTIL_ID;
 			if (id === VIRTUAL_SCHEDULER_ID) return RESOLVED_VIRTUAL_SCHEDULER_ID;
+			if (id === VIRTUAL_ENV_ID) return RESOLVED_VIRTUAL_ENV_ID;
 		},
 		load(id) {
 			if (id === RESOLVED_VIRTUAL_CONFIG_ID) return generateConfigModule(serializableConfig);
 			if (id === RESOLVED_VIRTUAL_DIALECT_ID) return generateDialectModule({
 				entrypoint: resolvedConfig.database?.entrypoint,
 				type: resolvedConfig.database?.type,
-				supportsRequestScope: resolvedConfig.database?.supportsRequestScope ?? false
+				supportsRequestScope: resolvedConfig.database?.supportsRequestScope ?? false,
+				supportsCoalescing: resolvedConfig.database?.supportsCoalescing ?? false
 			});
 			if (id === RESOLVED_VIRTUAL_STORAGE_ID) return generateStorageModule(resolvedConfig.storage?.entrypoint);
 			if (id === RESOLVED_VIRTUAL_OBJECT_CACHE_ID) return generateObjectCacheModule(resolvedConfig.objectCache?.entrypoint, resolvedConfig.objectCache?.config);
@@ -1540,7 +1601,7 @@ function createVirtualModulesPlugin(options, astroCommand) {
 			if (id === RESOLVED_VIRTUAL_SANDBOX_RUNNER_ID) return generateSandboxRunnerModule(resolvedConfig.sandboxRunner, resolvedConfig.sandbox);
 			if (id === RESOLVED_VIRTUAL_SANDBOXED_PLUGINS_ID) {
 				const projectRoot = fileURLToPath(astroConfig.root);
-				return generateSandboxedPluginsModule(resolvedConfig.sandboxed ?? [], projectRoot);
+				return generateSandboxedPluginsModule(resolvedConfig.sandboxed ?? [], projectRoot, (filePath) => this.addWatchFile(filePath));
 			}
 			if (id === RESOLVED_VIRTUAL_AUTH_ID) {
 				const authDescriptor = resolvedConfig.auth;
@@ -1556,6 +1617,7 @@ function createVirtualModulesPlugin(options, astroCommand) {
 				const schedulerCommand = astroCommand === "dev" ? "serve" : "build";
 				return generateSchedulerModule(astroConfig.adapter?.name, schedulerCommand);
 			}
+			if (id === RESOLVED_VIRTUAL_ENV_ID) return generateEnvModule(astroConfig.adapter?.name);
 		}
 	};
 }
@@ -1829,6 +1891,21 @@ function resolveImageEndpoint(opts) {
 	if (PASSTHROUGH_IMAGE_ENDPOINTS.has(current)) return {};
 	return { warn: `A custom image.endpoint (${current}) is configured; EmDash will not wrap it, so storage-backed media may render unoptimized.` };
 }
+/**
+* Warn when `@astrojs/react` is not registered in the host's `integrations`.
+*
+* The admin SPA is a React app hydrated via `client:only="react"`. Without the
+* React integration the build succeeds and the admin route returns 200, but the
+* bundle never hydrates -- the page sits on "Loading EmDash..." forever with no
+* error anywhere (#962). Checked in `astro:config:done` so integrations added
+* by other integrations are visible too.
+*
+* @internal Exported for unit testing.
+*/
+function missingReactIntegrationWarning(integrations) {
+	if (integrations.some((integration) => integration.name === "@astrojs/react")) return;
+	return "@astrojs/react is not registered in your Astro config. The EmDash admin UI will not hydrate without it (the page stays on \"Loading EmDash...\"). Add it to your integrations:\n\n  import react from \"@astrojs/react\";\n  export default defineConfig({\n    integrations: [react(), emdash({ ... })],\n  });";
+}
 const dim = (s) => `\x1b[2m${s}\x1b[22m`;
 const bold = (s) => `\x1b[1m${s}\x1b[22m`;
 const cyan = (s) => `\x1b[36m${s}\x1b[39m`;
@@ -1908,7 +1985,8 @@ function emdash(config = {}) {
 		siteUrl: resolvedConfig.siteUrl,
 		trustedProxyHeaders: resolvedConfig.trustedProxyHeaders,
 		maxUploadSize: resolvedConfig.maxUploadSize,
-		admin: resolvedConfig.admin
+		admin: resolvedConfig.admin,
+		toolbar: resolvedConfig.toolbar
 	};
 	const useExternalAuth = !!(resolvedConfig.auth && "entrypoint" in resolvedConfig.auth);
 	let astroCommand;
@@ -1920,6 +1998,8 @@ function emdash(config = {}) {
 				printBanner(logger);
 				const astroVersion = resolveAstroVersion();
 				if (astroVersion !== void 0) serializableConfig.astroVersion = astroVersion;
+				serializableConfig.astroCspEnabled = Boolean(astroConfig.security.csp);
+				serializableConfig.trailingSlash = astroConfig.trailingSlash;
 				if (astroConfig.i18n) {
 					const routing = astroConfig.i18n.routing;
 					serializableConfig.i18n = {
@@ -2008,6 +2088,10 @@ function emdash(config = {}) {
 					order: "pre"
 				});
 			},
+			"astro:config:done": ({ config: finalConfig, logger }) => {
+				const warning = missingReactIntegrationWarning(finalConfig.integrations);
+				if (warning) logger.warn(warning);
+			},
 			"astro:server:setup": ({ server, logger }) => {
 				if (astroCommand === "dev") server.httpServer?.once("listening", () => {
 					const address = server.httpServer?.address();