) {
const encoder = new TextEncoder();
diff --git a/src/render.ts b/src/render.ts
index d5000898c72..5588492d8c4 100644
--- a/src/render.ts
+++ b/src/render.ts
@@ -14,7 +14,6 @@ import type { Context } from "./context.ts";
import { recordSpanError, tracer } from "./otel.ts";
import { DEV_ERROR_OVERLAY_URL } from "./constants.ts";
import { renderToString } from "preact-render-to-string";
-import { BUILD_ID } from "./runtime/build_id.ts";
export type AsyncAnyComponent = {
(
@@ -85,12 +84,17 @@ export function preactRender(
} finally {
// Add preload headers
const basePath = ctx.config.basePath;
- const runtimeUrl = `${basePath}/_fresh/js/${BUILD_ID}/fresh-runtime.js`;
- let link = `<${encodeURI(runtimeUrl)}>; rel="modulepreload"; as="script"`;
+ const runtimeUrl = state.buildCache.clientEntry.startsWith(".")
+ ? state.buildCache.clientEntry.slice(1)
+ : state.buildCache.clientEntry;
+ let link = `<${
+ encodeURI(`${basePath}${runtimeUrl}`)
+ }>; rel="modulepreload"; as="script"`;
state.islands.forEach((island) => {
- link += `, <${
- encodeURI(`${basePath}${island.file}`)
- }>; rel="modulepreload"; as="script"`;
+ const specifier = `${basePath}${
+ island.file.startsWith(".") ? island.file.slice(1) : island.file
+ }`;
+ link += `, <${encodeURI(specifier)}>; rel="modulepreload"; as="script"`;
});
if (link !== "") {
diff --git a/src/runtime/build_id.ts b/src/runtime/build_id.ts
index 1e9ddcd847d..a7f3375b4b0 100644
--- a/src/runtime/build_id.ts
+++ b/src/runtime/build_id.ts
@@ -1,6 +1,8 @@
import { encodeHex } from "@std/encoding/hex";
-export const DENO_DEPLOYMENT_ID = Deno.env.get("DENO_DEPLOYMENT_ID");
+export const DENO_DEPLOYMENT_ID: string | undefined = Deno.env.get(
+ "DENO_DEPLOYMENT_ID",
+);
const deploymentId = DENO_DEPLOYMENT_ID ||
// For CI
Deno.env.get("GITHUB_SHA") ||
@@ -10,8 +12,8 @@ const buildIdHash = await crypto.subtle.digest(
new TextEncoder().encode(deploymentId),
);
-export let BUILD_ID = encodeHex(buildIdHash);
+export let BUILD_ID: string = encodeHex(buildIdHash);
-export function setBuildId(buildId: string) {
+export function setBuildId(buildId: string): void {
BUILD_ID = buildId;
}
diff --git a/src/runtime/client/partials.ts b/src/runtime/client/partials.ts
index 5db02a99294..26af1878b7d 100644
--- a/src/runtime/client/partials.ts
+++ b/src/runtime/client/partials.ts
@@ -329,7 +329,7 @@ export async function applyPartials(res: Response): Promise {
for (let i = 0; i < json.islands.length; i++) {
const island = json.islands[i];
promises.push(
- import(island.chunk).then((mod) => {
+ import(/* @vite-ignore */ island.chunk).then((mod) => {
ISLAND_REGISTRY.set(island.name, mod[island.exportName]);
}),
);
diff --git a/src/runtime/client/preact_hooks_client.ts b/src/runtime/client/preact_hooks_client.ts
index 345648823d8..9684385ad00 100644
--- a/src/runtime/client/preact_hooks_client.ts
+++ b/src/runtime/client/preact_hooks_client.ts
@@ -1,6 +1,6 @@
import { options } from "preact";
import { assetHashingHook, CLIENT_NAV_ATTR } from "../shared_internal.tsx";
-import { BUILD_ID } from "../build_id.ts";
+import { BUILD_ID } from "fresh/build-id";
const oldVNodeHook = options.vnode;
options.vnode = (vnode) => {
diff --git a/src/runtime/server/preact_hooks.tsx b/src/runtime/server/preact_hooks.tsx
index 09d209f57a8..ab01760ca1c 100644
--- a/src/runtime/server/preact_hooks.tsx
+++ b/src/runtime/server/preact_hooks.tsx
@@ -23,7 +23,7 @@ import {
setActiveUrl,
} from "../shared_internal.tsx";
import type { BuildCache } from "../../build_cache.ts";
-import { BUILD_ID } from "../build_id.ts";
+import { BUILD_ID } from "fresh/build-id";
import {
DEV_ERROR_OVERLAY_URL,
PARTIAL_SEARCH_PARAM,
@@ -433,7 +433,8 @@ export interface PartialStateJson {
}
function FreshRuntimeScript() {
- const { islands, nonce, ctx, islandProps, partialId } = RENDER_STATE!;
+ const { islands, nonce, ctx, islandProps, partialId, buildCache } =
+ RENDER_STATE!;
const basePath = ctx.config.basePath;
const islandArr = Array.from(islands);
@@ -470,7 +471,11 @@ function FreshRuntimeScript() {
: island.exportName === island.name
? `{ ${island.exportName} }`
: `{ ${island.exportName} as ${island.name} }`;
- return `import ${named} from "${`${basePath}${island.file}`}";`;
+
+ const islandSpec = island.file.startsWith(".")
+ ? island.file.slice(1)
+ : island.file;
+ return `import ${named} from "${basePath}${islandSpec}";`;
}).join("");
const islandObj = "{" + islandArr.map((island) => island.name)
@@ -482,9 +487,12 @@ function FreshRuntimeScript() {
{ json: true },
);
- const runtimeUrl = `${basePath}/_fresh/js/${BUILD_ID}/fresh-runtime.js`;
+ // const runtimeUrl = `${basePath}/_fresh/js/${BUILD_ID}/fresh-runtime.js`;
+ const runtimeUrl = buildCache.clientEntry.startsWith(".")
+ ? buildCache.clientEntry.slice(1)
+ : buildCache.clientEntry;
const scriptContent =
- `import { boot } from "${runtimeUrl}";${islandImports}boot(${islandObj},${serializedProps});`;
+ `import { boot } from "${basePath}${runtimeUrl}";${islandImports}boot(${islandObj},${serializedProps});`;
return (
<>
@@ -496,7 +504,7 @@ function FreshRuntimeScript() {
__html: scriptContent,
}}
/>
- {ctx.config.mode === "development" ? : null}
+ {buildCache.features.errorOverlay ? : null}
);
}
diff --git a/src/runtime/shared.ts b/src/runtime/shared.ts
index c2293ac6600..f316a834268 100644
--- a/src/runtime/shared.ts
+++ b/src/runtime/shared.ts
@@ -1,5 +1,5 @@
import type { ComponentChildren, VNode } from "preact";
-import { BUILD_ID } from "./build_id.ts";
+import { BUILD_ID } from "fresh/build-id";
import { assetInternal, assetSrcSetInternal } from "./shared_internal.tsx";
/**
diff --git a/src/test_utils.ts b/src/test_utils.ts
index fa408dc12e8..449f9d54ba8 100644
--- a/src/test_utils.ts
+++ b/src/test_utils.ts
@@ -83,7 +83,7 @@ export function serveMiddleware(
(() => new Response("not found", { status: 404 }));
const config = options.config ?? DEFAULT_CONFIG;
const buildCache = options.buildCache ??
- new MockBuildCache([]);
+ new MockBuildCache([], options.config?.mode ?? "production");
const ctx = new Context(
req,
@@ -149,9 +149,12 @@ export async function withTmpDir(
export class MockBuildCache implements BuildCache {
#files: FsRouteFile[];
root = "";
+ clientEntry = "";
islandRegistry: ServerIslandRegistry = new Map();
+ features = { errorOverlay: false };
- constructor(files: FsRouteFile[]) {
+ constructor(files: FsRouteFile[], mode: "development" | "production") {
+ this.features.errorOverlay = mode === "development";
this.#files = files;
}
diff --git a/tests/test_utils.tsx b/tests/test_utils.tsx
index 53072f865a1..6555ec3fcf0 100644
--- a/tests/test_utils.tsx
+++ b/tests/test_utils.tsx
@@ -129,7 +129,8 @@ export async function withChildProcessServer(
let address = "";
let found = false;
// @ts-ignore yes it does
- for await (const line of lines.values({ preventCancel: true })) {
+ for await (const raw of lines.values({ preventCancel: true })) {
+ const line = colors.stripAnsiCode(raw);
output.push(line);
const match = line.match(
/https?:\/\/[^:]+:\d+(\/\w+[-\w]*)*/g,
@@ -147,12 +148,25 @@ export async function withChildProcessServer(
throw new Error(`Could not find server address`);
}
+ let failed = false;
try {
await fn(address);
+ } catch (err) {
+ // deno-lint-ignore no-console
+ console.log(output);
+ failed = true;
+ throw err;
} finally {
aborter.abort();
await cp.status;
- for await (const _ of lines) { /* noop */ }
+ for await (const line of lines) {
+ output.push(line);
+ }
+
+ if (failed) {
+ // deno-lint-ignore no-console
+ console.log(output);
+ }
}
}