fix: vue vapor compiler

sxzz · Nov 17, 2024 · e0044fb · e0044fb
1 parent f478091
commit e0044fb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/composables/parser/index.ts b/composables/parser/index.ts
@@ -28,9 +28,13 @@ export interface Parser<C = unknown, O = unknown> {
   pkgName: string
   version:
     | string
-    | ((this: C | Promise<C>, pkgName: string) => string | Promise<string>)
+    | ((
+        this: C | Promise<C>,
+        pkgName: string,
+        version?: string,
+      ) => string | Promise<string>)
   versionOverridable?: boolean
-  getModuleUrl?: (pkgName: string) => string
+  getModuleUrl?: (pkgName: string, version?: string) => string
   init?: (moduleUrl: string, pkgId: string) => C | Promise<C>
   parse: (this: C, code: string, options: O) => unknown
   options: {

diff --git a/composables/parser/vue.ts b/composables/parser/vue.ts
@@ -105,9 +105,15 @@ const vueVapor: Parser<
     editorLanguage: 'javascript',
   },
   pkgName: '@vue-vapor/compiler-vapor',
-  getModuleUrl: (pkg) =>
-    getJsdelivrUrl(pkg, `/dist/compiler-vapor.esm-browser.js`),
-  version: fetchVersion,
+  getModuleUrl: (pkg, version) =>
+    `https://next.esm.sh/pr/vuejs/vue-vapor/@vue/compiler-vapor@${version || 'main'}`,
+  version: async (pkg, version) => {
+    if (version) return version
+    const { url } = await fetch(
+      'https://pkg.pr.new/vuejs/vue-vapor/@vue/compiler-vapor@main',
+    )
+    return url.split('@').pop()!
+  },
   parse(code, options) {
     return this.compile(code, { ...options }).ast
   },

diff --git a/composables/state/parser.ts b/composables/state/parser.ts
@@ -96,7 +96,9 @@ async function initParser() {
     : `${pkgName}${overrideVersion.value ? `@${overrideVersion.value}` : ''}`
   if (parserModuleCache[pkgId]) return parserModuleCache[pkgId]
 
-  const moduleUrl = isUrlVersion.value ? pkgId : getModuleUrl(pkgId)
+  const moduleUrl = isUrlVersion.value
+    ? pkgId
+    : getModuleUrl(pkgId, overrideVersion.value)
   return (parserModuleCache[pkgId] = await init(moduleUrl, pkgId))
 }
 
@@ -174,7 +176,11 @@ if (import.meta.client) {
       } else {
         displayVersion.value = ''
         const res = await Promise.resolve(
-          parser.version.call(parserModulePromise.value, parser.pkgName),
+          parser.version.call(
+            parserModulePromise.value,
+            parser.pkgName,
+            overrideVersion.value,
+          ),
         )
         if (currentParser.value.id === parser.id) {
           displayVersion.value = res