feat: 更新3.6 依赖

NervJS · Apr 25, 2023 · cbbdf77 · cbbdf77
1 parent b6e5ff6
commit cbbdf77
Show file tree

Hide file tree

Showing 24 changed files with 7,558 additions and 6,824 deletions.
diff --git a/...-ui-demo/.swc/plugins/v4/200063c2c798457e0f441f309e564fe9e258e1dcb142b8c6a1df1cbb41ae9bd9 b/...-ui-demo/.swc/plugins/v4/200063c2c798457e0f441f309e564fe9e258e1dcb142b8c6a1df1cbb41ae9bd9
diff --git a/packages/taro-ui-demo/babel.config.js b/packages/taro-ui-demo/babel.config.js
@@ -6,7 +6,8 @@ module.exports = {
       'taro',
       {
         framework: 'react',
-        ts: true
+        ts: true,
+        hot: false
       }
     ]
   ]

diff --git a/packages/taro-ui-demo/config/dev.js b/packages/taro-ui-demo/config/dev.js
@@ -4,5 +4,9 @@ module.exports = {
   },
   defineConstants: {},
   weapp: {},
-  h5: {}
+  h5: {
+    devServer: {
+      hot: false
+    }
+  }
 }
diff --git a/packages/taro-ui-demo/package.json b/packages/taro-ui-demo/package.json
@@ -1,71 +1,85 @@
 {
-  "private": true,
-  "name": "taro-ui-demo",
-  "version": "3.0.0-alpha.10",
-  "description": "Taro UI demo",
-  "author": "O2Team <aotu.io>",
-  "homepage": "https://taro-ui.aotu.io",
-  "repository": {
-    "type": "git",
-    "url": "git@github.com:nervjs/taro-ui.git"
-  },
-  "license": "MIT",
-  "templateInfo": {
-    "name": "default",
-    "typescript": true,
-    "css": "sass"
-  },
-  "scripts": {
-    "build": "yarn run build:h5",
-    "build:weapp": "taro build --type weapp",
-    "build:swan": "taro build --type swan",
-    "build:alipay": "taro build --type alipay",
-    "build:tt": "taro build --type tt",
-    "build:h5": "taro build --type h5",
-    "build:rn": "taro build --type rn",
-    "build:qq": "taro build --type qq",
-    "build:quickapp": "taro build --type quickapp",
-    "dev:weapp": "yarn run build:weapp --watch",
-    "dev:swan": "yarn run build:swan --watch",
-    "dev:alipay": "yarn run build:alipay --watch",
-    "dev:tt": "yarn run build:tt --watch",
-    "dev:h5": "yarn run build:h5 --watch",
-    "dev:rn": "yarn run build:rn --watch",
-    "dev:qq": "yarn run build:qq --watch",
-    "dev:quickapp": "yarn run build:quickapp --watch",
-    "clean": "rimraf .temp dist"
-  },
-  "browserslist": [
-    "last 3 versions",
-    "Android >= 4.1",
-    "ios >= 8"
-  ],
-  "dependencies": {
-    "@babel/runtime": "^7.7.7",
-    "@tarojs/components": "3.4.3",
-    "@tarojs/runtime": "3.4.3",
-    "@tarojs/taro": "3.4.3",
-    "@tarojs/plugin-framework-react": "3.4.3",
-    "@tarojs/react": "3.4.3",
-    "react-dom": "^17.0.0",
-    "react": "^17.0.0",
-    "taro-ui": "file:../taro-ui"
-  },
-  "devDependencies": {
-    "@types/webpack-env": "^1.13.6",
-    "@types/react": "^17.0.2",
-    "@tarojs/mini-runner": "3.4.3",
-    "@babel/core": "^7.8.0",
-    "@tarojs/webpack-runner": "3.4.3",
-    "babel-preset-taro": "3.4.3",
-    "eslint-config-taro": "3.4.3",
-    "eslint": "^6.8.0",
-    "eslint-plugin-react": "^7.8.2",
-    "eslint-plugin-import": "^2.12.0",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "stylelint": "^14.4.0",
-    "@typescript-eslint/parser": "^4.15.1",
-    "@typescript-eslint/eslint-plugin": "^4.15.1",
-    "typescript": "^4.1.0"
-  }
+	"private": true,
+	"name": "taro-ui-demo",
+	"version": "3.0.0-alpha.11",
+	"description": "Taro UI demo",
+	"author": "O2Team <aotu.io>",
+	"homepage": "https://taro-ui.aotu.io",
+	"repository": {
+		"type": "git",
+		"url": "git@github.com:nervjs/taro-ui.git"
+	},
+	"license": "MIT",
+	"templateInfo": {
+		"name": "default",
+		"typescript": true,
+		"css": "sass"
+	},
+	"scripts": {
+		"build": "yarn run build:h5",
+		"build:weapp": "taro build --type weapp",
+		"build:swan": "taro build --type swan",
+		"build:alipay": "taro build --type alipay",
+		"build:tt": "taro build --type tt",
+		"build:h5": "taro build --type h5",
+		"build:rn": "taro build --type rn",
+		"build:qq": "taro build --type qq",
+		"build:quickapp": "taro build --type quickapp",
+		"dev:weapp": "yarn run build:weapp --watch",
+		"dev:swan": "yarn run build:swan --watch",
+		"dev:alipay": "yarn run build:alipay --watch",
+		"dev:tt": "yarn run build:tt --watch",
+		"dev:h5": "yarn run build:h5 --watch",
+		"dev:rn": "yarn run build:rn --watch",
+		"dev:qq": "yarn run build:qq --watch",
+		"dev:quickapp": "yarn run build:quickapp --watch",
+		"clean": "rimraf .temp dist"
+	},
+	"browserslist": [
+		"last 3 versions",
+		"Android >= 4.1",
+		"ios >= 8"
+	],
+	"dependencies": {
+		"@babel/runtime": "^7.7.7",
+		"@tarojs/components": "3.6.1",
+		"@tarojs/helper": "3.6.1",
+		"@tarojs/plugin-platform-weapp": "3.6.1",
+		"@tarojs/plugin-platform-alipay": "3.6.1",
+		"@tarojs/plugin-platform-tt": "3.6.1",
+		"@tarojs/plugin-platform-swan": "3.6.1",
+		"@tarojs/plugin-platform-jd": "3.6.1",
+		"@tarojs/plugin-platform-qq": "3.6.1",
+		"@tarojs/plugin-platform-h5": "3.6.1",
+		"@tarojs/runtime": "3.6.1",
+		"@tarojs/shared": "3.6.1",
+		"@tarojs/taro": "3.6.1",
+		"@tarojs/plugin-framework-react": "3.6.1",
+		"@tarojs/react": "3.6.1",
+		"react-dom": "^18.0.0",
+		"react": "^18.0.0",
+		"taro-ui": "file:../taro-ui"
+	},
+	"devDependencies": {
+		"@babel/core": "^7.8.0",
+		"@tarojs/cli": "3.6.1",
+		"@types/webpack-env": "^1.13.6",
+		"@types/react": "^18.0.0",
+		"@tarojs/mini-runner": "3.6.1",
+		"@tarojs/webpack-runner": "3.6.1",
+		"webpack": "4.46.0",
+		"babel-preset-taro": "3.6.1",
+		"eslint-config-taro": "3.6.1",
+		"eslint": "^8.12.0",
+		"@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
+		"react-refresh": "^0.11.0",
+		"eslint-plugin-react": "^7.8.2",
+		"eslint-plugin-import": "^2.12.0",
+		"eslint-plugin-react-hooks": "^4.2.0",
+		"stylelint": "^14.4.0",
+		"@typescript-eslint/parser": "^5.20.0",
+		"@typescript-eslint/eslint-plugin": "^5.20.0",
+		"typescript": "^4.1.0",
+		"postcss": "^8.4.18"
+	}
 }
diff --git a/packages/taro-ui-demo/src/pages/action/swipe-action/index.tsx b/packages/taro-ui-demo/src/pages/action/swipe-action/index.tsx
@@ -171,7 +171,7 @@ export default class SwipeActionPage extends React.Component<
 
           <View className='panel'>
             <View className='panel__title'>使用变量控制开关</View>
-            <View className='panel__controller' style='margin-bottom: 10px'>
+            <View className='panel__controller' style={{marginBottom: '10px'}}>
               <AtButton size='small' onClick={this.handleStatusClick}>
                 当前状态: {isOpened2 ? '开' : '关'}{' '}
               </AtButton>

diff --git a/packages/taro-ui-demo/src/pages/basic/color/index.tsx b/packages/taro-ui-demo/src/pages/basic/color/index.tsx
@@ -155,12 +155,12 @@ export default class BasicColor extends React.Component<{}, BasicColorState> {
                     >
                       <View
                         className='color-item__circle'
-                        style={`background: ${color.hex}`}
+                        style={{background: color.hex}}
                       >
                         <View className='inner-circle-1'></View>
                         <View
                           className='inner-circle-2'
-                          style={`border-color: ${color.hex}`}
+                          style={{borderColor: color.hex}}
                         ></View>
                       </View>
                       <View className='color-item__info'>

diff --git a/packages/taro-ui-demo/src/pages/form/picker-view/index.tsx b/packages/taro-ui-demo/src/pages/form/picker-view/index.tsx
@@ -106,27 +106,31 @@ export default class Index extends React.Component<{}, IndexState> {
                     <PickerView
                       indicatorStyle='height: 50px;'
                       className='picker'
-                      style='width: 100%; height: 300px; text-align: center;'
+                      style={{
+                        width: '100%',
+                        height: '300px',
+                        textAlign: 'center',
+                      }}
                       value={value}
                       onChange={this.handleChange}
                     >
                       <PickerViewColumn>
                         {years.map((item, idx) => (
-                          <View key={idx} style='line-height: 50px'>
+                          <View key={idx} style={{lineHeight: '50px'}}>
                             {item}年
                           </View>
                         ))}
                       </PickerViewColumn>
                       <PickerViewColumn>
                         {months.map((item, idx) => (
-                          <View key={idx} style='line-height: 50px'>
+                          <View key={idx} style={{lineHeight: '50px'}}>
                             {item}月
                           </View>
                         ))}
                       </PickerViewColumn>
                       <PickerViewColumn>
                         {days.map((item, idx) => (
-                          <View key={idx} style='line-height: 50px'>
+                          <View key={idx} style={{lineHeight: '50px'}}>
                             {item}日
                           </View>
                         ))}

diff --git a/packages/taro-ui-docs/babel.config.json b/packages/taro-ui-docs/babel.config.json
@@ -0,0 +1,35 @@
+{
+  "overrides": [
+    {
+      "include": "packages/taro-ui-docs/**",
+      "presets": [
+        "@babel/preset-react",
+        [
+          "@babel/preset-env",
+          {
+            "spec": true,
+            "modules": false,
+            "targets": {
+              "browsers": [
+                "ie >= 9",
+                "Chrome >= 21",
+                "Firefox >= 1",
+                "Edge >= 13",
+                "last 3 versions"
+              ]
+            },
+            "loose": false,
+            "forceAllTransforms": true,
+            "useBuiltIns": "entry",
+            "corejs": "3.6"
+          }
+        ],
+      ],
+      "plugins": [
+        "@babel/plugin-syntax-dynamic-import",
+        "@babel/plugin-proposal-class-properties",
+        "@babel/plugin-syntax-jsx"
+      ]
+    }
+  ]
+}
diff --git a/packages/taro-ui-docs/package.json b/packages/taro-ui-docs/package.json
@@ -62,7 +62,7 @@
     "markdown-it": "^10.0.0",
     "markdown-it-container": "^2.0.0",
     "ora": "^4.0.3",
-    "postcss": "^7.0.27",
+    "postcss": "^8.3.0",
     "postcss-loader": "^3.0.0",
     "sass-loader": "^8.0.2",
     "style-loader": "^1.1.3",

diff --git a/packages/taro-ui/package.json b/packages/taro-ui/package.json
@@ -56,9 +56,9 @@
     "@rollup/plugin-commonjs": "^11.0.2",
     "@rollup/plugin-json": "^4.0.2",
     "@rollup/plugin-node-resolve": "^7.1.1",
-    "@tarojs/components": "~3.4.3",
-    "@tarojs/react": "~3.4.3",
-    "@tarojs/taro": "~3.4.3",
+    "@tarojs/components": "~3.6.1",
+    "@tarojs/react": "~3.6.1",
+    "@tarojs/taro": "~3.6.1",
     "@types/classnames": "^2.2.9",
     "@types/node": "^13.11.1",
     "@types/react": "^16.9.23",

diff --git a/packages/taro-ui/src/components/flex/item/index.scss b/packages/taro-ui/src/components/flex/item/index.scss
@@ -10,7 +10,7 @@
   box-sizing: border-box;
 
   @for $col from 1 through 12 {
-    $width: ($col / 12) * 100%;
+    $width: calc($col / 12) * 100%;
 
     &-#{$col} {
       @include flex(0, 0, $width);

diff --git a/packages/taro-ui/src/components/icon/index.tsx b/packages/taro-ui/src/components/icon/index.tsx
@@ -15,7 +15,7 @@ export default class AtIcon extends React.Component<AtIconProps> {
 
   public render(): JSX.Element {
     const {
-      customStyle,
+      customStyle = {},
       className,
       prefixClass,
       value,
@@ -32,7 +32,7 @@ export default class AtIcon extends React.Component<AtIconProps> {
     return (
       <Text
         className={classNames(prefixClass, iconName, className)}
-        style={mergeStyle(rootStyle, customStyle as object)}
+        style={mergeStyle(rootStyle, customStyle)}
         onClick={this.handleClick.bind(this)}
       ></Text>
     )

diff --git a/packages/taro-ui/src/components/message/index.tsx b/packages/taro-ui/src/components/message/index.tsx
@@ -44,10 +44,10 @@ export default class AtMessage extends React.Component<
       })
     })
     // 绑定函数
-    Taro.atMessage = Taro.eventCenter.trigger.bind(
+    ;(Taro as any).atMessage = Taro.eventCenter.trigger.bind(
       Taro.eventCenter,
       'atMessage'
-    )
+    ) as Taro.TaroStatic
   }
 
   public componentDidShow(): void {

diff --git a/packages/taro-ui/src/style/components/avatar.scss b/packages/taro-ui/src/style/components/avatar.scss
@@ -5,7 +5,7 @@
   width: $at-avatar-size-md;
   height: $at-avatar-size-md;
   color: $at-avatar-color;
-  font-size: $at-avatar-size-md / 2.5;
+  font-size: calc($at-avatar-size-md / 2.5);
   line-height: $at-avatar-size-md;
   text-align: center;
   border-radius: $border-radius-md;
@@ -23,14 +23,14 @@
   &--large {
     width: $at-avatar-size-lg;
     height: $at-avatar-size-lg;
-    font-size: $at-avatar-size-lg / 2.5;
+    font-size: calc($at-avatar-size-lg / 2.5);
     line-height: $at-avatar-size-lg;
   }
 
   &--small {
     width: $at-avatar-size-sm;
     height: $at-avatar-size-sm;
-    font-size: $at-avatar-size-sm / 2.5;
+    font-size: calc($at-avatar-size-sm / 2.5);
     line-height: $at-avatar-size-sm;
   }
 

diff --git a/packages/taro-ui/src/style/components/button.scss b/packages/taro-ui/src/style/components/button.scss
@@ -84,7 +84,7 @@
   }
 
   &--circle {
-    border-radius: $at-button-height / 2;
+    border-radius: calc($at-button-height / 2);
     background-clip: border-box;
     overflow: hidden;
   }
@@ -99,7 +99,7 @@
     line-height: $at-button-height-sm - 2;
 
     &.at-button--circle {
-      border-radius: $at-button-height-sm / 2;
+      border-radius: calc($at-button-height-sm / 2);
     }
   }