vite-plugin-svg-spritegen 1.1.0 → 1.2.0

package/dist/index.js

@@ -134,22 +134,28 @@ const svgoDefault = {
         }
       }
     },
-    "removeDimensions"
+    "removeDimensions",
+    {
+      name: "removeAttrs",
+      params: { attrs: "(stroke-width|stroke-linecap|stroke-linejoin|class)" }
+    }
   ]
 };
+const defaultMatchPattern = /:\s*(?:"|'|`)(?<icon>.+?)(?:"|'|`)/g;
 const inputConfigDefaults = {
   pattern: "**/*.svg",
   baseDir: "./",
   prefix: "",
-  removeAttrs: ["stroke-width", "stroke-linecap", "stroke-linejoin", "class"],
-  svgoPlugins: [],
+  removeAttrs: [],
   svgo: svgoDefault,
+  svgoPlugins: [],
   getSymbolId: (config) => config.prefix + config.matchPath.replace(/\.[^/.]+$/, "").replaceAll("/", "-").toLowerCase()
 };
 const stripUnusedDefaults = {
   enabled: true,
   srcInclude: "**/*.[jt]sx",
-  srcExclude: []
+  srcExclude: [],
+  whitelist: []
 };
 function svgSpritegen(config) {
   const inputConfigs = Array.isArray(config.input) ? config.input : [config.input ?? inputConfigDefaults];
@@ -210,12 +216,14 @@ function svgSpritegen(config) {
       watcher = chokidar.watch(inputPaths, { ignoreInitial: true }).on("add", onWatch).on("change", onWatch).on("unlink", onWatch);
     },
     moduleParsed(info) {
-      var _a;
       if (!isBuild || !stripUnusedResolved.enabled || !srcFilter(info.id) || !info.code) return;
-      const matches = info.code.matchAll(/(?:(?:name)|(?:iconName)|(?:icon)): "(?<icon>.+?)"/g);
-      for (const match of matches) {
-        const icon = (_a = match.groups) == null ? void 0 : _a.icon;
-        if (!icon || referencedSvgFiles.has(icon)) continue;
+      const matchPattern = config.matchPattern ? new RegExp(config.matchPattern) : defaultMatchPattern;
+      const icons = [...info.code.matchAll(matchPattern)].flatMap(
+        ({ groups }) => (groups == null ? void 0 : groups.icon) ?? []
+      );
+      icons.push(...stripUnusedResolved.whitelist);
+      for (const icon of icons) {
+        if (!referencedSvgFiles.has(icon)) continue;
         const svgPath = allSvgFiles.get(icon);
         if (!svgPath) continue;
         referencedSvgFiles.set(icon, svgPath);
@@ -225,7 +233,7 @@ function svgSpritegen(config) {
       if (stripUnusedResolved.enabled) {
         const spriteContent = await writeSprite(spriteFilePath, referencedSvgFiles);
         Object.values(bundle).forEach((file) => {
-          if (file.type === "asset" && file.name === spriteNameResolved) {
+          if (file.type === "asset" && file.names.includes(spriteNameResolved)) {
             file.source = spriteContent;
           }
         });

package/dist/index.mjs

@@ -132,22 +132,28 @@ const svgoDefault = {
         }
       }
     },
-    "removeDimensions"
+    "removeDimensions",
+    {
+      name: "removeAttrs",
+      params: { attrs: "(stroke-width|stroke-linecap|stroke-linejoin|class)" }
+    }
   ]
 };
+const defaultMatchPattern = /:\s*(?:"|'|`)(?<icon>.+?)(?:"|'|`)/g;
 const inputConfigDefaults = {
   pattern: "**/*.svg",
   baseDir: "./",
   prefix: "",
-  removeAttrs: ["stroke-width", "stroke-linecap", "stroke-linejoin", "class"],
-  svgoPlugins: [],
+  removeAttrs: [],
   svgo: svgoDefault,
+  svgoPlugins: [],
   getSymbolId: (config) => config.prefix + config.matchPath.replace(/\.[^/.]+$/, "").replaceAll("/", "-").toLowerCase()
 };
 const stripUnusedDefaults = {
   enabled: true,
   srcInclude: "**/*.[jt]sx",
-  srcExclude: []
+  srcExclude: [],
+  whitelist: []
 };
 function svgSpritegen(config) {
   const inputConfigs = Array.isArray(config.input) ? config.input : [config.input ?? inputConfigDefaults];
@@ -208,12 +214,14 @@ function svgSpritegen(config) {
       watcher = watch(inputPaths, { ignoreInitial: true }).on("add", onWatch).on("change", onWatch).on("unlink", onWatch);
     },
     moduleParsed(info) {
-      var _a;
       if (!isBuild || !stripUnusedResolved.enabled || !srcFilter(info.id) || !info.code) return;
-      const matches = info.code.matchAll(/(?:(?:name)|(?:iconName)|(?:icon)): "(?<icon>.+?)"/g);
-      for (const match of matches) {
-        const icon = (_a = match.groups) == null ? void 0 : _a.icon;
-        if (!icon || referencedSvgFiles.has(icon)) continue;
+      const matchPattern = config.matchPattern ? new RegExp(config.matchPattern) : defaultMatchPattern;
+      const icons = [...info.code.matchAll(matchPattern)].flatMap(
+        ({ groups }) => (groups == null ? void 0 : groups.icon) ?? []
+      );
+      icons.push(...stripUnusedResolved.whitelist);
+      for (const icon of icons) {
+        if (!referencedSvgFiles.has(icon)) continue;
         const svgPath = allSvgFiles.get(icon);
         if (!svgPath) continue;
         referencedSvgFiles.set(icon, svgPath);
@@ -223,7 +231,7 @@ function svgSpritegen(config) {
       if (stripUnusedResolved.enabled) {
         const spriteContent = await writeSprite(spriteFilePath, referencedSvgFiles);
         Object.values(bundle).forEach((file) => {
-          if (file.type === "asset" && file.name === spriteNameResolved) {
+          if (file.type === "asset" && file.names.includes(spriteNameResolved)) {
             file.source = spriteContent;
           }
         });

package/dist/types.d.ts

@@ -19,6 +19,7 @@ export interface StripUnusedConfig {
     enabled?: boolean;
     srcInclude?: FilterPattern;
     srcExclude?: FilterPattern;
+    whitelist?: string[];
 }
 export interface PluginConfig {
     outputDir: string;
@@ -27,4 +28,5 @@ export interface PluginConfig {
     typesFileName?: string;
     spriteFileName?: string;
     gitignore?: boolean;
+    matchPattern?: string | RegExp;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-svg-spritegen",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Vite plugin that generates an svg spritesheet, optionally removing unused svg files.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",