vite-plugin-vanjs 0.1.2 → 0.1.4

package/README.md

@@ -5,7 +5,7 @@
 [![NPM Version](https://img.shields.io/npm/v/vite-plugin-vanjs.svg)](https://www.npmjs.com/package/vite-plugin-vanjs)
 [![NPM Downloads](https://img.shields.io/npm/dm/vite-plugin-vanjs.svg)](http://npm-stat.com/charts.html?package=vite-plugin-vanjs)
 [![typescript version](https://img.shields.io/badge/typescript-5.6.2-brightgreen)](https://www.typescriptlang.org/)
-[![vanjs-core version](https://img.shields.io/badge/vanjs--core-1.5.3-brightgreen)](https://github.com/vanjs-org/van)
+[![vanjs-core version](https://img.shields.io/badge/vanjs--core-1.5.5-brightgreen)](https://github.com/vanjs-org/van)
 [![mini-van-plate version](https://img.shields.io/badge/mini--van--plate-0.6.3-brightgreen)](https://github.com/vanjs-org/mini-van-plate)
 [![vitest version](https://img.shields.io/badge/vitest-3.1.2-brightgreen)](https://www.vitest.dev/)
 [![vite version](https://img.shields.io/badge/vite-6.3.3-brightgreen)](https://vite.dev)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-vanjs",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "author": "thednp",
   "license": "MIT",
   "description": "A mini meta-framework for VanJS powered by Vite",
@@ -83,11 +83,11 @@
   "dependencies": {
     "csstype": "^3.1.3",
     "mini-van-plate": "^0.6.3",
-    "vanjs-core": "^1.5.3",
+    "vanjs-core": "^1.5.5",
     "vanjs-ext": "^0.6.2"
   },
   "devDependencies": {
-    "@types/node": "^22.15.2",
+    "@types/node": "^22.15.3",
     "@vitest/browser": "^3.1.2",
     "@vitest/coverage-istanbul": "^3.1.2",
     "@vitest/ui": "^3.1.2",

package/plugin/index.mjs

@@ -19,6 +19,36 @@ const pluginDefaults = {
   extensions: [".tsx", ".jsx", ".ts", ".js"],
 };
 
+// Define module mapping configuration
+const moduleAliases = {
+  // Core modules
+  "@vanjs/van": "../setup/van",
+  "@vanjs/vanX": "../setup/vanX",
+
+  // Setup modules
+  "@vanjs/setup": "../setup/index",
+
+  // Other modules
+  "@vanjs/client": "../client",
+  "@vanjs/server": "../server",
+  "@vanjs/meta": "../meta",
+  "@vanjs/router": "../router",
+  "@vanjs/jsx": "../jsx",
+};
+
+// SSR specific module mappings
+const ssrModuleAliases = {
+  "@vanjs/van": "../setup/van-ssr",
+  "@vanjs/vanX": "../setup/vanX-ssr",
+  "@vanjs/setup": "../setup/index-ssr",
+};
+
+// Debug specific module mappings (development only)
+const debugModuleAliases = {
+  "@vanjs/van": "../setup/van-debug",
+  "@vanjs/setup": "../setup/index-debug",
+};
+
 export default function VitePluginVanJS(options = {}) {
   const pluginConfig = { ...pluginDefaults, ...options };
   const { routesDir } = pluginConfig;
@@ -101,71 +131,61 @@ export default function VitePluginVanJS(options = {}) {
       server.watcher.on("change", changeHandler);
     },
     /** @type {(source: string, importer: string | undefined, ops: { ssr: boolean }) => string | null} */
-    resolveId(source, importer, ops) {
-      // istanbul ignore else
+    resolveId(source, importer, { ssr }) {
+      // Handle virtual module
       if (source === virtualModuleId) {
         return resolvedVirtualModuleId;
       }
-      const isVanXFile = importer &&
-        /vanjs-ext[\/\\]src[\/\\]van-x/.test(importer);
-      const isSetupFile = importer &&
-        /vite-plugin-vanjs[\/\\]setup/.test(importer);
+
+      // Get the appropriate module aliases based on environment
       const isProduction = process.env.NODE_ENV === "production";
       const isTest = process.env.NODE_ENV === "test";
-      const isJSXImport = source.includes("/vite-plugin-vanjs/jsx/jsx") ||
-        importer?.includes("/vite-plugin-vanjs/jsx/jsx.mjs");
-
-      const resolvedVan = toAbsolute(
-        ops.ssr ? "../setup/van-ssr.mjs" : (isJSXImport || isProduction ||
-            isTest)
-          ? "../setup/van.mjs"
-          : "../setup/van-debug.mjs",
-      );
-      const resolvedVanX = toAbsolute(
-        ops.ssr ? "../setup/vanX-ssr.mjs" : "../setup/vanX.mjs",
+      const isSetupFile = typeof importer === "string" &&
+        importer.includes("vite-plugin-vanjs/setup");
+      const isImportedVanXFile = typeof importer === "string" &&
+        importer.includes("vite-plugin-vanjs/setup/vanX");
+      const isResolvedVanXFile = source.includes(
+        "vite-plugin-vanjs/setup/vanX",
       );
-      const setupResolved = toAbsolute(
-        ops.ssr
-          ? "../setup/index-ssr.mjs"
-          : (isProduction || isTest)
-          ? "../setup/index.mjs"
-          : "../setup/index-debug.mjs",
+      const isResolvedVanFile = !isResolvedVanXFile &&
+        source.includes("vite-plugin-vanjs/setup/van");
+      const isResolvedSetupFile = source.includes(
+        "vite-plugin-vanjs/setup/index",
       );
-
-      // Resolve early when source already resolved. EG: @vanjs/van
-      if (
-        (ops.ssr || isTest) &&
-        (source === setupResolved || setupResolved.includes(source))
-      ) {
-        return setupResolved;
-      }
-      if (
-        (ops.ssr || isTest) &&
-        (source === resolvedVan || resolvedVan.includes(source))
-      ) {
-        return resolvedVan;
-      }
-      if (
-        (ops.ssr || isTest) &&
-        (source === resolvedVanX || resolvedVanX.includes(source))
-      ) {
-        return resolvedVanX;
+      const isJSXImport = source.includes("/vite-plugin-vanjs/jsx/jsx") ||
+        (typeof importer === "string" &&
+          importer.includes("/vite-plugin-vanjs/jsx/jsx.mjs"));
+      const isDebugImport = !ssr && typeof importer === "string" &&
+        importer.includes("/src/van.debug.js") &&
+        source.includes("/van.js");
+      let aliases = moduleAliases;
+
+      // Handle special case for debug
+      if (isDebugImport) {
+        return toAbsolute("../setup/van.mjs");
       }
 
-      // istanbul ignore else
-      if (!isSetupFile && !isVanXFile) {
-        if (source === "@vanjs/setup") {
-          return setupResolved;
-        }
-        if (importer?.endsWith("debug.js") && source.endsWith("/van.js")) {
-          return toAbsolute("../setup/van.mjs");
-        }
-        if (source === "vanjs-core" || source === "@vanjs/van") {
-          return resolvedVan;
-        }
-        if (source === "vanjs-ext" || source === "@vanjs/vanX") {
-          return resolvedVanX;
-        }
+      // Select appropriate aliases based on environment
+      if (ssr) {
+        aliases = { ...aliases, ...ssrModuleAliases };
+      } else if (!isProduction && !isTest && !isJSXImport) {
+        aliases = { ...aliases, ...debugModuleAliases };
+      }
+      // Check if the source is a known module
+      const matchedSource =
+        isResolvedVanFile || (source === "vanjs-core" && !isSetupFile)
+          ? "@vanjs/van"
+          : isResolvedVanXFile ||
+              (source === "vanjs-ext" && /* istanbul ignore next */
+                !isImportedVanXFile)
+          ? "@vanjs/vanX"
+          : isResolvedSetupFile && (!ssr && isSetupFile || ssr && !isSetupFile)
+          ? "@vanjs/setup"
+          : null;
+      const resolvedPath = matchedSource ? aliases[matchedSource] : null;
+
+      if (resolvedPath) {
+        return toAbsolute(resolvedPath + ".mjs");
       }
 
       return null;

package/server/index.mjs

@@ -80,8 +80,12 @@ export function renderPreloadLinks(modules, manifest) {
 
   // First pass: collect all assets from ignored paths
   Object.entries(manifest).forEach(([id, files]) => {
-    // istanbul ignore else
-    if (["src/pages", "src/routes"].some((l) => id.includes(l))) {
+    // istanbul ignore else - don't pre-render routes, layouts and JSX stuff
+    if (
+      ["src/pages", "src/routes", "vite-plugin-vanjs/jsx"].some((l) =>
+        id.includes(l)
+      )
+    ) {
       files.forEach((asset) => ignoredAssets.add(asset));
     }
   });