mp-weixin-back 0.0.6 → 0.0.7

package/build.config.ts

@@ -8,5 +8,5 @@ export default defineBuildConfig({
     emitCJS: true,
   },
   failOnWarn: false,
-  externals: ['vite', 'vue']
-})
+  externals: ['vite', 'vue', '@babel/generator'],
+})

package/dist/index.cjs

@@ -3,7 +3,7 @@
 const path = require('path');
 const fs = require('fs');
 const JSON5 = require('json5');
-const chalk = require('chalk');
+const kolorist = require('kolorist');
 const generate = require('@babel/generator');
 const compilerSfc = require('@vue/compiler-sfc');
 const astKit = require('ast-kit');
@@ -13,7 +13,6 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 const JSON5__default = /*#__PURE__*/_interopDefaultCompat(JSON5);
-const chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
 const generate__default = /*#__PURE__*/_interopDefaultCompat(generate);
 
 const virtualFileId = "mp-weixin-back-helper";
@@ -65,14 +64,17 @@ async function transformVueFile(code, id) {
           const callback = node.expression.arguments[0];
           const backArguments = node.expression.arguments[1];
           if (backArguments && backArguments.type == "ObjectExpression") {
-            const config = new Function(`return (${generate__default(backArguments).code});`)();
+            const config = new Function(
+              // @ts-ignore
+              `return (${(generate__default.default ? generate__default.default : generate__default)(backArguments).code});`
+            )();
             pageBackConfig = { ...pageBackConfig, ...config };
           }
           if (callback && (callback.type === "ArrowFunctionExpression" || callback.type === "FunctionExpression")) {
             const body = callback.body;
             if (body.type === "BlockStatement") {
               body.body.forEach((statement) => {
-                callbackCode += generate__default(statement).code;
+                callbackCode += (generate__default.default ? generate__default.default : generate__default)(statement).code;
               });
             }
           }
@@ -150,14 +152,14 @@ class pageContext {
     __publicField(this, "pages", []);
     __publicField(this, "log", {
       info: (text) => {
-        console.log(chalk__default.white(text));
+        console.log(kolorist.white(text));
       },
       error: (text) => {
-        console.log(chalk__default.red(text));
+        console.log(kolorist.red(text));
       },
       devLog: (text) => {
         if (this.config.mode === "development" && this.config.debug) {
-          console.log(chalk__default.green(text));
+          console.log(kolorist.green(text));
         }
       }
     });

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import path from 'path';
 import fs from 'fs';
 import JSON5 from 'json5';
-import chalk from 'chalk';
+import { white, red, green } from 'kolorist';
 import generate from '@babel/generator';
 import { parse } from '@vue/compiler-sfc';
 import { babelParse, walkAST } from 'ast-kit';
@@ -55,14 +55,17 @@ async function transformVueFile(code, id) {
           const callback = node.expression.arguments[0];
           const backArguments = node.expression.arguments[1];
           if (backArguments && backArguments.type == "ObjectExpression") {
-            const config = new Function(`return (${generate(backArguments).code});`)();
+            const config = new Function(
+              // @ts-ignore
+              `return (${(generate.default ? generate.default : generate)(backArguments).code});`
+            )();
             pageBackConfig = { ...pageBackConfig, ...config };
           }
           if (callback && (callback.type === "ArrowFunctionExpression" || callback.type === "FunctionExpression")) {
             const body = callback.body;
             if (body.type === "BlockStatement") {
               body.body.forEach((statement) => {
-                callbackCode += generate(statement).code;
+                callbackCode += (generate.default ? generate.default : generate)(statement).code;
               });
             }
           }
@@ -140,14 +143,14 @@ class pageContext {
     __publicField(this, "pages", []);
     __publicField(this, "log", {
       info: (text) => {
-        console.log(chalk.white(text));
+        console.log(white(text));
       },
       error: (text) => {
-        console.log(chalk.red(text));
+        console.log(red(text));
       },
       devLog: (text) => {
         if (this.config.mode === "development" && this.config.debug) {
-          console.log(chalk.green(text));
+          console.log(green(text));
         }
       }
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mp-weixin-back",
   "type": "module",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "监听微信小程序的手势返回和页面默认导航栏的返回",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -46,9 +46,9 @@
     "@vitejs/plugin-vue": "^5.2.0",
     "@vue/test-utils": "^2.4.6",
     "ast-kit": "^1.3.1",
-    "chalk": "^5.3.0",
     "happy-dom": "^15.11.6",
     "json5": "^2.2.3",
+    "kolorist": "^1.8.0",
     "typescript": "^5.7.2",
     "vitest": "^2.1.5"
   },

package/src/context.ts

@@ -1,7 +1,7 @@
 import path from 'path'
 import fs from 'fs'
 import JSON5 from 'json5'
-import chalk from 'chalk'
+import { red, white, green } from 'kolorist'
 import { ContextConfig, PagesJson } from '../types'
 import { transformVueFile } from '../utils'
 
@@ -10,14 +10,14 @@ export class pageContext {
   pages: string[] = []
   log = {
     info: (text: string) => {
-      console.log(chalk.white(text))
+      console.log(white(text))
     },
     error: (text: string) => {
-      console.log(chalk.red(text))
+      console.log(red(text))
     },
     devLog: (text: string) => {
       if (this.config.mode === 'development' && this.config.debug) {
-        console.log(chalk.green(text))
+        console.log(green(text))
       }
     },
   }

package/utils/index.ts

@@ -71,7 +71,10 @@ export async function transformVueFile(this: pageContext, code: string, id: stri
           const backArguments = node.expression.arguments[1]
           // 第二个参数为object才有效，覆盖插件传入的配置
           if (backArguments && backArguments.type == 'ObjectExpression') {
-            const config = new Function(`return (${generate(backArguments).code});`)()
+            const config = new Function(
+              // @ts-ignore
+              `return (${(generate.default ? generate.default : generate)(backArguments).code});`
+            )()
             pageBackConfig = { ...pageBackConfig, ...config }
           }
 
@@ -83,7 +86,8 @@ export async function transformVueFile(this: pageContext, code: string, id: stri
             if (body.type === 'BlockStatement') {
               // 遍历 BlockStatement 的内容
               body.body.forEach((statement) => {
-                callbackCode += generate(statement).code // 将 AST 节点生成代码
+                // @ts-ignore
+                callbackCode += (generate.default ? generate.default : generate)(statement).code // 将 AST 节点生成代码
               })
             }
           }