Update UnoConfig types

Author: ije

examples/with-unocss/leptos-app/server.ts

@@ -1,13 +1,13 @@
 import { serve } from "aleph/server";
-import unocss from "aleph/unocss";
-import init, { ssr } from "./pkg/server.js";
+import UnoCSS from "aleph/unocss";
 import config from "./unocss.config.ts";
+import init, { ssr } from "./pkg/server.js";
 
 const wasmUrl = new URL("./pkg/server_bg.wasm", import.meta.url);
 await init(await Deno.readFile(wasmUrl));
 
 serve({
   baseUrl: import.meta.url,
-  atomicCSS: unocss(/\.rs$/, config),
+  atomicCSS: UnoCSS(/\.rs$/, config),
   ssr: ({ url }) => ssr(url.href),
 });

examples/with-unocss/react-app/server.ts

@@ -1,11 +1,11 @@
 import { serve } from "aleph/react-server";
-import unocss from "aleph/unocss";
-import routes from "./routes/_export.ts";
+import UnoCSS from "aleph/unocss";
 import config from "./unocss.config.ts";
+import routes from "./routes/_export.ts";
 
 serve({
   baseUrl: import.meta.url,
   router: { routes },
-  atomicCSS: unocss(config),
+  atomicCSS: UnoCSS({ ...config, resetCSS: false }),
   ssr: true,
 });

examples/with-unocss/solid-app/server.ts

@@ -1,11 +1,11 @@
 import { serve } from "aleph/solid-server";
-import unocss from "aleph/unocss";
-import routes from "./routes/_export.ts";
+import UnoCSS from "aleph/unocss";
 import config from "./unocss.config.ts";
+import routes from "./routes/_export.ts";
 
 serve({
   baseUrl: import.meta.url,
   router: { routes },
-  atomicCSS: unocss(config),
+  atomicCSS: UnoCSS(config),
   ssr: true,
 });

examples/with-unocss/yew-app/server.ts

@@ -1,13 +1,13 @@
 import { serve } from "aleph/server";
-import unocss from "aleph/unocss";
-import init, { ssr } from "./pkg/yew_app.js";
+import UnoCSS from "aleph/unocss";
 import config from "./unocss.config.ts";
+import init, { ssr } from "./pkg/yew_app.js";
 
 const wasmUrl = new URL("./pkg/yew_app_bg.wasm", import.meta.url);
 await init(await Deno.readFile(wasmUrl));
 
 serve({
   baseUrl: import.meta.url,
-  atomicCSS: unocss(/\.rs$/, config),
+  atomicCSS: UnoCSS(/\.rs$/, config),
   ssr: ({ url }) => ssr(url.href),
 });

server/helpers.ts

@@ -6,7 +6,7 @@ import log from "./log.ts";
 import { getContentType } from "./media_type.ts";
 import type { AlephConfig, CookieOptions, ImportMap, JSXConfig } from "./types.ts";
 
-export const regJsxFile = /\.(jsx|tsx)$/;
+export const regJsxFile = /\.(jsx|tsx|mdx)$/;
 export const regFullVersion = /@\d+\.\d+\.\d+/;
 export const builtinModuleExts = ["tsx", "ts", "mts", "jsx", "js", "mjs"];
 

server/transformer.ts

@@ -203,8 +203,8 @@ export default {
         const styleTs = `${alephPkgUri}/runtime/core/style.ts`;
         // embed module unocss css in dev mode
         if (isDev && config?.atomicCSS) {
-          const regexp = config.atomicCSS.test ?? regJsxFile;
-          if (regexp.test(pathname)) {
+          const re = config.atomicCSS.test ?? regJsxFile;
+          if (re.test(pathname)) {
             try {
               const { css, matched } = await config.atomicCSS.generate(source, {
                 id: specifier,

server/unocss.ts

@@ -1,11 +1,11 @@
 import { createGenerator, type UnoGenerator, type UserConfig } from "@unocss/core";
 import type { AtomicCSSConfig } from "./types.ts";
 
-type UnoConfig = UserConfig & AtomicCSSConfig;
+type UnoConfig = UserConfig & { test?: RegExp; resetCSS?: boolean };
 
-export default function unocss(config: UnoConfig): UnoGenerator & AtomicCSSConfig;
-export default function unocss(test: RegExp, config: UnoConfig): UnoGenerator & AtomicCSSConfig;
-export default function unocss(
+export default function UnoCSS(config: UnoConfig): UnoGenerator & AtomicCSSConfig;
+export default function UnoCSS(test: RegExp, config: UnoConfig): UnoGenerator & AtomicCSSConfig;
+export default function UnoCSS(
   testOrConfig: RegExp | UnoConfig,
   config?: UnoConfig,
 ): UnoGenerator & AtomicCSSConfig {
@@ -18,13 +18,15 @@ export default function unocss(
   if (test) {
     Reflect.set(generator, "test", test);
   }
-  if (config.test) {
+  if (config.test instanceof RegExp) {
     Reflect.set(generator, "test", config.test);
   }
-  Reflect.set(
-    generator,
-    "resetCSS",
-    `https://esm.sh/@unocss/reset@${generator.version}/${config.resetCSS ?? "tailwind"}.css`,
-  );
+  if (config.resetCSS !== false) {
+    Reflect.set(
+      generator,
+      "resetCSS",
+      `https://esm.sh/@unocss/reset@${generator.version}/tailwind.css`,
+    );
+  }
   return generator;
 }