frontend: organize

test

packages/frontend/package.json

@@ -112,16 +112,20 @@
     },
     "./spa": "./src/spa/exports.js",
     "./*/common": "./src/server/*/common.js",
+    "./*/hooks/build": "./src/server/*/hooks/build/index.js",
+    "./*/hooks/serve": "./src/server/*/hooks/serve/index.js",
+    "./*/client/create-root": "./src/client/*/create-root.js",
+    "./*/client/expose": "./src/client/*/expose.js",
+    "./*/client": "./src/client/*/index.js",
     "./*/head": "./src/server/*/head.js",
     "./react/context/*": "./src/server/react/context/*.js",
     "./solid/context/*": "./src/server/solid/context/*.js",
-    "./webc/client": "./src/server/webc/client/index.js",
     "./webc/component": "./src/server/webc/Component.js",
     "./base/*": "./src/base/server/*.js",
     "./errors/*": "./src/errors/*.js",
     "./*": {
-      "runtime": "./src/server/*/runtime/index.js",
-      "default": "./src/server/*/default/index.js"
+      "runtime": "./src/server/*/runtime.js",
+      "default": "./src/server/*/default.js"
     }
   }
 }

packages/frontend/src/server/angular/default/index.js → packages/frontend/src/server/angular/default.js

@@ -1,6 +1,6 @@
 import { default_extension, name } from "@primate/frontend/angular/common";
-import serve from "../runtime/serve.js";
-import build from "./build.js";
+import build from "@primate/frontend/angular/hooks/build";
+import serve from "@primate/frontend/angular/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/angular/runtime/index.js → packages/frontend/src/server/angular/runtime.js

@@ -1,5 +1,5 @@
 import { default_extension, name } from "@primate/frontend/angular/common";
-import serve from "./serve.js";
+import serve from "@primate/frontend/angular/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/eta/default/index.js → packages/frontend/src/server/eta/default.js

@@ -1,6 +1,6 @@
 import { default_extension, name } from "@primate/frontend/eta/common";
-import serve from "../runtime/serve.js";
-import build from "./build.js";
+import build from "@primate/frontend/eta/hooks/build";
+import serve from "@primate/frontend/eta/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/eta/runtime/index.js → packages/frontend/src/server/eta/runtime.js

@@ -1,5 +1,5 @@
 import { default_extension, name } from "@primate/frontend/eta/common";
-import serve from "./serve.js";
+import serve from "@primate/frontend/eta/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/handlebars/default/index.js → packages/frontend/src/server/handlebars/default.js

@@ -1,6 +1,6 @@
 import { name, default_extension } from "@primate/frontend/handlebars/common";
-import serve from "../runtime/serve.js";
-import build from "./build.js";
+import build from "@primate/frontend/handlebars/hooks/build";
+import serve from "@primate/frontend/handlebars/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/handlebars/runtime/index.js → packages/frontend/src/server/handlebars/runtime.js

@@ -1,5 +1,5 @@
 import { name, default_extension } from "@primate/frontend/handlebars/common";
-import serve from "./serve.js";
+import serve from "@primate/frontend/handlebars/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/html/default/index.js → packages/frontend/src/server/html/default.js

@@ -1,6 +1,6 @@
 import { default_extension, name } from "@primate/frontend/html/common";
-import serve from "../runtime/serve.js";
-import build from "./build.js";
+import build from "@primate/frontend/html/hooks/build";
+import serve from "@primate/frontend/html/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/html/runtime/index.js → packages/frontend/src/server/html/runtime.js

@@ -1,5 +1,5 @@
 import { default_extension, name } from "@primate/frontend/html/common";
-import serve from "./serve.js";
+import serve from "@primate/frontend/html/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/htmx/default/index.js → packages/frontend/src/server/htmx/default.js

@@ -1,6 +1,6 @@
 import { default_extension, name } from "@primate/frontend/htmx/common";
-import serve from "../runtime/serve.js";
-import build from "./build.js";
+import build from "@primate/frontend/htmx/hooks/build";
+import serve from "@primate/frontend/htmx/hooks/serve";
 
 export default ({
   extension = default_extension,

packages/frontend/src/server/htmx/runtime/index.js → packages/frontend/src/server/htmx/runtime.js

@@ -1,5 +1,5 @@
 import { default_extension, name } from "@primate/frontend/htmx/common";
-import serve from "./serve.js";
+import serve from "@primate/frontend/htmx/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/markdown/default/index.js → packages/frontend/src/server/markdown/default.js

@@ -1,6 +1,6 @@
 import { default_extension, name } from "@primate/frontend/markdown/common";
-import serve from "../runtime/serve.js";
-import build from "./build.js";
+import build from "@primate/frontend/markdown/hooks/build";
+import serve from "@primate/frontend/markdown/hooks/serve";
 
 export default ({ extension = default_extension, options } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/markdown/runtime/index.js → packages/frontend/src/server/markdown/runtime.js

@@ -1,5 +1,5 @@
 import { default_extension, name } from "@primate/frontend/markdown/common";
-import serve from "./serve.js";
+import serve from "@primate/frontend/markdown/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/marko/default/index.js → packages/frontend/src/server/marko/default.js

@@ -1,6 +1,6 @@
 import { default_extension, name } from "@primate/frontend/marko/common";
-import serve from "../runtime/serve.js";
-import build from "./build.js";
+import build from "@primate/frontend/marko/hooks/build";
+import serve from "@primate/frontend/marko/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/marko/runtime/index.js → packages/frontend/src/server/marko/runtime.js

@@ -1,5 +1,5 @@
 import { default_extension, name } from "@primate/frontend/marko/common";
-import serve from "./serve.js";
+import serve from "@primate/frontend/marko/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/react/default/index.js → packages/frontend/src/server/react/default.js

@@ -1,6 +1,6 @@
 import { default_extension, name } from "@primate/frontend/react/common";
-import serve from "../runtime/serve.js";
-import build from "./build.js";
+import build from "@primate/frontend/react/hooks/build";
+import serve from "@primate/frontend/react/hooks/serve";
 
 export default ({
   extension = default_extension,

packages/frontend/src/server/react/default/build.js → packages/frontend/src/server/react/hooks/build/index.js

@@ -1,8 +1,8 @@
 import compile from "@primate/frontend/base/compile";
 import depend from "@primate/frontend/base/depend";
 import server_root from "@primate/frontend/base/server-root";
+import create_root from "@primate/frontend/react/client/create-root";
 import { dependencies, name } from "@primate/frontend/react/common";
-import create_root from "../client/create-root.js";
 import { client, server } from "./compile.js";
 import prepare from "./prepare.js";
 import publish from "./publish.js";
@@ -13,15 +13,13 @@ export default extension => async (app, next) => {
   // compile server
   await server_root(app, name, create_root, server);
 
-  const compiled = await compile({
+  app.register(extension, await compile({
     app,
     extension,
     name,
     create_root,
     compile: { server, client },
-  });
-
-  app.register(extension, compiled);
+  }));
 
   app.build.plugin(publish(app, extension));
   const code = "export { default as spa } from '@primate/frontend/spa';";

packages/frontend/src/server/react/hooks/build/prepare.js

@@ -0,0 +1,3 @@
+import expose from "@primate/frontend/react/client/expose";
+
+export default app => app.build.export(expose);

packages/frontend/src/server/react/runtime/serve.js → packages/frontend/src/server/react/hooks/serve/index.js

@@ -1,6 +1,6 @@
 import handler from "@primate/frontend/base/handler";
 import { name } from "@primate/frontend/react/common";
-import client from "../client/default.js";
+import client from "@primate/frontend/react/client";
 import render from "./render.js";
 
 export default (extension, spa) => (app, next) => {

packages/frontend/src/server/react/runtime/index.js → packages/frontend/src/server/react/runtime.js

@@ -1,5 +1,5 @@
 import { default_extension, name } from "@primate/frontend/react/common";
-import serve from "./serve.js";
+import serve from "@primate/frontend/react/hooks/serve";
 
 export default ({
   extension = default_extension,

packages/frontend/src/server/solid/default/index.js → packages/frontend/src/server/solid/default.js

@@ -1,6 +1,6 @@
 import { default_extension, name } from "@primate/frontend/solid/common";
-import serve from "../runtime/serve.js";
-import build from "./build.js";
+import build from "@primate/frontend/solid/hooks/build";
+import serve from "@primate/frontend/solid/hooks/serve";
 
 export default ({
   extension = default_extension,

packages/frontend/src/server/solid/default/build.js → packages/frontend/src/server/solid/hooks/build/index.js

@@ -1,8 +1,8 @@
 import compile from "@primate/frontend/base/compile";
 import depend from "@primate/frontend/base/depend";
 import server_root from "@primate/frontend/base/server-root";
+import create_root from "@primate/frontend/solid/client/create-root";
 import { dependencies, name } from "@primate/frontend/solid/common";
-import create_root from "../client/create-root.js";
 import { client, server } from "./compile.js";
 import prepare from "./prepare.js";
 import publish from "./publish.js";
@@ -13,15 +13,13 @@ export default extension => async (app, next) => {
   // compile server
   await server_root(app, name, create_root, server);
 
-  const compiled = await compile({
+  app.register(extension, await compile({
     app,
     extension,
     name,
     create_root,
     compile: { server, client },
-  });
-
-  app.register(extension, compiled);
+  }));
 
   app.build.plugin(publish(app, extension));
   const code = "export { default as spa } from '@primate/frontend/spa';";

packages/frontend/src/server/solid/hooks/build/prepare.js

@@ -0,0 +1,3 @@
+import expose from "@primate/frontend/solid/client/expose";
+
+export default app => app.build.export(expose);

packages/frontend/src/server/solid/runtime/serve.js → packages/frontend/src/server/solid/hooks/serve/index.js

@@ -1,6 +1,6 @@
 import handler from "@primate/frontend/base/handler";
 import { name } from "@primate/frontend/solid/common";
-import client from "../client/default.js";
+import client from "@primate/frontend/solid/client";
 import render from "./render.js";
 
 export default (extension, spa) => (app, next) => {

packages/frontend/src/server/solid/runtime/index.js → packages/frontend/src/server/solid/runtime.js

@@ -1,5 +1,5 @@
 import { default_extension, name } from "@primate/frontend/solid/common";
-import serve from "./serve.js";
+import serve from "@primate/frontend/solid/hooks/serve";
 
 export default ({
   extension = default_extension,

packages/frontend/src/server/svelte/default/index.js → packages/frontend/src/server/svelte/default.js

@@ -1,6 +1,6 @@
 import { default_extension, name } from "@primate/frontend/svelte/common";
-import serve from "../runtime/serve.js";
-import build from "./build.js";
+import build from "@primate/frontend/svelte/hooks/build";
+import serve from "@primate/frontend/svelte/hooks/serve";
 
 export default ({
   extension = default_extension,

packages/frontend/src/server/svelte/default/build.js → packages/frontend/src/server/svelte/hooks/build/index.js

@@ -1,8 +1,8 @@
 import compile from "@primate/frontend/base/compile";
 import depend from "@primate/frontend/base/depend";
 import server_root from "@primate/frontend/base/server-root";
+import create_root from "@primate/frontend/svelte/client/create-root";
 import { dependencies, name } from "@primate/frontend/svelte/common";
-import create_root from "../client/create-root.js";
 import { client, server } from "./compile.js";
 import prepare from "./prepare.js";
 import publish from "./publish.js";

packages/frontend/src/server/svelte/hooks/build/prepare.js

@@ -0,0 +1,3 @@
+import expose from "@primate/frontend/svelte/client/expose";
+
+export default app => app.build.export(expose);

packages/frontend/src/server/svelte/runtime/serve.js → packages/frontend/src/server/svelte/hooks/serve/index.js

@@ -1,6 +1,6 @@
 import handler from "@primate/frontend/base/handler";
 import { name } from "@primate/frontend/svelte/common";
-import client from "../client/default.js";
+import client from "@primate/frontend/svelte/client";
 import render from "./render.js";
 
 export default (extension, spa) => (app, next) => {

packages/frontend/src/server/svelte/runtime/index.js → packages/frontend/src/server/svelte/runtime.js

@@ -1,5 +1,5 @@
 import { default_extension, name } from "@primate/frontend/svelte/common";
-import serve from "./serve.js";
+import serve from "@primate/frontend/svelte/hooks/serve";
 
 export default ({
   extension = default_extension,

packages/frontend/src/server/voby/default/index.js → packages/frontend/src/server/voby/default.js

@@ -1,6 +1,6 @@
 import { default_extension, name } from "@primate/frontend/voby/common";
-import serve from "../runtime/serve.js";
-import build from "./build.js";
+import build from "@primate/frontend/voby/hooks/build";
+import serve from "@primate/frontend/voby/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/voby/runtime/index.js → packages/frontend/src/server/voby/runtime.js

@@ -1,5 +1,5 @@
 import { default_extension, name } from "@primate/frontend/voby/common";
-import serve from "./serve.js";
+import serve from "@primate/frontend/voby/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/vue/default/index.js → packages/frontend/src/server/vue/default.js

@@ -1,6 +1,6 @@
 import { default_extension, name } from "@primate/frontend/vue/common";
-import serve from "../runtime/serve.js";
-import build from "./build.js";
+import build from "@primate/frontend/vue/hooks/build";
+import serve from "@primate/frontend/vue/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/vue/runtime/index.js → packages/frontend/src/server/vue/runtime.js

@@ -1,5 +1,5 @@
 import { default_extension, name } from "@primate/frontend/vue/common";
-import serve from "./serve.js";
+import serve from "@primate/frontend/vue/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/webc/default/index.js → packages/frontend/src/server/webc/default.js

@@ -1,6 +1,6 @@
 import { default_extension, name } from "@primate/frontend/webc/common";
-import serve from "../runtime/serve.js";
-import build from "./build.js";
+import build from "@primate/frontend/webc/hooks/build";
+import serve from "@primate/frontend/webc/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,

packages/frontend/src/server/webc/runtime/index.js → packages/frontend/src/server/webc/runtime.js

@@ -1,5 +1,5 @@
 import { default_extension, name } from "@primate/frontend/webc/common";
-import serve from "./serve.js";
+import serve from "@primate/frontend/webc/hooks/serve";
 
 export default ({ extension = default_extension } = {}) => ({
   name: `primate:${name}`,