Skip to content

Commit a942d28

Browse files
Miles-hxyMiles-hxy
authored
Merge branch 'feat_v3.x' into hxy/actionsheet
2 parents 476fd36 + 1fa8c82 commit a942d28

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+987
-928
lines changed

‎.github/workflows/sync-migrate.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ jobs:
3131
- name: Copy migrate from v2
3232
run: node scripts/copy-migrate-from-v2.js
3333

34+
- name: Copy migrate from v1
35+
run: node scripts/copy-migrate-from-v1.js
36+
3437
- name : Sync
3538
uses : JamesIves/[email protected]
3639
with :

‎package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "@nutui/nutui-react-taro",
3-
"version": "3.0.0-beta.4",
2+
"name": "@nutui/nutui-react",
3+
"version": "3.0.0-beta.5",
44
"style": "dist/style.css",
55
"main": "dist/nutui.react.umd.js",
66
"module": "dist/es/packages/nutui.react.build.js",
@@ -75,7 +75,7 @@
7575
"build:taro:jmapp": "npm run checked:taro && VITE_APP_PROJECT_ID=jmapp node scripts/build-taro.mjs",
7676
"build:site": "npm run checked && vite build --config vite.config.site.ts",
7777
"build:site:jmapp": "npm run checked && VITE_APP_PROJECT_ID=jmapp vite build",
78-
"build:taro:site": "npm run checked:taro && npm run generate:file:taro:pages && pnpm --dir ./packages/nutui-taro-demo build:h5",
78+
"build:taro:site": "pnpm update:taro:entry && npm run checked:taro && npm run generate:file:taro:pages && pnpm --dir ./packages/nutui-taro-demo build:h5",
7979
"build:taro:site:jmapp": "npm run checked:taro && VITE_APP_PROJECT_ID=jmapp npm run generate:file:taro:pages && VITE_APP_PROJECT_ID=jmapp pnpm --dir ./packages/nutui-taro-demo build:h5",
8080
"build:theme:site": "npm run checked && vite build --config vite.config.theme.ts && npm run generate:themes-dev",
8181
"generate:file": "node scripts/generate-nutui.js",
@@ -129,11 +129,11 @@
129129
"@rollup/plugin-node-resolve": "15.2.3",
130130
"@rollup/plugin-typescript": "^11.1.6",
131131
"@swc/core": "^1.4.8",
132-
"@tarojs/components": "4.0.8-beta.0",
133-
"@tarojs/plugin-platform-alipay": "4.0.8-beta.0",
134-
"@tarojs/plugin-platform-weapp": "4.0.8-beta.0",
135-
"@tarojs/react": "4.0.8-beta.0",
136-
"@tarojs/taro": "4.0.8-beta.0",
132+
"@tarojs/components": "4.0.8-beta.1",
133+
"@tarojs/plugin-platform-alipay": "4.0.8-beta.1",
134+
"@tarojs/plugin-platform-weapp": "4.0.8-beta.1",
135+
"@tarojs/react": "4.0.8-beta.1",
136+
"@tarojs/taro": "4.0.8-beta.1",
137137
"@testing-library/jest-dom": "^6.4.2",
138138
"@testing-library/react": "^16.0.0",
139139
"@types/fs-extra": "^11.0.4",

‎packages/nutui-taro-demo/package.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -57,27 +57,27 @@
5757
"@jdreact/jdreact-jsbundle-commonpack": "1.0.425",
5858
"@jdtaro/plugin-platform-jdhybrid": "0.2.1",
5959
"@jdtaro/taro-platform-jdharmony": "2.0.70",
60-
"@jdtaro/plugin-platform-jdharmony-cpp": "0.1.2-alpha.0",
60+
"@jdtaro/plugin-platform-jdharmony-cpp": "0.1.4-alpha.3",
6161
"@nutui/replace-icons": "^1.0.0",
6262
"@nutui/touch-emulator": "^1.0.0",
6363
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
64-
"@tarojs/components": "4.0.8-beta.0",
65-
"@tarojs/helper": "4.0.8-beta.0",
66-
"@tarojs/plugin-framework-react": "4.0.8-beta.0",
67-
"@tarojs/plugin-html": "4.0.8-beta.0",
68-
"@tarojs/plugin-platform-alipay": "4.0.8-beta.0",
69-
"@tarojs/plugin-platform-h5": "4.0.8-beta.0",
70-
"@tarojs/plugin-platform-jd": "4.0.8-beta.0",
71-
"@tarojs/plugin-platform-qq": "4.0.8-beta.0",
72-
"@tarojs/plugin-platform-swan": "4.0.8-beta.0",
73-
"@tarojs/plugin-platform-tt": "4.0.8-beta.0",
74-
"@tarojs/plugin-platform-weapp": "4.0.8-beta.0",
75-
"@tarojs/react": "4.0.8-beta.0",
76-
"@tarojs/router": "4.0.8-beta.0",
77-
"@tarojs/runtime": "4.0.8-beta.0",
78-
"@tarojs/shared": "4.0.8-beta.0",
79-
"@tarojs/taro": "4.0.8-beta.0",
80-
"@tarojs/taro-h5": "4.0.8-beta.0",
64+
"@tarojs/components": "4.0.8-beta.1",
65+
"@tarojs/helper": "4.0.8-beta.1",
66+
"@tarojs/plugin-framework-react": "4.0.8-beta.1",
67+
"@tarojs/plugin-html": "4.0.8-beta.1",
68+
"@tarojs/plugin-platform-alipay": "4.0.8-beta.1",
69+
"@tarojs/plugin-platform-h5": "4.0.8-beta.1",
70+
"@tarojs/plugin-platform-jd": "4.0.8-beta.1",
71+
"@tarojs/plugin-platform-qq": "4.0.8-beta.1",
72+
"@tarojs/plugin-platform-swan": "4.0.8-beta.1",
73+
"@tarojs/plugin-platform-tt": "4.0.8-beta.1",
74+
"@tarojs/plugin-platform-weapp": "4.0.8-beta.1",
75+
"@tarojs/react": "4.0.8-beta.1",
76+
"@tarojs/router": "4.0.8-beta.1",
77+
"@tarojs/runtime": "4.0.8-beta.1",
78+
"@tarojs/shared": "4.0.8-beta.1",
79+
"@tarojs/taro": "4.0.8-beta.1",
80+
"@tarojs/taro-h5": "4.0.8-beta.1",
8181
"babel-plugin-import": "^1.13.8",
8282
"lodash.isequal": "^4.5.0",
8383
"lodash.kebabcase": "^4.1.1",
@@ -88,10 +88,10 @@
8888
},
8989
"devDependencies": {
9090
"@babel/core": "^7.23.9",
91-
"@tarojs/cli": "4.0.8-beta.0",
92-
"@tarojs/plugin-platform-harmony-ets": "4.0.8-beta.0",
93-
"@tarojs/vite-runner": "4.0.8-beta.0",
94-
"@tarojs/webpack5-runner": "4.0.8-beta.0",
91+
"@tarojs/cli": "4.0.8-beta.1",
92+
"@tarojs/plugin-platform-harmony-ets": "4.0.8-beta.1",
93+
"@tarojs/vite-runner": "4.0.8-beta.1",
94+
"@tarojs/webpack5-runner": "4.0.8-beta.1",
9595
"@types/react": "^18.2.57",
9696
"@types/react-dom": "^18.2.19",
9797
"@types/react-router-dom": "^5.3.3",
@@ -101,9 +101,9 @@
101101
"@types/webpack-env": "^1.18.4",
102102
"@typescript-eslint/eslint-plugin": "^7.0.2",
103103
"@typescript-eslint/parser": "^7.0.2",
104-
"babel-preset-taro": "4.0.8-beta.0",
104+
"babel-preset-taro": "4.0.8-beta.1",
105105
"eslint": "^8.56.0",
106-
"eslint-config-taro": "4.0.8-beta.0",
106+
"eslint-config-taro": "4.0.8-beta.1",
107107
"eslint-plugin-import": "^2.29.1",
108108
"eslint-plugin-react": "^7.33.2",
109109
"eslint-plugin-react-hooks": "^4.6.0",
@@ -113,7 +113,7 @@
113113
},
114114
"resolutions": {
115115
"sass": "1.77.6",
116-
"@tarojs/api": "4.0.8-beta.0",
117-
"@tarojs/components": "4.0.8-beta.0"
116+
"@tarojs/api": "4.0.8-beta.1",
117+
"@tarojs/components": "4.0.8-beta.1"
118118
}
119119
}

‎packages/nutui-taro-demo/src/app.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../../src/styles/jd-font.scss';
2+
13
body {
24
font-size: 14px;
35
}

‎packages/nutui-taro-demo/src/pages/index/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Taro from '@tarojs/taro'
2-
import { View, Image, Text, ScrollView, Button, Input, Video } from '@tarojs/components'
2+
import { View, Image, Swiper, SwiperItem, Text, ScrollView, Button, Input, Video } from '@tarojs/components'
33
import pkg from '@/packages/../config.json'
44
import packageJson from '@/packages/../../package.json'
55
import './index.scss'
@@ -10,7 +10,7 @@ const navs = pkg.nav
1010

1111

1212
// hack taro load button xml
13-
console.log(Button, Input, Video )
13+
console.log(Button, Input, Video,Image, Swiper, SwiperItem, )
1414

1515
// try {
1616
// console.log('xxx', Schema)

0 commit comments

Comments
 (0)