@uniflowed/vite 0.0.0-alpha.27 → 0.0.0-alpha.29

package/internal/routes.js

@@ -74,6 +74,9 @@ export const UNSUPPORTED_SEGMENTS = Object.freeze([
  */
 export const LAYOUT_PROP_NAMES = Object.freeze(["children", "params"]);
 
+/** Template spellings that look conventional elsewhere but uf will not open. */
+const UNSUPPORTED_TEMPLATE_FILES = Object.freeze(["template.js", "_uf.template.js"]);
+
 /** Extensions a page or layout may use; `.mdx` is a page written as content. */
 const PAGE_EXTENSIONS = [".js", ".jsx", ".mdx"];
 const MODULE_EXTENSIONS = [".js", ".jsx"];
@@ -328,6 +331,8 @@ export function scanRoutes(appRoot, options = {}) {
       a.name < b.name ? -1 : a.name > b.name ? 1 : 0,
     );
 
+    refuseUnsupportedTemplateFiles(directory, entries);
+
     // 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,
     // so one found here is a file nothing would ever open.
@@ -626,6 +631,8 @@ function scanSlot(parent, directoryName, name, segments, ownLayout, above, targe
       a.name < b.name ? -1 : a.name > b.name ? 1 : 0,
     );
 
+    refuseUnsupportedTemplateFiles(current, entries);
+
     let nestedSlots = [];
     for (const entry of entries) {
       if (!entry.isDirectory()) continue;
@@ -715,6 +722,24 @@ function findModule(directory, stem, extensions, target = "web") {
   return null;
 }
 
+function refuseUnsupportedTemplateFiles(directory, entries) {
+  for (const entry of entries) {
+    if (!entry.isFile() || !UNSUPPORTED_TEMPLATE_FILES.includes(entry.name)) {
+      continue;
+    }
+    const file = path.join(directory, entry.name);
+    throw new Error(`${file}: ${unsupportedTemplateFileReason(entry.name)}`);
+  }
+}
+
+function unsupportedTemplateFileReason(fileName) {
+  return (
+    `\`${fileName}\` looks like a route template, but uf's route template file is ` +
+    "`$template.js`. This file would be ignored rather than remounting the route, so it is " +
+    "refused; rename it to `$template.js`. https://github.com/ubugeeei-prod/uf/issues/267"
+  );
+}
+
 /**
  * What one directory name means to the route path.
  *

package/internal/rsc.js

@@ -92,6 +92,14 @@ function clientModules(manifest) {
       module.environment === "client" || module.proximity === "reaches-boundary",
     );
   }
+  for (const boundary of manifest.clientBoundaries ?? []) {
+    if (boundary == null || typeof boundary.importer !== "string") continue;
+    modules.set(boundary.importer, true);
+  }
+  for (const root of manifest.clientBundleRoots ?? []) {
+    if (root == null || root.kind !== "module" || typeof root.path !== "string") continue;
+    modules.set(root.path, true);
+  }
   return modules;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniflowed/vite",
-  "version": "0.0.0-alpha.27",
+  "version": "0.0.0-alpha.29",
   "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",
@@ -34,10 +34,10 @@
   "dependencies": {
     "@mdx-js/rollup": "^3.1.1",
     "@shikijs/rehype": "^3.23.0",
-    "@uniflowed/host": "0.0.0-alpha.27",
-    "@uniflowed/router": "0.0.0-alpha.27",
-    "@uniflowed/server": "0.0.0-alpha.27",
-    "@uniflowed/validator": "0.0.0-alpha.27",
+    "@uniflowed/host": "0.0.0-alpha.29",
+    "@uniflowed/router": "0.0.0-alpha.29",
+    "@uniflowed/server": "0.0.0-alpha.29",
+    "@uniflowed/validator": "0.0.0-alpha.29",
     "rehype-slug": "^6.0.0",
     "remark-frontmatter": "^5.0.0",
     "remark-gfm": "^4.0.1",