feat: added virtual id import

vbenjs · May 24, 2021 · a86cb57 · a86cb57
1 parent 0e586b2
commit a86cb57
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ export default () => {
 - Introduce the registration script in src/main.ts
 
 ```ts
-import 'vite-plugin-svg-icons/register';
+import 'virtual:svg-icons-register';
 ```
 
 Here the svg sprite map has been generated

diff --git a/README.zh_CN.md b/README.zh_CN.md
@@ -50,7 +50,7 @@ export default () => {
 - 在 src/main.ts 内引入注册脚本
 
 ```ts
-import 'vite-plugin-svg-icons/register';
+import 'virtual:svg-icons-register';
 ```
 
 到这里 svg 雪碧图已经生成

diff --git a/client.ts b/client.ts
diff --git a/example/src/main.ts b/example/src/main.ts
@@ -1,7 +1,7 @@
 import { createApp } from 'vue';
 import App from './App.vue';
 
-import 'vite-plugin-svg-icons/register';
+import 'virtual:svg-icons-register';
 
 import allKeys from 'virtual:svg-icons-names';
 

diff --git a/package.json b/package.json
@@ -9,8 +9,8 @@
   "author": "Vben",
   "files": [
     "dist",
-    "register.ts",
-    "client.ts"
+    "register.d.ts",
+    "client.d.ts"
   ],
   "scripts": {
     "dev": "npm run build -- --watch",

diff --git a/register.ts b/register.ts
diff --git a/src/constants.ts b/src/constants.ts
@@ -1,4 +1,4 @@
-export const SVG_ICONS_NAME = 'vite-plugin-svg-icons/register';
+export const SVG_ICONS_NAME = ['vite-plugin-svg-icons/register', 'virtual:svg-icons-register'];
 export const SVG_ICONS_CLIENT = ['vite-plugin-svg-icons/client', 'virtual:svg-icons-names'];
 
 export const SVG_DOM_ID = '__svg__icons__dom__' + new Date().getTime() + '__';
diff --git a/src/index.ts b/src/index.ts
@@ -70,15 +70,15 @@ export default (opt: ViteSvgIconsPlugin): Plugin => {
       debug('resolvedConfig:', resolvedConfig);
     },
     resolveId(importee) {
-      if (importee === SVG_ICONS_NAME || SVG_ICONS_CLIENT.includes(importee)) {
+      if (SVG_ICONS_NAME.includes(importee) || SVG_ICONS_CLIENT.includes(importee)) {
         return importee;
       }
       return null;
     },
 
     async load(id) {
       if (!isBuild) return null;
-      const isRegister = id.endsWith(SVG_ICONS_NAME);
+      const isRegister = SVG_ICONS_NAME.some((item) => id.endsWith(item));
       const isClient = SVG_ICONS_CLIENT.some((item) => id.endsWith(item));
       const { code, idSet } = await createModuleCode(
         cache,
@@ -96,17 +96,17 @@ export default (opt: ViteSvgIconsPlugin): Plugin => {
       middlewares.use(cors({ origin: '*' }));
       middlewares.use(async (req, res, next) => {
         const url = normalizePath(req.url!);
-        const registerId = `/@id/${SVG_ICONS_NAME}`;
+        const registerIds = SVG_ICONS_NAME.map((item) => `/@id/${item}`);
         const clientIds = SVG_ICONS_CLIENT.map((item) => `/@id/${item}`);
-        if ([...clientIds, registerId].some((item) => url.endsWith(item))) {
+        if ([...clientIds, ...registerIds].some((item) => url.endsWith(item))) {
           res.setHeader('Content-Type', 'application/javascript');
           res.setHeader('Cache-Control', 'no-cache');
           const { code, idSet } = await createModuleCode(
             cache,
             svgoOptions as OptimizeOptions,
             options
           );
-          const content = url.endsWith(registerId) ? code : idSet;
+          const content = registerIds.some((item) => url.endsWith(item)) ? code : idSet;
 
           res.setHeader('Etag', getEtag(content, { weak: true }));
           res.statusCode = 200;