Merge branch 'dev-harmony' into hxy/steps/0816

.husky/commit-msg

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx --no-install commitlint --edit $1

.prettierrc

@@ -6,5 +6,5 @@
   "printWidth": 80,
   "proseWrap": "preserve",
   "endOfLine": "auto",
-  "plugins": ["@nutui/prettier-plugin"]
+  "plugins": ["prettier-markdown-table"]
 }

CHANGELOG.md

@@ -1,3 +1,52 @@
+# v2.6.20
+
+`2024-09-20`
+
+- :bug: fix: i18n (#2597)
+- :bug: fix: 类型构建错误 (#2605)
+- 🏡 chore: replace local prettier plugin with npm package (#2603)
+
+# v2.6.19
+
+`2024-09-13`
+
+- 🏡 chore(deps): update dependency vite-plugin-dts to v4 (#2533)
+- :bug: fix(cascader): 受控状态下 value 变化时同步组件选中状态 (#2591)
+- :bug: fix: 移除不必要的 fragment 元素 (#2587)
+- :bug: fix(datepicker): show zero on page (#2582)
+- :bug: fix: findDomNode from transition (#2525)
+- :bug: fix(props): add mergeProps utility to resolve all defaultProps warnings (#2581)
+- 🪵 refactor: resolve sass nested rules warning (#2579)
+
+# v2.6.18
+
+`2024-09-06`
+
+- 🏡 chore: remove deprecated (#2573)
+- 🏡 chore(deps): update dependency marked to v14 (#2532)
+- :sparkles: feat: demos for popup & dialog (#2574)
+- :sparkles: feat: beforeupload (#2567)
+- :bug: fix: remove icons defaultprops (#2571)
+- :bug: fix(input): type props didnot work when equals number|digit (#2563)
+- :bug: fix: dialog
+- :bug: fix(sticky): should rerender when zIndex changes (#2572)
+- :bug: fix(sticky): rerender sticky when threshold change (#2564)
+- :bug: fix(deps): update dependency jscodeshift to v17 (#2534)
+
+# v2.6.17
+
+`2024-08-30`
+
+- 🏡 chore(form): form demo (#2528)
+- 📖 docs(readme): fix pnpm run dev weapp jd dir (#2514)
+- :sparkles: feat(cell): add clickable prop to support click style feedback (#2527)
+- :sparkles: feat(image-preview): 增加索引字段，用于预览内容排序 (#2519)
+- :bug: fix(tabs.taro.tsx): 解决在不需要滚动的时候，切换tab产生tab位置错乱的问题 (#2554)
+- :bug: fix(uploader): beforeUpload should trigger every time before uploading (#2553)
+- :bug: fix(PullToRefresh): 修复PullToRefresh组件disabled属性在taro中无效的问题 (#2538)
+- :bug: fix(uploader): ios 下无法回显的问题修复 (#2550)
+- :bug: fix(uploader): sizeType prop didnot work when weapp || jd (#2526)
+
 # v2.6.16
 
 `2024-08-03`

gulpfile.js

@@ -20,7 +20,7 @@ console.log(argvs, 'argvs')
 // 监视频率 https://www.martin-brennan.com/gulp-watch-high-cpu-usage/
 const interval = { interval: 500 }
 // 监视文件变化
-gulp.task('watch', function () {
+gulp.task('watch', () => {
   argvs.forEach((argv) => {
     gulp.watch(
       `src/packages/${argv}/demos/taro/*`,
@@ -42,6 +42,11 @@ gulp.task('watch', function () {
       interval,
       gulp.series(`${argv}copyTaro`)
     )
+    gulp.watch(
+      `src/packages/${argv}/${argv}.rn.tsx`,
+      interval,
+      gulp.series(`${argv}copyRN`)
+    )
   })
   const watchTasks = []
   // eslint-disable-next-line array-callback-return
@@ -60,14 +65,14 @@ gulp.task('watch', function () {
 })
 argvs.forEach((argv) => {
   const targetBaseUrl = `${process.cwd()}/packages/nutui-taro-demo/nutui-react/packages/${argv}`
-  gulp.task(`${argv}copyDemo`, function (path) {
+  gulp.task(`${argv}copyDemo`, (path) => {
     console.log(path, 'path')
     return gulp
       .src(`src/packages/${argv}/demos/taro/*`)
       .pipe(gulp.dest(`${targetBaseUrl}/demos/taro/`))
   })
 
-  gulp.task(`${argv}sass`, function () {
+  gulp.task(`${argv}sass`, () => {
     return gulp
       .src([`src/packages/${argv}/${argv}.scss`])
       .pipe(
@@ -94,7 +99,7 @@ argvs.forEach((argv) => {
       .pipe(gulp.dest(`src/packages/${argv}/`))
   })
 
-  gulp.task(`${argv}copyCss`, function () {
+  gulp.task(`${argv}copyCss`, () => {
     return gulp
       .src([
         `src/packages/${argv}/*.scss`,
@@ -103,17 +108,23 @@ argvs.forEach((argv) => {
       .pipe(gulp.dest(`${targetBaseUrl}/`))
   })
 
-  gulp.task(`${argv}copyTaroDemo`, function () {
+  gulp.task(`${argv}copyTaroDemo`, () => {
     return gulp
       .src(`src/packages/${argv}/demo.taro.tsx`)
       .pipe(insert.prepend(`import '../../../styles/demo.scss';\n`))
       .pipe(gulp.dest(`${targetBaseUrl}/`))
   })
 
-  gulp.task(`${argv}copyTaro`, function () {
+  gulp.task(`${argv}copyTaro`, () => {
     return gulp
       .src(`src/packages/${argv}/${argv}.taro.tsx`)
       .pipe(insert.prepend(`import "./${argv}.harmony.css";\n`))
       .pipe(gulp.dest(`${targetBaseUrl}/`))
   })
+  gulp.task(`${argv}copyRN`, () => {
+    return gulp
+      .src(`src/packages/${argv}/${argv}.rn.tsx`)
+      .pipe(insert.prepend(`import "./${argv}.harmony.css";\n`))
+      .pipe(gulp.dest(`${targetBaseUrl}/`))
+  })
 })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dongdesign/components",
-  "version": "1.0.1",
+  "version": "1.0.9",
   "style": "dist/style.css",
   "main": "dist/nutui.react.umd.js",
   "module": "dist/es/packages/nutui.react.build.js",
@@ -90,15 +90,17 @@
     "publish:beta": "npm publish --tag beta",
     "prepare": "husky && npm run generate:file && npm run generate:file:taro && npm run generate:file:taro:pages",
     "prepublishOnly": "node scripts/prepublish.js",
-    "postpublish": "node scripts/postpublish.js"
+    "postpublish": "node scripts/postpublish.js",
+    "upgradeTaro": "pnpm --dir ./packages/nutui-taro-demo upgradeTaro"
   },
   "lint-staged": {
     "*.{scss,md}": "prettier --write",
-    "*.{ts,tsx,js,md}": "eslint"
+    "*.{ts,tsx,js}": "eslint"
   },
   "dependencies": {
-    "@nutui/icons-react": "^1.0.4",
-    "@nutui/icons-react-taro": "^1.0.4",
+    "@babel/runtime": "^7.23.9",
+    "@nutui/icons-react": "^1.0.5",
+    "@nutui/icons-react-taro": "^1.0.5",
     "@nutui/touch-emulator": "^1.0.0",
     "@react-spring/web": "~9.6.1",
     "@swc/helpers": "^0.5.7",
@@ -114,7 +116,7 @@
     "@commitlint/cli": "^19.0.3",
     "@commitlint/config-conventional": "^19.0.3",
     "@loadable/component": "^5.16.3",
-    "@nutui/prettier-plugin": "workspace:*",
+    "prettier-markdown-table": "^1.0.2",
     "@mdx-js/mdx": "^3.0.1",
     "@mdx-js/react": "^3.0.1",
     "@mdx-js/rollup": "^3.0.1",
@@ -124,11 +126,11 @@
     "@rollup/plugin-node-resolve": "15.2.3",
     "@rollup/plugin-typescript": "^11.1.6",
     "@swc/core": "^1.4.8",
-    "@tarojs/components": "^4.0.0-alpha.34",
-    "@tarojs/plugin-platform-alipay": "^4.0.0-alpha.34",
-    "@tarojs/plugin-platform-weapp": "^4.0.0-alpha.34",
-    "@tarojs/react": "^4.0.0-alpha.34",
-    "@tarojs/taro": "^4.0.0-alpha.34",
+    "@tarojs/components": "4.0.2",
+    "@tarojs/plugin-platform-alipay": "4.0.2",
+    "@tarojs/plugin-platform-weapp": "4.0.2",
+    "@tarojs/react": "4.0.2",
+    "@tarojs/taro": "4.0.2",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^16.0.0",
     "@types/fs-extra": "^11.0.4",
@@ -173,13 +175,12 @@
     "highlight.js": "^11.9.0",
     "husky": "^9.0.11",
     "inquirer": "^10.1.4",
-    "jscodeshift": "^0.15.1",
-    "linguist-languages": "^7.27.0",
+    "jscodeshift": "^17.0.0",
     "lint-staged": "^15.2.2",
     "lzutf8": "0.6.3",
     "map-stream": "0.0.7",
     "markdown-it": "^14.0.0",
-    "marked": "^13.0.3",
+    "marked": "^14.1.1",
     "mobx": "^6.12.0",
     "mobx-react-lite": "^4.0.5",
     "postcss": "^8.4.35",
@@ -193,6 +194,7 @@
     "react-color": "^2.19.3",
     "react-dom": "^18.2.0",
     "react-markdown": "^9.0.1",
+    "react-native": "0.72.3",
     "react-refresh": "^0.14.0",
     "react-router-dom": "^6.22.1",
     "react-syntax-highlighter": "^15.5.0",
@@ -209,7 +211,7 @@
     "unist-util-visit": "^5.0.0",
     "vinyl-fs": "^4.0.0",
     "vite": "^5.1.3",
-    "vite-plugin-dts": "3.6.4",
+    "vite-plugin-dts": "4.2.1",
     "vitest": "^2.0.4",
     "vitest-canvas-mock": "^0.3.3",
     "simple-git": "^3.25.0",

packages/nutui-codemod/package.json

@@ -28,7 +28,7 @@
   "dependencies": {
     "chalk": "^5.3.0",
     "is-git-clean": "^1.1.0",
-    "jscodeshift": "^0.15.1"
+    "jscodeshift": "^17.0.0"
   },
   "devDependencies": {
     "jest": "^29.7.0",

packages/nutui-taro-demo/config/index.js

@@ -85,11 +85,11 @@ const config = {
           '@/utils': path.resolve(__dirname, '../nutui-react/utils'),
           '@nutui/nutui-react-taro': path.resolve(
             __dirname,
-            '../nutui-react/packages/nutui.react.taro.ts'
+            '../nutui-react/packages/nutui.react.rn.ts'
           ),
           '@nutui/icons-react-taro': path.resolve(
             __dirname,
-            '../nutui-react/packages/nutui.react.taro.ts'
+            '../nutui-react/packages/nutui.react.rn.ts'
           ),
           '@styles': path.resolve(__dirname, '../styles'),
         }

packages/nutui-taro-demo/package.json

@@ -41,7 +41,8 @@
     "dev:rn:jmapp": "VITE_APP_PROJECT_ID=jmapp npm run build:rn -- --watch",
     "dev:qq:jmapp": "VITE_APP_PROJECT_ID=jmapp npm run build:qq -- --watch",
     "dev:jd:jmapp": "VITE_APP_PROJECT_ID=jmapp npm run build:jd -- --watch",
-    "dev:quickapp:jmapp": "VITE_APP_PROJECT_ID=jmapp npm run build:quickapp -- --watch"
+    "dev:quickapp:jmapp": "VITE_APP_PROJECT_ID=jmapp npm run build:quickapp -- --watch",
+    "upgradeTaro": "chmod +x scripts/taro/upgradeTaro && ./scripts/taro/upgradeTaro"
   },
   "browserslist": [
     "last 3 versions",