@modular-css/vite 27.1.0 → 28.1.1

package/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [28.1.1](https://github.com/tivac/modular-css/compare/v28.1.0...v28.1.1) (2022-04-08)
+
+**Note:** Version bump only for package @modular-css/vite
+
+
+
+
+
+# [28.0.0](https://github.com/tivac/modular-css/compare/v27.2.0...v28.0.0) (2022-02-25)
+
+**Note:** Version bump only for package @modular-css/vite
+
+
+
+
+
+## [27.1.1](https://github.com/tivac/modular-css/compare/v27.1.0...v27.1.1) (2022-02-09)
+
+
+### Bug Fixes
+
+* **vite:** non-win32 file resolution ([#809](https://github.com/tivac/modular-css/issues/809)) ([115c517](https://github.com/tivac/modular-css/commit/115c517ca5f4586619db2207d1d37675981237c6))
+
+
+
+
+
 # [27.1.0](https://github.com/tivac/modular-css/compare/v27.0.3...v27.1.0) (2022-02-03)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-css/vite",
-  "version": "27.1.0",
+  "version": "28.1.1",
   "description": "vite support for modular-css",
   "main": "./vite.js",
   "repository": {
@@ -26,12 +26,12 @@
     "postcss"
   ],
   "dependencies": {
-    "@modular-css/css-to-js": "^27.1.0",
-    "@modular-css/processor": "^27.1.0",
+    "@modular-css/css-to-js": "^28.1.1",
+    "@modular-css/processor": "^28.0.0",
     "@rollup/pluginutils": "^4.1.2"
   },
   "peerDependencies": {
     "vite": "^2.7.3"
   },
-  "gitHead": "e302570bde992b563a69bad58245c68adda65504"
+  "gitHead": "90370d2b7007deb078d3acd2716b0a35a98f6c78"
 }

package/vite.js

@@ -31,10 +31,6 @@ const virtualize = (file) => `${file}?${CSS_QUERY}`;
 const devirtualize = (file) => `${file.split("?")[0]}`;
 const isVirtual = (file) => file.endsWith(`?${CSS_QUERY}`);
 
-// NOTE: Can't use basic isAbsolute check because of paths vite passes in. On windows they can be
-// "/foo/bar/baz.mcss" which isAbsolute will treat as absolute, even though it definitely isn't
-const isPartial = (file) => (process.platform !== "win32" ? !path.isAbsolute(file) : path.parse(file).root === "/");
-
 module.exports = (
     /* istanbul ignore next: too painful to test */
     pluginOptions = {}
@@ -89,15 +85,26 @@ module.exports = (
             Object.keys(processor.files).forEach((file) => this.addWatchFile(file));
         },
 
-        resolveId(source) {
+        async resolveId(source) {
+            // Only care about our particular type of virtual file
             if(!isVirtual(source)) {
                 return null;
             }
 
+            log("resolving", source);
+
             let resolved = source;
+            
+            // Check file as passed (minus the query params)
+            if(processor.has(devirtualize(resolved))) {
+                return resolved;
+            }
+
+            resolved = path.join(process.cwd(), resolved);
 
-            if(isPartial(resolved)) {
-                resolved = path.join(process.cwd(), resolved);
+            // Check file as an asbolute path (minus the query params)
+            if(!processor.has(devirtualize(resolved))) {
+                return null;
             }
 
             resolved = slash(resolved);
@@ -118,15 +125,9 @@ module.exports = (
 
             log("loading", id);
 
-            let file = devirtualize(id);
-
-            if(isPartial(file)) {
-                file = path.join(process.cwd(), file);
-            }
+            const file = devirtualize(id);
 
             if(!processor.has(file)) {
-                log("no loading", file);
-
                 return null;
             }