@timber-js/app 0.2.0-alpha.191 → 0.2.0-alpha.192

package/dist/config-types.d.ts

@@ -157,12 +157,30 @@ export interface TimberUserConfig {
      * to use a custom location.
      */
     appDir?: string;
-    /** MDX compilation options passed to @mdx-js/rollup. See design/20-content-collections.md. */
-    mdx?: {
-        remarkPlugins?: unknown[];
-        rehypePlugins?: unknown[];
-        recmaPlugins?: unknown[];
-        remarkRehypeOptions?: Record<string, unknown>;
+    /**
+     * MDX/Markdown compilation options passed to vite-plugin-satteri.
+     *
+     * Satteri's plugin API is visitor-based (`defineMdastPlugin` /
+     * `defineHastPlugin` from the `satteri` package) — unified
+     * remark/rehype plugins are not supported.
+     *
+     * Set to `false` to disable timber's MDX support entirely — even when a
+     * `content/` directory exists. Use this when registering your own MDX
+     * compiler (e.g. `@mdx-js/rollup` for the unified pipeline) directly in
+     * `vite.config.ts`.
+     *
+     * See design/20-content-collections.md.
+     */
+    mdx?: false | {
+        /** MDAST-stage plugins (created with satteri's `defineMdastPlugin`). */
+        mdastPlugins?: unknown[];
+        /** HAST-stage plugins (created with satteri's `defineHastPlugin`). */
+        hastPlugins?: unknown[];
+        /**
+         * Parser feature toggles. Defaults: `gfm: true`, `frontmatter: true`,
+         * everything else (math, directive, wikilinks, …) off.
+         */
+        features?: Record<string, unknown>;
     };
     /**
      * Server action bound args encryption configuration.

package/dist/config-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-types.d.ts","sourceRoot":"","sources":["../src/config-types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,uDAAuD;AACvD,MAAM,WAAW,sBAAsB;IACrC,yEAAyE;IACzE,QAAQ,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC7B;;;;;;;;;;OAUG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;;;;;;;;;;OAaG;IACH,gBAAgB,CAAC,EAAE,OAAO,GAAG,sBAAsB,CAAC;IACpD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE;QACP,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,KAAK,CAAC,EAAE;QACN;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WA6BG;QACH,oBAAoB,CAAC,EAAE,OAAO,GAAG,SAAS,MAAM,EAAE,CAAC;KACpD,CAAC;IACF,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;;;;;;;OAWG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;;;;;;;;OAaG;IACH,cAAc,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACpD,mEAAmE;IACnE,GAAG,CAAC,EAAE;QACJ,oFAAoF;QACpF,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF;;;;;;;;;;;;;;OAcG;IACH,YAAY,CAAC,EAAE,UAAU,GAAG,OAAO,GAAG,KAAK,CAAC;IAC5C;;;OAGG;IACH,MAAM,CAAC,EAAE;QACP,0EAA0E;QAC1E,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8FAA8F;IAC9F,GAAG,CAAC,EAAE;QACJ,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC;QAC1B,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC;QAC1B,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC;QACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC/C,CAAC;IACF;;;;;;;;;;;;;OAaG;IACH,gBAAgB,CAAC,EAAE;QACjB;;;;WAIG;QACH,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;IACF;;;;;;;;;;;;;;;;OAgBG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxE;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,EAAE;QACR,2EAA2E;QAC3E,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,oGAAoG;QACpG,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,wDAAwD;QACxD,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAChC,gEAAgE;QAChE,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,+DAA+D;QAC/D,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC5B,CAAC;IACF;;;;;;;;;;;;;;;OAeG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;;;;;;;;;;OAcG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,SAAS,CAAC,EAAE;QACV,wDAAwD;QACxD,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,qCAAqC;QACrC,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,wCAAwC;QACxC,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,qDAAqD;QACrD,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,kFAAkF;QAClF,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,kCAAkC;QAClC,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH"}
+{"version":3,"file":"config-types.d.ts","sourceRoot":"","sources":["../src/config-types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,uDAAuD;AACvD,MAAM,WAAW,sBAAsB;IACrC,yEAAyE;IACzE,QAAQ,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC7B;;;;;;;;;;OAUG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;;;;;;;;;;OAaG;IACH,gBAAgB,CAAC,EAAE,OAAO,GAAG,sBAAsB,CAAC;IACpD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE;QACP,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,KAAK,CAAC,EAAE;QACN;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WA6BG;QACH,oBAAoB,CAAC,EAAE,OAAO,GAAG,SAAS,MAAM,EAAE,CAAC;KACpD,CAAC;IACF,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;;;;;;;OAWG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;;;;;;;;OAaG;IACH,cAAc,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACpD,mEAAmE;IACnE,GAAG,CAAC,EAAE;QACJ,oFAAoF;QACpF,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF;;;;;;;;;;;;;;OAcG;IACH,YAAY,CAAC,EAAE,UAAU,GAAG,OAAO,GAAG,KAAK,CAAC;IAC5C;;;OAGG;IACH,MAAM,CAAC,EAAE;QACP,0EAA0E;QAC1E,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;;;;;;;;OAaG;IACH,GAAG,CAAC,EACA,KAAK,GACL;QACE,wEAAwE;QACxE,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC;QACzB,sEAAsE;QACtE,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC;QACxB;;;WAGG;QACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACpC,CAAC;IACN;;;;;;;;;;;;;OAaG;IACH,gBAAgB,CAAC,EAAE;QACjB;;;;WAIG;QACH,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;IACF;;;;;;;;;;;;;;;;OAgBG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxE;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,EAAE;QACR,2EAA2E;QAC3E,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,oGAAoG;QACpG,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,wDAAwD;QACxD,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAChC,gEAAgE;QAChE,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,+DAA+D;QAC/D,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC5B,CAAC;IACF;;;;;;;;;;;;;;;OAeG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;;;;;;;;;;OAcG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,SAAS,CAAC,EAAE;QACV,wDAAwD;QACxD,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,qCAAqC;QACrC,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,wCAAwC;QACxC,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,qDAAqD;QACrD,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,kFAAkF;QAClF,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,kCAAkC;QAClC,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH"}

package/dist/index.js

@@ -2094,6 +2094,7 @@ function findMdxComponents(root) {
 * Determine if MDX should be activated based on config and project structure.
 */
 function shouldActivate(ctx) {
+	if (ctx.config.mdx === false) return false;
 	const exts = ctx.config.pageExtensions;
 	if (exts && exts.some((ext) => MDX_EXTENSIONS.includes(ext))) return true;
 	if (existsSync(join(ctx.root, "content"))) return true;
@@ -2105,13 +2106,11 @@ function shouldActivate(ctx) {
 *
 * Why this matters: pnpm only hoists declared (peer) dependencies into a
 * package's resolution scope. The MDX integration's optional companions
-* — `remark-frontmatter`, `remark-mdx-frontmatter`, `@mdx-js/rollup` — are
-* installed as direct deps of the consumer (e.g. `packages/website`), not
-* `@timber-js/app`. A bare `import('remark-frontmatter')` from inside this
-* file resolves against `packages/timber-app/node_modules` and silently
-* fails with `ERR_MODULE_NOT_FOUND`, which made `tryImport` return
-* `undefined` and skipped frontmatter parsing entirely — leaving MDX to
-* choke on YAML as JS expressions (TIM-840).
+* — `vite-plugin-satteri` and `satteri` — are installed as direct deps of
+* the consumer (e.g. `packages/website`), not `@timber-js/app`. A bare
+* `import('vite-plugin-satteri')` from inside this file resolves against
+* `packages/timber-app/node_modules` and silently fails with
+* `ERR_MODULE_NOT_FOUND` (TIM-840).
 *
 * Resolving relative to `projectRoot` (via `createRequire`) makes the
 * lookup walk the consumer's `node_modules` tree first, which is where
@@ -2138,39 +2137,41 @@ async function tryImport(name, projectRoot) {
 * Create the timber-mdx Vite plugin.
 *
 * Uses the transform and resolveId hooks to delegate MDX compilation
-* to @mdx-js/rollup. The inner plugin is loaded lazily on first activation.
+* to vite-plugin-satteri. The inner plugin is loaded lazily on first
+* activation.
 *
-* Hooks: buildStart (loads @mdx-js/rollup), resolveId, load, transform
+* Hooks: buildStart (loads vite-plugin-satteri), resolveId, load, transform
 */
 function timberMdx(ctx) {
 	let innerPlugin = null;
 	async function activate() {
 		if (innerPlugin !== null || !shouldActivate(ctx)) return;
-		const createMdxPlugin = await tryImport("@mdx-js/rollup", ctx.root);
-		if (!createMdxPlugin) throw new Error([
-			"[timber] MDX is enabled but @mdx-js/rollup is not installed.",
+		if (ctx.config.pageExtensions?.includes("md")) throw new Error([
+			"[timber] pageExtensions includes 'md', but .md route pages are not supported:",
+			"Markdown files compile to HTML strings, not components.",
+			"",
+			"Use .mdx for pages (pageExtensions: ['tsx', 'ts', 'mdx']).",
+			".md files can still be imported as HTML strings — no pageExtensions entry needed."
+		].join("\n"));
+		const createSatteriPlugin = await tryImport("vite-plugin-satteri", ctx.root);
+		if (!createSatteriPlugin) throw new Error([
+			"[timber] MDX is enabled but vite-plugin-satteri is not installed.",
 			"",
 			"Install it:",
-			"  pnpm add -D @mdx-js/rollup remark-frontmatter remark-mdx-frontmatter",
+			"  pnpm add -D vite-plugin-satteri satteri",
 			"",
 			"MDX is activated because pageExtensions includes \"mdx\"/\"md\" or a content/ directory exists."
 		].join("\n"));
-		const mdxConfig = ctx.config.mdx ?? {};
-		const remarkPlugins = [];
-		const remarkFrontmatter = await tryImport("remark-frontmatter", ctx.root);
-		const remarkMdxFrontmatter = await tryImport("remark-mdx-frontmatter", ctx.root);
-		if (remarkFrontmatter) remarkPlugins.push(remarkFrontmatter);
-		if (remarkMdxFrontmatter) remarkPlugins.push(remarkMdxFrontmatter);
-		if (mdxConfig.remarkPlugins) remarkPlugins.push(...mdxConfig.remarkPlugins);
-		const mdxOptions = {
-			remarkPlugins,
-			rehypePlugins: mdxConfig.rehypePlugins ?? [],
-			recmaPlugins: mdxConfig.recmaPlugins ?? [],
-			remarkRehypeOptions: mdxConfig.remarkRehypeOptions
-		};
+		const mdxConfig = ctx.config.mdx || {};
+		const mdxOptions = { development: ctx.dev };
 		const mdxComponentsPath = findMdxComponents(ctx.root);
 		if (mdxComponentsPath) mdxOptions.providerImportSource = mdxComponentsPath;
-		innerPlugin = createMdxPlugin(mdxOptions);
+		innerPlugin = createSatteriPlugin({
+			mdx: mdxOptions,
+			...mdxConfig.mdastPlugins ? { mdastPlugins: mdxConfig.mdastPlugins } : {},
+			...mdxConfig.hastPlugins ? { hastPlugins: mdxConfig.hastPlugins } : {},
+			...mdxConfig.features ? { features: mdxConfig.features } : {}
+		});
 	}
 	return {
 		name: "timber-mdx",
@@ -2198,6 +2199,7 @@ function timberMdx(ctx) {
 		},
 		async transform(code, id) {
 			if (!innerPlugin) return null;
+			if (id.includes("?")) return null;
 			const envName = this.environment?.name;
 			if (envName && envName !== "rsc") return null;
 			if (typeof innerPlugin.transform === "function") return innerPlugin.transform.call(this, code, id);
@@ -7426,7 +7428,8 @@ var BUILD_ONLY_EXTERNALS = [
 	"vite",
 	"nitro",
 	"rollup",
-	"@mdx-js/rollup",
+	"vite-plugin-satteri",
+	"satteri",
 	"fsevents",
 	"chokidar"
 ];