Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: remove rn's, and update taro version #2731

Merged
merged 3 commits into from
Nov 11, 2024
Merged

chore: remove rn's, and update taro version #2731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8ae7b6
fix: 恢复icon,简化demo
xiaoyatong Nov 10, 2024
c97a912
chore: 去掉rn相关,升级taro版本
xiaoyatong Nov 11, 2024
bf81cad
Merge branch 'V3.0' into chore-svg
xiaoyatong Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,11 @@
"@rollup/plugin-node-resolve": "15.2.3",
"@rollup/plugin-typescript": "^11.1.6",
"@swc/core": "^1.4.8",
"@tarojs/components": "4.0.0-beta.138",
"@tarojs/plugin-platform-alipay": "4.0.0-beta.138",
"@tarojs/plugin-platform-weapp": "4.0.0-beta.138",
"@tarojs/react": "4.0.0-beta.138",
"@tarojs/taro": "4.0.0-beta.138",
"@tarojs/components": "4.0.8-beta.0",
"@tarojs/plugin-platform-alipay": "4.0.8-beta.0",
"@tarojs/plugin-platform-weapp": "4.0.8-beta.0",
"@tarojs/react": "4.0.8-beta.0",
"@tarojs/taro": "4.0.8-beta.0",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^16.0.0",
"@types/fs-extra": "^11.0.4",
Expand Down
51 changes: 24 additions & 27 deletions packages/nutui-taro-demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,44 +56,42 @@
"@dongdesign/inject-jd-platform-styles": "1.0.4",
"@jdreact/jdreact-jsbundle-commonpack": "1.0.425",
"@jdtaro/plugin-platform-jdhybrid": "0.2.1",
"@jdtaro/plugin-platform-jdrn": "2.0.0-beta.0",
"@jdtaro/taro-platform-jdharmony": "2.0.70",
"@jdtaro/plugin-platform-jdharmony-cpp": "0.0.93",
"@jdtaro/plugin-platform-jdharmony-cpp": "0.1.2-alpha.0",
"@nutui/replace-icons": "^1.0.0",
"@nutui/touch-emulator": "^1.0.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
"@tarojs/components": "4.0.0-beta.138",
"@tarojs/helper": "4.0.0-beta.138",
"@tarojs/plugin-framework-react": "4.0.0-beta.138",
"@tarojs/plugin-html": "4.0.0-beta.138",
"@tarojs/plugin-platform-alipay": "4.0.0-beta.138",
"@tarojs/plugin-platform-h5": "4.0.0-beta.138",
"@tarojs/plugin-platform-jd": "4.0.0-beta.138",
"@tarojs/plugin-platform-qq": "4.0.0-beta.138",
"@tarojs/plugin-platform-swan": "4.0.0-beta.138",
"@tarojs/plugin-platform-tt": "4.0.0-beta.138",
"@tarojs/plugin-platform-weapp": "4.0.0-beta.138",
"@tarojs/react": "4.0.0-beta.138",
"@tarojs/router": "4.0.0-beta.138",
"@tarojs/runtime": "4.0.0-beta.138",
"@tarojs/shared": "4.0.0-beta.138",
"@tarojs/taro": "4.0.0-beta.138",
"@tarojs/taro-h5": "4.0.0-beta.138",
"@tarojs/components": "4.0.8-beta.0",
"@tarojs/helper": "4.0.8-beta.0",
"@tarojs/plugin-framework-react": "4.0.8-beta.0",
"@tarojs/plugin-html": "4.0.8-beta.0",
"@tarojs/plugin-platform-alipay": "4.0.8-beta.0",
"@tarojs/plugin-platform-h5": "4.0.8-beta.0",
"@tarojs/plugin-platform-jd": "4.0.8-beta.0",
"@tarojs/plugin-platform-qq": "4.0.8-beta.0",
"@tarojs/plugin-platform-swan": "4.0.8-beta.0",
"@tarojs/plugin-platform-tt": "4.0.8-beta.0",
"@tarojs/plugin-platform-weapp": "4.0.8-beta.0",
"@tarojs/react": "4.0.8-beta.0",
"@tarojs/router": "4.0.8-beta.0",
"@tarojs/runtime": "4.0.8-beta.0",
"@tarojs/shared": "4.0.8-beta.0",
"@tarojs/taro": "4.0.8-beta.0",
"@tarojs/taro-h5": "4.0.8-beta.0",
"babel-plugin-import": "^1.13.8",
"lodash.isequal": "^4.5.0",
"lodash.kebabcase": "^4.1.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-native": "0.72.3",
"react-refresh": "^0.14.0",
"react-transition-group": "^4.4.5"
},
"devDependencies": {
"@babel/core": "^7.23.9",
"@tarojs/cli": "4.0.0-beta.138",
"@tarojs/plugin-platform-harmony-ets": "4.0.0-beta.138",
"@tarojs/vite-runner": "4.0.0-beta.138",
"@tarojs/webpack5-runner": "4.0.0-beta.138",
"@tarojs/cli": "4.0.8-beta.0",
"@tarojs/plugin-platform-harmony-ets": "4.0.8-beta.0",
"@tarojs/vite-runner": "4.0.8-beta.0",
"@tarojs/webpack5-runner": "4.0.8-beta.0",
"@types/react": "^18.2.57",
"@types/react-dom": "^18.2.19",
"@types/react-router-dom": "^5.3.3",
Expand All @@ -103,9 +101,9 @@
"@types/webpack-env": "^1.18.4",
"@typescript-eslint/eslint-plugin": "^7.0.2",
"@typescript-eslint/parser": "^7.0.2",
"babel-preset-taro": "4.0.0-beta.138",
"babel-preset-taro": "4.0.8-beta.0",
"eslint": "^8.56.0",
"eslint-config-taro": "4.0.0-beta.138",
"eslint-config-taro": "4.0.8-beta.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
Expand All @@ -114,7 +112,6 @@
"typescript": "^5.3.3"
},
"resolutions": {
"react-native-webview": "13.6.3",
"sass":"1.77.6"
}
}
38 changes: 18 additions & 20 deletions packages/nutui-taro-demo/src/pages/index/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Taro from '@tarojs/taro'
import { View, Image, Text, ScrollView, Button, Input, Video } from '@tarojs/components'
import { View, Image, Text, ScrollView } from '@tarojs/components'
import pkg from '@/packages/../config.json'
import packageJson from '@/packages/../../package.json'
import './index.scss'
Expand All @@ -8,10 +8,6 @@ import './index.scss'
const navs = pkg.nav
// console.log(navs)


// hack taro load button xml
console.log(Button, Input, Video )

// try {
// console.log('xxx', Schema)
// } catch (e) {}
Expand Down Expand Up @@ -39,37 +35,39 @@ const Index = () => {
}

return (
<ScrollView className='index'>
<View className='index-header'>
<ScrollView className="index">
<View className="index-header">
<Image
className='index-header-img'
src='https://img14.360buyimg.com/imagetools/jfs/t1/117879/25/28831/6279/6329723bE66715a2f/5f099b8feca9e8cc.png'
className="index-header-img"
src="https://img14.360buyimg.com/imagetools/jfs/t1/117879/25/28831/6279/6329723bE66715a2f/5f099b8feca9e8cc.png"
/>
<View className='index-header-info'>
<View className='index-header-info-h1'>NutUI React</View>
<View className='index-header-info-p'>
<View className="index-header-info">
<View className="index-header-info-h1">NutUI React</View>
<View className="index-header-info-p">
京东风格的轻量级小程序组件库 React 版
</View>
<View className='index-header-info-p'>
<Text className='index-header-info-text'>v{packageJson?.version}</Text>
<View className="index-header-info-p">
<Text className="index-header-info-text">
v{packageJson?.version}
</Text>
</View>
</View>
</View>
<View className='index-components'>
<View className="index-components">
{navs.map((nav) => (
<View key={nav.enName} className='index-components-item'>
<View key={nav.enName} className="index-components-item">
{nav.enName === 'dataentry' ? null : (
<View className='index-components-item-title'>{nav.name}</View>
<View className="index-components-item-title">{nav.name}</View>
)}
<View className='index-components-sublist'>
<View className="index-components-sublist">
{nav.packages.map((com) =>
com.show && com.taro && com.version === '3.0.0' ? (
<View
key={com.name}
className='index-components-sublist-item'
className="index-components-sublist-item"
>
<View
className='index-components-sublist-item-content'
className="index-components-sublist-item-content"
key={com.name}
onClick={() => gotoNext(com.name, nav.enName)}
>
Expand Down
Loading
Loading