@tarojs/cli-convertor 3.6.18 → 3.6.19

package/dist/index.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+// import { ProjectType } from './../../taro-plugin-mini-ci/src/BaseCi';
 const template_1 = require("@babel/template");
 const traverse_1 = require("@babel/traverse");
 const t = require("@babel/types");
@@ -22,10 +23,11 @@ const unitTransform = require("postcss-taro-unit-transform");
 const prettier = require("prettier");
 const util_1 = require("./util");
 const astConvert_1 = require("./util/astConvert");
+const global_1 = require("./util/global");
 const prettierJSConfig = {
     semi: false,
     singleQuote: true,
-    parser: 'babel'
+    parser: 'babel',
 };
 const babylonConfig = {
     sourceType: 'module',
@@ -36,19 +38,18 @@ const babylonConfig = {
         'asyncGenerators',
         'objectRestSpread',
         'decorators',
-        'dynamicImport'
-    ]
+        'dynamicImport',
+    ],
 };
 const OUTPUT_STYLE_EXTNAME = '.scss';
 const WX_GLOBAL_FN = new Set(['getApp', 'getCurrentPages', 'requirePlugin', 'Behavior']);
 function processStyleImports(content, processFn) {
-    const style = [];
-    const imports = [];
+    // 获取css中的引用样式文件路径集合
+    const imports = (0, util_1.getWxssImports)(content);
+    // 将引用的样式文件路径转换为相对路径，后缀名转换为.scss
     const styleReg = new RegExp('.wxss');
     content = content.replace(helper_1.CSS_IMPORT_REG, (m, _$1, $2) => {
         if (styleReg.test($2)) {
-            style.push(m);
-            imports.push($2);
             if (processFn) {
                 return processFn(m, $2);
             }
@@ -61,33 +62,38 @@ function processStyleImports(content, processFn) {
     });
     return {
         content,
-        style,
-        imports
+        imports,
     };
 }
 class Convertor {
-    constructor(root) {
+    constructor(root, isTsProject) {
         this.wxsIncrementId = (0, util_1.incrementId)();
         this.root = root;
         this.convertRoot = path.join(this.root, 'taroConvert');
         this.convertDir = path.join(this.convertRoot, 'src');
         this.importsDir = path.join(this.convertDir, 'imports');
+        this.isTsProject = isTsProject;
+        if (isTsProject) {
+            this.miniprogramRoot = path.join(this.root, 'miniprogram');
+        }
         this.fileTypes = {
             TEMPL: '.wxml',
             STYLE: '.wxss',
             CONFIG: '.json',
-            SCRIPT: '.js'
+            SCRIPT: isTsProject ? '.ts' : '.js',
         };
         this.pages = new Set();
         this.components = new Set();
         this.hadBeenCopyedFiles = new Set();
         this.hadBeenBuiltComponents = new Set();
         this.hadBeenBuiltImports = new Set();
+        this.reportErroMsg = [];
         this.init();
     }
     init() {
         console.log(helper_1.chalk.green('开始代码转换...'));
         this.initConvert();
+        this.getConvertConfig();
         this.getApp();
         this.getPages();
         this.getSitemapLocation();
@@ -100,13 +106,22 @@ class Convertor {
         else {
             helper_1.fs.ensureDirSync(this.convertRoot);
         }
+        this.convertSelfDefinedConfig();
+        // 创建.convert目录，存放转换中间数据
+        (0, util_1.generateDir)(path.join(this.convertRoot, '.convert'));
+        global_1.globals.logFilePath = path.join(this.convertRoot, '.convert', 'convert.log');
     }
     parseAst({ ast, sourceFilePath, outputFilePath, importStylePath, depComponents, imports = [] }) {
         const scriptFiles = new Set();
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         const self = this;
+        // 转换后js页面的所有自定义标签
+        const scriptComponents = [];
         let componentClassName;
         let needInsertImportTaro = false;
+        let hasCacheOptionsRequired = false;
+        let hasDatasetRequired = false;
+        const set = new Set();
         (0, traverse_1.default)(ast, {
             Program: {
                 enter(astPath) {
@@ -121,10 +136,10 @@ class Convertor {
                                             astPath.traverse({
                                                 JSXElement() {
                                                     isTaroComponent = true;
-                                                }
+                                                },
                                             });
                                         }
-                                    }
+                                    },
                                 });
                                 if (isTaroComponent) {
                                     componentClassName = node.id.name;
@@ -141,10 +156,10 @@ class Convertor {
                                             astPath.traverse({
                                                 JSXElement() {
                                                     isTaroComponent = true;
-                                                }
+                                                },
                                             });
                                         }
-                                    }
+                                    },
                                 });
                                 if (isTaroComponent) {
                                     if (node.id === null) {
@@ -172,10 +187,10 @@ class Convertor {
                                                 astPath.traverse({
                                                     JSXElement() {
                                                         isTaroComponent = true;
-                                                    }
+                                                    },
                                                 });
                                             }
-                                        }
+                                        },
                                     });
                                     if (isTaroComponent) {
                                         componentClassName = declaration.id.name;
@@ -187,40 +202,211 @@ class Convertor {
                             const node = astPath.node;
                             const source = node.source;
                             const value = source.value;
-                            (0, util_1.analyzeImportUrl)(self.root, sourceFilePath, scriptFiles, source, value);
+                            (0, util_1.analyzeImportUrl)(self.root, sourceFilePath, scriptFiles, source, value, self.isTsProject);
                         },
                         CallExpression(astPath) {
+                            (0, util_1.printToLogFile)(`解析CallExpression: ${astPath} ${(0, util_1.getLineBreak)()}`);
                             const node = astPath.node;
                             const calleePath = astPath.get('callee');
                             const callee = calleePath.node;
                             if (callee.type === 'Identifier') {
                                 if (callee.name === 'require') {
                                     const args = node.arguments;
+                                    if (args.length === 0) {
+                                        // require()
+                                        return;
+                                    }
+                                    if (!t.isStringLiteral(args[0])) {
+                                        // require 暂不支持动态导入，如require('aa' + aa)，后续收录到报告中
+                                        throw new Error(`require暂不支持动态导入, filePath: ${sourceFilePath}, context: ${astPath}`);
+                                    }
                                     const value = args[0].value;
-                                    (0, util_1.analyzeImportUrl)(self.root, sourceFilePath, scriptFiles, args[0], value);
+                                    (0, util_1.analyzeImportUrl)(self.root, sourceFilePath, scriptFiles, args[0], value, self.isTsProject);
                                 }
                                 else if (WX_GLOBAL_FN.has(callee.name)) {
                                     calleePath.replaceWith(t.memberExpression(t.identifier('Taro'), callee));
                                     needInsertImportTaro = true;
                                 }
+                                else if (callee.name === 'Page' || callee.name === 'Component' || callee.name === 'App') {
+                                    // 将 App() Page() Component() 改为 cacheOptions.setOptionsToCache() 的形式去初始化页面数据
+                                    const arg = astPath.get('arguments')[0];
+                                    const cacheOptionsAstNode = t.callExpression(t.memberExpression(t.identifier('cacheOptions'), t.identifier('setOptionsToCache')), [arg.node]);
+                                    astPath.replaceWith(cacheOptionsAstNode);
+                                    // 创建导入 cacheOptions 对象的 ast 节点
+                                    const requireCacheOptionsAst = t.variableDeclaration('const', [
+                                        t.variableDeclarator(t.objectPattern([
+                                            t.objectProperty(t.identifier('cacheOptions'), t.identifier('cacheOptions'), false, true),
+                                        ]), t.callExpression(t.identifier('require'), [t.stringLiteral('@tarojs/with-weapp')])),
+                                    ]);
+                                    // 若已经引入过 cacheOptions 则不在引入，防止重复引入问题
+                                    if (!hasCacheOptionsRequired) {
+                                        ast.program.body.unshift(requireCacheOptionsAst);
+                                        hasCacheOptionsRequired = true;
+                                    }
+                                }
                             }
                         },
                         MemberExpression(astPath) {
                             const node = astPath.node;
                             const object = node.object;
+                            const prettier = node.property;
                             if (t.isIdentifier(object) && object.name === 'wx') {
                                 node.object = t.identifier('Taro');
                                 needInsertImportTaro = true;
                             }
-                        }
+                            else if (t.isIdentifier(prettier) && prettier.name === 'dataset') {
+                                node.object = t.callExpression(t.identifier('getTarget'), [object, t.identifier('Taro')]);
+                                // 创建导入 cacheOptions 对象的 ast 节点
+                                if (!hasDatasetRequired) {
+                                    const requireCacheOptionsAst = t.variableDeclaration('const', [
+                                        t.variableDeclarator(t.objectPattern([
+                                            t.objectProperty(t.identifier('getTarget'), t.identifier('getTarget'), false, true),
+                                        ]), t.callExpression(t.identifier('require'), [t.stringLiteral('@tarojs/with-weapp')])),
+                                    ]);
+                                    ast.program.body.unshift(requireCacheOptionsAst);
+                                    hasDatasetRequired = true;
+                                    needInsertImportTaro = true;
+                                }
+                            }
+                        },
+                        OptionalMemberExpression(astPath) {
+                            const node = astPath.node;
+                            const object = node.object;
+                            const prettier = node.property;
+                            if (t.isIdentifier(prettier) && prettier.name === 'dataset') {
+                                node.object = t.callExpression(t.identifier('getTarget'), [object, t.identifier('Taro')]);
+                                // 创建导入 getTarget 对象的 ast 节点, 并且防止重复引用
+                                if (!hasDatasetRequired) {
+                                    const requireCacheOptionsAst = t.variableDeclaration('const', [
+                                        t.variableDeclarator(t.objectPattern([
+                                            t.objectProperty(t.identifier('getTarget'), t.identifier('getTarget'), false, true),
+                                        ]), t.callExpression(t.identifier('require'), [t.stringLiteral('@tarojs/with-weapp')])),
+                                    ]);
+                                    ast.program.body.unshift(requireCacheOptionsAst);
+                                    hasDatasetRequired = true;
+                                    needInsertImportTaro = true;
+                                }
+                            }
+                        },
+                        // 获取js界面所有用到的自定义标签，不重复
+                        JSXElement(astPath) {
+                            const openingElement = astPath.get('openingElement');
+                            const jsxName = openingElement.get('name');
+                            if (jsxName.isJSXIdentifier()) {
+                                const componentName = jsxName.node.name;
+                                if (!util_1.DEFAULT_Component_SET.has(componentName) && scriptComponents.indexOf(componentName) === -1) {
+                                    scriptComponents.push(componentName);
+                                }
+                                if (/^\S(\S)*Tmpl$/.test(componentName)) {
+                                    const templateImport = imports.find((tmplImport) => tmplImport.name === `${componentName}`);
+                                    const templateFuncs = templateImport === null || templateImport === void 0 ? void 0 : templateImport.funcs;
+                                    if (templateFuncs && templateFuncs.size > 0) {
+                                        const attributes = openingElement.node.attributes;
+                                        templateFuncs.forEach((templateFunc) => {
+                                            const memberExpression = t.memberExpression(t.thisExpression(), t.identifier(templateFunc));
+                                            const value = t.jsxExpressionContainer(memberExpression);
+                                            const name = t.jsxIdentifier(templateFunc);
+                                            // 传递的方法插入到Tmpl标签属性中
+                                            attributes.push(t.jsxAttribute(name, value));
+                                        });
+                                    }
+                                }
+                                else if (componentName === 'Template') {
+                                    // 处理没被成功转换的模板, 如果被转换了就不会还是Template
+                                    const attrs = openingElement.get('attributes');
+                                    const is = attrs.find((attr) => t.isJSXAttribute(attr) &&
+                                        t.isJSXIdentifier(attr.get('name')) &&
+                                        t.isJSXAttribute(attr.node) &&
+                                        attr.node.name.name === 'is');
+                                    // 处理<template is=包含变量的情况(组件的动态名称)
+                                    if (is && t.isJSXAttribute(is.node)) {
+                                        const value = is.node.value;
+                                        if (value && t.isJSXExpressionContainer(value)) {
+                                            const expression = value.expression;
+                                            // 1、<template is={{var}}> 2、<template is="string{{var}}">
+                                            if (t.isIdentifier(expression) ||
+                                                (t.isBinaryExpression(expression) && expression.operator === '+')) {
+                                                // 加上map, template原名和新名字的映射
+                                                const componentMapList = [];
+                                                for (const order in imports) {
+                                                    for (const key in imports[order]) {
+                                                        if (key === 'tmplName') {
+                                                            const tmplName = imports[order][key];
+                                                            const tmplLastName = imports[order].name;
+                                                            // imports去重可能会把map里的去掉, 所以要加回去
+                                                            if (!scriptComponents.includes(tmplLastName)) {
+                                                                scriptComponents.push(tmplLastName);
+                                                            }
+                                                            componentMapList.push(t.objectProperty(t.stringLiteral('' + tmplName), t.identifier(tmplLastName)));
+                                                        }
+                                                    }
+                                                }
+                                                const withWeappPath = astPath.findParent((p) => p.isClassDeclaration());
+                                                if (withWeappPath) {
+                                                    const MapVariableDeclaration = t.variableDeclaration('const', [
+                                                        t.variableDeclarator(t.identifier('ComponentMap'), t.objectExpression(componentMapList)),
+                                                    ]);
+                                                    withWeappPath.insertBefore(MapVariableDeclaration);
+                                                }
+                                                // 加上用map给新标签赋值
+                                                const returnPath = astPath.findParent((p) => p.isReturnStatement());
+                                                if (returnPath) {
+                                                    const ComponentNameVariableDeclaration = t.variableDeclaration('let', [
+                                                        t.variableDeclarator(t.identifier('ComponentName'), t.memberExpression(t.identifier('ComponentMap'), expression, true)),
+                                                    ]);
+                                                    returnPath.insertBefore(ComponentNameVariableDeclaration);
+                                                }
+                                                // 标签非Template的情况下不会加spread, 删除spread属性; 更改开闭合标签为ComponentName
+                                                const attributes = [];
+                                                const data = attrs.find((attr) => t.isJSXAttribute(attr) &&
+                                                    t.isJSXIdentifier(attr.get('name')) &&
+                                                    t.isJSXAttribute(attr.node) &&
+                                                    attr.node.name.name === 'data');
+                                                if (data && t.isJSXAttribute(data.node)) {
+                                                    attributes.push(data.node);
+                                                }
+                                                astPath.replaceWith(t.jSXElement(t.jSXOpeningElement(t.jSXIdentifier('ComponentName'), attributes), t.jSXClosingElement(t.jSXIdentifier('ComponentName')), [], true));
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        // 处理this.data.xx = XXX 的情况，因为此表达式在taro暂不支持, 转为setData
+                        AssignmentExpression(astPath) {
+                            const node = astPath.node;
+                            if (t.isMemberExpression(node.left) &&
+                                t.isMemberExpression(node.left.object) &&
+                                t.isThisExpression(node.left.object.object) &&
+                                t.isIdentifier(node.left.object.property)) {
+                                // 确认左边是this.data
+                                if (node.left.object.property.name === 'data' && t.isIdentifier(node.left.property)) {
+                                    const lastName = node.left.property.name;
+                                    // 右边不能确定数据类型，所以直接存整个对象
+                                    const rightValue = node.right;
+                                    // 由于合并setData会导致打乱代码顺序, 影响代码逻辑, 所以每一句this.data.xx单独转成一句setData
+                                    const memberExp = t.memberExpression(t.thisExpression(), t.identifier('setData'));
+                                    const objExp = t.objectExpression([t.objectProperty(t.identifier(lastName), rightValue)]);
+                                    astPath.replaceWith(t.expressionStatement(t.callExpression(memberExp, [objExp])));
+                                    console.log(`转换  语法      this.data.xx=XX暂不支持,原地替换为setData()`);
+                                }
+                            }
+                        },
                     });
                 },
                 exit(astPath) {
                     const bodyNode = astPath.get('body');
-                    const lastImport = bodyNode.filter(p => p.isImportDeclaration()).pop();
-                    const hasTaroImport = bodyNode.some(p => p.isImportDeclaration() && p.node.source.value === '@tarojs/taro');
-                    if (needInsertImportTaro && !hasTaroImport) {
-                        astPath.node.body.unshift(t.importDeclaration([t.importDefaultSpecifier(t.identifier('Taro'))], t.stringLiteral('@tarojs/taro')));
+                    const lastImport = bodyNode.filter((p) => p.isImportDeclaration() || (0, astConvert_1.isCommonjsImport)(p)).pop();
+                    if (needInsertImportTaro && !(0, astConvert_1.hasTaroImport)(bodyNode)) {
+                        // 根据模块类型（commonjs/es6) 确定导入taro模块的类型
+                        if ((0, astConvert_1.isCommonjsModule)(ast.program.body)) {
+                            astPath.node.body.unshift(t.variableDeclaration('const', [
+                                t.variableDeclarator(t.identifier('Taro'), t.callExpression(t.identifier('require'), [t.stringLiteral('@tarojs/taro')])),
+                            ]));
+                        }
+                        else {
+                            astPath.node.body.unshift(t.importDeclaration([t.importDefaultSpecifier(t.identifier('Taro'))], t.stringLiteral('@tarojs/taro')));
+                        }
                     }
                     astPath.traverse({
                         StringLiteral(astPath) {
@@ -237,7 +423,7 @@ class Convertor {
                                 const imageRelativePath = (0, helper_1.promoteRelativePath)(path.relative(sourceFilePath, sourceImagePath));
                                 const outputImagePath = self.getDistFilePath(sourceImagePath);
                                 if (helper_1.fs.existsSync(sourceImagePath)) {
-                                    self.copyFileToTaro(sourceImagePath, outputImagePath);
+                                    (0, util_1.copyFileToTaro)(sourceImagePath, outputImagePath);
                                     (0, helper_1.printLog)("copy" /* processTypeEnum.COPY */, '图片', self.generateShowPath(outputImagePath));
                                 }
                                 else if (!t.isBinaryExpression(astPath.parent) || astPath.parent.operator !== '+') {
@@ -250,11 +436,18 @@ class Convertor {
                                     astPath.replaceWith(t.jSXExpressionContainer(t.callExpression(t.identifier('require'), [t.stringLiteral(imageRelativePath)])));
                                 }
                             }
-                        }
+                        },
                     });
                     if (lastImport) {
                         if (importStylePath) {
-                            lastImport.insertAfter(t.importDeclaration([], t.stringLiteral((0, helper_1.promoteRelativePath)(path.relative(sourceFilePath, importStylePath)))));
+                            if ((0, astConvert_1.isCommonjsModule)(ast.program.body)) {
+                                lastImport.insertAfter(t.callExpression(t.identifier('require'), [
+                                    t.stringLiteral((0, helper_1.promoteRelativePath)(path.relative(sourceFilePath, importStylePath))),
+                                ]));
+                            }
+                            else {
+                                lastImport.insertAfter(t.importDeclaration([], t.stringLiteral((0, helper_1.promoteRelativePath)(path.relative(sourceFilePath, importStylePath)))));
+                            }
                         }
                         if (imports && imports.length) {
                             imports.forEach(({ name, ast, wxs }) => {
@@ -262,34 +455,172 @@ class Convertor {
                                 if (componentClassName === importName) {
                                     return;
                                 }
-                                const importPath = path.join(self.importsDir, importName + (wxs ? self.wxsIncrementId() : '') + '.js');
+                                const importPath = path.join(self.importsDir, importName + (wxs ? self.wxsIncrementId() : '') + (self.isTsProject ? '.ts' : '.js'));
                                 if (!self.hadBeenBuiltImports.has(importPath)) {
                                     self.hadBeenBuiltImports.add(importPath);
                                     self.writeFileToTaro(importPath, prettier.format((0, astConvert_1.generateMinimalEscapeCode)(ast), prettierJSConfig));
                                 }
-                                lastImport.insertAfter((0, template_1.default)(`import ${importName} from '${(0, helper_1.promoteRelativePath)(path.relative(outputFilePath, importPath))}'`, babylonConfig)());
+                                if (scriptComponents.indexOf(importName) !== -1 || (wxs && wxs === true)) {
+                                    lastImport.insertAfter((0, template_1.default)(`import ${importName} from '${(0, helper_1.promoteRelativePath)(path.relative(outputFilePath, importPath))}'`, babylonConfig)());
+                                }
                             });
                         }
                         if (depComponents && depComponents.size) {
-                            depComponents.forEach(componentObj => {
-                                const name = (0, helper_1.pascalCase)(componentObj.name);
-                                const component = componentObj.path;
-                                lastImport.insertAfter((0, template_1.default)(`import ${name} from '${(0, helper_1.promoteRelativePath)(path.relative(sourceFilePath, component))}'`, babylonConfig)());
+                            depComponents.forEach((componentObj) => {
+                                const name = (0, helper_1.pascalCase)(componentObj.name.toLowerCase());
+                                // 如果不是js页面用到的组件，无需导入
+                                if (scriptComponents.indexOf(name) === -1) {
+                                    return;
+                                }
+                                // 如果用到了，从scriptComponents中移除
+                                const index = scriptComponents.indexOf(name);
+                                scriptComponents.splice(index, 1);
+                                let componentPath = componentObj.path;
+                                if (componentPath.indexOf(self.root) !== -1) {
+                                    componentPath = path.relative(sourceFilePath, componentPath);
+                                }
+                                lastImport.insertAfter((0, template_1.default)(`import ${name} from '${(0, helper_1.promoteRelativePath)(componentPath)}'`, babylonConfig)());
                             });
                         }
                     }
+                },
+            },
+        });
+        // 遍历 ast ,将多次 const { xxx } = require('@tarojs/with-weapp')  引入压缩为一次引入
+        (0, traverse_1.default)(ast, {
+            VariableDeclaration(astPath) {
+                const { kind, declarations } = astPath.node;
+                let currentAstIsWithWeapp = false;
+                if (kind === 'const') {
+                    declarations.forEach((declaration) => {
+                        const { id, init } = declaration;
+                        if (t.isObjectPattern(id) &&
+                            t.isCallExpression(init) &&
+                            t.isIdentifier(init.callee) &&
+                            t.isStringLiteral(init.arguments[0])) {
+                            const name = init.callee.name;
+                            const args = init.arguments[0].value;
+                            if (name === 'require' && args === '@tarojs/with-weapp') {
+                                currentAstIsWithWeapp = true;
+                                id.properties.forEach((propertie) => {
+                                    if (t.isObjectProperty(propertie) && t.isIdentifier(propertie.value)) {
+                                        set.add(propertie.value.name);
+                                    }
+                                });
+                            }
+                        }
+                    });
                 }
-            }
+                if (currentAstIsWithWeapp) {
+                    astPath.remove();
+                }
+            },
         });
+        // 若 set 为空则不引入 @tarojs/with-weapp
+        if (set.size !== 0) {
+            if ((0, astConvert_1.isCommonjsModule)(ast.program.body)) {
+                const objectPropertyArray = [];
+                set.forEach((key) => {
+                    if (key === 'withWeapp') {
+                        objectPropertyArray.push(t.objectProperty(t.identifier('default'), t.identifier('withWeapp'), false, true));
+                    }
+                    else {
+                        objectPropertyArray.push(t.objectProperty(t.identifier(key), t.identifier(key), false, true));
+                    }
+                });
+                const requireWithWeappAst = t.variableDeclaration('const', [
+                    t.variableDeclarator(t.objectPattern(objectPropertyArray), t.callExpression(t.identifier('require'), [t.stringLiteral('@tarojs/with-weapp')])),
+                ]);
+                ast.program.body.unshift(requireWithWeappAst);
+            }
+            else {
+                const objectPropertyArray = [];
+                let hasWithWeapp = false;
+                set.forEach((key) => {
+                    if (key === 'withWeapp') {
+                        hasWithWeapp = true;
+                    }
+                    else {
+                        objectPropertyArray.push(t.importSpecifier(t.identifier(key), t.identifier(key)));
+                    }
+                });
+                if (hasWithWeapp) {
+                    objectPropertyArray.unshift(t.importDefaultSpecifier(t.identifier('withWeapp')));
+                }
+                const importWithWeapp = t.importDeclaration(objectPropertyArray, t.stringLiteral('@tarojs/with-weapp'));
+                ast.program.body.unshift(importWithWeapp);
+            }
+        }
         return {
             ast,
-            scriptFiles
+            scriptFiles,
         };
     }
+    convertSelfDefinedConfig() {
+        // 搬运自定义的配置文件
+        const selfDefinedConfig = [];
+        // 目前只有tsconfig.json，还有的话继续加到array里
+        selfDefinedConfig[0] = `tsconfig${this.fileTypes.CONFIG}`;
+        for (const tempConfig of selfDefinedConfig) {
+            const tempConfigPath = path.join(this.root, tempConfig);
+            if (helper_1.fs.existsSync(tempConfig)) {
+                try {
+                    const outputFilePath = path.join(this.convertRoot, tempConfig);
+                    (0, util_1.copyFileToTaro)(tempConfigPath, outputFilePath);
+                }
+                catch (err) {
+                    // 失败不退出，仅提示
+                    console.log(helper_1.chalk.red(`tsconfig${this.fileTypes.CONFIG} 拷贝失败，请检查！`));
+                }
+            }
+        }
+    }
+    getConvertConfig() {
+        // 处理convert.config.json，并存储到convertConfig中
+        const convertJsonPath = path.join(this.root, `convert.config${this.fileTypes.CONFIG}`);
+        if (helper_1.fs.existsSync(convertJsonPath)) {
+            try {
+                const convertJson = JSON.parse(String(helper_1.fs.readFileSync(convertJsonPath)));
+                this.convertConfig = Object.assign({}, convertJson);
+                this.convertConfig.external = (0, util_1.transRelToAbsPath)(convertJsonPath, this.convertConfig.external);
+            }
+            catch (err) {
+                console.log(helper_1.chalk.red(`convert.config${this.fileTypes.CONFIG} 读取失败，请检查！`));
+                process.exit(1);
+            }
+        }
+    }
     getApp() {
-        this.entryJSPath = path.join(this.root, `app${this.fileTypes.SCRIPT}`);
-        this.entryJSONPath = path.join(this.root, `app${this.fileTypes.CONFIG}`);
-        this.entryStylePath = path.join(this.root, `app${this.fileTypes.STYLE}`);
+        try {
+            const projectConfigPath = path.join(this.root, `project.config${this.fileTypes.CONFIG}`); // project.config.json 文件路径
+            // 解析 project.config.json 文件，获取 miniprogramRoot 字段的值
+            const projectConfig = JSON.parse(helper_1.fs.readFileSync(projectConfigPath, 'utf8'));
+            this.miniprogramRoot = projectConfig.miniprogramRoot;
+        }
+        catch (err) {
+            console.error('读取 project.config.json 文件失败:', err);
+            process.exit(1);
+        }
+        // 如果找到 miniprogramRoot字段，则以对应目录作为小程序逻辑目录
+        if (this.miniprogramRoot) {
+            this.root = path.resolve(this.miniprogramRoot);
+        }
+        if (this.isTsProject) {
+            this.entryJSPath = path.join(this.miniprogramRoot, `app${this.fileTypes.SCRIPT}`);
+            this.entryJSONPath = path.join(this.miniprogramRoot, `app${this.fileTypes.CONFIG}`);
+            this.entryStylePath = path.join(this.miniprogramRoot, `app${this.fileTypes.STYLE}`);
+        }
+        else {
+            this.entryJSPath = path.join(this.root, `app${this.fileTypes.SCRIPT}`);
+            this.entryJSONPath = path.join(this.root, `app${this.fileTypes.CONFIG}`);
+            this.entryStylePath = path.join(this.root, `app${this.fileTypes.STYLE}`);
+        }
+        // 如果在 miniprogramRoot 目录下找到 app.json 文件，则将入口文件和配置文件路径修改为对应的路径
+        if (this.miniprogramRoot && helper_1.fs.existsSync(path.join(this.root, `app${this.fileTypes.CONFIG}`))) {
+            this.entryJSPath = path.join(this.root, `app${this.fileTypes.SCRIPT}`);
+            this.entryJSONPath = path.join(this.root, `app${this.fileTypes.CONFIG}`);
+            this.entryStylePath = path.join(this.root, `app${this.fileTypes.STYLE}`);
+        }
         try {
             this.entryJSON = JSON.parse(String(helper_1.fs.readFileSync(this.entryJSONPath)));
             const using = this.entryJSON.usingComponents;
@@ -298,7 +629,10 @@ class Convertor {
                     if (using[key].startsWith('plugin://'))
                         continue;
                     const componentPath = using[key];
-                    using[key] = path.join(this.root, componentPath);
+                    // 非三方库的路径需要处理
+                    if (!this.isThirdPartyLib(componentPath, this.root)) {
+                        using[key] = path.join(this.root, componentPath);
+                    }
                 }
                 this.entryUsingComponents = using;
                 delete this.entryJSON.usingComponents;
@@ -329,10 +663,10 @@ class Convertor {
         if (!subPackages || !subPackages.length) {
             return;
         }
-        subPackages.forEach(item => {
+        subPackages.forEach((item) => {
             if (item.pages && item.pages.length) {
                 const root = item.root;
-                item.pages.forEach(page => {
+                item.pages.forEach((page) => {
                     let pagePath = `${root}/${page}`;
                     pagePath = pagePath.replace(/\/{2,}/g, '/');
                     this.pages.add(pagePath);
@@ -347,7 +681,7 @@ class Convertor {
             const sitemapFilePath = path.join(this.root, sitemapLocation);
             if (helper_1.fs.existsSync(sitemapFilePath)) {
                 const outputFilePath = path.join(this.convertRoot, sitemapLocation);
-                this.copyFileToTaro(sitemapFilePath, outputFilePath);
+                (0, util_1.copyFileToTaro)(sitemapFilePath, outputFilePath);
             }
         }
     }
@@ -356,32 +690,49 @@ class Convertor {
             return;
         }
         if (files.size) {
-            files.forEach(file => {
+            files.forEach((file) => {
+                var _a, _b;
+                // 处理三方库引用，可在convert.config.json中nodePath字段自定义配置配置，默认node_modules
+                if (!path.isAbsolute(file)) {
+                    (0, util_1.handleThirdPartyLib)(file, (_a = this.convertConfig) === null || _a === void 0 ? void 0 : _a.nodePath, this.root, this.convertRoot);
+                    return;
+                }
                 if (!helper_1.fs.existsSync(file) || this.hadBeenCopyedFiles.has(file)) {
                     return;
                 }
-                const code = helper_1.fs.readFileSync(file).toString();
-                let outputFilePath = file.replace(this.root, this.convertDir);
-                const extname = path.extname(outputFilePath);
-                if (/\.wxs/.test(extname)) {
-                    outputFilePath += '.js';
+                // 处理不转换的目录，可在convert.config.json中external字段配置
+                const matchUnconvertDir = (0, util_1.getMatchUnconvertDir)(file, (_b = this.convertConfig) === null || _b === void 0 ? void 0 : _b.external);
+                if (matchUnconvertDir !== null) {
+                    (0, util_1.handleUnconvertDir)(matchUnconvertDir, this.root, this.convertDir);
+                    return;
+                }
+                try {
+                    const code = helper_1.fs.readFileSync(file).toString();
+                    let outputFilePath = file.replace(this.isTsProject ? this.miniprogramRoot : this.root, this.convertDir);
+                    const extname = path.extname(outputFilePath);
+                    if (/\.wxs/.test(extname)) {
+                        outputFilePath += '.js';
+                    }
+                    const transformResult = (0, transformer_wx_1.default)({
+                        code,
+                        sourcePath: file,
+                        isNormal: true,
+                        isTyped: helper_1.REG_TYPESCRIPT.test(file),
+                    });
+                    const { ast, scriptFiles } = this.parseAst({
+                        ast: transformResult.ast,
+                        outputFilePath,
+                        sourceFilePath: file,
+                    });
+                    const jsCode = (0, astConvert_1.generateMinimalEscapeCode)(ast);
+                    this.writeFileToTaro(outputFilePath, prettier.format(jsCode, prettierJSConfig));
+                    (0, helper_1.printLog)("copy" /* processTypeEnum.COPY */, 'JS 文件', this.generateShowPath(outputFilePath));
+                    this.hadBeenCopyedFiles.add(file);
+                    this.generateScriptFiles(scriptFiles);
+                }
+                catch (error) {
+                    console.log(`转换文件${file}异常，errorMessage:${error}`);
                 }
-                const transformResult = (0, transformer_wx_1.default)({
-                    code,
-                    sourcePath: file,
-                    isNormal: true,
-                    isTyped: helper_1.REG_TYPESCRIPT.test(file)
-                });
-                const { ast, scriptFiles } = this.parseAst({
-                    ast: transformResult.ast,
-                    outputFilePath,
-                    sourceFilePath: file
-                });
-                const jsCode = (0, astConvert_1.generateMinimalEscapeCode)(ast);
-                this.writeFileToTaro(outputFilePath, prettier.format(jsCode, prettierJSConfig));
-                (0, helper_1.printLog)("copy" /* processTypeEnum.COPY */, 'JS 文件', this.generateShowPath(outputFilePath));
-                this.hadBeenCopyedFiles.add(file);
-                this.generateScriptFiles(scriptFiles);
             });
         }
     }
@@ -389,19 +740,19 @@ class Convertor {
         helper_1.fs.ensureDirSync(path.dirname(dist));
         helper_1.fs.writeFileSync(dist, code);
     }
-    copyFileToTaro(from, to, options) {
-        const filename = path.basename(from);
-        if (helper_1.fs.statSync(from).isFile() && !path.extname(to)) {
-            helper_1.fs.ensureDir(to);
-            return helper_1.fs.copySync(from, path.join(to, filename), options);
-        }
-        helper_1.fs.ensureDir(path.dirname(to));
-        return helper_1.fs.copySync(from, to, options);
+    // 自定义组件，如果组件文件命名为index，引入时可省略index这一层，解析时需加上
+    getComponentPath(component, extname) {
+        if (helper_1.fs.existsSync(component + extname))
+            return component + extname;
+        else
+            return component + '/index' + extname;
     }
     getDistFilePath(src, extname) {
         if (!extname)
-            return src.replace(this.root, this.convertDir);
-        return src.replace(this.root, this.convertDir).replace(path.extname(src), extname);
+            return src.replace(this.isTsProject ? this.miniprogramRoot : this.root, this.convertDir);
+        return src
+            .replace(this.isTsProject ? this.miniprogramRoot : this.root, this.convertDir)
+            .replace(path.extname(src), extname);
     }
     getConfigFilePath(src) {
         const { dir, name } = path.parse(src);
@@ -413,10 +764,7 @@ class Convertor {
         this.writeFileToTaro(configSrc, prettier.format(code, prettierJSConfig));
     }
     generateShowPath(filePath) {
-        return filePath
-            .replace(path.join(this.root, '/'), '')
-            .split(path.sep)
-            .join('/');
+        return filePath.replace(path.join(this.root, '/'), '').split(path.sep).join('/');
     }
     formatFile(jsCode, template = '') {
         let code = jsCode;
@@ -442,10 +790,12 @@ ${code}
             const taroizeResult = taroize({
                 json: entryJSON,
                 script: entryJS,
+                scriptPath: this.entryJSPath,
                 path: this.root,
                 rootPath: this.root,
                 framework: this.framework,
-                isApp: true
+                isApp: true,
+                logFilePath: global_1.globals.logFilePath,
             });
             const { ast, scriptFiles } = this.parseAst({
                 ast: taroizeResult.ast,
@@ -454,7 +804,7 @@ ${code}
                 importStylePath: this.entryStyle
                     ? this.entryStylePath.replace(path.extname(this.entryStylePath), OUTPUT_STYLE_EXTNAME)
                     : null,
-                isApp: true
+                isApp: true,
             });
             const jsCode = (0, astConvert_1.generateMinimalEscapeCode)(ast);
             this.writeFileToTaro(entryDistJSPath, jsCode);
@@ -477,7 +827,7 @@ ${code}
         const { list = [] } = tabBar;
         const icons = new Set();
         if (Array.isArray(list) && list.length) {
-            list.forEach(item => {
+            list.forEach((item) => {
                 if (typeof item.iconPath === 'string')
                     icons.add(item.iconPath);
                 if (typeof item.selectedIconPath === 'string')
@@ -485,10 +835,10 @@ ${code}
             });
             if (icons.size > 0) {
                 Array.from(icons)
-                    .map(icon => path.join(this.root, icon))
-                    .forEach(iconPath => {
+                    .map((icon) => path.join(this.root, icon))
+                    .forEach((iconPath) => {
                     const iconDistPath = this.getDistFilePath(iconPath);
-                    this.copyFileToTaro(iconPath, iconDistPath);
+                    (0, util_1.copyFileToTaro)(iconPath, iconDistPath);
                     (0, helper_1.printLog)("copy" /* processTypeEnum.COPY */, 'TabBar 图标', this.generateShowPath(iconDistPath));
                 });
             }
@@ -500,7 +850,7 @@ ${code}
         const customTabbarPath = path.join(this.root, 'custom-tab-bar');
         if (helper_1.fs.existsSync(customTabbarPath)) {
             const customTabbarDistPath = this.getDistFilePath(customTabbarPath);
-            this.copyFileToTaro(customTabbarPath, customTabbarDistPath);
+            (0, util_1.copyFileToTaro)(customTabbarPath, customTabbarDistPath);
             (0, helper_1.printLog)("copy" /* processTypeEnum.COPY */, '自定义 TabBar', this.generateShowPath(customTabbarDistPath));
         }
     }
@@ -510,9 +860,52 @@ ${code}
         }
         return path.join(path.dirname(file), path.basename(file, path.extname(file)) + '.vue');
     }
+    // 判断是否是三方库
+    isThirdPartyLib(modulePath, curPageDir) {
+        // 相对路径和带根目录的路径都不是三方库
+        if (modulePath.indexOf('.') === 0 || modulePath.indexOf('/') === 0 || modulePath.indexOf(this.root) !== -1) {
+            return false;
+        }
+        // 通过格式如component/component引用组件
+        // app.json中引用组件
+        if (curPageDir === this.root) {
+            if (helper_1.fs.existsSync((0, helper_1.resolveScriptPath)(path.join(curPageDir, modulePath)))) {
+                return false;
+            }
+        }
+        else {
+            // 页面中引用组件
+            if (helper_1.fs.existsSync((0, helper_1.resolveScriptPath)(path.join(curPageDir, modulePath))) ||
+                helper_1.fs.existsSync((0, helper_1.resolveScriptPath)(path.join(this.root, modulePath)))) {
+                return false;
+            }
+        }
+        return true;
+    }
+    // 判断三方库是否安装
+    isInNodeModule(modulePath) {
+        const nodeModules = path.resolve(this.root, 'node_modules');
+        if (!helper_1.fs.existsSync(nodeModules)) {
+            return false;
+        }
+        const modules = helper_1.fs.readdirSync(nodeModules);
+        const parts = modulePath.split('/');
+        if (modules.indexOf(parts[0]) === -1) {
+            return false;
+        }
+        return true;
+    }
     traversePages() {
-        this.pages.forEach(page => {
-            const pagePath = path.join(this.root, page);
+        this.pages.forEach((page) => {
+            var _a;
+            (0, util_1.printToLogFile)(`开始转换页面 ${page} ${(0, util_1.getLineBreak)()}`);
+            const pagePath = this.isTsProject ? path.join(this.miniprogramRoot, page) : path.join(this.root, page);
+            // 处理不转换的页面，可在convert.config.json中external字段配置
+            const matchUnconvertDir = (0, util_1.getMatchUnconvertDir)(pagePath, (_a = this.convertConfig) === null || _a === void 0 ? void 0 : _a.external);
+            if (matchUnconvertDir !== null) {
+                (0, util_1.handleUnconvertDir)(matchUnconvertDir, this.root, this.convertDir);
+                return;
+            }
             const pageJSPath = pagePath + this.fileTypes.SCRIPT;
             const pageDistJSPath = this.getDistFilePath(pageJSPath);
             const pageConfigPath = pagePath + this.fileTypes.CONFIG;
@@ -542,11 +935,15 @@ ${code}
                     if (pageUsingComponents) {
                         // 页面依赖组件
                         const usingComponents = {};
-                        Object.keys(pageUsingComponents).forEach(component => {
+                        Object.keys(pageUsingComponents).forEach((component) => {
+                            var _a;
                             const unResolveComponentPath = pageUsingComponents[component];
                             if (unResolveComponentPath.startsWith('plugin://')) {
                                 usingComponents[component] = unResolveComponentPath;
                             }
+                            else if (this.isThirdPartyLib(unResolveComponentPath, path.resolve(pagePath, '..'))) {
+                                (0, util_1.handleThirdPartyLib)(unResolveComponentPath, (_a = this.convertConfig) === null || _a === void 0 ? void 0 : _a.nodePath, this.root, this.convertRoot);
+                            }
                             else {
                                 let componentPath;
                                 if (unResolveComponentPath.startsWith(this.root)) {
@@ -554,13 +951,14 @@ ${code}
                                 }
                                 else {
                                     componentPath = path.resolve(pageConfigPath, '..', pageUsingComponents[component]);
+                                    // 支持将组件库放在工程根目录下
                                     if (!helper_1.fs.existsSync((0, helper_1.resolveScriptPath)(componentPath))) {
                                         componentPath = path.join(this.root, pageUsingComponents[component]);
                                     }
                                 }
                                 depComponents.add({
                                     name: component,
-                                    path: componentPath
+                                    path: componentPath,
                                 });
                             }
                         });
@@ -574,6 +972,7 @@ ${code}
                     param.json = JSON.stringify(pageConfig);
                 }
                 param.script = String(helper_1.fs.readFileSync(pageJSPath));
+                param.scriptPath = pageJSPath;
                 if (helper_1.fs.existsSync(pageTemplPath)) {
                     (0, helper_1.printLog)("convert" /* processTypeEnum.CONVERT */, '页面模板', this.generateShowPath(pageTemplPath));
                     param.wxml = String(helper_1.fs.readFileSync(pageTemplPath));
@@ -585,6 +984,7 @@ ${code}
                 }
                 param.path = path.dirname(pageJSPath);
                 param.rootPath = this.root;
+                param.logFilePath = global_1.globals.logFilePath;
                 const taroizeResult = taroize(Object.assign(Object.assign({}, param), { framework: this.framework }));
                 const { ast, scriptFiles } = this.parseAst({
                     ast: taroizeResult.ast,
@@ -592,10 +992,11 @@ ${code}
                     outputFilePath: pageDistJSPath,
                     importStylePath: pageStyle ? pageStylePath.replace(path.extname(pageStylePath), OUTPUT_STYLE_EXTNAME) : null,
                     depComponents,
-                    imports: taroizeResult.imports
+                    imports: taroizeResult.imports,
                 });
                 const jsCode = (0, astConvert_1.generateMinimalEscapeCode)(ast);
                 this.writeFileToTaro(this.getComponentDest(pageDistJSPath), this.formatFile(jsCode, taroizeResult.template));
+                (0, helper_1.printLog)("generate" /* processTypeEnum.GENERATE */, 'writeFileToTaro', this.generateShowPath(pageDistJSPath));
                 this.writeFileToConfig(pageDistJSPath, param.json);
                 (0, helper_1.printLog)("generate" /* processTypeEnum.GENERATE */, '页面文件', this.generateShowPath(pageDistJSPath));
                 if (pageStyle) {
@@ -607,6 +1008,7 @@ ${code}
             catch (err) {
                 (0, helper_1.printLog)("error" /* processTypeEnum.ERROR */, '页面转换', this.generateShowPath(pageJSPath));
                 console.log(err);
+                (0, util_1.printToLogFile)(`转换页面异常 ${err.stack} ${(0, util_1.getLineBreak)()}`);
             }
         });
     }
@@ -614,21 +1016,21 @@ ${code}
         if (!components || !components.size) {
             return;
         }
-        components.forEach(componentObj => {
+        components.forEach((componentObj) => {
             const component = componentObj.path;
             if (this.hadBeenBuiltComponents.has(component))
                 return;
             this.hadBeenBuiltComponents.add(component);
-            const componentJSPath = component + this.fileTypes.SCRIPT;
+            const componentJSPath = this.getComponentPath(component, this.fileTypes.SCRIPT);
             const componentDistJSPath = this.getDistFilePath(componentJSPath);
-            const componentConfigPath = component + this.fileTypes.CONFIG;
-            const componentStylePath = component + this.fileTypes.STYLE;
-            const componentTemplPath = component + this.fileTypes.TEMPL;
+            const componentConfigPath = this.getComponentPath(component, this.fileTypes.CONFIG);
+            const componentStylePath = this.getComponentPath(component, this.fileTypes.STYLE);
+            const componentTemplPath = this.getComponentPath(component, this.fileTypes.TEMPL);
             try {
                 const param = {};
                 const depComponents = new Set();
                 if (!helper_1.fs.existsSync(componentJSPath)) {
-                    throw new Error(`组件 ${component} 没有 JS 文件！`);
+                    throw new Error(`自定义组件 ${component} 没有 JS 文件！`);
                 }
                 (0, helper_1.printLog)("convert" /* processTypeEnum.CONVERT */, '组件文件', this.generateShowPath(componentJSPath));
                 if (helper_1.fs.existsSync(componentConfigPath)) {
@@ -638,14 +1040,17 @@ ${code}
                     const componentUsingComponnets = componentConfig.usingComponents;
                     if (componentUsingComponnets) {
                         // 页面依赖组件
-                        Object.keys(componentUsingComponnets).forEach(component => {
+                        Object.keys(componentUsingComponnets).forEach((component) => {
                             let componentPath = path.resolve(componentConfigPath, '..', componentUsingComponnets[component]);
                             if (!helper_1.fs.existsSync((0, helper_1.resolveScriptPath)(componentPath))) {
                                 componentPath = path.join(this.root, componentUsingComponnets[component]);
                             }
+                            if (!helper_1.fs.existsSync(componentPath + this.fileTypes.SCRIPT)) {
+                                componentPath = path.join(componentPath, `/index`);
+                            }
                             depComponents.add({
                                 name: component,
-                                path: componentPath
+                                path: componentPath,
                             });
                         });
                         delete componentConfig.usingComponents;
@@ -664,6 +1069,7 @@ ${code}
                 }
                 param.path = path.dirname(componentJSPath);
                 param.rootPath = this.root;
+                param.logFilePath = global_1.globals.logFilePath;
                 const taroizeResult = taroize(Object.assign(Object.assign({}, param), { framework: this.framework }));
                 const { ast, scriptFiles } = this.parseAst({
                     ast: taroizeResult.ast,
@@ -673,7 +1079,7 @@ ${code}
                         ? componentStylePath.replace(path.extname(componentStylePath), OUTPUT_STYLE_EXTNAME)
                         : null,
                     depComponents,
-                    imports: taroizeResult.imports
+                    imports: taroizeResult.imports,
                 });
                 const jsCode = (0, astConvert_1.generateMinimalEscapeCode)(ast);
                 this.writeFileToTaro(this.getComponentDest(componentDistJSPath), this.formatFile(jsCode, taroizeResult.template));
@@ -693,7 +1099,7 @@ ${code}
     styleUnitTransform(filePath, content) {
         return __awaiter(this, void 0, void 0, function* () {
             const postcssResult = yield (0, postcss_1.default)([unitTransform()]).process(content, {
-                from: filePath
+                from: filePath,
             });
             return postcssResult;
         });
@@ -705,10 +1111,7 @@ ${code}
         styleDist = path.dirname(styleDist);
         while (token === null || token === void 0 ? void 0 : token.length) {
             let url = token[1];
-            if (url &&
-                url.indexOf('data:') !== 0 &&
-                url.indexOf('#') !== 0 &&
-                !(/^[a-z]+:\/\//.test(url))) {
+            if (url && url.indexOf('data:') !== 0 && url.indexOf('#') !== 0 && !/^[a-z]+:\/\//.test(url)) {
                 url = url.trim();
                 url.replace(/[/\\]/g, path.sep);
                 url = url.split('?')[0];
@@ -743,7 +1146,7 @@ ${code}
             this.writeFileToTaro(styleDist, css);
             (0, helper_1.printLog)("generate" /* processTypeEnum.GENERATE */, '样式文件', this.generateShowPath(styleDist));
             if (imports && imports.length) {
-                imports.forEach(importItem => {
+                imports.forEach((importItem) => {
                     const importPath = path.isAbsolute(importItem)
                         ? path.join(this.root, importItem)
                         : path.resolve(path.dirname(filePath), importItem);
@@ -773,44 +1176,48 @@ ${code}
             typescript: false,
             template: templateName,
             framework: this.framework,
-            compiler: 'webpack5'
+            compiler: 'webpack5',
         });
         creator.template(templateName, path.join('config', 'index.js'), path.join(configDir, 'index.js'), {
             date,
             projectName,
             framework: this.framework,
-            compiler: 'webpack5'
+            compiler: 'webpack5',
+            typescript: false,
         });
         creator.template(templateName, path.join('config', 'dev.js'), path.join(configDir, 'dev.js'), {
-            framework: this.framework
+            framework: this.framework,
+            compiler: 'webpack5',
+            typescript: false,
         });
         creator.template(templateName, path.join('config', 'prod.js'), path.join(configDir, 'prod.js'), {
-            framework: this.framework
+            framework: this.framework,
+            typescript: false,
         });
         creator.template(templateName, 'project.config.json', path.join(this.convertRoot, 'project.config.json'), {
             description,
             projectName,
-            framework: this.framework
+            framework: this.framework,
         });
         creator.template(templateName, '.gitignore', path.join(this.convertRoot, '.gitignore'));
         creator.template(templateName, '.editorconfig', path.join(this.convertRoot, '.editorconfig'));
         creator.template(templateName, '.eslintrc.js', path.join(this.convertRoot, '.eslintrc.js'), {
             typescript: false,
-            framework: this.framework
+            framework: this.framework,
         });
         creator.template(templateName, 'babel.config.js', path.join(this.convertRoot, 'babel.config.js'), {
             typescript: false,
-            framework: this.framework
+            framework: this.framework,
         });
         creator.template(templateName, path.join('src', 'index.html'), path.join(this.convertDir, 'index.html'), {
-            projectName
+            projectName,
         });
         creator.fs.commit(() => {
             const pkgObj = JSON.parse(helper_1.fs.readFileSync(pkgPath).toString());
             pkgObj.dependencies['@tarojs/with-weapp'] = `^${version}`;
             helper_1.fs.writeJSONSync(pkgPath, pkgObj, {
                 spaces: 2,
-                EOL: '\n'
+                EOL: '\n',
             });
             (0, helper_1.printLog)("generate" /* processTypeEnum.GENERATE */, '文件', this.generateShowPath(path.join(configDir, 'index.js')));
             (0, helper_1.printLog)("generate" /* processTypeEnum.GENERATE */, '文件', this.generateShowPath(path.join(configDir, 'dev.js')));
@@ -824,15 +1231,27 @@ ${code}
             this.showLog();
         });
     }
+    /**
+     * generateReport: 为转换后的 taroConvert 工程添加转换报告
+     */
+    generateReport() {
+        const reportDir = path.join(this.convertRoot, 'report');
+        const reportBundleFilePath = path.resolve(__dirname, '../', 'report/bundle.js');
+        const reportIndexFilePath = path.resolve(__dirname, '../', 'report/report.html');
+        (0, util_1.generateReportFile)(reportBundleFilePath, reportDir, 'bundle.js', this.reportErroMsg);
+        (0, util_1.generateReportFile)(reportIndexFilePath, reportDir, 'report.html');
+    }
     showLog() {
         console.log();
         console.log(`${helper_1.chalk.green('✔ ')} 转换成功，请进入 ${helper_1.chalk.bold('taroConvert')} 目录下使用 npm 或者 yarn 安装项目依赖后再运行！`);
+        console.log(`转换报告已生成，请在浏览器中打开 ${path.join(this.convertRoot, 'report', 'report.html')} 查看转换报告`);
     }
     run() {
         this.framework = 'react';
         this.generateEntry();
         this.traversePages();
         this.generateConfigFiles();
+        this.generateReport();
     }
 }
 exports.default = Convertor;