app depth isn't calculated correctly with only non-JS routes #160

primatejs · Aug 23, 2024 · 1434e51 · 1434e51
1 parent 4ad7cd8
commit 1434e51
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 4 deletions.
diff --git a/packages/core/src/build/hook/build.js b/packages/core/src/build/hook/build.js
@@ -41,7 +41,8 @@ const pre = async (app, mode, target) => {
   await Promise.all(["server", "client", "components"]
     .map(directory => app.runpath(directory).create()));
 
-  const router = await $router(app.path.routes);
+  const router = await $router(app.path.routes,
+    [".js"].concat(Object.keys(app.bindings)));
   const layout = { depth: router.depth("layout") };
   app.set("layout", layout);
 

diff --git a/packages/core/src/build/hook/router.js b/packages/core/src/build/hook/router.js
@@ -9,10 +9,11 @@ const error_entries = Object.entries({
   RestRoute: rest_route,
 });
 
-export default async directory => {
-
+export default async (directory, extensions) => {
   try {
     return await Router.load({
+        import: false,
+        extensions,
         directory,
         specials: {
           guard: { recursive: true },

diff --git a/packages/core/src/serve/app.js b/packages/core/src/serve/app.js
@@ -193,8 +193,9 @@ export default async (rootfile, build) => {
       this.handlers[extension] = handle;
     },
     hash,
-    // noop
+    // noops
     target(name, handler) {},
+    bind(extension, handler) {},
     build_target: target,
     loader,
     stop() {

diff --git a/packages/go/src/default.js b/packages/go/src/default.js
@@ -5,4 +5,8 @@ import pkgname from "#pkgname";
 export default ({ extension = default_extension } = {}) => ({
   name: pkgname,
   build: build({ extension }),
+  init(app, next) {
+    app.bind(extension, () => null);
+    next(app);
+  },
 });
diff --git a/packages/python/src/default.js b/packages/python/src/default.js
@@ -5,4 +5,8 @@ import pkgname from "#pkgname";
 export default ({ extension = default_extension, packages = [] } = {}) => ({
   name: pkgname,
   build: build({ extension, packages }),
+  init(app, next) {
+    app.bind(extension, () => null);
+    next(app);
+  },
 });
diff --git a/packages/ruby/src/default.js b/packages/ruby/src/default.js
@@ -5,4 +5,8 @@ import pkgname from "#pkgname";
 export default ({ extension = default_extension } = {}) => ({
   name: pkgname,
   build: build({ extension }),
+  init(app, next) {
+    app.bind(extension, () => null);
+    next(app);
+  },
 });
diff --git a/packages/typescript/src/default.js b/packages/typescript/src/default.js
@@ -5,4 +5,8 @@ import pkgname from "#pkgname";
 export default ({ extension = default_extension } = {}) => ({
   name: pkgname,
   build: build({ extension }),
+  init(app, next) {
+    app.bind(extension, () => null);
+    next(app);
+  },
 });