@uniflowed/vite 0.0.0-alpha.41 → 0.0.0-alpha.42

package/driver.js

@@ -42,6 +42,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 { installFlowHooks } from "@uniflowed/host/internal/sync-hooks.js";
 import { cpSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import path from "node:path";
@@ -1579,7 +1580,12 @@ async function deploy() {
     plugins: [
       ...inline.plugins,
       nativeAddonGuard(),
-      ...(shape.workerBuiltins === true ? [workerBuiltinGuard()] : []),
+      ...(shape.workerBuiltins === true
+        ? [
+            workerBuiltinGuard(),
+            esmExternalRequirePlugin({ external: [...builtinModules, /^node:/] }),
+          ]
+        : []),
     ],
     // Fixed, because this bundle inlines every dependency and so both of each
     // React package's builds, and a runtime lookup of `NODE_ENV` in a worker
@@ -1610,6 +1616,10 @@ async function deploy() {
       emptyOutDir: false,
       rollupOptions: {
         input,
+        // Workers provide the selected built-ins, but cannot use Node's
+        // createRequire(import.meta.url) runtime helper. External requires
+        // above become ESM imports; the remaining helpers are platform neutral.
+        ...(shape.workerBuiltins === true ? { platform: "neutral" } : {}),
         output: {
           entryFileNames: "[name].js",
           // Route modules are lazy `import()`s, so the server bundle splits

package/index.js

@@ -44,6 +44,8 @@
 // `uniflowed(options)` returns the array; a project that wants to add a plugin
 // declares it in `uf.config.js` and the driver appends it after these.
 
+import { instrumentationFile } from "./internal/instrumentation.js";
+
 import path from "node:path";
 import { nativeWebPlugin } from "./internal/native-web.js";
 
@@ -579,6 +581,7 @@ function flowPlugin({
       // looking at. See `clientModuleSource`.
       if (id === resolved(VIRTUAL.client) && flightState != null) {
         return flightClientSource(entryPath, {
+          instrumentation: instrumentationFile(appRoot, true),
           strictMode: strictMode && !isProduction,
           navigation,
           staleTime,
@@ -587,6 +590,7 @@ function flowPlugin({
       }
       if (id === resolved(VIRTUAL.client)) {
         return clientModuleSource(entryPath, {
+          instrumentation: instrumentationFile(appRoot, true),
           strictMode: strictMode && !isProduction,
           navigation,
           staleTime,
@@ -596,8 +600,14 @@ function flowPlugin({
       }
       if (id === resolved(VIRTUAL.server)) {
         return flightState == null
-          ? serverModuleSource(entryPath, routing)
-          : flightServerSource(entryPath, VIRTUAL.routes, VIRTUAL.actions, routing);
+          ? serverModuleSource(entryPath, routing, instrumentationFile(appRoot))
+          : flightServerSource(
+              entryPath,
+              VIRTUAL.routes,
+              VIRTUAL.actions,
+              routing,
+              instrumentationFile(appRoot),
+            );
       }
       if (flightState != null) {
         if (id === resolved(FLIGHT_VIRTUAL.entry)) return rscEntrySource(VIRTUAL.routes, routing);
@@ -864,8 +874,10 @@ function flowPlugin({
       const reserved = new RegExp(`/(${stems})(\\.[a-z]+)?\\.(js|jsx|mdx)$`);
       const onRouteFile = (file) => {
         if (!reserved.test(file) || !file.startsWith(appRoot)) return;
-        const routes = devServer.moduleGraph.getModuleById(resolved(VIRTUAL.routes));
-        if (routes) devServer.moduleGraph.invalidateModule(routes);
+        for (const id of [VIRTUAL.routes, VIRTUAL.server, VIRTUAL.client]) {
+          const module = devServer.moduleGraph.getModuleById(resolved(id));
+          if (module) devServer.moduleGraph.invalidateModule(module);
+        }
         devServer.ws.send({ type: "full-reload", path: "*" });
       };
       devServer.watcher.on("add", onRouteFile);

package/internal/flight.js

@@ -49,6 +49,8 @@
 // In development the rsc environment's module graph is read instead, once the
 // route's modules have been imported.
 
+import { clientInstrumentationSource } from "./instrumentation.js";
+
 import path from "node:path";
 import { relayDependencies } from "./relay.js";
 
@@ -666,7 +668,7 @@ export function flightClientSource(appEntry, options = {}) {
     options.staleTime > 0 ? `, staleTime: ${JSON.stringify(options.staleTime)}` : "";
   return `import { hydrateFlight } from "@uniflowed/router/rsc/client";
 import App from ${JSON.stringify(appEntry)};
-hydrateFlight({ App${strictMode}${navigation}${staleTime}${routing} });
+${clientInstrumentationSource(options.instrumentation)}hydrateFlight({ App${strictMode}${navigation}${staleTime}${routing} });
 `;
 }
 
@@ -687,9 +689,13 @@ export function flightServerSource(
   routesId,
   actionsId,
   routing = { redirects: [], rewrites: [], headers: [], basePath: "", trailingSlash: "ignore" },
+  instrumentation = null,
 ) {
   return `import {
   createActionDispatcher,
+  createInstrumentation,
+  instrumentRender,
+  traceRequestPhase,
   createDispatcher,
   createMiddlewareRunner,
   installRouting,
@@ -703,15 +709,22 @@ import App from ${JSON.stringify(appEntry)};
 export const routing = ${JSON.stringify(routing)};
 installRouting(routing);
 export { routes, handlers, middleware, notFound, errors };
-export { beginRequest } from "@uniflowed/router/server";
+${instrumentation == null ? "" : `import * as hooks from ${JSON.stringify(instrumentation)};`}
+export const { beginRequest } = createInstrumentation(${instrumentation == null ? "" : "hooks"});
 const renderer = createDocumentRenderer({ App, renderFlight, loadClientModule });
-export const render = renderer.render;
+export const render = (url, assets, options = {}) => instrumentRender(
+  (onError) => renderer.render(url, assets, { ...options, onError }), options.onError,
+);
 export const prerender = renderer.prerender;
-export const flight = renderer.flight;
+export const flight = (url, options = {}) => instrumentRender(
+  (onError) => renderer.flight(url, { ...options, onError }), options.onError,
+);
 export { shellDocument } from "@uniflowed/router/server";
-export const dispatch = createDispatcher({ handlers });
+const dispatchRoute = createDispatcher({ handlers });
+export const dispatch = (request) => traceRequestPhase("route", () => dispatchRoute(request));
 export const callAction = createActionDispatcher({ actions });
-export const runMiddleware = createMiddlewareRunner({ middleware });
+const guard = createMiddlewareRunner({ middleware });
+export const runMiddleware = (request) => traceRequestPhase("middleware", () => guard(request));
 `;
 }
 

package/internal/instrumentation.js

@@ -0,0 +1,23 @@
+// @noflow
+
+import { existsSync } from "node:fs";
+import path from "node:path";
+
+export function instrumentationFile(root, client = false) {
+  const stem = client ? "$instrumentation.client" : "$instrumentation";
+  const files = [".js", ".jsx"]
+    .map((extension) => path.join(root, stem + extension))
+    .filter(existsSync);
+  if (files.length > 1)
+    throw new Error(`uf: choose one instrumentation module: ${files.join(", ")}`);
+  return files[0] ?? null;
+}
+
+export function clientInstrumentationSource(file) {
+  if (file == null) return "";
+  return `import * as instrumentation from ${JSON.stringify(file)};
+import { installClientInstrumentation } from "@uniflowed/router/instrumentation";
+const disposeInstrumentation = await installClientInstrumentation(instrumentation);
+if (import.meta.hot) import.meta.hot.dispose(disposeInstrumentation);
+`;
+}

package/internal/routes.js

@@ -14,6 +14,8 @@
 // route table imports every page and layout lazily, so a route is a chunk of
 // its own and the client only downloads what it navigates to.
 
+import { clientInstrumentationSource } from "./instrumentation.js";
+
 import { readdirSync, statSync } from "node:fs";
 import path from "node:path";
 
@@ -28,6 +30,7 @@ export const RESERVED = Object.freeze({
   error: "$error",
   loading: "$loading",
   route: "$route",
+  instrumentation: "$instrumentation",
 });
 
 /**
@@ -381,6 +384,15 @@ export function scanRoutes(appRoot, options = {}) {
     );
 
     refuseUnsupportedTemplateFiles(directory, entries);
+    for (const entry of entries) {
+      if (entry.name.startsWith("$instrumentation") && !/\.test\.jsx?$/.test(entry.name)) {
+        if (depth !== 0 || !/^\$instrumentation(?:\.client)?\.jsx?$/.test(entry.name)) {
+          throw new Error(
+            `uf: ${path.join(directory, entry.name)} must be $instrumentation.js or $instrumentation.client.js at the router root`,
+          );
+        }
+      }
+    }
 
     // A `$default.js` answers one question — what a slot renders when the
     // URL says nothing about it — and this walk is everywhere a slot is not,
@@ -1660,7 +1672,7 @@ export function clientModuleSource(appEntry, options = {}) {
   return `import { ${mount} } from "@uniflowed/router/client";
 import { routes, notFound, errors } from ${JSON.stringify(VIRTUAL.routes)};
 import App from ${JSON.stringify(appEntry)};
-${mount}({ App, routes, notFound, errors${strictMode}${navigation}${staleTime}${routing} });
+${clientInstrumentationSource(options.instrumentation)}${mount}({ App, routes, notFound, errors${strictMode}${navigation}${staleTime}${routing} });
 `;
 }
 
@@ -1718,9 +1730,12 @@ ${mount}({ App, routes, notFound, errors${strictMode}${navigation}${staleTime}${
  * shorter proof of the paragraph above: the copy the router dispatches and
  * renders with is by construction the copy the host is handed.
  */
-export function serverModuleSource(appEntry, routing = routingRulesOf({})) {
+export function serverModuleSource(appEntry, routing = routingRulesOf({}), instrumentation = null) {
   return `import {
   createActionDispatcher,
+  createInstrumentation,
+  instrumentRender,
+  traceRequestPhase,
   createDispatcher,
   createMiddlewareRunner,
   createRenderer,
@@ -1731,14 +1746,19 @@ import { actions } from ${JSON.stringify(VIRTUAL.actions)};
 import App from ${JSON.stringify(appEntry)};
 ${routingExportSource(routing)}installRouting(routing);
 export { routes, handlers, middleware, notFound, errors };
-export { beginRequest } from "@uniflowed/router/server";
+${instrumentation == null ? "" : `import * as hooks from ${JSON.stringify(instrumentation)};`}
+export const { beginRequest } = createInstrumentation(${instrumentation == null ? "" : "hooks"});
 const renderer = createRenderer({ App, routes, notFound, errors });
-export const render = renderer.render;
+export const render = (url, assets, options = {}) => instrumentRender(
+  (onError) => renderer.render(url, assets, { ...options, onError }), options.onError,
+);
 export const prerender = renderer.prerender;
 export { shellDocument } from "@uniflowed/router/server";
-export const dispatch = createDispatcher({ handlers });
+const dispatchRoute = createDispatcher({ handlers });
+export const dispatch = (request) => traceRequestPhase("route", () => dispatchRoute(request));
 export const callAction = createActionDispatcher({ actions });
-export const runMiddleware = createMiddlewareRunner({ middleware });
+const guard = createMiddlewareRunner({ middleware });
+export const runMiddleware = (request) => traceRequestPhase("middleware", () => guard(request));
 `;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniflowed/vite",
-  "version": "0.0.0-alpha.41",
+  "version": "0.0.0-alpha.42",
   "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",
@@ -35,10 +35,10 @@
     "@babel/core": "^7.29.7",
     "@mdx-js/rollup": "^3.1.1",
     "@shikijs/rehype": "^3.23.0",
-    "@uniflowed/host": "0.0.0-alpha.41",
-    "@uniflowed/router": "0.0.0-alpha.41",
-    "@uniflowed/server": "0.0.0-alpha.41",
-    "@uniflowed/validator": "0.0.0-alpha.41",
+    "@uniflowed/host": "0.0.0-alpha.42",
+    "@uniflowed/router": "0.0.0-alpha.42",
+    "@uniflowed/server": "0.0.0-alpha.42",
+    "@uniflowed/validator": "0.0.0-alpha.42",
     "babel-plugin-relay": "^21.0.1",
     "estree-util-value-to-estree": "^3.5.0",
     "rehype-slug": "^6.0.0",
@@ -47,7 +47,8 @@
     "shiki": "^3.23.0",
     "unist-util-mdx-define": "^1.1.2",
     "vite": "^8.2.2",
-    "yaml": "^2.9.1"
+    "yaml": "^2.9.1",
+    "rolldown": "^1.2.7"
   },
   "peerDependencies": {
     "axe-core": ">=4",