babel-preset-taro 3.4.0-beta.1 → 3.4.1

package/index.js

@@ -28,7 +28,7 @@ module.exports = (_, options = {}) => {
     }])
     if (process.env.TARO_ENV === 'h5' && process.env.NODE_ENV !== 'production' && options.hot !== false) {
       if (options.framework === 'react') {
-        plugins.push([require('react-refresh/babel')])
+        plugins.push([require('react-refresh/babel'), { skipEnvCheck: true }])
       } else if (options.framework === 'preact') {
         overrides.push({
           include: /\.[jt]sx$/,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-taro",
-  "version": "3.4.0-beta.1",
+  "version": "3.4.1",
   "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": {
@@ -35,22 +36,19 @@
     "@babel/runtime": "^7.14.5",
     "@babel/runtime-corejs3": "^7.14.5",
     "@prefresh/babel-plugin": "^0.4.1",
-    "@tarojs/helper": "3.4.0-beta.1",
-    "@tarojs/taro-h5": "3.4.0-beta.1",
+    "@tarojs/helper": "3.4.1",
+    "@tarojs/taro-h5": "3.4.1",
     "@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.4.0-beta.1",
-    "babel-plugin-transform-taroapi": "3.4.0-beta.1",
+    "babel-plugin-transform-react-jsx-to-rn-stylesheet": "3.4.1",
+    "babel-plugin-transform-taroapi": "3.4.1",
     "core-js": "^3.6.5",
     "metro-react-native-babel-preset": "^0.66.2",
     "react-refresh": "0.9.0"
   },
-  "devDependencies": {
-    "@tarojs/taro-rn": "3.4.0-beta.1"
-  },
-  "gitHead": "bd7b3674278d22f71e2658b530cc0be24bf9964e"
+  "gitHead": "a2437215b1966fd0b6dd09311bcb4fd894a871d0"
 }

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()
+      }
+    }
+  }
+}

package/rn/index.js

@@ -60,14 +60,16 @@ function getEnv () {
 }
 
 function parseDefineConst (config) {
+  const result = {}
   Object.keys(config.defineConstants).forEach((key) => {
     try {
-      config.defineConstants[key] = JSON.parse(config.defineConstants[key])
+      result[key] = JSON.parse(config.defineConstants[key])
     } catch (e) {
-      console.error('defineConstants环境配置有误')
-      config.defineConstants[key] = ''
+      console.error('defineConstants error: ', e)
+      result[key] = ''
     }
   })
+  return result
 }
 
 /**
@@ -77,17 +79,20 @@ function parseDefineConst (config) {
 function getDefineConstants () {
   const config = getProjectConfig()
   const rnconfig = getRNConfig()
+  const env = getEnv()
   if (rnconfig.defineConstants) {
-    parseDefineConst(rnconfig)
-    rnconfig.defineConstants = Object.assign(rnconfig.defineConstants, getEnv())
-    return rnconfig.defineConstants
+    return {
+      ...parseDefineConst(rnconfig),
+      ...env
+    }
   }
   if (config.defineConstants) {
-    parseDefineConst(config)
-    config.defineConstants = Object.assign(config.defineConstants, getEnv())
-    return config.defineConstants
+    return {
+      ...parseDefineConst(config),
+      ...env
+    }
   }
-  return getEnv()
+  return env
 }
 
 function getCSSModule () {
@@ -112,7 +117,6 @@ module.exports = (_, options = {}) => {
   const nativeLibs = require('@tarojs/taro-rn/libList.js')
   const nativeInterfaces = nativeApis.concat(nativeLibs)
 
-  getEnv()
   const defineConstants = getDefineConstants()
   const presets = []
   const plugins = []
@@ -155,13 +159,16 @@ module.exports = (_, options = {}) => {
     [require('babel-plugin-global-define'), defineConstants]
   )
 
-  // 添加一个默认 plugin, 与小程序/h5保持一致. todo: 3.1后采用拓展的方式
+  // 添加一个默认 plugin, 与小程序/h5保持一致.
   plugins.push(
     [require('@babel/plugin-proposal-decorators'), {
       decoratorsBeforeExport,
       legacy: decoratorsLegacy !== false
     }]
   )
+
+  plugins.push(require('../remove-define-config'))
+
   return {
     presets,
     plugins