Remove wrong etag header of transformer

Author: ije

lib/fs.ts

@@ -66,7 +66,7 @@ export async function getFiles(
 /* read source code from fs/cdn/cache */
 export async function readCode(
   specifier: string,
-): Promise<[code: string, mtime: number | undefined, contentType: string]> {
+): Promise<[code: string, contentType: string]> {
   if (util.isLikelyHttpURL(specifier)) {
     const url = new URL(specifier);
     if (url.hostname === "esm.sh" && !url.searchParams.has("target")) {
@@ -76,14 +76,11 @@ export async function readCode(
     if (res.status >= 400) {
       throw new Error(`fetch ${url.href}: ${res.status} - ${res.statusText}`);
     }
-    const val = res.headers.get("Last-Modified");
-    const mtime = val ? new Date(val).getTime() : undefined;
-    return [await res.text(), mtime, res.headers.get("Content-Type") || getContentType(url.pathname)];
+    return [await res.text(), res.headers.get("Content-Type") || getContentType(url.pathname)];
   }
 
   specifier = util.splitBy(specifier, "?")[0];
-  const stat = await Deno.stat(specifier);
-  return [await Deno.readTextFile(specifier), stat.mtime?.getTime(), getContentType(specifier)];
+  return [await Deno.readTextFile(specifier), getContentType(specifier)];
 }
 
 /* watch the given directory and its subdirectories */

loaders/vue.ts

@@ -29,7 +29,6 @@ export default class VueSFCLoader implements Pick<ModuleLoader, "load"> {
   }
 
   async load(pathname: string, env: ModuleLoaderEnv): Promise<ModuleLoaderContent> {
-    const stat = await Deno.lstat(`.${pathname}`);
     const content = await Deno.readTextFile(`.${pathname}`);
     const filename = "." + pathname;
     const id = (await util.computeHash("SHA-256", filename)).slice(0, 8);
@@ -133,7 +132,6 @@ export default class VueSFCLoader implements Pick<ModuleLoader, "load"> {
 
     return {
       code: output.join("\n"),
-      modtime: stat?.mtime?.getTime(),
       lang: isTS ? "ts" : "js",
       inlineCSS: css || undefined,
       atomicCSS: true,

server/mod.ts

@@ -1,7 +1,6 @@
 import type { ConnInfo, ServeInit } from "https://deno.land/[email protected]/http/server.ts";
 import { serve as stdServe, serveTls } from "https://deno.land/[email protected]/http/server.ts";
 import { readableStreamFromReader } from "https://deno.land/[email protected]/streams/conversion.ts";
-import { VERSION } from "https://deno.land/x/[email protected]/version.ts";
 import FetchError from "../framework/core/fetch_error.ts";
 import type { RouteRecord } from "../framework/core/route.ts";
 import log, { LevelName } from "../lib/log.ts";
@@ -42,16 +41,6 @@ export const serve = (options: ServerOptions = {}) => {
   const jsxConfigPromise = importMapPromise.then(loadJSXConfig);
   const moduleLoadersPromise = importMapPromise.then(initModuleLoaders);
   const routesPromise = config?.routes ? initRoutes(config.routes) : Promise.resolve({ routes: [] });
-  const buildHashPromise = Promise.all([jsxConfigPromise, importMapPromise]).then(([jsxConfig, importMap]) => {
-    const buildArgs = JSON.stringify({
-      ...(config ? util.pick(config, "build", "unocss") : undefined),
-      comilper: VERSION,
-      importMap,
-      jsxConfig,
-      isDev,
-    });
-    return util.computeHash("sha-1", buildArgs);
-  });
   const handler = async (req: Request, connInfo: ConnInfo): Promise<Response> => {
     const url = new URL(req.url);
     const { host, pathname, searchParams } = url;
@@ -71,15 +60,13 @@ export const serve = (options: ServerOptions = {}) => {
     // transform client modules
     if (clientModuleTransformer.test(pathname)) {
       try {
-        const [buildHash, jsxConfig, importMap] = await Promise.all([
-          buildHashPromise,
+        const [jsxConfig, importMap] = await Promise.all([
           jsxConfigPromise,
           importMapPromise,
         ]);
         return await clientModuleTransformer.fetch(req, {
           importMap,
           jsxConfig,
-          buildHash,
           buildTarget: config?.build?.target,
           isDev,
         });
@@ -100,8 +87,7 @@ export const serve = (options: ServerOptions = {}) => {
     const loader = moduleLoaders.find((loader) => loader.test(pathname));
     if (loader) {
       try {
-        const [buildHash, jsxConfig, importMap] = await Promise.all([
-          buildHashPromise,
+        const [jsxConfig, importMap] = await Promise.all([
           jsxConfigPromise,
           importMapPromise,
         ]);
@@ -110,7 +96,6 @@ export const serve = (options: ServerOptions = {}) => {
           loaded,
           importMap,
           jsxConfig,
-          buildHash,
           buildTarget: config?.build?.target,
           isDev,
         });

server/transformer.ts

@@ -8,6 +8,7 @@ import { bundleCSS } from "./bundle_css.ts";
 import {
   builtinModuleExts,
   getAlephPkgUri,
+  getDeploymentId,
   getUnoGenerator,
   regFullVersion,
   restoreUrl,
@@ -18,7 +19,6 @@ import { DependencyGraph } from "./graph.ts";
 import type { ImportMap, JSXConfig, ModuleLoaderContent } from "./types.ts";
 
 export type TransformerOptions = {
-  buildHash: string;
   buildTarget?: TransformOptions["target"];
   importMap: ImportMap;
   isDev: boolean;
@@ -33,33 +33,30 @@ export default {
       pathname.endsWith(".css");
   },
   fetch: async (req: Request, options: TransformerOptions): Promise<Response> => {
-    const { isDev, buildHash, loaded } = options;
+    const { isDev, loaded } = options;
     const { pathname, searchParams, search } = new URL(req.url);
     const specifier = pathname.startsWith("/-/") ? restoreUrl(pathname + search) : `.${pathname}`;
     const clientDependencyGraph: DependencyGraph | undefined = Reflect.get(globalThis, "clientDependencyGraph");
 
     let sourceCode: string;
-    let mtime: number | undefined;
     let lang: string | undefined;
     let isCSS: boolean;
     let uno: boolean;
     if (loaded) {
       sourceCode = loaded.code;
-      mtime = loaded.modtime;
       lang = loaded.lang;
       isCSS = loaded.lang === "css";
       uno = !!loaded.atomicCSS;
     } else {
       let codeType: string;
-      [sourceCode, mtime, codeType] = await readCode(specifier);
+      [sourceCode, codeType] = await readCode(specifier);
       isCSS = codeType.startsWith("text/css");
       uno = pathname.endsWith(".jsx") || pathname.endsWith(".tsx");
     }
 
-    const etag = mtime
-      ? `W/${mtime.toString(16)}-${sourceCode.length.toString(16)}-${buildHash.slice(0, 8)}`
-      : await util.computeHash("sha-1", sourceCode + buildHash);
-    if (req.headers.get("If-None-Match") === etag) {
+    const deployId = getDeploymentId();
+    const etag = deployId ? `W/${deployId}` : null;
+    if (etag && req.headers.get("If-None-Match") === etag) {
       return new Response(null, { status: 304 });
     }
 
@@ -162,10 +159,10 @@ export default {
         resBody = code;
       }
     }
-    const headers = new Headers({
-      "Content-Type": `${resType}; charset=utf-8`,
-      "Etag": etag,
-    });
+    const headers = new Headers([["Content-Type", `${resType}; charset=utf-8`]]);
+    if (etag) {
+      headers.set("ETag", etag);
+    }
     if (searchParams.get("v") || (pathname.startsWith("/-/") && regFullVersion.test(pathname))) {
       headers.append("Cache-Control", "public, max-age=31536000, immutable");
     }

server/types.ts

@@ -71,7 +71,6 @@ export type ModuleLoaderContent = {
   atomicCSS?: boolean;
   lang?: "js" | "jsx" | "ts" | "tsx" | "css";
   map?: string;
-  modtime?: number;
 };
 
 export { UnoConfig };