vite-plugin-svg-sprite 0.2.5 → 0.3.0

package/es/index.d.ts

@@ -1,9 +1,10 @@
-import { Options as SvgoOptions } from 'svgo';
+import { OptimizeOptions as SvgoOptimizeOptions } from 'svgo';
 import { Plugin } from 'vite';
+export type { SvgoOptimizeOptions };
 export interface SvgSpriteOptions {
     include?: string[] | string;
     symbolId?: string;
-    svgo?: boolean | SvgoOptions;
+    svgo?: boolean | SvgoOptimizeOptions;
 }
 declare const _default: (options?: SvgSpriteOptions) => Plugin;
 export default _default;

package/es/index.js

@@ -3,16 +3,13 @@ import fs from 'fs';
 import crypto from 'crypto';
 import micromatch from 'micromatch';
 import SVGCompiler from 'svg-baker';
-import Svgo from 'svgo';
+import { optimize } from 'svgo';
 const { stringify } = JSON;
 export default (options) => {
     var _a;
     const svgCompiler = new SVGCompiler();
     const match = (_a = options === null || options === void 0 ? void 0 : options.include) !== null && _a !== void 0 ? _a : '**.svg';
-    let svgo;
-    if ((options === null || options === void 0 ? void 0 : options.svgo) !== false) {
-        svgo = new Svgo((options === null || options === void 0 ? void 0 : options.svgo) === true ? {} : options === null || options === void 0 ? void 0 : options.svgo);
-    }
+    const svgoOptions = options === null || options === void 0 ? void 0 : options.svgo;
     const plugin = {
         name: 'svg-sprite',
         async transform(src, filepath) {
@@ -23,8 +20,12 @@ export default (options) => {
             }
             let code = await fs.promises.readFile(filepath, 'utf-8');
             const { name } = p.parse(filepath);
-            if (svgo) {
-                code = (await svgo.optimize(code)).data;
+            if (svgoOptions !== false) {
+                const result = (optimize(code, svgoOptions === true ? undefined : svgoOptions));
+                if (result.error != null) {
+                    throw result.error;
+                }
+                code = result.data;
             }
             let id = name;
             if (options === null || options === void 0 ? void 0 : options.symbolId) {

package/index.mjs

@@ -0,0 +1,3 @@
+import plugin from './lib/index.js';
+
+export default plugin.default || plugin;

package/lib/index.d.ts

@@ -1,9 +1,10 @@
-import { Options as SvgoOptions } from 'svgo';
+import { OptimizeOptions as SvgoOptimizeOptions } from 'svgo';
 import { Plugin } from 'vite';
+export type { SvgoOptimizeOptions };
 export interface SvgSpriteOptions {
     include?: string[] | string;
     symbolId?: string;
-    svgo?: boolean | SvgoOptions;
+    svgo?: boolean | SvgoOptimizeOptions;
 }
 declare const _default: (options?: SvgSpriteOptions) => Plugin;
 export default _default;

package/lib/index.js

@@ -8,16 +8,13 @@ const fs_1 = __importDefault(require("fs"));
 const crypto_1 = __importDefault(require("crypto"));
 const micromatch_1 = __importDefault(require("micromatch"));
 const svg_baker_1 = __importDefault(require("svg-baker"));
-const svgo_1 = __importDefault(require("svgo"));
+const svgo_1 = require("svgo");
 const { stringify } = JSON;
 exports.default = (options) => {
     var _a;
     const svgCompiler = new svg_baker_1.default();
     const match = (_a = options === null || options === void 0 ? void 0 : options.include) !== null && _a !== void 0 ? _a : '**.svg';
-    let svgo;
-    if ((options === null || options === void 0 ? void 0 : options.svgo) !== false) {
-        svgo = new svgo_1.default((options === null || options === void 0 ? void 0 : options.svgo) === true ? {} : options === null || options === void 0 ? void 0 : options.svgo);
-    }
+    const svgoOptions = options === null || options === void 0 ? void 0 : options.svgo;
     const plugin = {
         name: 'svg-sprite',
         async transform(src, filepath) {
@@ -28,8 +25,12 @@ exports.default = (options) => {
             }
             let code = await fs_1.default.promises.readFile(filepath, 'utf-8');
             const { name } = path_1.default.parse(filepath);
-            if (svgo) {
-                code = (await svgo.optimize(code)).data;
+            if (svgoOptions !== false) {
+                const result = ((0, svgo_1.optimize)(code, svgoOptions === true ? undefined : svgoOptions));
+                if (result.error != null) {
+                    throw result.error;
+                }
+                code = result.data;
             }
             let id = name;
             if (options === null || options === void 0 ? void 0 : options.symbolId) {

package/package.json

@@ -1,23 +1,21 @@
 {
   "name": "vite-plugin-svg-sprite",
-  "version": "0.2.5",
+  "version": "0.3.0",
   "description": "SVG sprite plugin for Vite",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "exports": {
     ".": {
-      "import": "./es/index.js",
+      "import": "./index.mjs",
       "require": "./lib/index.js"
     },
-    "./runtime": {
-      "import": "./es/runtime.js",
-      "require": "./lib/runtime.js"
-    }
+    "./runtime": "./es/runtime.js"
   },
   "files": [
     "lib",
     "es",
     "src",
+    "index.mjs",
     "LICENSE"
   ],
   "scripts": {
@@ -38,18 +36,18 @@
   "devDependencies": {
     "@types/micromatch": "^4.0.1",
     "@types/node": "^14.14.21",
-    "@types/svgo": "^1.3.3",
+    "@types/svgo": "^2.6.4",
     "@typescript-eslint/eslint-plugin": "^4.8.2",
     "eslint": "^7.14.0",
     "eslint-config-airbnb-typescript": "^12.0.0",
     "eslint-plugin-import": "^2.22.1",
     "typescript": "^4.1.2",
-    "vite": "^2.3.6"
+    "vite": "^3.1.0"
   },
   "dependencies": {
     "micromatch": "^4.0.2",
     "svg-baker": "~1.7.0",
-    "svgo": "^1.3.2"
+    "svgo": "^2.8.0"
   },
   "peerDependencies": {
     "vite": "^2 || ^3"

package/src/index.ts

@@ -3,24 +3,22 @@ import fs from 'fs';
 import crypto from 'crypto';
 import micromatch from 'micromatch';
 import SVGCompiler from 'svg-baker';
-import Svgo, { Options as SvgoOptions } from 'svgo';
+import { optimize, OptimizeOptions as SvgoOptimizeOptions } from 'svgo';
 import { Plugin } from 'vite';
 
 const { stringify } = JSON;
 
+export type { SvgoOptimizeOptions };
 export interface SvgSpriteOptions {
   include?: string[] | string;
   symbolId?: string;
-  svgo?: boolean | SvgoOptions;
+  svgo?: boolean | SvgoOptimizeOptions;
 }
 
 export default (options?: SvgSpriteOptions) => {
   const svgCompiler = new SVGCompiler();
   const match = options?.include ?? '**.svg';
-  let svgo: Svgo | null;
-  if (options?.svgo !== false) {
-    svgo = new Svgo(options?.svgo === true ? {} : options?.svgo);
-  }
+  const svgoOptions = options?.svgo;
 
   const plugin: Plugin = {
     name: 'svg-sprite',
@@ -34,8 +32,12 @@ export default (options?: SvgSpriteOptions) => {
 
       let code = await fs.promises.readFile(filepath, 'utf-8');
       const { name } = p.parse(filepath);
-      if (svgo) {
-        code = (await svgo.optimize(code)).data;
+      if (svgoOptions !== false) {
+        const result = (optimize(code, svgoOptions === true ? undefined : svgoOptions));
+        if (result.error != null) {
+          throw result.error;
+        }
+        code = result.data;
       }
 
       let id = name;