chore: 合并[email protected]

yymzy · Nov 15, 2022 · e4be91d · e4be91d
1 parent 617d5fd
commit e4be91d
Show file tree

Hide file tree

Showing 45 changed files with 5,172 additions and 5,490 deletions.
diff --git a/packages/taro-ui-demo-rn/metro.config.js b/packages/taro-ui-demo-rn/metro.config.js
@@ -1,11 +1,11 @@
 const fs = require('fs')
 const path = require('path')
-const blacklist = require('metro-config/src/defaults/exclusionList')
+const exclusionList = require('metro-config/src/defaults/exclusionList')
 const escape = require('escape-string-regexp')
 
 const taroUI = path.resolve(__dirname, '../taro-ui')
 const pak = JSON.parse(
-  fs.readFileSync(path.join(taroUI, 'package.json'), 'utf8'),
+  fs.readFileSync(path.join(taroUI, 'package.json'), 'utf8')
 )
 
 const modules = [
@@ -17,8 +17,8 @@ const modules = [
   'react-native-root-siblings',
   ...Object.keys({
     ...pak.dependencies,
-    ...pak.peerDependencies,
-  }),
+    ...pak.peerDependencies
+  })
 ]
 
 module.exports = {
@@ -30,8 +30,8 @@ module.exports = {
       acc[name] = path.join(__dirname, 'node_modules', name)
       return acc
     }, {}),
-    blacklistRE: blacklist([
-      new RegExp(`^${escape(path.join(taroUI, 'node_modules'))}\\/.*$`),
-    ]),
-  },
+    blockList: exclusionList([
+      new RegExp(`^${escape(path.join(taroUI, 'node_modules'))}\\/.*$`)
+    ])
+  }
 }
diff --git a/packages/taro-ui-demo-rn/package.json b/packages/taro-ui-demo-rn/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "taro-ui-demo-rn",
-  "version": "3.1.0-beta.2",
+  "version": "3.1.0-beta.4",
   "description": "Taro UI demo",
   "author": "O2Team <aotu.io>",
   "homepage": "https://taro-ui.aotu.io",
@@ -42,31 +42,47 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.7.7",
-    "@tarojs/components": "^3.3.20",
-    "@tarojs/react": "^3.3.20",
-    "@tarojs/rn-runner": "^3.3.20",
-    "@tarojs/runtime": "^3.3.20",
-    "@tarojs/taro": "^3.3.20",
-    "@tarojs/taro-rn": "^3.3.20",
+    "@tarojs/components": "3.4.13",
+    "@tarojs/plugin-framework-react": "3.4.13",
+    "@tarojs/react": "3.4.13",
+    "@tarojs/rn-runner": "3.4.13",
+    "@tarojs/runtime": "3.4.13",
+    "@tarojs/taro": "3.4.13",
+    "@tarojs/taro-rn": "3.4.13",
     "react": "^17.0.2",
     "react-dom": "^16.13.0",
-    "react-native": "^0.66.0",
+    "react-native": "~0.68.1",
     "react-native-modal": "^13.0.0",
-    "taro-ui": "3.1.0-beta.2"
+    "taro-ui": "3.1.0-beta.4"
   },
   "devDependencies": {
     "@babel/core": "^7.8.0",
     "@react-native-picker/picker": "^1.15.0",
-    "@tarojs/cli": "^3.3.20",
-    "@tarojs/mini-runner": "^3.3.20",
-    "@tarojs/webpack-runner": "^3.3.20",
+    "@tarojs/cli": "3.4.13",
+    "@tarojs/mini-runner": "3.4.13",
+    "@tarojs/webpack-runner": "3.4.13",
     "@types/react": "^16.0.0",
     "@types/webpack-env": "^1.13.6",
     "babel-plugin-transform-imports": "^2.0.0",
-    "babel-preset-taro": "^3.3.20",
+    "babel-preset-taro": "3.4.13",
     "escape-string-regexp": "^4.0.0",
-    "eslint-config-taro": "^3.3.20",
+    "eslint-config-taro": "3.4.13",
+    "expo-constants": "13.1.1",
+    "expo-modules-core": "0.9.2",
     "patch-package": "^6.4.7",
     "typescript": "^3.8.3"
+  },
+  "resolutions": {
+    "sass": "1.37.5",
+    "expo-camera": "12.3.0",
+    "expo-barcode-scanner": "11.3.0",
+    "expo-image-picker": "13.1.1",
+    "expo-brightness": "10.2.0",
+    "expo-file-system": "14.0.0",
+    "expo-keep-awake": "10.1.1",
+    "expo-permissions": "13.2.0",
+    "expo-sensors": "11.3.0",
+    "expo-asset": "8.5.0",
+    "expo-av": "11.2.3"
   }
 }