mp-weixin-back 0.0.14 → 0.0.15

package/dist/index.cjs

@@ -4,11 +4,12 @@ const path = require('path');
 const fs = require('fs');
 const JSON5 = require('json5');
 const kolorist = require('kolorist');
-const compilerSfc = require('@vue/compiler-sfc');
+const module$1 = require('module');
 const generate = require('@babel/generator');
 const MagicString = require('magic-string');
 const astKit = require('ast-kit');
 
+var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
@@ -407,9 +408,35 @@ const vueWalker = {
   optionsWalk
 };
 
+let compilerPromise = null;
+async function resolveCompiler(root) {
+  if (compilerPromise) {
+    return compilerPromise;
+  }
+  compilerPromise = (async () => {
+    try {
+      const _require = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)));
+      const compilerPath = _require.resolve("@vue/compiler-sfc", { paths: [root] });
+      return _require(compilerPath);
+    } catch (firstError) {
+      try {
+        return await import('@vue/compiler-sfc');
+      } catch (secondError) {
+        throw new Error(
+          `\u65E0\u6CD5\u89E3\u6790 @vue/compiler-sfc\u3002
+\u6B64\u63D2\u4EF6\u9700\u8981\u9879\u76EE\u4E2D\u5B89\u88C5 @vue/compiler-sfc\u3002
+\u8BF7\u624B\u52A8\u5B89\u88C5\uFF1Apnpm add -D @vue/compiler-sfc
+`
+        );
+      }
+    }
+  })();
+  return compilerPromise;
+}
 async function transformVueFile(code, id) {
   try {
-    const sfc = compilerSfc.parse(code).descriptor;
+    const sfcCompiler = await resolveCompiler(this.config.root);
+    const sfc = sfcCompiler.parse(code).descriptor;
     const { template, script, scriptSetup } = sfc;
     if (!template?.content) {
       return code;
@@ -421,7 +448,7 @@ async function transformVueFile(code, id) {
     return vueWalker[walker](this, code, sfc, id);
   } catch (error) {
     this.log.error("\u89E3\u6790vue\u6587\u4EF6\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u6587\u4EF6\u662F\u5426\u6B63\u786E");
-    this.log.debugLog(String(error));
+    this.log.error(String(error));
     return code;
   }
 }

package/dist/index.mjs

@@ -2,7 +2,7 @@ import path from 'path';
 import fs from 'fs';
 import JSON5 from 'json5';
 import { white, red, green } from 'kolorist';
-import { parse } from '@vue/compiler-sfc';
+import { createRequire } from 'module';
 import generate from '@babel/generator';
 import MagicString from 'magic-string';
 import { babelParse, walkAST } from 'ast-kit';
@@ -397,9 +397,35 @@ const vueWalker = {
   optionsWalk
 };
 
+let compilerPromise = null;
+async function resolveCompiler(root) {
+  if (compilerPromise) {
+    return compilerPromise;
+  }
+  compilerPromise = (async () => {
+    try {
+      const _require = createRequire(import.meta.url);
+      const compilerPath = _require.resolve("@vue/compiler-sfc", { paths: [root] });
+      return _require(compilerPath);
+    } catch (firstError) {
+      try {
+        return await import('@vue/compiler-sfc');
+      } catch (secondError) {
+        throw new Error(
+          `\u65E0\u6CD5\u89E3\u6790 @vue/compiler-sfc\u3002
+\u6B64\u63D2\u4EF6\u9700\u8981\u9879\u76EE\u4E2D\u5B89\u88C5 @vue/compiler-sfc\u3002
+\u8BF7\u624B\u52A8\u5B89\u88C5\uFF1Apnpm add -D @vue/compiler-sfc
+`
+        );
+      }
+    }
+  })();
+  return compilerPromise;
+}
 async function transformVueFile(code, id) {
   try {
-    const sfc = parse(code).descriptor;
+    const sfcCompiler = await resolveCompiler(this.config.root);
+    const sfc = sfcCompiler.parse(code).descriptor;
     const { template, script, scriptSetup } = sfc;
     if (!template?.content) {
       return code;
@@ -411,7 +437,7 @@ async function transformVueFile(code, id) {
     return vueWalker[walker](this, code, sfc, id);
   } catch (error) {
     this.log.error("\u89E3\u6790vue\u6587\u4EF6\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u6587\u4EF6\u662F\u5426\u6B63\u786E");
-    this.log.debugLog(String(error));
+    this.log.error(String(error));
     return code;
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mp-weixin-back",
   "type": "module",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "description": "监听微信小程序的手势返回和页面默认导航栏的返回",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -47,8 +47,8 @@
     "magic-string": "^0.30.13"
   },
   "peerDependencies": {
-    "@vue/compiler-sfc": "^2.7.0 || ^3.0.0",
-    "vite": "^2.0.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0"
+    "@vue/compiler-sfc": "^3.2.0",
+    "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0"
   },
   "lint-staged": {
     "*": "prettier --write"

package/utils/index.ts

@@ -1,10 +1,43 @@
-import { parse } from '@vue/compiler-sfc'
+import { createRequire } from 'module'
 import { pageContext } from '../src/context'
 import { vueWalker } from './walker'
 
+let compilerPromise: Promise<typeof import('@vue/compiler-sfc')> | null = null
+
+async function resolveCompiler(root: string): Promise<typeof import('@vue/compiler-sfc')> {
+  // 避免重复解析（防止并发调用时的竞态条件）
+  if (compilerPromise) {
+    return compilerPromise
+  }
+
+  compilerPromise = (async () => {
+    // 尝试加载用户项目中的 @vue/compiler-sfc
+    try {
+      const _require = createRequire(import.meta.url)
+      // 尝试从用户根目录解析
+      const compilerPath = _require.resolve('@vue/compiler-sfc', { paths: [root] })
+      return _require(compilerPath) as typeof import('@vue/compiler-sfc')
+    } catch (firstError) {
+      try {
+        // 降级尝试直接 import
+        return await import('@vue/compiler-sfc')
+      } catch (secondError) {
+        throw new Error(
+          `无法解析 @vue/compiler-sfc。\n` +
+            `此插件需要项目中安装 @vue/compiler-sfc。\n` +
+            `请手动安装：pnpm add -D @vue/compiler-sfc\n`
+        )
+      }
+    }
+  })()
+
+  return compilerPromise
+}
+
 export async function transformVueFile(this: pageContext, code: string, id: string) {
   try {
-    const sfc = parse(code).descriptor
+    const sfcCompiler = await resolveCompiler(this.config.root)
+    const sfc = sfcCompiler.parse(code).descriptor
     const { template, script, scriptSetup } = sfc
     if (!template?.content) {
       return code
@@ -19,7 +52,7 @@ export async function transformVueFile(this: pageContext, code: string, id: stri
     return vueWalker[walker](this, code, sfc, id)
   } catch (error) {
     this.log.error('解析vue文件失败，请检查文件是否正确')
-    this.log.debugLog(String(error))
+    this.log.error(String(error))
     return code
   }
 }