@navita/vite-plugin 2.0.3 → 2.0.5

package/index.cjs

@@ -74,7 +74,7 @@ function navita(options) {
                 renderer.clearCache(id);
                 return null;
             }
-            const { result , sourceMap , dependencies  } = await renderer.transformAndProcess({
+            const { result, sourceMap, dependencies } = await renderer.transformAndProcess({
                 content: code,
                 filePath: id
             });
@@ -126,7 +126,7 @@ function navita(options) {
         }
         clearTimeout(updateTimer);
         updateTimer = setTimeout(()=>{
-            const { moduleGraph , ws  } = server;
+            const { moduleGraph, ws } = server;
             const mod = moduleGraph.getModuleById(RESOLVED_VIRTUAL_MODULE_ID);
             if (mod) {
                 moduleGraph.invalidateModule(mod);

package/index.mjs

@@ -72,7 +72,7 @@ function navita(options) {
                 renderer.clearCache(id);
                 return null;
             }
-            const { result , sourceMap , dependencies  } = await renderer.transformAndProcess({
+            const { result, sourceMap, dependencies } = await renderer.transformAndProcess({
                 content: code,
                 filePath: id
             });
@@ -124,7 +124,7 @@ function navita(options) {
         }
         clearTimeout(updateTimer);
         updateTimer = setTimeout(()=>{
-            const { moduleGraph , ws  } = server;
+            const { moduleGraph, ws } = server;
             const mod = moduleGraph.getModuleById(RESOLVED_VIRTUAL_MODULE_ID);
             if (mod) {
                 moduleGraph.invalidateModule(mod);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navita/vite-plugin",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "Navita Vite Plugin",
   "keywords": [
     "vite",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@navita/core": "1.0.1",
-    "@navita/css": "0.2.0"
+    "@navita/css": "0.2.1"
   },
   "license": "MIT",
   "author": "Eagerpatch",

package/remix.cjs

@@ -22,12 +22,15 @@ function _interopNamespaceDefault(e) {
 
 var crypto__namespace = /*#__PURE__*/_interopNamespaceDefault(crypto);
 
-const remixServerBuildId = '\0virtual:remix/server-build';
+const VIRTUAL_MODULE_IDS = [
+    '\0virtual:remix/server-build',
+    '\0virtual:react-router/server-build'
+];
 let cssFileName;
 function navitaRemix(options) {
     let isProduction = false;
     let hasEmittedCss = false;
-    const { renderChunk , ...navitaVite } = index.navita(options);
+    const { renderChunk, ...navitaVite } = index.navita(options);
     return [
         navitaVite,
         {
@@ -36,10 +39,10 @@ function navitaRemix(options) {
                 isProduction = config.mode === 'production';
             },
             transform (code, id) {
-                if (isProduction || id !== remixServerBuildId) {
+                if (isProduction || !VIRTUAL_MODULE_IDS.includes(id)) {
                     return;
                 }
-                return `${code}\n${remixServerBuildExtension}`;
+                return `${code}\n${SERVER_BUILD_EXTENSION}`;
             },
             renderChunk (_, chunk, options) {
                 const isServerChunk = options.dir.endsWith('/server');
@@ -56,7 +59,7 @@ function navitaRemix(options) {
                 }
                 if (isServerChunk && !hasEmittedCss) {
                     // In the server-build, we'll generate the CSS and emit it as an asset.
-                    // Remix will then move it to the client assets.
+                    // Remix/react-router will then move it to the client assets.
                     this.emitFile({
                         fileName: cssFileName,
                         name: 'navita.css',
@@ -69,7 +72,7 @@ function navitaRemix(options) {
         }
     ];
 }
-const remixServerBuildExtension = `
+const SERVER_BUILD_EXTENSION = `
   routes.root.module = {
     ...route0,
     links: () => [

package/remix.mjs

@@ -1,12 +1,15 @@
 import * as crypto from 'node:crypto';
 import { navita, getRenderer, VIRTUAL_MODULE_ID } from './index.mjs';
 
-const remixServerBuildId = '\0virtual:remix/server-build';
+const VIRTUAL_MODULE_IDS = [
+    '\0virtual:remix/server-build',
+    '\0virtual:react-router/server-build'
+];
 let cssFileName;
 function navitaRemix(options) {
     let isProduction = false;
     let hasEmittedCss = false;
-    const { renderChunk , ...navitaVite } = navita(options);
+    const { renderChunk, ...navitaVite } = navita(options);
     return [
         navitaVite,
         {
@@ -15,10 +18,10 @@ function navitaRemix(options) {
                 isProduction = config.mode === 'production';
             },
             transform (code, id) {
-                if (isProduction || id !== remixServerBuildId) {
+                if (isProduction || !VIRTUAL_MODULE_IDS.includes(id)) {
                     return;
                 }
-                return `${code}\n${remixServerBuildExtension}`;
+                return `${code}\n${SERVER_BUILD_EXTENSION}`;
             },
             renderChunk (_, chunk, options) {
                 const isServerChunk = options.dir.endsWith('/server');
@@ -35,7 +38,7 @@ function navitaRemix(options) {
                 }
                 if (isServerChunk && !hasEmittedCss) {
                     // In the server-build, we'll generate the CSS and emit it as an asset.
-                    // Remix will then move it to the client assets.
+                    // Remix/react-router will then move it to the client assets.
                     this.emitFile({
                         fileName: cssFileName,
                         name: 'navita.css',
@@ -48,7 +51,7 @@ function navitaRemix(options) {
         }
     ];
 }
-const remixServerBuildExtension = `
+const SERVER_BUILD_EXTENSION = `
   routes.root.module = {
     ...route0,
     links: () => [