emdash 1.2.0 → 1.3.1

package/dist/astro/index.mjs

@@ -1,23 +1,24 @@
-import "../runner-wqt4BrIW.mjs";
+import "../runner-CLorw5vo.mjs";
 import "../dialect-helpers-7_IqPdh9.mjs";
-import "../config-CvmjJcVw.mjs";
+import "../config-Cs_AwWXI.mjs";
 import "../datetime-normalization-PeiEdcRY.mjs";
-import { t as INTERNAL_MEDIA_PREFIX } from "../normalize-BuWa0lvd.mjs";
-import { n as DEV_TYPEGEN_REFRESH_GLOBAL, t as DEV_TYPEGEN_REFRESH_EVENT } from "../dev-typegen-Dtl8AfS6.mjs";
-import { a as parseDurationSeconds, c as resolveRegistryConfigForSandbox, i as normalizeRegistryConfig } from "../config-Bo4eOOdV.mjs";
-import { n as VERSION, t as COMMIT } from "../version-C4kz0PcO.mjs";
-import { r as getEnvSiteUrl } from "../public-url-uT1Ok2Tu.mjs";
-import { n as validateAllowedOrigins, r as validateOriginShape } from "../allowed-origins-CLpHGGlc.mjs";
-import { r as normalizeMigrationConfig } from "../policy-B_2qnHSy.mjs";
-import { c as normalizeAstroI18n, n as MIGRATION_CONFIG_SYMBOL, o as serializeMigrationManifest, r as createMigrationIntegrationMetadata, s as validateMigrationManifest, t as buildMigrationManifest } from "../manifest-builder-BOFCd9rX.mjs";
-import { r as getCoreMigrationIdentity } from "../identity-BwBKM1fH.mjs";
-import { A as VIRTUAL_SANDBOX_RUNNER_ID, B as generateConfigModule, C as VIRTUAL_CONFIG_ID, D as VIRTUAL_OBJECT_CACHE_ID, E as VIRTUAL_MEDIA_PROVIDERS_ID, F as generateAdminRegistryModule, G as generatePluginsModule, H as generateEnvModule, I as generateAuthModule, J as generateSchedulerModule, K as generateSandboxRunnerModule, L as generateAuthProvidersModule, M as VIRTUAL_SEED_ID, N as VIRTUAL_STORAGE_ID, O as VIRTUAL_PLUGINS_ID, P as VIRTUAL_WAIT_UNTIL_ID, R as generateBlockComponentsModule, S as VIRTUAL_BUILD_ID, T as VIRTUAL_ENV_ID, U as generateMediaProvidersModule, V as generateDialectModule, W as generateObjectCacheModule, X as generateStorageModule, Y as generateSeedModule, Z as generateWaitUntilModule, _ as RESOLVED_VIRTUAL_WAIT_UNTIL_ID, a as RESOLVED_VIRTUAL_BUILD_ID, b as VIRTUAL_AUTH_PROVIDERS_ID, c as RESOLVED_VIRTUAL_ENV_ID, d as RESOLVED_VIRTUAL_PLUGINS_ID, f as RESOLVED_VIRTUAL_SANDBOXED_PLUGINS_ID, g as RESOLVED_VIRTUAL_STORAGE_ID, h as RESOLVED_VIRTUAL_SEED_ID, i as RESOLVED_VIRTUAL_BLOCK_COMPONENTS_ID, j as VIRTUAL_SCHEDULER_ID, k as VIRTUAL_SANDBOXED_PLUGINS_ID, l as RESOLVED_VIRTUAL_MEDIA_PROVIDERS_ID, m as RESOLVED_VIRTUAL_SCHEDULER_ID, n as RESOLVED_VIRTUAL_AUTH_ID, o as RESOLVED_VIRTUAL_CONFIG_ID, p as RESOLVED_VIRTUAL_SANDBOX_RUNNER_ID, q as generateSandboxedPluginsModule, r as RESOLVED_VIRTUAL_AUTH_PROVIDERS_ID, s as RESOLVED_VIRTUAL_DIALECT_ID, t as RESOLVED_VIRTUAL_ADMIN_REGISTRY_ID, u as RESOLVED_VIRTUAL_OBJECT_CACHE_ID, v as VIRTUAL_ADMIN_REGISTRY_ID, w as VIRTUAL_DIALECT_ID, x as VIRTUAL_BLOCK_COMPONENTS_ID, y as VIRTUAL_AUTH_ID, z as generateBuildModule } from "../virtual-modules-D0e6VbEv.mjs";
+import { t as INTERNAL_MEDIA_PREFIX } from "../normalize-Ip_hFAm8.mjs";
+import { n as DEV_TYPEGEN_REFRESH_GLOBAL, t as DEV_TYPEGEN_REFRESH_EVENT } from "../dev-typegen-ZeWYV8Jp.mjs";
+import { a as parseDurationSeconds, c as resolveRegistryConfigForSandbox, i as normalizeRegistryConfig } from "../config-BdQzFtmR.mjs";
+import { n as VERSION, t as COMMIT } from "../version-Dcvx_C9g.mjs";
+import { r as getEnvSiteUrl } from "../public-url-CQwzRljH.mjs";
+import { n as validateAllowedOrigins, r as validateOriginShape } from "../allowed-origins-CovsTkm3.mjs";
+import { i as normalizeMigrationConfig } from "../policy-DOJ2sPqB.mjs";
+import { c as normalizeAstroI18n, n as MIGRATION_CONFIG_SYMBOL, o as serializeMigrationManifest, r as createMigrationIntegrationMetadata, s as validateMigrationManifest, t as buildMigrationManifest } from "../manifest-builder-CGF5kujD.mjs";
+import { r as getCoreMigrationIdentity } from "../identity-BivQ8wkV.mjs";
+import { A as VIRTUAL_SANDBOX_RUNNER_ID, B as generateConfigModule, C as VIRTUAL_CONFIG_ID, D as VIRTUAL_OBJECT_CACHE_ID, E as VIRTUAL_MEDIA_PROVIDERS_ID, F as generateAdminRegistryModule, G as generatePluginsModule, H as generateEnvModule, I as generateAuthModule, J as generateSchedulerModule, K as generateSandboxRunnerModule, L as generateAuthProvidersModule, M as VIRTUAL_SEED_ID, N as VIRTUAL_STORAGE_ID, O as VIRTUAL_PLUGINS_ID, P as VIRTUAL_WAIT_UNTIL_ID, R as generateBlockComponentsModule, S as VIRTUAL_BUILD_ID, T as VIRTUAL_ENV_ID, U as generateMediaProvidersModule, V as generateDialectModule, W as generateObjectCacheModule, X as generateStorageModule, Y as generateSeedModule, Z as generateWaitUntilModule, _ as RESOLVED_VIRTUAL_WAIT_UNTIL_ID, a as RESOLVED_VIRTUAL_BUILD_ID, b as VIRTUAL_AUTH_PROVIDERS_ID, c as RESOLVED_VIRTUAL_ENV_ID, d as RESOLVED_VIRTUAL_PLUGINS_ID, f as RESOLVED_VIRTUAL_SANDBOXED_PLUGINS_ID, g as RESOLVED_VIRTUAL_STORAGE_ID, h as RESOLVED_VIRTUAL_SEED_ID, i as RESOLVED_VIRTUAL_BLOCK_COMPONENTS_ID, j as VIRTUAL_SCHEDULER_ID, k as VIRTUAL_SANDBOXED_PLUGINS_ID, l as RESOLVED_VIRTUAL_MEDIA_PROVIDERS_ID, m as RESOLVED_VIRTUAL_SCHEDULER_ID, n as RESOLVED_VIRTUAL_AUTH_ID, o as RESOLVED_VIRTUAL_CONFIG_ID, p as RESOLVED_VIRTUAL_SANDBOX_RUNNER_ID, q as generateSandboxedPluginsModule, r as RESOLVED_VIRTUAL_AUTH_PROVIDERS_ID, s as RESOLVED_VIRTUAL_DIALECT_ID, t as RESOLVED_VIRTUAL_ADMIN_REGISTRY_ID, u as RESOLVED_VIRTUAL_OBJECT_CACHE_ID, v as VIRTUAL_ADMIN_REGISTRY_ID, w as VIRTUAL_DIALECT_ID, x as VIRTUAL_BLOCK_COMPONENTS_ID, y as VIRTUAL_AUTH_ID, z as generateBuildModule } from "../virtual-modules-CU29aip9.mjs";
 import { createRequire } from "node:module";
 import { dirname, isAbsolute, join, posix, relative, resolve, win32 } from "node:path";
+import { existsSync, readFileSync } from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { randomUUID } from "node:crypto";
 import { mkdir, rename, unlink, writeFile } from "node:fs/promises";
-import { existsSync, readFileSync } from "node:fs";
+import { request } from "node:https";
 import { fontProviders } from "astro/config";
 
 //#region src/astro/storage/adapters.ts
@@ -290,6 +291,64 @@ function loadDevEnv(root) {
 	for (const [key, value] of Object.entries(parsed)) if (DEV_ENV_SECRET_VAR_NAMES.has(key) && !process.env[key]) process.env[key] = value;
 }
 
+//#endregion
+//#region src/astro/integration/dev-scheduler-bridge.ts
+const DEFAULT_INTERVAL_MS = 6e4;
+function postMaintenance(url) {
+	if (url.protocol !== "https:") return fetch(url, { method: "POST" });
+	return new Promise((resolve, reject) => {
+		const request$1 = request(url, {
+			method: "POST",
+			rejectUnauthorized: false,
+			agent: false
+		}, (response) => {
+			const status = response.statusCode ?? 500;
+			response.once("error", reject);
+			response.once("end", () => resolve({
+				ok: status >= 200 && status < 300,
+				status
+			}));
+			response.resume();
+		});
+		request$1.once("error", reject);
+		request$1.end();
+	});
+}
+function startDevSchedulerBridge(server, logger, options = {}) {
+	const httpServer = server.httpServer;
+	if (!httpServer) return;
+	const intervalMs = options.intervalMs ?? DEFAULT_INTERVAL_MS;
+	let stopped = false;
+	let timer;
+	const schedule = () => {
+		if (stopped) return;
+		timer = setTimeout(() => void run(), intervalMs);
+		if (typeof timer === "object" && "unref" in timer) timer.unref();
+	};
+	const run = async () => {
+		try {
+			const origin = server.resolvedUrls?.local[0] ?? server.resolvedUrls?.network[0];
+			if (!origin) {
+				logger.warn("Dev scheduler bridge could not resolve the dev server origin.");
+				return;
+			}
+			const base = origin.endsWith("/") ? origin : `${origin}/`;
+			const url = new URL("_emdash/api/dev/scheduled-tasks", base);
+			const response = options.fetch ? await options.fetch(url, { method: "POST" }) : await postMaintenance(url);
+			if (!response.ok) logger.warn(`Dev scheduler bridge request failed with status ${response.status}. Verify that EmDash's dev maintenance route is available.`);
+		} catch (error) {
+			logger.warn(`Dev scheduler bridge request failed: ${error instanceof Error ? error.message : String(error)}`);
+		} finally {
+			schedule();
+		}
+	};
+	httpServer.once("listening", schedule);
+	httpServer.once("close", () => {
+		stopped = true;
+		if (timer !== void 0) clearTimeout(timer);
+	});
+}
+
 //#endregion
 //#region src/astro/integration/dev-typegen.ts
 /**
@@ -1329,6 +1388,10 @@ function injectCoreRoutes(injectRoute, options = {}) {
 		pattern: "/_emdash/api/dev/emails",
 		entrypoint: resolveRoute("api/dev/emails.ts")
 	});
+	if (options.cloudflareDevScheduler) injectRoute({
+		pattern: "/_emdash/api/dev/scheduled-tasks",
+		entrypoint: resolveRoute("api/dev/scheduled-tasks.ts")
+	});
 	injectRoute({
 		pattern: "/_emdash/api/auth/me",
 		entrypoint: resolveRoute("api/auth/me.ts")
@@ -1535,7 +1598,7 @@ function resolveIntegrationShim(fileName) {
 /**
 * Creates the EmDash virtual modules Vite plugin.
 */
-function createVirtualModulesPlugin(options, astroCommand) {
+function createVirtualModulesPlugin(options) {
 	const { serializableConfig, resolvedConfig, pluginDescriptors, astroConfig } = options;
 	let viteCommand;
 	const buildTime = Date.now();
@@ -1591,10 +1654,7 @@ function createVirtualModulesPlugin(options, astroCommand) {
 			if (id === RESOLVED_VIRTUAL_BLOCK_COMPONENTS_ID) return generateBlockComponentsModule(pluginDescriptors);
 			if (id === RESOLVED_VIRTUAL_SEED_ID) return generateSeedModule(fileURLToPath(astroConfig.root), viteCommand === "serve");
 			if (id === RESOLVED_VIRTUAL_WAIT_UNTIL_ID) return generateWaitUntilModule(astroConfig.adapter?.name);
-			if (id === RESOLVED_VIRTUAL_SCHEDULER_ID) {
-				const schedulerCommand = astroCommand === "dev" ? "serve" : "build";
-				return generateSchedulerModule(astroConfig.adapter?.name, schedulerCommand);
-			}
+			if (id === RESOLVED_VIRTUAL_SCHEDULER_ID) return generateSchedulerModule(astroConfig.adapter?.name);
 			if (id === RESOLVED_VIRTUAL_ENV_ID) return generateEnvModule(astroConfig.adapter?.name);
 			if (id === RESOLVED_VIRTUAL_BUILD_ID) return generateBuildModule(buildTime);
 		}
@@ -1647,6 +1707,9 @@ function canResolveProjectDependency(projectRoot, specifier) {
 */
 function createViteConfig(options, command) {
 	const adminDistPath = resolveAdminDist();
+	const adminRequire = createRequire(resolve(adminDistPath, "index.js"));
+	const adminLinguiReactPath = dirname(adminRequire.resolve("@lingui/react/package.json"));
+	const adminLinguiCorePath = dirname(adminRequire.resolve("@lingui/core/package.json"));
 	const cloudflare = isCloudflareAdapter(options.astroConfig);
 	const isDev = command === "dev";
 	const projectRoot = fileURLToPath(options.astroConfig.root);
@@ -1672,6 +1735,14 @@ function createViteConfig(options, command) {
 				"react-dom"
 			],
 			alias: [
+				{
+					find: "@lingui/react",
+					replacement: adminLinguiReactPath
+				},
+				{
+					find: "@lingui/core",
+					replacement: adminLinguiCorePath
+				},
 				{
 					find: ADMIN_STYLES_ALIAS,
 					replacement: resolve(adminDistPath, "styles.css")
@@ -1699,7 +1770,7 @@ function createViteConfig(options, command) {
 			]
 		},
 		plugins: [
-			createVirtualModulesPlugin(options, command),
+			createVirtualModulesPlugin(options),
 			...adminLocales ? [createAdminLocaleResolverPlugin({
 				adminDistPath,
 				adminSourcePath,
@@ -1864,6 +1935,29 @@ function resolveAstroVersion() {
 		return;
 	}
 }
+/**
+* `@emdash-cms/cloudflare` depends on the exact `emdash` version it was
+* released with. A site that upgrades only one of the two installs a second
+* copy of `emdash` for the adapter, so warn when the installed adapter's
+* version differs from this one.
+*
+* @internal Exported for unit testing.
+*/
+function adapterVersionMismatchWarning(root, version = VERSION) {
+	if (version === "dev") return void 0;
+	for (let dir = fileURLToPath(root); dir !== dirname(dir); dir = dirname(dir)) {
+		const file = join(dir, "node_modules", "@emdash-cms", "cloudflare", "package.json");
+		if (!existsSync(file)) continue;
+		let pkg;
+		try {
+			pkg = JSON.parse(readFileSync(file, "utf8"));
+		} catch {
+			return;
+		}
+		if (typeof pkg.version !== "string" || pkg.version === version) return void 0;
+		return `@emdash-cms/cloudflare ${pkg.version} does not match emdash ${version}, so the adapter runs against its own copy of emdash ${pkg.version}. Install the same version of both packages, for example:\n\n  npm install emdash@${version} @emdash-cms/cloudflare@${version}`;
+	}
+}
 /** Default storage: Local filesystem in .emdash directory */
 const DEFAULT_STORAGE = local({
 	directory: "./.emdash/uploads",
@@ -2159,6 +2253,7 @@ function emdash(config = {}) {
 	const serializableConfig = buildSerializableConfig(resolvedConfig);
 	const useExternalAuth = !!(resolvedConfig.auth && "entrypoint" in resolvedConfig.auth);
 	let astroCommand;
+	let usesCloudflareAdapter = false;
 	let normalizedI18n = null;
 	const migrationMetadata = createMigrationIntegrationMetadata(resolvedConfig.database);
 	const integration = {
@@ -2166,6 +2261,7 @@ function emdash(config = {}) {
 		hooks: {
 			"astro:config:setup": ({ injectRoute: astroInjectRoute, addMiddleware, logger, updateConfig, config: astroConfig, command }) => {
 				astroCommand = command;
+				usesCloudflareAdapter = astroConfig.adapter?.name === "@astrojs/cloudflare";
 				normalizeRegistryConfig(registry, { allowLocalhost: command === "dev" || command === "sync" });
 				printBanner(logger);
 				if (command === "dev") try {
@@ -2234,7 +2330,10 @@ function emdash(config = {}) {
 					...route,
 					prerender: false
 				});
-				injectCoreRoutes(injectRoute, { srcDir: astroConfig.srcDir });
+				injectCoreRoutes(injectRoute, {
+					srcDir: astroConfig.srcDir,
+					cloudflareDevScheduler: command === "dev" && usesCloudflareAdapter
+				});
 				if (resolvedConfig.authProviders?.length) injectAuthProviderRoutes(injectRoute, resolvedConfig.authProviders);
 				if (!useExternalAuth) injectBuiltinAuthRoutes(injectRoute);
 				if (resolvedConfig.mcp !== false) injectMcpRoute(injectRoute);
@@ -2243,6 +2342,8 @@ function emdash(config = {}) {
 			"astro:config:done": async ({ config: finalConfig, logger }) => {
 				const warning = missingReactIntegrationWarning(finalConfig.integrations);
 				if (warning) logger.warn(warning);
+				const adapterWarning = adapterVersionMismatchWarning(finalConfig.root);
+				if (adapterWarning) logger.warn(adapterWarning);
 				const sessionWarning = useExternalAuth ? void 0 : missingSessionDriverWarning(finalConfig.session);
 				if (sessionWarning) logger.warn(sessionWarning);
 				if (astroCommand !== "build" && astroCommand !== "sync") return;
@@ -2262,6 +2363,7 @@ function emdash(config = {}) {
 				await writeMigrationManifest(fileURLToPath(finalConfig.root), manifest);
 			},
 			"astro:server:setup": ({ server, logger }) => {
+				if (astroCommand === "dev" && usesCloudflareAdapter) startDevSchedulerBridge(server, logger);
 				if (astroCommand === "dev") server.httpServer?.once("listening", () => {
 					const address = server.httpServer?.address();
 					if (!address || typeof address === "string") return;