Clean up

Author: ije

framework/core/redirect.ts

@@ -4,8 +4,6 @@ import events from "./events.ts";
 let routerReady = false;
 let preRedirect: URL | null = null;
 
-const deno = typeof Deno === "object" && Deno !== null && typeof Deno.env === "object";
-
 const onrouterready = (_: Record<string, unknown>) => {
   events.off("routerready", onrouterready);
   if (preRedirect) {
@@ -17,12 +15,11 @@ const onrouterready = (_: Record<string, unknown>) => {
 events.on("routerready", onrouterready);
 
 export function redirect(url: string, replace?: boolean) {
-  if (!util.isFilledString(url) || deno) {
+  const { history, location } = globalThis;
+  if (!util.isFilledString(url) || !history || !location) {
     return;
   }
 
-  const { location } = window;
-
   if (util.isLikelyHttpURL(url) || url.startsWith("file://") || url.startsWith("mailto:") || url.startsWith("data:")) {
     location.href = url;
     return;

loaders/vue.ts

@@ -13,7 +13,7 @@ import {
 } from "https://esm.sh/@vue/[email protected]";
 import log from "../lib/log.ts";
 import util from "../lib/util.ts";
-import type { ModuleLoader, ModuleLoaderContent, ModuleLoaderEnv } from "../server/types.ts";
+import type { ModuleLoader, ModuleLoaderEnv, ModuleLoaderOutput } from "../server/types.ts";
 
 type Options = {
   script?: Omit<SFCScriptCompileOptions, "id">;
@@ -28,7 +28,7 @@ export default class VueSFCLoader implements Pick<ModuleLoader, "load"> {
     this.#options = { ...options };
   }
 
-  async load(pathname: string, env: ModuleLoaderEnv): Promise<ModuleLoaderContent> {
+  async load(pathname: string, env: ModuleLoaderEnv): Promise<ModuleLoaderOutput> {
     const content = await Deno.readTextFile(`.${pathname}`);
     const filename = "." + pathname;
     const id = (await util.computeHash("SHA-256", filename)).slice(0, 8);
@@ -134,7 +134,7 @@ export default class VueSFCLoader implements Pick<ModuleLoader, "load"> {
       code: output.join("\n"),
       lang: isTS ? "ts" : "js",
       inlineCSS: css || undefined,
-      atomicCSS: true,
+      isTemplateLanguage: true,
     };
   }
 }

server/build.ts

@@ -245,8 +245,7 @@ export async function build(serverEntry?: string) {
 
   // create server_dependency_graph.js
   if (serverDependencyGraph) {
-    // deno-lint-ignore no-unused-vars
-    const modules = serverDependencyGraph.modules.map(({ sourceCode, ...ret }) => ret);
+    const { modules } = serverDependencyGraph;
     await Deno.writeTextFile(
       join(outputDir, "server_dependency_graph.js"),
       "export default " + JSON.stringify({ modules }),

server/transformer.ts

@@ -16,14 +16,14 @@ import {
 } from "./helpers.ts";
 import { isRouteFile } from "./routing.ts";
 import { DependencyGraph } from "./graph.ts";
-import type { ImportMap, JSXConfig, ModuleLoaderContent } from "./types.ts";
+import type { ImportMap, JSXConfig, ModuleLoaderOutput } from "./types.ts";
 
 export type TransformerOptions = {
   buildTarget?: TransformOptions["target"];
   importMap: ImportMap;
   isDev: boolean;
   jsxConfig?: JSXConfig;
-  loaded?: ModuleLoaderContent;
+  loaded?: ModuleLoaderOutput;
 };
 
 export default {
@@ -46,7 +46,7 @@ export default {
       sourceCode = loaded.code;
       lang = loaded.lang;
       isCSS = loaded.lang === "css";
-      uno = !!loaded.atomicCSS;
+      uno = Boolean(loaded.isTemplateLanguage || loaded.lang === "jsx" || loaded.lang === "tsx");
     } else {
       let codeType: string;
       [sourceCode, codeType] = await readCode(specifier);