@primate/core 0.1.6 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/core",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Primate core",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",
@@ -21,13 +21,13 @@
     "@rcompat/build": "^0.4.0",
     "@rcompat/cli": "^0.5.1",
     "@rcompat/crypto": "^0.5.0",
-    "@rcompat/fs": "^0.5.0",
+    "@rcompat/fs": "^0.5.1",
     "@rcompat/function": "^0.4.0",
     "@rcompat/http": "^0.5.3",
     "@rcompat/invariant": "^0.5.0",
     "@rcompat/object": "^0.5.0",
     "@rcompat/package": "^0.7.0",
-    "@rcompat/platform": "^0.3.0",
+    "@rcompat/runtime": "^0.1.0",
     "@rcompat/stdio": "^0.5.0",
     "@rcompat/sync": "^0.3.0"
   },

package/src/build/hook/build.js

@@ -38,7 +38,7 @@ const pre = async (app, mode, target) => {
   await app.path.build.remove();
   await app.path.build.create();
 
-  await Promise.all(["server", "client", "pages", "components"]
+  await Promise.all(["server", "client", "components"]
     .map(directory => app.runpath(directory).create()));
 
   const router = await $router(app.path.routes);
@@ -50,14 +50,15 @@ const pre = async (app, mode, target) => {
 
 const js_re = /^.*.js$/u;
 const write_directories = async (build_directory, app) => {
+  const location = app.get("location");
   for (const name of app.server_build) {
-    const d = app.runpath(name);
+    const d = app.runpath(location.server, name);
     const e = await Promise.all((await collect(d, js_re, { recursive: true }))
       .map(async path => `${path}`.replace(d, _ => "")));
     const files_js = `
     const ${name} = [];
     ${e.map((path, i) =>
-    `import * as ${name}${i} from "${webpath(`../${name}${path}`)}";
+    `import * as ${name}${i} from "${webpath(`../server/${name}${path}`)}";
     ${name}.push(["${webpath(path.slice(1, -".js".length))}", ${name}${i}]);`,
   ).join("\n")}
     export default ${name};`;
@@ -113,10 +114,10 @@ const post = async (app, mode, target) => {
   const defaults = join(import.meta.dirname, "../defaults");
 
   // stage routes
-  await app.stage(app.path.routes, location.routes);
+  await app.stage(app.path.routes, join(location.server, location.routes));
 
   // stage types
-  await app.stage(app.path.types, location.types);
+  await app.stage(app.path.types, join(location.server, location.types));
 
   // stage components, transforming defines
   await app.stage(app.path.components, location.components, true);
@@ -127,9 +128,9 @@ const post = async (app, mode, target) => {
       ?.(directory, path.debase(`${directory}/`));
   }
   // copy framework pages
-  await app.stage(defaults, location.pages);
+  await app.stage(defaults, join(location.server, location.pages));
   // overwrite transformed pages to build
-  await app.stage(app.path.pages, location.pages);
+  await app.stage(app.path.pages, join(location.server, location.pages));
 
   // copy static files to build/server/static
   await app.stage(app.path.static, join(location.server, location.static));

package/src/build/index.js

@@ -7,7 +7,7 @@ import tryreturn from "@rcompat/async/tryreturn";
 import empty from "@rcompat/object/empty";
 import override from "@rcompat/object/override";
 import root from "@rcompat/package/root";
-import platform from "@rcompat/platform";
+import runtime from "@rcompat/runtime";
 import app from "./app.js";
 import { build, init } from "./hook/exports.js";
 
@@ -25,7 +25,7 @@ const get_config = async project_root => {
       return imported;
     } catch (error) {
       if (error.level === undefined) {
-        error_in_config_file(error.message, `${platform} ${local_config}`);
+        error_in_config_file(error.message, `${runtime} ${local_config}`);
       } else {
         throw error;
       }

package/src/build/targets/web.js

@@ -20,12 +20,12 @@ export default async app => {
       type,
     };
   });
-  const d = app.runpath(location.pages);
+  const d = app.runpath(location.server, location.pages);
   const pages = await Promise.all((await collect(d, html, { recursive: true }))
     .map(async file => `${file.debase(d)}`.slice(1)));
   const pages_str = pages.map(page =>
     `"${page}": await load_text(import.meta.url,
-    "${webpath(`../${location.pages}/${page}`)}"),`).join("\n");
+    "${webpath(`../${location.server}/${location.pages}/${page}`)}"),`).join("\n");
 
   const assets_scripts = `
   import loader from "primate/loader";