Merge branch 'main' into feat/ssr-component

Author: ZEJIA-LIU

packages/taro-cli-convertor/src/index.ts

@@ -459,36 +459,36 @@ export default class Convertor {
               }
             },
 
-            ClassExpression (astPath) {
-              updateLogFileContent(
-                `INFO [taro-cli-convertor] parseAst - 解析ClassExpression ${getLineBreak()}${astPath} ${getLineBreak()}`
-              )
-              const node = astPath.node
-              if (node.superClass) {
-                let isTaroComponent = false
-                astPath.traverse({
-                  ClassMethod (astPath) {
-                    if (astPath.get('key').isIdentifier({ name: 'render' })) {
-                      astPath.traverse({
-                        JSXElement () {
-                          isTaroComponent = true
-                        },
-                      })
-                    }
-                  },
-                })
-                if (isTaroComponent) {
-                  if (node.id === null) {
-                    const parentNode = astPath.parentPath.node as t.VariableDeclarator
-                    if (t.isVariableDeclarator(astPath.parentPath)) {
-                      componentClassName = (parentNode.id as t.Identifier).name
-                    }
-                  } else {
-                    componentClassName = node.id!.name
-                  }
-                }
-              }
-            },
+            // ClassExpression (astPath) {
+            //   updateLogFileContent(
+            //     `INFO [taro-cli-convertor] parseAst - 解析ClassExpression ${getLineBreak()}${astPath} ${getLineBreak()}`
+            //   )
+            //   const node = astPath.node
+            //   if (node.superClass) {
+            //     let isTaroComponent = false
+            //     astPath.traverse({
+            //       ClassMethod (astPath) {
+            //         if (astPath.get('key').isIdentifier({ name: 'render' })) {
+            //           astPath.traverse({
+            //             JSXElement () {
+            //               isTaroComponent = true
+            //             },
+            //           })
+            //         }
+            //       },
+            //     })
+            //     if (isTaroComponent) {
+            //       if (node.id === null) {
+            //         const parentNode = astPath.parentPath.node as t.VariableDeclarator
+            //         if (t.isVariableDeclarator(astPath.parentPath)) {
+            //           componentClassName = (parentNode.id as t.Identifier).name
+            //         }
+            //       } else {
+            //         componentClassName = node.id!.name
+            //       }
+            //     }
+            //   }
+            // },
             ExportDefaultDeclaration (astPath) {
               updateLogFileContent(
                 `INFO [taro-cli-convertor] parseAst - 解析ExportDefaultDeclaration ${getLineBreak()}${astPath} ${getLineBreak()}`
@@ -1628,18 +1628,18 @@ ${code}
   }
 
   // 判断三方库是否安装
-  isInNodeModule (modulePath: string) {
-    const nodeModules = path.resolve(this.root, 'node_modules')
-    if (!fs.existsSync(nodeModules)) {
-      return false
-    }
-    const modules = fs.readdirSync(nodeModules)
-    const parts = modulePath.split('/')
-    if (modules.indexOf(parts[0]) === -1) {
-      return false
-    }
-    return true
-  }
+  // isInNodeModule (modulePath: string) {
+  //   const nodeModules = path.resolve(this.root, 'node_modules')
+  //   if (!fs.existsSync(nodeModules)) {
+  //     return false
+  //   }
+  //   const modules = fs.readdirSync(nodeModules)
+  //   const parts = modulePath.split('/')
+  //   if (modules.indexOf(parts[0]) === -1) {
+  //     return false
+  //   }
+  //   return true
+  // }
 
   traversePages (root: string, pages: Set<string>) {
     pages.forEach((page) => {

packages/taro-cli-convertor/src/util/index.ts

@@ -399,16 +399,16 @@ export function handleUnconvertDir (matchUnconvertDir: string, rootPath: string,
   }
 }
 
-export function getMatchDirPath (filePath: string, matchStr: string) {
-  const reg = new RegExp(matchStr)
-  const match = reg.exec(filePath)
-  if (match) {
-    if (matchStr.length >= 2 && matchStr.endsWith('*')) {
-      return matchStr.slice(0, matchStr.length - 2)
-    }
-    return match[0]
-  }
-}
+// export function getMatchDirPath (filePath: string, matchStr: string) {
+//   const reg = new RegExp(matchStr)
+//   const match = reg.exec(filePath)
+//   if (match) {
+//     if (matchStr.length >= 2 && matchStr.endsWith('*')) {
+//       return matchStr.slice(0, matchStr.length - 2)
+//     }
+//     return match[0]
+//   }
+// }
 
 // 路径标准化
 function normalizePath (path) {

packages/taroize/src/utils.ts

@@ -2,7 +2,7 @@ import { codeFrameColumns } from '@babel/code-frame'
 import generate from '@babel/generator'
 import { parse } from '@babel/parser'
 import { default as template } from '@babel/template'
-import traverse, { NodePath } from '@babel/traverse'
+import traverse from '@babel/traverse'
 import * as t from '@babel/types'
 import { fs } from '@tarojs/helper'
 import { camelCase, capitalize } from 'lodash'
@@ -16,13 +16,13 @@ const prettierJSConfig: prettier.Options = {
   parser: 'babel',
 }
 
-export function isAliasThis (p: NodePath<t.Node>, name: string) {
-  const binding = p.scope.getBinding(name)
-  if (binding) {
-    return binding.path.isVariableDeclarator() && t.isThisExpression(binding.path.get('init'))
-  }
-  return false
-}
+// export function isAliasThis (p: NodePath<t.Node>, name: string) {
+//   const binding = p.scope.getBinding(name)
+//   if (binding) {
+//     return binding.path.isVariableDeclarator() && t.isThisExpression(binding.path.get('init'))
+//   }
+//   return false
+// }
 
 /**
  * 标准化传入路径