@vanilla-extract/vite-plugin 3.2.1 → 3.3.0

package/dist/vanilla-extract-vite-plugin.cjs.dev.js

@@ -113,27 +113,32 @@ function vanillaExtractPlugin({
     },
 
     resolveId(source) {
-      if (!source.endsWith(virtualExt)) {
+      const [validId, query] = source.split('?');
+
+      if (!validId.endsWith(virtualExt)) {
         return;
       } // Absolute paths seem to occur often in monorepos, where files are
       // imported from outside the config root.
 
 
-      const absoluteId = source.startsWith(config.root) ? source : getAbsoluteVirtualFileId(source); // There should always be an entry in the `cssMap` here.
+      const absoluteId = source.startsWith(config.root) ? source : getAbsoluteVirtualFileId(validId); // There should always be an entry in the `cssMap` here.
       // The only valid scenario for a missing one is if someone had written
       // a file in their app using the .vanilla.js/.vanilla.css extension
 
       if (cssMap.has(absoluteId)) {
-        return absoluteId;
+        // Keep the original query string for HMR.
+        return absoluteId + (query ? `?${query}` : '');
       }
     },
 
     load(id) {
-      if (!cssMap.has(id)) {
+      const [validId] = id.split('?');
+
+      if (!cssMap.has(validId)) {
         return;
       }
 
-      const css = cssMap.get(id);
+      const css = cssMap.get(validId);
 
       if (typeof css !== 'string') {
         return;
@@ -145,24 +150,26 @@ function vanillaExtractPlugin({
 
       return outdent__default["default"]`
         import { injectStyles } from '@vanilla-extract/css/injectStyles';
-        
+
         const inject = (css) => injectStyles({
           fileScope: ${JSON.stringify({
-        filePath: id
+        filePath: validId
       })},
           css
         });
 
         inject(${JSON.stringify(css)});
 
-        import.meta.hot.on('${styleUpdateEvent(id)}', (css) => {
+        import.meta.hot.on('${styleUpdateEvent(validId)}', (css) => {
           inject(css);
-        });   
+        });
       `;
     },
 
     async transform(code, id, ssrParam) {
-      if (!integration.cssFileFilter.test(id)) {
+      const [validId] = id.split('?');
+
+      if (!integration.cssFileFilter.test(validId)) {
         return null;
       }
 
@@ -174,10 +181,7 @@ function vanillaExtractPlugin({
         ssr = ssrParam === null || ssrParam === void 0 ? void 0 : ssrParam.ssr;
       }
 
-      const index = id.indexOf('?');
-      const validId = index === -1 ? id : id.substring(0, index);
-
-      if (ssr) {
+      if (ssr && !process.env.VITE_RSC_BUILD) {
         return integration.addFileScope({
           source: code,
           filePath: vite.normalizePath(validId),
@@ -198,7 +202,7 @@ function vanillaExtractPlugin({
       for (const file of watchFiles) {
         // In start mode, we need to prevent the file from rewatching itself.
         // If it's a `build --watch`, it needs to watch everything.
-        if (config.command === 'build' || file !== id) {
+        if (config.command === 'build' || file !== validId) {
           this.addWatchFile(file);
         }
       }
@@ -227,10 +231,12 @@ function vanillaExtractPlugin({
             const {
               moduleGraph
             } = server;
-            const module = moduleGraph.getModuleById(absoluteId);
+            const [module] = Array.from(moduleGraph.getModulesByFile(absoluteId) || []);
 
             if (module) {
-              moduleGraph.invalidateModule(module);
+              moduleGraph.invalidateModule(module); // Vite uses this timestamp to add `?t=` query string automatically for HMR.
+
+              module.lastHMRTimestamp = module.lastInvalidationTimestamp || Date.now();
             }
 
             server.ws.send({

package/dist/vanilla-extract-vite-plugin.cjs.prod.js

@@ -113,27 +113,32 @@ function vanillaExtractPlugin({
     },
 
     resolveId(source) {
-      if (!source.endsWith(virtualExt)) {
+      const [validId, query] = source.split('?');
+
+      if (!validId.endsWith(virtualExt)) {
         return;
       } // Absolute paths seem to occur often in monorepos, where files are
       // imported from outside the config root.
 
 
-      const absoluteId = source.startsWith(config.root) ? source : getAbsoluteVirtualFileId(source); // There should always be an entry in the `cssMap` here.
+      const absoluteId = source.startsWith(config.root) ? source : getAbsoluteVirtualFileId(validId); // There should always be an entry in the `cssMap` here.
       // The only valid scenario for a missing one is if someone had written
       // a file in their app using the .vanilla.js/.vanilla.css extension
 
       if (cssMap.has(absoluteId)) {
-        return absoluteId;
+        // Keep the original query string for HMR.
+        return absoluteId + (query ? `?${query}` : '');
       }
     },
 
     load(id) {
-      if (!cssMap.has(id)) {
+      const [validId] = id.split('?');
+
+      if (!cssMap.has(validId)) {
         return;
       }
 
-      const css = cssMap.get(id);
+      const css = cssMap.get(validId);
 
       if (typeof css !== 'string') {
         return;
@@ -145,24 +150,26 @@ function vanillaExtractPlugin({
 
       return outdent__default["default"]`
         import { injectStyles } from '@vanilla-extract/css/injectStyles';
-        
+
         const inject = (css) => injectStyles({
           fileScope: ${JSON.stringify({
-        filePath: id
+        filePath: validId
       })},
           css
         });
 
         inject(${JSON.stringify(css)});
 
-        import.meta.hot.on('${styleUpdateEvent(id)}', (css) => {
+        import.meta.hot.on('${styleUpdateEvent(validId)}', (css) => {
           inject(css);
-        });   
+        });
       `;
     },
 
     async transform(code, id, ssrParam) {
-      if (!integration.cssFileFilter.test(id)) {
+      const [validId] = id.split('?');
+
+      if (!integration.cssFileFilter.test(validId)) {
         return null;
       }
 
@@ -174,10 +181,7 @@ function vanillaExtractPlugin({
         ssr = ssrParam === null || ssrParam === void 0 ? void 0 : ssrParam.ssr;
       }
 
-      const index = id.indexOf('?');
-      const validId = index === -1 ? id : id.substring(0, index);
-
-      if (ssr) {
+      if (ssr && !process.env.VITE_RSC_BUILD) {
         return integration.addFileScope({
           source: code,
           filePath: vite.normalizePath(validId),
@@ -198,7 +202,7 @@ function vanillaExtractPlugin({
       for (const file of watchFiles) {
         // In start mode, we need to prevent the file from rewatching itself.
         // If it's a `build --watch`, it needs to watch everything.
-        if (config.command === 'build' || file !== id) {
+        if (config.command === 'build' || file !== validId) {
           this.addWatchFile(file);
         }
       }
@@ -227,10 +231,12 @@ function vanillaExtractPlugin({
             const {
               moduleGraph
             } = server;
-            const module = moduleGraph.getModuleById(absoluteId);
+            const [module] = Array.from(moduleGraph.getModulesByFile(absoluteId) || []);
 
             if (module) {
-              moduleGraph.invalidateModule(module);
+              moduleGraph.invalidateModule(module); // Vite uses this timestamp to add `?t=` query string automatically for HMR.
+
+              module.lastHMRTimestamp = module.lastInvalidationTimestamp || Date.now();
             }
 
             server.ws.send({

package/dist/vanilla-extract-vite-plugin.esm.js

@@ -86,27 +86,32 @@ function vanillaExtractPlugin({
     },
 
     resolveId(source) {
-      if (!source.endsWith(virtualExt)) {
+      const [validId, query] = source.split('?');
+
+      if (!validId.endsWith(virtualExt)) {
         return;
       } // Absolute paths seem to occur often in monorepos, where files are
       // imported from outside the config root.
 
 
-      const absoluteId = source.startsWith(config.root) ? source : getAbsoluteVirtualFileId(source); // There should always be an entry in the `cssMap` here.
+      const absoluteId = source.startsWith(config.root) ? source : getAbsoluteVirtualFileId(validId); // There should always be an entry in the `cssMap` here.
       // The only valid scenario for a missing one is if someone had written
       // a file in their app using the .vanilla.js/.vanilla.css extension
 
       if (cssMap.has(absoluteId)) {
-        return absoluteId;
+        // Keep the original query string for HMR.
+        return absoluteId + (query ? `?${query}` : '');
       }
     },
 
     load(id) {
-      if (!cssMap.has(id)) {
+      const [validId] = id.split('?');
+
+      if (!cssMap.has(validId)) {
         return;
       }
 
-      const css = cssMap.get(id);
+      const css = cssMap.get(validId);
 
       if (typeof css !== 'string') {
         return;
@@ -118,24 +123,26 @@ function vanillaExtractPlugin({
 
       return outdent`
         import { injectStyles } from '@vanilla-extract/css/injectStyles';
-        
+
         const inject = (css) => injectStyles({
           fileScope: ${JSON.stringify({
-        filePath: id
+        filePath: validId
       })},
           css
         });
 
         inject(${JSON.stringify(css)});
 
-        import.meta.hot.on('${styleUpdateEvent(id)}', (css) => {
+        import.meta.hot.on('${styleUpdateEvent(validId)}', (css) => {
           inject(css);
-        });   
+        });
       `;
     },
 
     async transform(code, id, ssrParam) {
-      if (!cssFileFilter.test(id)) {
+      const [validId] = id.split('?');
+
+      if (!cssFileFilter.test(validId)) {
         return null;
       }
 
@@ -147,10 +154,7 @@ function vanillaExtractPlugin({
         ssr = ssrParam === null || ssrParam === void 0 ? void 0 : ssrParam.ssr;
       }
 
-      const index = id.indexOf('?');
-      const validId = index === -1 ? id : id.substring(0, index);
-
-      if (ssr) {
+      if (ssr && !process.env.VITE_RSC_BUILD) {
         return addFileScope({
           source: code,
           filePath: normalizePath(validId),
@@ -171,7 +175,7 @@ function vanillaExtractPlugin({
       for (const file of watchFiles) {
         // In start mode, we need to prevent the file from rewatching itself.
         // If it's a `build --watch`, it needs to watch everything.
-        if (config.command === 'build' || file !== id) {
+        if (config.command === 'build' || file !== validId) {
           this.addWatchFile(file);
         }
       }
@@ -200,10 +204,12 @@ function vanillaExtractPlugin({
             const {
               moduleGraph
             } = server;
-            const module = moduleGraph.getModuleById(absoluteId);
+            const [module] = Array.from(moduleGraph.getModulesByFile(absoluteId) || []);
 
             if (module) {
-              moduleGraph.invalidateModule(module);
+              moduleGraph.invalidateModule(module); // Vite uses this timestamp to add `?t=` query string automatically for HMR.
+
+              module.lastHMRTimestamp = module.lastInvalidationTimestamp || Date.now();
             }
 
             server.ws.send({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanilla-extract/vite-plugin",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "description": "Zero-runtime Stylesheets-in-TypeScript",
   "main": "dist/vanilla-extract-vite-plugin.cjs.js",
   "module": "dist/vanilla-extract-vite-plugin.esm.js",