mountaineer 0.20.0.dev3__tar.gz → 0.20.0.dev4__tar.gz

{mountaineer-0.20.0.dev3 → mountaineer-0.20.0.dev4}/.gitignore

@@ -183,3 +183,7 @@ website/site
 autospec
 
 mountaineer-*.data/
+
+# Generated fixture artifacts from running the ci_webapp test app
+mountaineer/__tests__/fixtures/ci_webapp/ci_webapp/views/**/_server/
+mountaineer/__tests__/fixtures/ci_webapp/ci_webapp/views/_static/

{mountaineer-0.20.0.dev3 → mountaineer-0.20.0.dev4}/Cargo.lock

@@ -724,7 +724,7 @@ dependencies = [
 
 [[package]]
 name = "mountaineer"
-version = "0.20.0-dev3"
+version = "0.20.0-dev4"
 dependencies = [
  "clap",
  "console",

{mountaineer-0.20.0.dev3 → mountaineer-0.20.0.dev4}/Cargo.toml

@@ -19,7 +19,7 @@ resolver = "2"
 
 [package]
 name = "mountaineer"
-version = "0.20.0-dev3"
+version = "0.20.0-dev4"
 edition = "2021"
 readme = "README.md"
 

{mountaineer-0.20.0.dev3 → mountaineer-0.20.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mountaineer
-Version: 0.20.0.dev3
+Version: 0.20.0.dev4
 Requires-Dist: pydantic>=2.5.3,<3.0.0
 Requires-Dist: fastapi>=0.114.1,<1.0.0
 Requires-Dist: inflection>=0.5.1,<1.0.0

{mountaineer-0.20.0.dev3 → mountaineer-0.20.0.dev4}/crates/lib/vite/assets/entrypoints.mjs

@@ -1,5 +1,11 @@
 const ENTRY_PREFIX = "virtual:mountaineer-entry:";
 const RESOLVED_ENTRY_PREFIX = `\0${ENTRY_PREFIX}`;
+// Dev hydration cannot `import("@id/react")` directly: react is aliased to an
+// absolute file, so bare-id URL requests bypass the dep optimizer and answer
+// 504 Outdated Optimize Dep. Routing the imports through a virtual module lets
+// import-analysis rewrite them to the optimized deps with the current hash.
+const DEV_RUNTIME_ID = "virtual:mountaineer-dev-runtime";
+const RESOLVED_DEV_RUNTIME_ID = `\0${DEV_RUNTIME_ID}`;
 
 export function entrypointInputs(entrypoints) {
   return Object.fromEntries(
@@ -15,11 +21,14 @@ export function mountaineerEntrypoints(entrypoints, target) {
     name: "mountaineer:entrypoints",
     enforce: "pre",
     resolveId(source) {
-      if (source.startsWith(ENTRY_PREFIX)) {
+      if (source.startsWith(ENTRY_PREFIX) || source === DEV_RUNTIME_ID) {
         return `\0${source}`;
       }
     },
     load(id) {
+      if (id === RESOLVED_DEV_RUNTIME_ID) {
+        return devRuntimeSource();
+      }
       if (!id.startsWith(RESOLVED_ENTRY_PREFIX)) {
         return;
       }
@@ -44,10 +53,7 @@ window.$RefreshReg$ = () => {};
 window.$RefreshSig$ = () => (type) => type;
 window.__vite_plugin_react_preamble_installed__ = true;
 await Promise.all(${JSON.stringify(styles)}.map((source) => import(source)));
-const ReactModule = await import("${base}@id/react");
-const React = ReactModule.default ?? ReactModule;
-const ReactDOMModule = await import("${base}@id/react-dom/client");
-const { hydrateRoot } = ReactDOMModule.default ?? ReactDOMModule;
+const { React, hydrateRoot } = await import("${base}@id/${DEV_RUNTIME_ID}");
 const components = await Promise.all(
   ${JSON.stringify(views)}.map((source) => import(source)),
 );
@@ -61,6 +67,17 @@ hydrateRoot(root, element);
 `;
 }
 
+function devRuntimeSource() {
+  return `
+import * as ReactModule from "react";
+import * as ReactDOMClient from "react-dom/client";
+export const React = ReactModule.default ?? ReactModule;
+export const hydrateRoot =
+  ReactDOMClient.hydrateRoot ??
+  (ReactDOMClient.default ?? ReactDOMClient).hydrateRoot;
+`;
+}
+
 function clientSource(views) {
   const imports = views
     .map(

{mountaineer-0.20.0.dev3 → mountaineer-0.20.0.dev4}/crates/lib/vite/assets/use-client.mjs

@@ -2,7 +2,11 @@ import { readFile } from "node:fs/promises";
 import path from "node:path";
 
 const WRAPPER_PREFIX = "\0mountaineer-client-wrapper:";
-const ACTUAL_PREFIX = "\0mountaineer-client-actual:";
+// The actual module keeps its real filesystem path with a query marker instead
+// of a \0-prefixed virtual id: rollup's createFilter unconditionally rejects
+// \0 ids, so vite's oxc/esbuild plugin would never run the TS/JSX transform on
+// the boundary's real source and import-analysis would choke on raw TSX.
+const ACTUAL_QUERY = "mountaineer-client-actual";
 const EXPORT_DEFAULT = /^\s*export\s+default\b/m;
 const EXPORT_ALL = /^\s*export\s+\*\s+from\b/m;
 const NAMED_EXPORTS = [
@@ -22,12 +26,12 @@ export function mountaineerUseClient(target) {
     name: "mountaineer:use-client",
     enforce: "pre",
     async resolveId(source, importer) {
-      if (source.startsWith(WRAPPER_PREFIX) || source.startsWith(ACTUAL_PREFIX)) {
+      if (source.startsWith(WRAPPER_PREFIX) || isActualId(source)) {
         return source;
       }
 
-      const actualImporter = importer?.startsWith(ACTUAL_PREFIX)
-        ? importer.slice(ACTUAL_PREFIX.length)
+      const actualImporter = isActualId(importer)
+        ? cleanId(importer)
         : importer;
       const resolved = await this.resolve(source, actualImporter, {
         skipSelf: true,
@@ -37,15 +41,15 @@ export function mountaineerUseClient(target) {
       }
 
       if (await isClientBoundary(resolved.id, boundaryCache)) {
-        return importer?.startsWith(ACTUAL_PREFIX)
-          ? `${ACTUAL_PREFIX}${cleanId(resolved.id)}`
+        return isActualId(importer)
+          ? actualId(cleanId(resolved.id))
           : `${WRAPPER_PREFIX}${cleanId(resolved.id)}`;
       }
-      return importer?.startsWith(ACTUAL_PREFIX) ? resolved : undefined;
+      return isActualId(importer) ? resolved : undefined;
     },
     async load(id) {
-      if (id.startsWith(ACTUAL_PREFIX)) {
-        return readFile(id.slice(ACTUAL_PREFIX.length), "utf8");
+      if (isActualId(id)) {
+        return readFile(cleanId(id), "utf8");
       }
       if (!id.startsWith(WRAPPER_PREFIX)) {
         return;
@@ -60,6 +64,18 @@ export function mountaineerUseClient(target) {
   };
 }
 
+function actualId(filename) {
+  return `${filename}?${ACTUAL_QUERY}`;
+}
+
+function isActualId(id) {
+  if (!id) {
+    return false;
+  }
+  const query = id.split("?", 2)[1];
+  return query !== undefined && query.split("&").includes(ACTUAL_QUERY);
+}
+
 async function isClientBoundary(id, cache) {
   const filename = cleanId(id);
   if (
@@ -156,7 +172,6 @@ ${exports}
 }
 
 function clientBoundarySource(filename, { hasDefault, named }) {
-  const actualId = `${ACTUAL_PREFIX}${filename}`;
   const exports = named
     .map(
       (name) =>
@@ -165,7 +180,7 @@ function clientBoundarySource(filename, { hasDefault, named }) {
     .join("\n");
   return `
 import React, { useEffect, useState } from "react";
-import * as actual from ${JSON.stringify(actualId)};
+import * as actual from ${JSON.stringify(actualId(filename))};
 const createClientBoundary = (Actual, exportName) => {
   const Boundary = (props) => {
     const [isMounted, setIsMounted] = useState(false);

{mountaineer-0.20.0.dev3 → mountaineer-0.20.0.dev4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mountaineer"
-version = "0.20.0.dev3"
+version = "0.20.0.dev4"
 description = "Mountaineer is a batteries-included webapp framework for Python."
 readme = "README.md"
 requires-python = ">=3.10,<3.15"