@modular-css/vite 30.0.6 → 30.1.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 30.1.0
+
+### Minor Changes
+
+- [#1024](https://github.com/tivac/modular-css/pull/1024) [`1c9322f`](https://github.com/tivac/modular-css/commit/1c9322fd9a39d05da01df8a8c6bd43e9218f9df1) Thanks [@tivac](https://github.com/tivac)! - Vite 6 support
+
 ## 30.0.6
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-css/vite",
-  "version": "30.0.6",
+  "version": "30.1.0",
   "description": "vite support for modular-css",
   "main": "./vite.js",
   "repository": {
@@ -31,6 +31,6 @@
     "@rollup/pluginutils": "^5.0.2"
   },
   "peerDependencies": {
-    "vite": "^3 || ^4 || ^5"
+    "vite": "^3 || ^4 || ^5 || ^6"
   }
 }

package/vite.js

@@ -151,7 +151,7 @@ module.exports = (
         },
 
         // Load the virtual CSS files
-        async load(id, opts = false) {
+        async load(id) {
             log("load", id);
 
             // Only want this to run for the virtual CSS modules
@@ -168,24 +168,25 @@ module.exports = (
             }
 
             if(viteServer) {
-                const node = await viteServer.moduleGraph.ensureEntryFromUrl(id);
+                const { moduleGraph } = this.environment || viteServer;
+                const thisModule = moduleGraph.getModuleById(id);
+
                 const deps = graph.directDependenciesOf(fileKey(normalize(file)));
                 const imported = filterByPrefix(FILE_PREFIX, deps).map((dep) => virtualize(slash(dep)));
 
-                await Promise.all(imported.map((dep) => viteServer.moduleGraph.ensureEntryFromUrl(dep)));
+                await Promise.all(imported.map((dep) => moduleGraph.ensureEntryFromUrl(dep)));
 
                 log("load deps", id, "=>", imported);
 
                 const hmrDeps = imported;
 
-                await viteServer.moduleGraph.updateModuleInfo(
-                    node,
+                await moduleGraph.updateModuleInfo(
+                    thisModule,
                     new Set(imported),
                     null,
                     new Set(hmrDeps),
                     null,
-                    true,
-                    Boolean(opts.ssr),
+                    false,
                 );
             }