Merge branch 'main' into check-docs

Author: iuioiua

src/build_cache.ts

@@ -1,5 +1,5 @@
 import * as path from "@std/path";
-import type { ResolvedFreshConfig } from "./config.ts";
+import { getSnapshotPath, type ResolvedFreshConfig } from "./config.ts";
 import { DENO_DEPLOYMENT_ID, setBuildId } from "./runtime/build_id.ts";
 import * as colors from "@std/fmt/colors";
 
@@ -30,7 +30,7 @@ export interface BuildCache {
 
 export class ProdBuildCache implements BuildCache {
   static async fromSnapshot(config: ResolvedFreshConfig, islandCount: number) {
-    const snapshotPath = path.join(config.build.outDir, "snapshot.json");
+    const snapshotPath = getSnapshotPath(config);
 
     const staticFiles = new Map<string, FileSnapshot>();
     const islandToChunk = new Map<string, string>();

src/constants.ts

@@ -1,5 +1,3 @@
 export const INTERNAL_PREFIX = "/_frsh";
-export const DEV_CLIENT_URL = `${INTERNAL_PREFIX}/fresh_dev_client.js`;
 export const DEV_ERROR_OVERLAY_URL = `${INTERNAL_PREFIX}/error_overlay`;
 export const ALIVE_URL = `${INTERNAL_PREFIX}/alive`;
-export const JS_PREFIX = `/js`;

src/dev/dev_build_cache.ts

@@ -1,7 +1,7 @@
 import type { BuildCache, StaticFile } from "../build_cache.ts";
 import * as path from "@std/path";
 import { SEPARATOR as WINDOWS_SEPARATOR } from "@std/path/windows/constants";
-import type { ResolvedFreshConfig } from "../config.ts";
+import { getSnapshotPath, type ResolvedFreshConfig } from "../config.ts";
 import type { BuildSnapshot } from "../build_cache.ts";
 import { encodeHex } from "@std/encoding/hex";
 import { crypto } from "@std/crypto";
@@ -284,7 +284,7 @@ export class DiskBuildCache implements DevBuildCache {
     }
 
     await Deno.writeTextFile(
-      path.join(this.config.build.outDir, "snapshot.json"),
+      getSnapshotPath(this.config),
       JSON.stringify(snapshot, null, 2),
     );
   }

tests/precompile_test.ts

@@ -1,37 +1,26 @@
-import * as path from "@std/path";
 import { expect } from "@std/expect";
 
 Deno.test("JSX precompile - check config", async () => {
-  const cwd = path.join(import.meta.dirname!, "fixture_precompile", "invalid");
-  const output = await new Deno.Command(Deno.execPath(), {
-    args: [
-      "run",
-      "-A",
-      path.join(cwd, "dev.ts"),
-    ],
-    cwd,
+  const { stderr, success } = await new Deno.Command(Deno.execPath(), {
+    args: ["run", "-A", "dev.ts"],
+    cwd: new URL("./fixture_precompile/invalid", import.meta.url),
   }).output();
 
-  const stderr = new TextDecoder().decode(output.stderr);
-  expect(stderr).toContain("jsxPrecompileSkipElements to contain");
-  expect(output.code).toEqual(1);
+  const stderrText = new TextDecoder().decode(stderr);
+  expect(stderrText).toContain("jsxPrecompileSkipElements to contain");
+  expect(success).toEqual(false);
 });
 
 Deno.test("JSX precompile - run vnode hooks", async () => {
-  const cwd = path.join(import.meta.dirname!, "fixture_precompile", "valid");
-  const output = await new Deno.Command(Deno.execPath(), {
-    args: [
-      "run",
-      "-A",
-      path.join(cwd, "main.tsx"),
-    ],
-    cwd,
+  const { stdout, success } = await new Deno.Command(Deno.execPath(), {
+    args: ["run", "-A", "main.tsx"],
+    cwd: new URL("./fixture_precompile/valid", import.meta.url),
   }).output();
 
-  const stdout = new TextDecoder().decode(output.stdout);
-  expect(stdout).toContain('<img src="/foo.jpg?__frsh_c=');
-  expect(stdout).toContain('<source src="/bar.jpg?__frsh_c=');
-  expect(stdout).toContain('<div f-client-nav="true">');
-  expect(stdout).toContain('<span f-client-nav="false">');
-  expect(output.code).toEqual(0);
+  const stdoutText = new TextDecoder().decode(stdout);
+  expect(stdoutText).toContain('<img src="/foo.jpg?__frsh_c=');
+  expect(stdoutText).toContain('<source src="/bar.jpg?__frsh_c=');
+  expect(stdoutText).toContain('<div f-client-nav="true">');
+  expect(stdoutText).toContain('<span f-client-nav="false">');
+  expect(success).toEqual(true);
 });