@uniflowed/vite 0.10.0 → 0.11.1

package/driver.js

@@ -43,6 +43,7 @@ import { randomUUID } from "node:crypto";
 import { createServer as createHttpServer } from "node:http";
 import { builtinModules, register } from "node:module";
 import { esmExternalRequirePlugin } from "rolldown/plugins";
+import "@ox-content/napi";
 import { installFlowHooks } from "@uniflowed/host/internal/sync-hooks.js";
 import { cpSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import path from "node:path";
@@ -118,8 +119,8 @@ process.env.UF_PROJECT_ROOT = root;
 // Deno has no `register` either, and it gets its hooks *here* rather than from
 // a preload, for a reason that is about order. While a Deno `load` hook is
 // registered, `require()` of a native addon fails — and Vite requires one,
-// Rolldown's binding. The static imports above have already loaded Vite by
-// this line, binding included, so hooks installed now see only what is
+// Rolldown's binding and ox-content's Markdown parser. The static imports
+// above load both native bindings before hooks, so hooks now see only what is
 // imported after them: the config, and the `@uniflowed/*` modules this driver
 // reaches dynamically. They are the in-thread hooks a new enough Node takes
 // through `@uniflowed/host/register` too; see
@@ -785,7 +786,7 @@ async function build() {
   // every build and read by nothing unless a project turned a durable cache on
   // — at which point it is the thing that stops a deploy answering the new
   // build's URLs with the previous build's documents. See
-  // `packages/server/internal/cache-key.js`, which argues the whole of it, and
+  // `npm/server/internal/cache-key.js`, which argues the whole of it, and
   // `internal/serve.js`'s `buildIdentity`, which is what reads this.
   writeFileSync(path.join(serverDir, BUILD_ID_FILE), `${buildId}\n`);
 
@@ -1401,7 +1402,7 @@ const ADAPTERS = {
   // The same two files as `node`, with `@uniflowed/server/bun` in place of
   // `@uniflowed/server/node`. That module is `./internal/static.js` for every
   // decision and `Bun.file` for the bytes, which is where the measured win is
-  // — see ubugeeei-prod/uf#391 and the header of `packages/server/bun.js`.
+  // — see ubugeeei-prod/uf#391 and the header of `npm/server/bun.js`.
   //
   // No `conditions` of its own, unlike `edge`. Bun honours a `bun` export
   // condition and this deliberately does not ask for it: the measured win is
@@ -1475,7 +1476,7 @@ const ADAPTERS = {
       worker: workerEntrySource("./handler.js", schedules),
     }),
     // Workers KV, through the same module seam a project's own provider goes
-    // through. `packages/server/cache-kv.js` argues KV over the Cache API: the
+    // through. `npm/server/cache-kv.js` argues KV over the Cache API: the
     // seam has to find every entry under a tag, and the Cache API cannot list
     // what it holds.
     regenerationStore: "@uniflowed/server/cache/kv",
@@ -1872,7 +1873,7 @@ async function deploy() {
  * at all rather than something read at boot: the build id is a fact about the
  * artefact being written, known here and nowhere later. `internal/serve.js`'s
  * `buildIdentity` is where it came from and
- * `packages/server/internal/cache-key.js` is why it exists.
+ * `npm/server/internal/cache-key.js` is why it exists.
  */
 function handlerEntrySource(document, cache, capabilities, build, regeneration, images, partial) {
   const route = cache?.route === true;

package/index.js

@@ -24,10 +24,8 @@
 //                 `internal/rsc.js` reads the RSC analysis and leaves out the
 //                 page of every route no client boundary reaches, so that
 //                 route's modules never enter the browser bundle.
-// * `uf:mdx`    — `@mdx-js/rollup`, configured for React with GitHub-flavoured
-//                 markdown, front matter, heading ids and build-time syntax
-//                 highlighting, so `.mdx` works with
-//                 no configuration.
+// * `uf:mdx`    — ox-content's native Markdown/MDX parser, with React codegen,
+//                 front matter, heading ids and build-time syntax highlighting.
 // * `uf:barrel-imports` — a named import from `@uniflowed/ui` becomes an import
 //                 from the file that defines the name, in every environment,
 //                 so a page using one component loads that component's module
@@ -68,7 +66,7 @@ import { emit, reportRenderError, errorEvent } from "./internal/events.js";
 import remarkFrontmatterExport from "./internal/frontmatter.js";
 import { highlightPlugin } from "./internal/highlight.js";
 import { moduleId } from "./internal/module-graph.js";
-import remarkFrontmatter from "remark-frontmatter";
+import remarkOxContent from "./internal/markdown.js";
 import remarkGfm from "remark-gfm";
 
 import {
@@ -1346,7 +1344,7 @@ function mdxPlugin(markdown) {
       // key's old default, which has no runtime in it — where the config is
       // read, so it never arrives here.
       jsxImportSource: mdxConfig.jsxImportSource ?? "react",
-      remarkPlugins: [remarkGfm, remarkFrontmatter, remarkFrontmatterExport],
+      remarkPlugins: [remarkGfm, remarkOxContent, remarkFrontmatterExport],
       rehypePlugins,
     }),
     name: "uf:mdx",
@@ -1465,7 +1463,7 @@ const ALL_DIAGNOSTICS = "UF_REACT_COMPILER_DIAGNOSTICS";
  *
  * The position is real too, and is the expression the compiler objected to
  * rather than the function containing it, so the two halves of the line say
- * different things — `packages/hooks/dom.js:195:7: This value cannot be
+ * different things — `npm/hooks/dom.js:195:7: This value cannot be
  * modified (in useLongPress)` locates the write and names the hook to look in.
  *
  * A dependency's findings are held back. A React Compiler bailout inside
@@ -1578,7 +1576,7 @@ function packageOf(file) {
   // No `node_modules` in the path: a workspace link, resolved to a checkout.
   // The directory the module hangs off is the closest thing to a package name
   // that is true without reading its `package.json` from a warning path.
-  const up = parts.lastIndexOf("packages");
+  const up = parts.lastIndexOf("npm");
   return up === -1 ? parts.slice(0, -1).join("/") || file : parts.slice(up, up + 2).join("/");
 }
 

package/internal/devtools.js

@@ -32,7 +32,7 @@
 // edit away from being lost:
 //
 //   1. **The hook, before the renderer.** This module, injected by
-//      `packages/vite/index.js`'s `transformIndexHtml` as a *classic* script at
+//      `npm/vite/index.js`'s `transformIndexHtml` as a *classic* script at
 //      the top of the head — see [`devtoolsPreamble`] for why classic.
 //   2. **One copy of the renderer.** `resolve.dedupe: ["react", "react-dom"]`
 //      in that same file. Two copies of `react-dom` register two renderers, and

package/internal/diagnostics.js

@@ -57,7 +57,7 @@
 // `@uniflowed/router`'s `internal/diagnostics.js` are the same two strings, and
 // they are the contract. They cannot be *imported* here: this module is loaded
 // by Vite before any Flow transform exists, and both of those are Flow. So they
-// are written out, and `packages/vite/dev-channel.test.js` asserts that all
+// are written out, and `npm/vite/dev-channel.test.js` asserts that all
 // four spellings agree — a duplicated constant with a test on it is honest, and
 // one without is how the browser ends up posting to a path nothing serves.
 //

package/internal/flight.js

@@ -120,9 +120,9 @@ export const DEV_RSC_HOOK = "uf.dev.rsc";
 /**
  * The last segment of a route's payload URL.
  *
- * A third spelling, beside `packages/router/internal/flight.js` and
- * `packages/server/internal/flight.js`, because this file is plain JavaScript
- * that Vite imports before any Flow transform exists. `packages/server/flight.test.js`
+ * A third spelling, beside `npm/router/internal/flight.js` and
+ * `npm/server/internal/flight.js`, because this file is plain JavaScript
+ * that Vite imports before any Flow transform exists. `npm/server/flight.test.js`
  * holds all three to one answer.
  */
 export const FLIGHT_SEGMENT = "__uf.flight";
@@ -687,8 +687,8 @@ function serverBundleAlreadyImportsClientReference(file) {
 const ROUTER_CLIENT_REFERENCES_IN_SERVER = Object.freeze([
   "/@uniflowed/router/internal/boundaries.js",
   "/@uniflowed/router/internal/error-view.js",
-  "/packages/router/internal/boundaries.js",
-  "/packages/router/internal/error-view.js",
+  "/npm/router/internal/boundaries.js",
+  "/npm/router/internal/error-view.js",
 ]);
 
 /**

package/internal/flow-keywords.js

@@ -435,7 +435,7 @@ export function markLines(lines) {
  *
  * Exported because it is where the decision is visible without starting Shiki:
  * give it the token split a grammar would produce and it says which words it
- * marked. `packages/vite/highlight.test.js` uses exactly that, and the splits
+ * marked. `npm/vite/highlight.test.js` uses exactly that, and the splits
  * in it are the ones that had bugs.
  */
 export function markLine(line) {

package/internal/frontmatter.js

@@ -25,7 +25,12 @@ import { parse } from "yaml";
 export default function remarkFrontmatterExport() {
   return (tree, file) => {
     const node = tree.children.find((child) => child.type === "yaml");
-    const data = node == null ? undefined : parse(node.value);
+    const data =
+      file.data != null && Object.hasOwn(file.data, "ufFrontmatter")
+        ? file.data.ufFrontmatter
+        : node == null
+          ? undefined
+          : parse(node.value);
     define(tree, file, {
       frontmatter: valueToEstree(data, { preserveReferences: true }),
     });

package/internal/http.js

@@ -84,7 +84,7 @@ export function toAddressRequest(incoming) {
  *
  * The same function as `requestUrl` in `@uniflowed/server/node`, which has the
  * argument for why; spelled twice because this file runs before any Flow
- * transform and cannot import that one. `packages/server/serve.test.js` holds
+ * transform and cannot import that one. `npm/server/serve.test.js` holds
  * both to one answer.
  *
  * @param {string} protocol

package/internal/markdown.js

@@ -0,0 +1,33 @@
+// @noflow
+// ox-content parses plain Markdown and frontmatter. MDX keeps the official
+// compiler's JavaScript/JSX grammar, including lowercase tags and nested Markdown.
+// uf owns the page shell and theme in both cases.
+import { parseFrontmatter, transformMdast } from "@ox-content/napi";
+
+/** Native Markdown/frontmatter with the official MDX parser for JSX documents. */
+export default function remarkOxContent() {
+  const mdxParser = this.parser;
+  this.parser = (source, file) => {
+    const hasFrontmatter = /^---\r?\n/.test(source);
+    if (!file.path?.endsWith(".md")) {
+      const result = parseFrontmatter(source);
+      file.data.ufFrontmatter = hasFrontmatter ? result.frontmatter : undefined;
+      // Retain the original line numbers for MDX errors and source maps.
+      const prefix = source.slice(0, source.length - result.content.length);
+      return mdxParser(prefix.replace(/[^\r\n]/g, "") + result.content, file);
+    }
+    const result = transformMdast(source, { gfm: true, mdx: false, frontmatter: true });
+    if (result.errors.length !== 0) file.fail(result.errors.join("; "));
+    file.data.ufFrontmatter = hasFrontmatter ? JSON.parse(result.frontmatter) : undefined;
+    const tree = JSON.parse(result.astJson);
+    escapeHtml(tree);
+    return tree;
+  };
+}
+
+// Plain Markdown does not execute JSX or raw HTML. Render HTML as literal text,
+// as uf doc does, so the React compiler never receives unsupported HAST raw nodes.
+function escapeHtml(node) {
+  if (node.type === "html") node.type = "text";
+  for (const child of node.children ?? []) escapeHtml(child);
+}

package/internal/refresh-runtime.js

@@ -5,7 +5,7 @@
 
 /*! Copyright (c) Meta Platforms, Inc. and affiliates. **/
 /**
- * This is simplified pure-js version of https://github.com/facebook/react/blob/main/packages/react-refresh/src/ReactFreshRuntime.js
+ * This is simplified pure-js version of https://github.com/facebook/react/blob/main/npm/react-refresh/src/ReactFreshRuntime.js
  * without IE11 compatibility and verbose isDev checks.
  * Some utils are appended at the bottom for HMR integration.
  */

package/internal/routes.js

@@ -112,7 +112,8 @@ const UNSUPPORTED_SLOT_BOUNDARY_FILES = Object.freeze({
 });
 
 /** Extensions a page or layout may use; `.mdx` is a page written as content. */
-const PAGE_EXTENSIONS = [".js", ".jsx", ".mdx"];
+const PAGE_EXTENSIONS = [".js", ".jsx", ".mdx", ".md"];
+const isMarkdown = (file) => file.endsWith(".mdx") || file.endsWith(".md");
 const MODULE_EXTENSIONS = [".js", ".jsx"];
 
 /** Application targets the route scanner knows how to select files for. */
@@ -479,7 +480,7 @@ export function scanRoutes(appRoot, options = {}) {
         loading: nextLoading,
         templates: nextTemplates,
         slots: nextSlots,
-        mdx: page.endsWith(".mdx"),
+        mdx: isMarkdown(page),
       });
     }
     // A handler answers the request itself, so it takes no layouts and is not
@@ -501,7 +502,7 @@ export function scanRoutes(appRoot, options = {}) {
         path: routeFromSegments(segments).path,
         page: ownNotFound,
         layouts: nextLayouts,
-        mdx: ownNotFound.endsWith(".mdx"),
+        mdx: isMarkdown(ownNotFound),
       });
     }
 
@@ -890,7 +891,7 @@ function scanSlot(parent, directoryName, name, segments, ownLayout, above, targe
         templates: nextTemplates,
         errorBoundary: nextErrorBoundary,
         slots: nestedSlots,
-        mdx: page.endsWith(".mdx"),
+        mdx: isMarkdown(page),
       });
     }
 
@@ -948,7 +949,7 @@ function scanSlot(parent, directoryName, name, segments, ownLayout, above, targe
     name,
     above,
     defaultPage,
-    defaultMdx: defaultPage != null && defaultPage.endsWith(".mdx"),
+    defaultMdx: defaultPage != null && isMarkdown(defaultPage),
     defaultErrorBoundary: defaultError == null ? null : { above: 0, module: defaultError },
     routes,
     intercepts,
@@ -1746,11 +1747,11 @@ ${clientInstrumentationSource(options.instrumentation)}${mount}({ App, routes, n
  * with no actions pays one `headers.get` per request and nothing else.
  *
  * `internal/serve.js` and `driver.js` call them in that order, and
- * `packages/vite/index.js` does the same for a project driving Vite itself.
+ * `npm/vite/index.js` does the same for a project driving Vite itself.
  *
  * `render` and `prerender` are two exports rather than one with a flag, because
  * a host is one or the other: a server streams, a build writes files. See the
- * header of `packages/router/server.js` for why React needs both told apart.
+ * header of `npm/router/server.js` for why React needs both told apart.
  *
  * `shellDocument` is the third and is neither: it renders no route, because a
  * `["csr"]` build has none to render at build time. It is re-exported straight

package/internal/rsc.js

@@ -18,9 +18,9 @@
 // Dropping a single Server Component from the client bundle is what Next.js
 // does, and it works there because the browser is handed a Flight payload
 // describing the tree the server rendered. uf's payload
-// (`packages/router/internal/payload.js`) carries the route's *data* and not
+// (`npm/router/internal/payload.js`) carries the route's *data* and not
 // its tree — that half needs a second React module graph, see
-// ubugeeei-prod/uf#519 — so `packages/router/client.js` still hydrates by
+// ubugeeei-prod/uf#519 — so `npm/router/client.js` still hydrates by
 // re-rendering the matched tree from the same modules the server rendered it
 // from, and a module missing from the client bundle is a module React cannot
 // hydrate. What *can* be dropped is a
@@ -106,7 +106,7 @@ function clientModules(manifest) {
 /**
  * Whether `boundary`'s route path covers `route`'s.
  *
- * Deliberately "covers" and not "is nearest to". `packages/router` picks the
+ * Deliberately "covers" and not "is nearest to". `npm/router` picks the
  * nearest not-found and error boundary above a path at render time; asking the
  * same question here would be a second implementation of that rule, and the
  * two would disagree the first time either moved. Every boundary that could
@@ -252,14 +252,14 @@ function slotPredicate(needed) {
 //
 // Both are keyed on the id and nothing else. No request-derived value ever
 // becomes a path, a specifier or an export name here or downstream; see the
-// header of `packages/router/internal/action-endpoint.js`.
+// header of `npm/router/internal/action-endpoint.js`.
 // ---------------------------------------------------------------------------
 
 /**
  * The request header carrying an action id, lowercased as Node delivers it.
  *
  * A second spelling of `ACTION_HEADER` in
- * `packages/router/internal/action-wire.js`, and it has to be one: this module
+ * `npm/router/internal/action-wire.js`, and it has to be one: this module
  * is plain JavaScript the Vite host imports before any transform, and that one
  * is Flow, which Node cannot import at all. `RSC_MANIFEST_ENV` above is the
  * same situation with `crates/uf_rsc/src/manifest.rs`. What keeps a second

package/internal/serve.js

@@ -32,7 +32,7 @@
 // module is the part that is genuinely Vite's: finding the build on disk and
 // reading the manifest a Vite build wrote.
 //
-// It moved because of `uf build --adapter`. `packages/server/serve.test.js` said
+// It moved because of `uf build --adapter`. `npm/server/serve.test.js` said
 // what was wrong with the old arrangement while it was still the only one:
 // "`internal/serve.js` is the seam a deploy adapter will need, and naming it
 // in `exports` before one exists would be promising an interface nothing has
@@ -380,7 +380,7 @@ export const BUILD_ID_FILE = "uf-build-id";
  * Only a durable cache reads it, and only a durable cache needs it: an entry
  * that cannot outlive the process cannot outlive the build either, so every
  * command that keeps its cache in memory is entitled to `null` here and never
- * looks. `packages/server/internal/cache-key.js` argues the rest.
+ * looks. `npm/server/internal/cache-key.js` argues the rest.
  *
  * `UF_BUILD_ID` first, then the file `uf build` wrote. The environment wins for
  * the reason it wins in `crates/uf_rsc`'s `BuildId::from_env_or_generate`,

package/internal/server-components.js

@@ -16,7 +16,7 @@
 // project has and what to change.
 //
 // The router's own Server Components entries refuse the same React at run time
-// (`packages/router/internal/react-version.js`). This is the earlier half of the
+// (`npm/router/internal/react-version.js`). This is the earlier half of the
 // same rule, for a project that builds with uf.
 
 import fs from "node:fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniflowed/vite",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "description": "Vite, driven by uf.config.js: every Flow module through `uf transform`, MDX, the file-system router and static rendering as Vite plugins.",
   "type": "module",
   "license": "MIT",
@@ -8,7 +8,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ubugeeei-prod/uf.git",
-    "directory": "packages/vite"
+    "directory": "npm/vite"
   },
   "uf": {
     "builder": {
@@ -34,21 +34,21 @@
   "dependencies": {
     "@babel/core": "^7.29.7",
     "@mdx-js/rollup": "^3.1.1",
+    "@ox-content/napi": "3.2.11",
     "@shikijs/rehype": "^3.23.0",
-    "@uniflowed/host": "0.10.0",
-    "@uniflowed/router": "0.10.0",
-    "@uniflowed/server": "0.10.0",
-    "@uniflowed/validator": "0.10.0",
+    "@uniflowed/host": "0.11.1",
+    "@uniflowed/router": "0.11.1",
+    "@uniflowed/server": "0.11.1",
+    "@uniflowed/validator": "0.11.1",
     "babel-plugin-relay": "^21.0.1",
     "estree-util-value-to-estree": "^3.5.0",
-    "rehype-slug": "^6.0.0",
-    "remark-frontmatter": "^5.0.0",
     "remark-gfm": "^4.0.1",
+    "rehype-slug": "^6.0.0",
+    "rolldown": "^1.2.7",
     "shiki": "^3.23.0",
     "unist-util-mdx-define": "^1.1.2",
     "vite": "^8.2.2",
-    "yaml": "^2.9.1",
-    "rolldown": "^1.2.7"
+    "yaml": "^2.9.1"
   },
   "peerDependencies": {
     "axe-core": ">=4",