primate 0.22.0 → 0.22.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primate",
-  "version": "0.22.0",
+  "version": "0.22.2",
   "description": "Expressive, minimal and extensible web framework",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",
@@ -18,7 +18,7 @@
     "directory": "packages/primate"
   },
   "dependencies": {
-    "runtime-compat": "^0.25.7"
+    "runtime-compat": "^0.25.8"
   },
   "engines": {
     "node": ">=18.16"

package/src/app.js

@@ -88,10 +88,11 @@ export default async (log, root, config) => {
       const target = this.runpath(directory);
 
       await Promise.all((await source.collect(filter)).map(async path => {
+        const debased = path.debase(this.root).path.slice(1);
         const filename = new Path(directory).join(path.debase(source));
         const to = await target.join(filename.debase(directory));
         await to.directory.file.create();
-        if (regexs.some(regex => regex.test(filename))) {
+        if (regexs.some(regex => regex.test(debased))) {
           const contents = mapper(await path.text());
           await to.file.write(contents);
         } else {

package/src/hooks/handle.js

@@ -9,7 +9,7 @@ const {NoFileForPath} = _errors;
 const guardError = Symbol("guardError");
 
 export default app => {
-  const {config: {http: {static: {root}}}, location} = app;
+  const {config: {http: {static: {root}}, location}} = app;
 
   const as_route = async request => {
     const {pathname} = request.url;
@@ -64,13 +64,13 @@ export default app => {
     },
   });
 
-  const client = app.runpath(app.config.location.client);
+  const client = app.runpath(location.client);
   const handle = async request => {
     const {pathname} = request.url;
     if (pathname.startsWith(root)) {
       const debased = pathname.replace(root, _ => "");
       // try static first
-      const asset = app.path.build.join(app.config.location.static, debased);
+      const asset = client.join(location.static, debased);
       if (await asset.isFile) {
         return as_asset(asset.file);
       }

package/src/hooks/publish.js

@@ -1,5 +1,6 @@
 import {Path} from "runtime-compat/fs";
 import {cascade} from "runtime-compat/async";
+import {stringify} from "runtime-compat/object";
 import copy_includes from "./copy_includes.js";
 
 const post = async app => {
@@ -17,23 +18,21 @@ const post = async app => {
     });
 
     if (await path.components.exists) {
-      // copy .js files from components to build/client, since frontend
-      // frameworks handle non-js files
+      // copy .js files from components to build/client/components, since
+      // frontend frameworks handle non-js files
       const to = Path.join(location.client, location.components);
       await app.stage(path.components, to, /^.*.js$/u);
     }
 
     const imports = {...app.importmaps, app: src.path};
-    await app.publish({
-      inline: true,
-      code: JSON.stringify({imports}, null, 2),
-      type: "importmap",
-    });
+    const inline = true;
+    const type = "importmap";
+    await app.publish({inline, code: stringify({imports}), type});
   }
 
   if (await path.static.exists) {
     // copy static files to build/static
-    await app.stage(path.static, location.static);
+    await app.stage(path.static, new Path(location.client, location.static));
 
     // publish JavaScript and CSS files
     const imports = await Path.collect(path.static, /\.(?:js|css)$/u);
@@ -44,7 +43,7 @@ const post = async app => {
       // already copied in `app.stage`
       await app.publish({src, code, type, copy: false});
       type === "style" && app.export({type,
-        code: `import "../${location.static}${src}";`});
+        code: `import "../${location.client}/${location.static}${src}";`});
     }));
   }