vite-plugin-vanjs 0.1.12 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-vanjs",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "author": "thednp",
   "license": "MIT",
   "description": "A mini meta-framework for VanJS powered by Vite",
@@ -91,7 +91,7 @@
     "@vitest/browser": "^4.1.2",
     "@vitest/coverage-istanbul": "^4.1.2",
     "@vitest/ui": "^4.1.2",
-    "happy-dom": "^20.8.8",
+    "happy-dom": "^20.8.9",
     "typescript": "6.0.2",
     "vite": "^8.0.3",
     "vitest": "^4.1.2"

package/plugin/index.mjs

@@ -1,11 +1,16 @@
+/** @typedef {typeof import("./types").VitePluginVanJS} VitePluginVanJS */
+/** @typedef {import("./types").VanJSPluginOptions} VanJSPluginOptions */
 /** @typedef {import("vite").ResolvedConfig} ResolvedConfig */
 /** @typedef {import("./types").PageFile} PageFile */
 /** @typedef {import("./types").RouteFile} RouteFile */
+/** @typedef {import("vite").BuildAppHook} BuildAppHook */
+/** @typedef {import("vite").TransformResult} TransformResult */
+/** @typedef {import("vite").Plugin} Plugin */
+/** @typedef {ThisParameterType<BuildAppHook>} PluginContext */
 
 import { fileURLToPath } from "node:url";
 import { dirname, join, resolve } from "node:path";
 import process from "node:process";
-import { transformWithOxc } from "vite";
 import { routes } from "../router/routes.mjs";
 import { generateRoute, getRoutes } from "./helpers.mjs";
 
@@ -49,6 +54,7 @@ const debugModuleAliases = {
   "@vanjs/setup": "../setup/index-debug",
 };
 
+/** @type {VitePluginVanJS} */
 export default function VitePluginVanJS(options = {}) {
   const pluginConfig = { ...pluginDefaults, ...options };
   const { routesDir } = pluginConfig;
@@ -57,6 +63,10 @@ export default function VitePluginVanJS(options = {}) {
   let config;
   /** @type {RouteFile[] | null} */
   let routeCache = null;
+  /** @type {PluginContext} */
+  let context;
+  let viteVersion = "8.0.0";
+  let isOxc = true;
 
   const virtualModuleId = "virtual:@vanjs/routes";
   const resolvedVirtualModuleId = "\0" + virtualModuleId;
@@ -64,6 +74,12 @@ export default function VitePluginVanJS(options = {}) {
   return {
     name: "vanjs",
     enforce: "pre",
+    buildStart() {
+      context = this;
+      viteVersion = context.meta?.viteVersion[0];
+      isOxc = Number(viteVersion) >= 8;
+    },
+    // @ts-expect-error - this is temporary esbuild will be
     config() {
       return {
         optimizeDeps: {
@@ -89,17 +105,29 @@ export default function VitePluginVanJS(options = {}) {
             "@vanjs/jsx": toAbsolute("../jsx"),
           },
         },
-        oxc: {
-          jsx: "automatic",
-          jsxImportSource: "@vanjs/jsx",
-        },
+        ...(
+          isOxc
+            ? {
+              oxc: {
+                include: /\.(jsx?|tsx?)$/,
+                jsx: {
+                  runtime: "preserve", // Options: 'automatic', 'classic', 'preserve'
+                  importSource: "@vanjs/jsx", // Default import source
+                },
+              },
+            }
+            : {
+              esbuild: {
+                jsx: "automatic",
+                jsxImportSource: "@vanjs/jsx",
+              },
+            }
+        ),
       };
     },
-    /** @param {import("vite").ResolvedConfig} resolvedConfig */
     configResolved(resolvedConfig) {
       config = resolvedConfig;
     },
-    /** @param {import("vite").ViteDevServer} server */
     configureServer(server) {
       // Watch routes directory
       const pagesPath = join(config.root, routesDir);
@@ -129,7 +157,6 @@ export default function VitePluginVanJS(options = {}) {
       server.watcher.on("unlinkDir", changeHandler);
       server.watcher.on("change", changeHandler);
     },
-    /** @type {(source: string, importer: string | undefined, ops: { ssr: boolean }) => string | null} */
     resolveId(source, importer, { ssr }) {
       // Handle virtual module
       if (source === virtualModuleId) {
@@ -171,11 +198,12 @@ export default function VitePluginVanJS(options = {}) {
         aliases = { ...aliases, ...debugModuleAliases };
       }
       // Check if the source is a known module
+      /* istanbul ignore next @preserve */
       const matchedSource =
         isResolvedVanFile || (source === "vanjs-core" && !isSetupFile)
           ? "@vanjs/van"
           : isResolvedVanXFile ||
-              (source === "vanjs-ext" && /* istanbul ignore next @preserve */
+              (source === "vanjs-ext" &&
                 !isImportedVanXFile)
           ? "@vanjs/vanX"
           : isResolvedSetupFile && (!ssr && isSetupFile || ssr && !isSetupFile)
@@ -189,7 +217,6 @@ export default function VitePluginVanJS(options = {}) {
 
       return null;
     },
-    /** @type {(id: string, ops: { ssr: boolean }) => Promise<({ code: string, map: null } | null)>} */
     async load(id, ops) {
       // istanbul ignore else
       if (id === resolvedVirtualModuleId) {
@@ -212,21 +239,31 @@ routes.length = 0;
 // Register routes
 ${currentRoutes.map(generateRoute).join("\n")}
 ${
-          ops.ssr && currentRoutes.length
+          (ops && ops.ssr && currentRoutes.length)
             ? `console.log(\`🍦 @vanjs/router registered ${currentRoutes.length} routes.\`)`
-            : /* istanbul ignore next @preserve - satisfied */ ""
+            : /* istanbul ignore next @preserve */ ""
         }
 `;
 
-        const result = await transformWithOxc(
-          routesScript,
-          id,
-          { lang: "js" },
-        );
+        const vite = await import("vite");
+        const transformer = isOxc ? "transformWithOxc" : "transformWithEsbuild";
+        const langProp = isOxc ? "lang" : "loader";
+        // const mapProp = isOxc ? "source_map" : "sourcemap";
+
+        const result = await vite[transformer](routesScript, id, {
+          [langProp]: "js",
+          sourcemap: true,
+        });
 
         return {
           code: result.code,
-          map: null,
+          map: result.map
+            ? (
+              typeof result.map === "string"
+                ? JSON.parse(result.map)
+                : /* istanbul ignore next @preserve */ result.map
+            )
+            : /* istanbul ignore next @preserve */ null,
         };
       }
       return null;

package/plugin/types.d.ts

@@ -5,7 +5,7 @@ export * from "../router/types.d.ts";
 export * from "../meta/types.d.ts";
 export * from "../server/types.d.ts";
 export * from "../client/types.d.ts";
-import type { PluginOption } from "vite";
+import type { Plugin } from "vite";
 
 export type VanJSPluginOptions = {
   routesDir?: string;
@@ -14,6 +14,6 @@ export type VanJSPluginOptions = {
 
 export declare const VitePluginVanJS: (
   config?: VanJSPluginOptions,
-) => PluginOption<VanJSPluginOptions>;
+) => Plugin<VanJSPluginOptions>;
 
 export default VitePluginVanJS;