@moritzloewenstein/vite-plugin-sass-glob-import 5.0.1 → 5.0.2

package/README.md

@@ -12,14 +12,14 @@ Fork of [vite-plugin-sass-glob-import](https://github.com/cmalven/vite-plugin-sa
 ## Install
 
 ```shell
-npm i -D vite-plugin-sass-glob-import
+npm i -D @moritzloewenstein/vite-plugin-sass-glob-import
 ```
 
 ```js
 // In vite.config.js
 
 import { defineConfig } from "vite";
-import sassGlobImports from "vite-plugin-sass-glob-import";
+import sassGlobImports from "@moritzloewenstein/vite-plugin-sass-glob-import";
 
 export default defineConfig({
   plugins: [sassGlobImports()],

package/dist/index.d.mts

@@ -2,6 +2,7 @@ import { Plugin } from 'vite';
 
 interface PluginOptions {
     ignorePaths?: string[];
+    autoInvalidation?: boolean;
 }
 
 declare function sassGlobImports(_options?: PluginOptions): Plugin;

package/dist/index.mjs

@@ -4,29 +4,83 @@ import path from "path";
 import c from "ansi-colors";
 import { globSync } from "glob";
 import { minimatch } from "minimatch";
+import {
+  normalizePath
+} from "vite";
 var IMPORT_REGEX;
 var options;
+var globToModuleIds;
+var projectRoot;
+var server;
 function sassGlobImports(_options = {}) {
   IMPORT_REGEX = /^([ \t]*(?:\/\*.*)?)@(import|use)\s+["']([^"']+\*[^"']*(?:\.scss|\.sass)?)["'];?([ \t]*(?:\/[/*].*)?)$/gm;
   options = _options;
+  globToModuleIds = /* @__PURE__ */ new Map();
   return {
     name: "sass-glob-import",
     enforce: "pre",
+    configResolved(config) {
+      projectRoot = normalizePath(config.root);
+      if (options.autoInvalidation && !config.server.watch) {
+        config.logger.warn(
+          "vite-plugin-sass-glob-import: set server.watch: true for automatic glob module invalidation"
+        );
+      }
+    },
+    configureServer(_server) {
+      if (!options.autoInvalidation) {
+        return;
+      }
+      server = _server;
+      server.watcher.on("all", async (_event, pathName) => {
+        if (!path.extname(pathName).match(/\.sass|\.scss/i)) {
+          return;
+        }
+        const relPathName = path.relative(projectRoot, pathName);
+        const modsToInvalidate = /* @__PURE__ */ new Set();
+        for (const [glob, modSet] of globToModuleIds) {
+          if (minimatch(relPathName, glob)) {
+            for (const mod of modSet) {
+              modsToInvalidate.add(mod);
+            }
+          }
+        }
+        const modsByFile = /* @__PURE__ */ new Set();
+        for (const mod of modsToInvalidate) {
+          const modules = server.moduleGraph.getModulesByFile(mod);
+          if (!modules) continue;
+          for (const m of modules) {
+            modsByFile.add(m);
+          }
+        }
+        invalidateModules(server, modsByFile, Date.now());
+        await Promise.all(
+          Array.from(modsByFile).map((mod) => server.reloadModule(mod))
+        );
+      });
+    },
     transform(src, id) {
-      const fileName = path.basename(id);
-      const filePath = path.dirname(id);
       return {
-        code: transform(src, fileName, filePath),
+        code: transform(src, id),
         map: null
         // provide source map if available
       };
     }
   };
 }
+function invalidateModules(server2, modules, timestamp) {
+  const seen = /* @__PURE__ */ new Set();
+  for (const mod of modules) {
+    server2.moduleGraph.invalidateModule(mod, seen, timestamp, true);
+  }
+  return modules;
+}
 function isSassOrScss(filename) {
   return !fs.statSync(filename).isDirectory() && path.extname(filename).match(/\.sass|\.scss/i);
 }
-function transform(src, fileName, filePath) {
+function transform(src, id) {
+  const fileName = path.basename(id);
+  const filePath = path.dirname(id);
   const isSass = path.extname(fileName).match(/\.sass/i);
   const searchBases = [filePath];
   const ignorePaths = options.ignorePaths || [];
@@ -35,6 +89,22 @@ function transform(src, fileName, filePath) {
     const result = [...src.matchAll(IMPORT_REGEX)];
     if (result.length === 0) continue;
     const [importRule, startComment, importType, globPattern, endComment] = result[0];
+    if (options.autoInvalidation) {
+      const projectGlob = path.relative(
+        projectRoot,
+        path.resolve(path.join(filePath, globPattern))
+      );
+      const hasGlob = globToModuleIds.has(projectGlob);
+      if (!globToModuleIds.get(projectGlob)?.has(id)) {
+        const modSet = globToModuleIds.get(projectGlob) ?? /* @__PURE__ */ new Set();
+        modSet.add(id);
+        globToModuleIds.set(projectGlob, modSet);
+        if (!hasGlob) {
+          const globDir = projectGlob.split("*")[0];
+          server.watcher.add(globDir);
+        }
+      }
+    }
     let files = [];
     let basePath = "";
     for (let i2 = 0; i2 < searchBases.length; i2++) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@moritzloewenstein/vite-plugin-sass-glob-import",
-	"version": "5.0.1",
+	"version": "5.0.2",
 	"description": "Use glob syntax for imports in your main Sass or SCSS file.",
 	"main": "./dist/index.mjs",
 	"types": "./dist/index.d.mts",