vite-plugin-svg-spritegen 1.2.8 → 1.4.0

package/dist/build-svg-map.d.ts

@@ -1,2 +1,2 @@
-import type { InputConfig, SvgMap } from './types';
-export declare const buildSvgMap: (inputConfigs: Required<InputConfig>[]) => Promise<SvgMap>;
+import type { InputConfigWithDefaults, SvgMap } from './types';
+export declare const buildSvgMap: (inputConfigs: InputConfigWithDefaults[]) => Promise<SvgMap>;

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 import type { Plugin } from 'vite';
 import type { PluginConfig } from './types';
 export declare function svgSpritegen(config: PluginConfig): Plugin;
+export default svgSpritegen;

package/dist/index.js

@@ -1,5 +1,5 @@
 "use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const path = require("node:path");
 const node_crypto = require("node:crypto");
 const chokidar = require("chokidar");
@@ -88,6 +88,26 @@ const writeSprite = (spritePath, svgMap) => {
     if (spritePath === svg.filePath) continue;
     let content2 = svg.content;
     if (svg.svgo !== false) {
+      const svgoDefault = {
+        plugins: [
+          {
+            name: "preset-default",
+            params: {
+              overrides: {
+                removeViewBox: false,
+                convertColors: { currentColor: true },
+                ...svg.svgoOverrides
+              }
+            }
+          },
+          "removeDimensions",
+          {
+            name: "removeAttrs",
+            params: { attrs: "(stroke-width|stroke-linecap|stroke-linejoin|class)" }
+          }
+        ]
+      };
+      svg.svgo = svg.svgo ?? svgoDefault;
       content2 = svgo.optimize(content2, {
         ...svg.svgo,
         plugins: [
@@ -132,37 +152,19 @@ const writeSprite = (spritePath, svgMap) => {
   writeIfChanged(spritePath, content);
   return content;
 };
-const svgoDefault = {
-  plugins: [
-    {
-      name: "preset-default",
-      params: {
-        overrides: {
-          removeViewBox: false,
-          convertColors: { currentColor: true }
-        }
-      }
-    },
-    "removeDimensions",
-    {
-      name: "removeAttrs",
-      params: { attrs: "(stroke-width|stroke-linecap|stroke-linejoin|class)" }
-    }
-  ]
-};
-const defaultMatchPattern = /(?:(?:name)|(?:iconName)|(?:icon)): "(?<icon>.+?)"/g;
+const defaultMatchPattern = /((name)|(iconName)|(icon)):\s?"(?<icon>.+?)"/g;
 const inputConfigDefaults = {
   pattern: "**/*.svg",
   baseDir: "./",
   prefix: "",
   removeAttrs: [],
-  svgo: svgoDefault,
   svgoPlugins: [],
   getSymbolId: (config) => config.prefix + config.matchPath.replace(/\.[^/.]+$/, "").replaceAll("/", "-").toLowerCase()
 };
 const stripUnusedDefaults = {
   enabled: true,
-  srcInclude: "**/*.[jt]sx",
+  matchPattern: defaultMatchPattern,
+  srcInclude: ["**/*.[jt]sx", "**/*.md?(x)"],
   srcExclude: [],
   whitelist: []
 };
@@ -227,7 +229,7 @@ function svgSpritegen(config) {
     },
     moduleParsed(info) {
       if (!isBuild || !stripUnusedResolved.enabled || !srcFilter(info.id) || !info.code) return;
-      const matchPattern = config.matchPattern ? new RegExp(config.matchPattern, "g") : defaultMatchPattern;
+      const matchPattern = new RegExp(stripUnusedResolved.matchPattern, "g");
       const matches = [...info.code.matchAll(matchPattern)].flatMap(
         ({ groups }) => (groups == null ? void 0 : groups.icon) ?? []
       );
@@ -272,4 +274,5 @@ function svgSpritegen(config) {
     }
   };
 }
+exports.default = svgSpritegen;
 exports.svgSpritegen = svgSpritegen;

package/dist/index.mjs

@@ -86,6 +86,26 @@ const writeSprite = (spritePath, svgMap) => {
     if (spritePath === svg.filePath) continue;
     let content2 = svg.content;
     if (svg.svgo !== false) {
+      const svgoDefault = {
+        plugins: [
+          {
+            name: "preset-default",
+            params: {
+              overrides: {
+                removeViewBox: false,
+                convertColors: { currentColor: true },
+                ...svg.svgoOverrides
+              }
+            }
+          },
+          "removeDimensions",
+          {
+            name: "removeAttrs",
+            params: { attrs: "(stroke-width|stroke-linecap|stroke-linejoin|class)" }
+          }
+        ]
+      };
+      svg.svgo = svg.svgo ?? svgoDefault;
       content2 = optimize(content2, {
         ...svg.svgo,
         plugins: [
@@ -130,37 +150,19 @@ const writeSprite = (spritePath, svgMap) => {
   writeIfChanged(spritePath, content);
   return content;
 };
-const svgoDefault = {
-  plugins: [
-    {
-      name: "preset-default",
-      params: {
-        overrides: {
-          removeViewBox: false,
-          convertColors: { currentColor: true }
-        }
-      }
-    },
-    "removeDimensions",
-    {
-      name: "removeAttrs",
-      params: { attrs: "(stroke-width|stroke-linecap|stroke-linejoin|class)" }
-    }
-  ]
-};
-const defaultMatchPattern = /(?:(?:name)|(?:iconName)|(?:icon)): "(?<icon>.+?)"/g;
+const defaultMatchPattern = /((name)|(iconName)|(icon)):\s?"(?<icon>.+?)"/g;
 const inputConfigDefaults = {
   pattern: "**/*.svg",
   baseDir: "./",
   prefix: "",
   removeAttrs: [],
-  svgo: svgoDefault,
   svgoPlugins: [],
   getSymbolId: (config) => config.prefix + config.matchPath.replace(/\.[^/.]+$/, "").replaceAll("/", "-").toLowerCase()
 };
 const stripUnusedDefaults = {
   enabled: true,
-  srcInclude: "**/*.[jt]sx",
+  matchPattern: defaultMatchPattern,
+  srcInclude: ["**/*.[jt]sx", "**/*.md?(x)"],
   srcExclude: [],
   whitelist: []
 };
@@ -225,7 +227,7 @@ function svgSpritegen(config) {
     },
     moduleParsed(info) {
       if (!isBuild || !stripUnusedResolved.enabled || !srcFilter(info.id) || !info.code) return;
-      const matchPattern = config.matchPattern ? new RegExp(config.matchPattern, "g") : defaultMatchPattern;
+      const matchPattern = new RegExp(stripUnusedResolved.matchPattern, "g");
       const matches = [...info.code.matchAll(matchPattern)].flatMap(
         ({ groups }) => (groups == null ? void 0 : groups.icon) ?? []
       );
@@ -271,5 +273,6 @@ function svgSpritegen(config) {
   };
 }
 export {
+  svgSpritegen as default,
   svgSpritegen
 };

package/dist/types.d.ts

@@ -1,5 +1,6 @@
 import { FilterPattern } from 'vite';
 import { Config as SvgoConfig } from 'svgo';
+import { PresetDefaultOverrides } from 'svgo/plugins/plugins-types';
 export interface InputConfig {
     pattern?: string;
     baseDir?: string;
@@ -7,9 +8,11 @@ export interface InputConfig {
     getSymbolId?: (config: Omit<ResolvedInputConfig, 'symbolId'>) => string;
     removeAttrs?: string[];
     svgoPlugins?: SvgoConfig['plugins'];
+    svgoOverrides?: PresetDefaultOverrides;
     svgo?: SvgoConfig | false;
 }
-export interface ResolvedInputConfig extends Required<InputConfig> {
+export type InputConfigWithDefaults = Required<Omit<InputConfig, 'svgoOverrides' | 'svgo'>> & Pick<InputConfig, 'svgoOverrides' | 'svgo'>;
+export interface ResolvedInputConfig extends InputConfigWithDefaults {
     symbolId: string;
     matchPath: string;
     filePath: string;
@@ -18,6 +21,7 @@ export interface ResolvedInputConfig extends Required<InputConfig> {
 export type SvgMap = Map<string, ResolvedInputConfig>;
 export interface StripUnusedConfig {
     enabled?: boolean;
+    matchPattern?: string | RegExp;
     srcInclude?: FilterPattern;
     srcExclude?: FilterPattern;
     whitelist?: string[];
@@ -29,5 +33,4 @@ 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.2.8",
+  "version": "1.4.0",
   "description": "Vite plugin that generates an svg spritesheet, optionally removing unused svg files.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",