(fix): Improve the check for vite/ imports

jspm · Aug 7, 2023 · 4b5f7bb · 4b5f7bb
1 parent 5218d23
commit 4b5f7bb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/plugin/package.json b/plugin/package.json
@@ -35,12 +35,12 @@
         "@vue/compiler-dom": "^3.2.31"
     },
     "dependencies": {
-        "@jspm/generator": "^1.1.1"
+        "@jspm/generator": "^1.1.9"
     },
     "peerDependencies": {
         "vite": "*"
     },
     "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18"
     }
 }
diff --git a/plugin/src/index.ts b/plugin/src/index.ts
@@ -90,8 +90,8 @@ async function plugin(pluginOptions?: PluginOptions): Promise<Plugin[]> {
         if (
           id.startsWith("/") ||
           id.startsWith(".") ||
-          id.startsWith("vite/") ||
-          id.startsWith("__vite") ||
+          id.includes("vite/") ||
+          id.includes("__vite") ||
           id.includes(".css") ||
           id.includes(".html") ||
           path.isAbsolute(id) ||
@@ -127,7 +127,7 @@ async function plugin(pluginOptions?: PluginOptions): Promise<Plugin[]> {
           return null;
         }
 
-        if (id.startsWith("vite/") || path.isAbsolute(id)) {
+        if (id.includes("vite/") || path.isAbsolute(id)) {
           return;
         }
 
@@ -163,7 +163,7 @@ async function plugin(pluginOptions?: PluginOptions): Promise<Plugin[]> {
         return { id, external: true };
       },
       async load(id) {
-        if (id?.startsWith("vite/") || !id?.startsWith("http")) {
+        if (id?.includes("vite/") || !id?.includes("http")) {
           return;
         }
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml