@primate/core 0.3.1 → 0.3.3

package/lib/private/ServeApp.js

@@ -280,7 +280,7 @@ export default class ServeApp extends App {
                 const verbs = router.get(v);
                 const routeHandler = verbs[verb];
                 return routeHandler?.handler;
-            }).filter(Boolean)])
+            }).filter(Boolean).toReversed()])
             .get();
         const verbs = router.get(route.path);
         const routePath = verbs[verb];

package/lib/private/config/index.d.ts

@@ -1,6 +1,7 @@
 import schema from "#config/schema";
 declare const _default: (config?: typeof schema.input) => {
     build: Record<string, unknown> | undefined;
+    bundle: string[];
     http: {
         csp: Record<string, string[]> | undefined;
         headers: Record<string, string> | undefined;

package/lib/private/config/schema.d.ts

@@ -2,6 +2,7 @@ import Module from "#Module";
 import FileRef from "@rcompat/fs/FileRef";
 declare const _default: import("pema").ObjectType<{
     build: import("pema").OptionalType<import("pema/record").RecordType<import("pema/string").StringType, import("pema/unknown").UnknownType>>;
+    bundle: import("pema").DefaultType<import("pema/array").ArrayType<import("pema/string").StringType>, string[]>;
     http: import("pema").ObjectType<{
         csp: import("pema").OptionalType<import("pema/record").RecordType<import("pema/string").StringType, import("pema/array").ArrayType<import("pema/string").StringType>>>;
         headers: import("pema").OptionalType<import("pema/record").RecordType<import("pema/string").StringType, import("pema/string").StringType>>;

package/lib/private/config/schema.js

@@ -1,6 +1,6 @@
 import Module from "#Module";
 import FileRef from "@rcompat/fs/FileRef";
-import pema from "pema";
+import p from "pema";
 import array from "pema/array";
 import boolean from "pema/boolean";
 import constructor from "pema/constructor";
@@ -9,8 +9,9 @@ import string from "pema/string";
 import uint from "pema/uint";
 import union from "pema/union";
 import unknown from "pema/unknown";
-export default pema({
+export default p({
     build: record(string, unknown).optional(),
+    bundle: p.array(p.string).default([]),
     http: {
         csp: record(string, array(string)).optional(),
         headers: record(string, string).optional(),

package/lib/private/frontend/Module.d.ts

@@ -24,7 +24,7 @@ export default abstract class FrontendModule<S = ServerView> extends Module {
             css?: null | string;
             js: string;
         }>;
-        server?: (text: string) => MaybePromise<string>;
+        server?: (text: string, file?: FileRef) => MaybePromise<string>;
     };
     css?: {
         filter: RegExp;

package/lib/private/frontend/Module.js

@@ -64,10 +64,10 @@ export default class FrontendModule extends Module {
         const app_asset = app.assets.find(asset => asset.src?.includes("app") && asset.src.endsWith(".js"));
         if (!app_asset)
             throw fail("Could not find app.js in assets");
-        const app_script = `<script type="module" src="${app_asset.src}" integrity="${app_asset.integrity}"></script>`;
+        const app_script = `<script type="module" src="${app_asset.src}"></script>`;
         const json_props = JSON.stringify({ frontend: this.name, ...client });
         const hydrated = await inline(json_props, APPLICATION_JSON, "hydration");
-        const script_src = [hydrated.integrity, `'${app_asset.integrity}'`];
+        const script_src = [hydrated.integrity];
         return {
             body,
             head: head.concat(app_script, hydrated.head),
@@ -138,7 +138,7 @@ export default class FrontendModule extends Module {
         }
         catch (error) {
             const path = `${location.views}/${view}`;
-            throw fail("error in view{0}\n{1}", path, error);
+            throw fail("error in view {0}\n{1}", path, error);
         }
     };
     serve(app, next) {
@@ -217,13 +217,14 @@ export default class FrontendModule extends Module {
             app.bind(e, async (file, { context }) => {
                 assert(contexts.includes(context), `${this.name}: only components supported`);
                 if (this.compile.server) {
-                    const code = await this.compile.server(await file.text());
+                    const code = await this.compile.server(await file.text(), file);
                     const bundled = await bundle({
                         code,
                         source: file,
                         root: app.root,
                         extensions: this.fileExtensions,
-                        compile: async (s) => this.compile.server(s),
+                        compile: async (s, f) => this.compile.server(s, f),
+                        bundle: app.config("bundle"),
                     });
                     return bundled;
                 }

package/lib/private/frontend/bundle-server.d.ts

@@ -5,7 +5,8 @@ type Init = {
     root: FileRef;
     extensions: string[];
     compile: (src: string, file?: FileRef) => Promise<string>;
+    bundle: string[];
 };
-export default function bundleServer(init: Init): Promise<string>;
+export default function bundle_server(init: Init): Promise<string>;
 export {};
 //# sourceMappingURL=bundle-server.d.ts.map

package/lib/private/frontend/bundle-server.js

@@ -1,7 +1,7 @@
 import FileRef from "@rcompat/fs/FileRef";
 import * as esbuild from "esbuild";
-export default async function bundleServer(init) {
-    const { code, source, root, extensions, compile } = init;
+export default async function bundle_server(init) {
+    const { code, source, root, extensions, compile, bundle } = init;
     const filter = new RegExp(`(${extensions.map(e => e.replace(".", "\\.")).join("|")})$`);
     const plugin = {
         name: "primate/bundle/server",
@@ -18,7 +18,7 @@ export default async function bundleServer(init) {
                 const p = args.path;
                 const relative = p.startsWith("./") || p.startsWith("../");
                 const views = p.startsWith("#view/");
-                if (!relative && !views)
+                if (!relative && !views && !bundle.includes(p))
                     return { path: p, external: true };
                 return null;
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/core",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "The universal web framework",
   "homepage": "https://primate.run",
   "bugs": "https://github.com/primate-run/primate/issues",