Merge pull request #189 from qican77/release-3.6.8-app

feat: 支持commonjs和es6的导入导出混用

packages/taro-transformer-wx/src/index.ts

@@ -13,6 +13,7 @@ import flowStrip from '@babel/plugin-transform-flow-strip-types'
 import jsxPlugin from '@babel/plugin-transform-react-jsx'
 import traverse, { Binding, NodePath } from '@babel/traverse'
 import * as t from '@babel/types'
+import babel_plugin_transform_commonjs from 'babel-plugin-transform-commonjs'
 // import * as template from '@babel/template'
 // const template = require('babel-template')
 import { prettyPrint } from 'html'
@@ -227,6 +228,7 @@ function parseCode(code: string) {
         [decorators, { legacy: true }],
         dynamicImport,
         optionalChaining,
+        babel_plugin_transform_commonjs,
       ],
     }) as { ast: t.File }
   ).ast

packages/taroize/package.json

@@ -40,6 +40,7 @@
     "@babel/types": "^7.21.4",
     "babel-core": "^6.26.3",
     "babel-generator": "^6.26.1",
+    "babel-plugin-transform-commonjs": "^1.1.6",
     "babel-template": "^6.26.0",
     "babel-traverse": "^6.26.0",
     "babel-types": "^6.26.0",

packages/taroize/src/script.ts

@@ -78,6 +78,59 @@ export function parseScript (
         path.remove()
       }
     },
+    VariableDeclaration (path) {
+      const variableDeclarator = path.node.declarations[0]
+      variableDeclarator.init
+      if (t.isVariableDeclarator(variableDeclarator)) {
+        // 去除commonjs转es6生成的var module = {exports: {},}
+        if (
+          t.isIdentifier(variableDeclarator.id) &&
+          variableDeclarator.id.name === 'module' &&
+          t.isObjectExpression(variableDeclarator.init)
+        ) {
+          const init: t.ObjectExpression = variableDeclarator.init
+          if (
+            init.properties &&
+            init.properties.length > 0 &&
+            t.isObjectProperty(init.properties[0]) &&
+            t.isIdentifier(init.properties[0].key) &&
+            init.properties[0].key.name === 'exports'
+          ) {
+            path.remove()
+          }
+        }
+        // 去除commonjs转es6生成的var exports = module.exports
+        if (
+          t.isIdentifier(variableDeclarator.id) &&
+          variableDeclarator.id.name === 'exports' &&
+          t.isMemberExpression(variableDeclarator.init)
+        ) {
+          const init: t.MemberExpression = variableDeclarator.init
+          if (
+            t.isIdentifier(init.object) &&
+            init.object.name === 'module' &&
+            t.isIdentifier(init.property) &&
+            init.property.name === 'exports'
+          ) {
+            path.remove()
+          }
+        }
+      }
+    },
+    ExportDefaultDeclaration (path) {
+      const declaration = path.node.declaration
+      // 去除commonjs转es6生成的export default module.exports
+      if (t.isMemberExpression(declaration)) {
+        if (
+          t.isIdentifier(declaration.object) &&
+          declaration.object.name === 'module' &&
+          t.isIdentifier(declaration.property) &&
+          declaration.property.name === 'exports'
+        ) {
+          path.remove()
+        }
+      }
+    },
   }
 
   traverse(ast, vistor)

packages/taroize/src/utils.ts

@@ -14,6 +14,7 @@ import presetTypescript from '@babel/preset-typescript'
 import { default as template } from '@babel/template'
 import { NodePath } from '@babel/traverse'
 import * as t from '@babel/types'
+import babel_plugin_transform_commonjs from 'babel-plugin-transform-commonjs'
 import { camelCase, capitalize } from 'lodash'
 
 export function isAliasThis (p: NodePath<t.Node>, name: string) {
@@ -62,6 +63,7 @@ export function parseCode (code: string, scriptPath?: string) {
           [decorators, { legacy: true }],
           dynamicImport,
           optionalChaining,
+          babel_plugin_transform_commonjs,
         ],
       }) as { ast: t.File }
     ).ast
@@ -81,6 +83,7 @@ export function parseCode (code: string, scriptPath?: string) {
         [decorators, { legacy: true }],
         dynamicImport,
         optionalChaining,
+        babel_plugin_transform_commonjs,
       ],
     }) as { ast: t.File }
   ).ast