@ogygia/core 0.12.0 → 0.12.2

package/dist/compiler/region/transform.js

@@ -839,7 +839,11 @@ var FileCompilation = class {
 		}
 		if (render_mode != null && !RENDER_MODES.has(render_mode)) throw fail(`unknown ${import_keys.render} '${render_mode}'. Use 'static' (inline HTML) | 'deferred' (a hole, fetched) | 'live' (a hole that revalidates).`);
 		const said = from_preset ? `preset '${from_preset}'` : "this import";
-		if (render_mode === "deferred" && wake_val != null) throw fail(`${said} times a \`${import_keys.render}: 'deferred'\` hole with \`${import_keys.wake}: '${wake_val}'\` — that spelling is gone. Write \`${import_keys.render}: 'deferred', ${import_keys.fetch}: '${wake_val}'\` instead: \`${import_keys.fetch}\` says when a hole's HTML arrives. (\`${import_keys.wake}\` is when an island's JS runs; a hole ships no JS.)`);
+		if (render_mode === "deferred" && wake_val != null) {
+			if (fetch_val != null) throw fail(`${said} times a \`${import_keys.render}: 'deferred'\` hole twice, with \`${import_keys.fetch}: '${fetch_val}'\` and \`${import_keys.wake}: '${wake_val}'\`. Keep \`${import_keys.fetch}\`: it says when a hole's HTML arrives.`);
+			warn_once(`deferred-wake:${rel_host}:${said}:${wake_val}`, `[ogygia] ${rel_host}: ${said} times a \`${import_keys.render}: 'deferred'\` hole with \`${import_keys.wake}: '${wake_val}'\`, which is deprecated. Write \`${import_keys.render}: 'deferred', ${import_keys.fetch}: '${wake_val}'\` instead: \`${import_keys.fetch}\` says when a hole's HTML arrives. (\`${import_keys.wake}\` is when an island's JS runs; a hole ships no JS.)`);
+			fetch_val = wake_val;
+		}
 		if (fetch_val != null && render_mode !== "deferred") throw fail(`${said} sets \`${import_keys.fetch}: '${fetch_val}'\` without \`${import_keys.render}: 'deferred'\` — \`${import_keys.fetch}\` is a hole's timing. Write \`${import_keys.render}: 'deferred', ${import_keys.fetch}: '${fetch_val}'\` for a hole` + (render_mode == null ? `, or \`${import_keys.wake}: '${fetch_val}'\` for an island.` : "."));
 		if (render_mode === "deferred") attrs.set("defer", fetch_val ?? "load");
 		else if (render_mode === "live") {
@@ -1731,8 +1735,11 @@ var TsRegionCompilation = class {
 		if (marker.fetch != null && marker.render == null) throw new Error(`[ogygia] ${this.#rel_host}: \`${fetchKey}: '${marker.fetch}'\` without \`${renderKey}: 'deferred'\` — \`${fetchKey}\` is a hole's timing. Write \`${renderKey}: 'deferred', ${fetchKey}: '${marker.fetch}'\` for a hole, or \`${this.#wakeKey}: '${marker.fetch}'\` for an island.`);
 		if (marker.render != null) {
 			if (marker.render !== "deferred") throw new Error(marker.render === "live" ? `[ogygia] ${this.#rel_host}: \`${renderKey}: 'live'\` is not supported on a .ts import — use it in a .svelte file.` : `[ogygia] ${this.#rel_host}: unknown \`${renderKey}\` '${marker.render}'. Use 'deferred'.`);
-			if (marker.wake != null) throw new Error(`[ogygia] ${this.#rel_host}: a \`${renderKey}: 'deferred'\` hole timed with \`${this.#wakeKey}: '${marker.wake}'\` — that spelling is gone. Write \`${renderKey}: 'deferred', ${fetchKey}: '${marker.wake}'\` instead: \`${fetchKey}\` says when a hole's HTML arrives. (\`${this.#wakeKey}\` is when an island's JS runs; a hole ships no JS.)`);
-			const dval = marker.fetch ?? "load";
+			if (marker.wake != null) {
+				if (marker.fetch != null) throw new Error(`[ogygia] ${this.#rel_host}: a \`${renderKey}: 'deferred'\` hole timed twice, with \`${fetchKey}: '${marker.fetch}'\` and \`${this.#wakeKey}: '${marker.wake}'\`. Keep \`${fetchKey}\`: it says when a hole's HTML arrives.`);
+				warn_once(`deferred-wake:${this.#rel_host}:ts:${marker.wake}`, `[ogygia] ${this.#rel_host}: a \`${renderKey}: 'deferred'\` hole timed with \`${this.#wakeKey}: '${marker.wake}'\`, which is deprecated. Write \`${renderKey}: 'deferred', ${fetchKey}: '${marker.wake}'\` instead: \`${fetchKey}\` says when a hole's HTML arrives. (\`${this.#wakeKey}\` is when an island's JS runs; a hole ships no JS.)`);
+			}
+			const dval = marker.fetch ?? marker.wake ?? "load";
 			let when;
 			if (DEFER_STRATEGIES.has(dval)) when = dval;
 			else if (is_media_query(dval)) when = dval;

package/dist/vite/index.d.ts

@@ -5,6 +5,7 @@ import { debarrel } from "../compiler/debarrel/plugin.js";
 import { BuildContext, MacroContext, MacroHandler, MarkupRegions, MarkupSource, OgygiaPlugin, PluginDefinition, definePlugin } from "./plugin-api.js";
 import { DebarrelOptions, Matcher } from "../compiler/debarrel/options.js";
 import { OgygiaOptions, OgygiaPreset, OgygiaRateLimit } from "./options.js";
+import { PreprocessorGroup } from "svelte/compiler";
 import { Plugin } from "vite";
 /**
  * Vite plugin: transforms `with { hydrate | defer | preset }` imports into islands,
@@ -16,4 +17,16 @@ import { Plugin } from "vite";
  * @returns Vite plugins (`ogygia` pre + island sourcemap fix post). Vite flattens the array.
  */
 export declare function ogygia(options?: OgygiaOptions): Plugin[];
+export declare namespace ogygia {
+  /**
+   * @deprecated Does nothing: returns `['.svelte']`. Markdown extensions come from
+   * `extensions()` in `@ogygia/content/vite`.
+   */
+  export const extensions: () => string[];
+  /**
+   * @deprecated Does nothing: returns `[]`. The markdown preprocessor comes from `preprocess()` in
+   * `@ogygia/content/vite`.
+   */
+  export const preprocess: () => PreprocessorGroup[];
+}
 export { type BuildContext, CLIENT_BINDING_STUB, DEFAULT_IMPORT_KEYS, type Matcher as DebarrelMatcher, type DebarrelOptions, type ImportKeys, type MacroContext, type MacroHandler, type MarkupRegions, type MarkupSource, type OgygiaOptions, type OgygiaPlugin, type OgygiaPreset, type OgygiaRateLimit, type PluginDefinition, debarrel, definePlugin, import_keys_hint, islandChunkFileName, islandId, islandPublicUrl, normalize_import_keys, regionId, regionIdentity, rewrite_lake_import_to_placeholder, strategyKey, wrapperVirtualId };

package/dist/vite/index.js

@@ -818,4 +818,8 @@ function ogygia(options = {}) {
 		server_sourcemaps_plugin(() => measure)
 	];
 }
+Object.assign(ogygia, {
+	extensions: () => [".svelte"],
+	preprocess: () => []
+});
 export { CLIENT_BINDING_STUB, DEFAULT_IMPORT_KEYS, debarrel, definePlugin, import_keys_hint, islandChunkFileName, islandId, islandPublicUrl, normalize_import_keys, ogygia, regionId, regionIdentity, rewrite_lake_import_to_placeholder, strategyKey, wrapperVirtualId };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ogygia/core",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "The core of ogygia (SSR islands for SvelteKit): apps install `ogygia`, plugins build on this",
   "homepage": "https://ogygiajs.dev",
   "bugs": {