babel-preset-taro 3.3.17 → 3.4.0-beta.2

package/index.js

@@ -9,7 +9,7 @@ module.exports = (_, options = {}) => {
   const presets = []
   const plugins = []
   const overrides = []
-  const isReact = options.framework === 'react'
+  const isReact = options.framework === 'react' || options.framework === 'preact'
   const isNerv = options.framework === 'nerv'
   const isVue = options.framework === 'vue'
   const isVue3 = options.framework === 'vue3'
@@ -27,7 +27,14 @@ module.exports = (_, options = {}) => {
       runtime: options.reactJsxRuntime || 'automatic'
     }])
     if (process.env.TARO_ENV === 'h5' && process.env.NODE_ENV !== 'production' && options.hot !== false) {
-      plugins.push([require('react-refresh/babel')])
+      if (options.framework === 'react') {
+        plugins.push([require('react-refresh/babel')])
+      } else if (options.framework === 'preact') {
+        overrides.push({
+          include: /\.[jt]sx$/,
+          plugins: [require('@prefresh/babel-plugin')]
+        })
+      }
     }
   }
 
@@ -154,10 +161,13 @@ module.exports = (_, options = {}) => {
       packageName: '@tarojs/taro',
       apis
     }])
-  } else {
+  }
+  if (options['dynamic-import-node'] || process.env.TARO_ENV !== 'h5') {
     plugins.push([require('babel-plugin-dynamic-import-node')])
   }
 
+  plugins.push(require('./remove-define-config'))
+
   return {
     sourceType: 'unambiguous',
     overrides: [{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-taro",
-  "version": "3.3.17",
+  "version": "3.4.0-beta.2",
   "description": "> TODO: description",
   "author": "yuche <i@yuche.me>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/babel-preset-taro#readme",
@@ -8,6 +8,7 @@
   "main": "index.js",
   "files": [
     "rn/",
+    "remove-define-config.js",
     "index.js"
   ],
   "repository": {
@@ -25,31 +26,32 @@
     "@babel/core": "*"
   },
   "dependencies": {
-    "@babel/plugin-proposal-class-properties": "7.10.4",
-    "@babel/plugin-proposal-decorators": "7.10.5",
-    "@babel/plugin-syntax-jsx": "^7.10.4",
-    "@babel/plugin-transform-runtime": "7.11.0",
-    "@babel/preset-env": "^7.11.0",
-    "@babel/preset-react": "7.12.13",
-    "@babel/preset-typescript": "7.12.17",
-    "@babel/runtime": "^7.11.2",
-    "@babel/runtime-corejs3": "^7.14.8",
-    "@tarojs/helper": "3.3.17",
-    "@tarojs/taro-h5": "3.3.17",
+    "@babel/plugin-proposal-class-properties": "^7.14.5",
+    "@babel/plugin-proposal-decorators": "^7.14.5",
+    "@babel/plugin-syntax-jsx": "^7.14.5",
+    "@babel/plugin-transform-runtime": "^7.14.5",
+    "@babel/preset-env": "^7.14.5",
+    "@babel/preset-react": "^7.14.5",
+    "@babel/preset-typescript": "^7.14.5",
+    "@babel/runtime": "^7.14.5",
+    "@babel/runtime-corejs3": "^7.14.5",
+    "@prefresh/babel-plugin": "^0.4.1",
+    "@tarojs/helper": "3.4.0-beta.2",
+    "@tarojs/taro-h5": "3.4.0-beta.2",
     "@vue/babel-plugin-jsx": "^1.0.6",
     "@vue/babel-preset-jsx": "^1.2.4",
-    "babel-plugin-dynamic-import-node": "^2.3.3",
-    "babel-plugin-global-define": "^1.0.3",
-    "babel-plugin-jsx-attributes-array-to-object": "^0.3.0",
-    "babel-plugin-transform-imports-api": "^1.0.0",
-    "babel-plugin-transform-react-jsx-to-rn-stylesheet": "3.3.17",
-    "babel-plugin-transform-taroapi": "3.3.17",
+    "babel-plugin-dynamic-import-node": "2.3.3",
+    "babel-plugin-global-define": "1.0.3",
+    "babel-plugin-jsx-attributes-array-to-object": "0.3.0",
+    "babel-plugin-transform-imports-api": "1.0.0",
+    "babel-plugin-transform-react-jsx-to-rn-stylesheet": "3.4.0-beta.2",
+    "babel-plugin-transform-taroapi": "3.4.0-beta.2",
     "core-js": "^3.6.5",
     "metro-react-native-babel-preset": "^0.66.2",
     "react-refresh": "0.9.0"
   },
   "devDependencies": {
-    "@tarojs/taro-rn": "3.3.17"
+    "@tarojs/taro-rn": "3.4.0-beta.2"
   },
-  "gitHead": "3f3ce5f66d370b1982a30e4a5f2c8eb383652063"
+  "gitHead": "ac3eb29f11aec15d25e061775d9e970efabc2c98"
 }

package/remove-define-config.js

@@ -0,0 +1,18 @@
+module.exports = function pluginRemovePageConfig (babel) {
+  const { types: t } = babel
+
+  return {
+    name: 'plugin:remove_pageconfig',
+    visitor: {
+      CallExpression (nodePath, state) {
+        if (!/src/.test(state.filename)) return
+        if (/\.config\.(t|j)sx?$/.test(state.filename)) return
+
+        const { callee } = nodePath.node
+        if (!t.isIdentifier(callee, { name: 'definePageConfig' })) return
+
+        nodePath.remove()
+      }
+    }
+  }
+}