From 51c0d4304a909d752edfa236933ecf8d5772fe17 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Fri, 13 Sep 2024 20:46:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E8=87=AA=E5=8A=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0taro=E7=89=88=E6=9C=AC=E7=9A=84=E8=84=9A=E6=9C=AC,=20?= =?UTF-8?q?=E9=80=82=E7=94=A8=E4=BA=8Ebeta=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/nutui-taro-demo/package.json | 47 ++++++++--------- .../nutui-taro-demo/scripts/taro/upgradeTaro | 50 +++++++++++++++++++ 2 files changed, 74 insertions(+), 23 deletions(-) create mode 100755 packages/nutui-taro-demo/scripts/taro/upgradeTaro diff --git a/packages/nutui-taro-demo/package.json b/packages/nutui-taro-demo/package.json index 83b2d6eafd..2478be3e30 100644 --- a/packages/nutui-taro-demo/package.json +++ b/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", @@ -55,26 +56,26 @@ "@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/taro-platform-jdharmony": "2.0.75", "@nutui/touch-emulator": "^1.0.0", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11", - "@tarojs/components": "4.0.2", - "@tarojs/helper": "4.0.2", - "@tarojs/plugin-framework-react": "4.0.2", - "@tarojs/plugin-html": "4.0.2", - "@tarojs/plugin-platform-alipay": "4.0.2", - "@tarojs/plugin-platform-h5": "4.0.2", - "@tarojs/plugin-platform-jd": "4.0.2", - "@tarojs/plugin-platform-qq": "4.0.2", - "@tarojs/plugin-platform-swan": "4.0.2", - "@tarojs/plugin-platform-tt": "4.0.2", - "@tarojs/plugin-platform-weapp": "4.0.2", - "@tarojs/react": "4.0.2", - "@tarojs/router": "4.0.2", - "@tarojs/runtime": "4.0.2", - "@tarojs/shared": "4.0.2", - "@tarojs/taro": "4.0.2", - "@tarojs/taro-h5": "4.0.2", + "@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", "babel-plugin-import": "^1.13.8", "lodash.isequal": "^4.5.0", "lodash.kebabcase": "^4.1.1", @@ -86,10 +87,10 @@ }, "devDependencies": { "@babel/core": "^7.23.9", - "@tarojs/cli": "4.0.2", - "@tarojs/plugin-platform-harmony-ets": "4.0.2", - "@tarojs/vite-runner": "4.0.2", - "@tarojs/webpack5-runner": "4.0.2", + "@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", "@types/react": "^18.2.57", "@types/react-dom": "^18.2.19", "@types/react-router-dom": "^5.3.3", diff --git a/packages/nutui-taro-demo/scripts/taro/upgradeTaro b/packages/nutui-taro-demo/scripts/taro/upgradeTaro new file mode 100755 index 0000000000..cfa215f7a4 --- /dev/null +++ b/packages/nutui-taro-demo/scripts/taro/upgradeTaro @@ -0,0 +1,50 @@ +#!/bin/bash + +get_package_version() { + grep "\"$1\"" package.json | sed -E 's/.*"\^*~*([^"]+)".*/\1/' +} + +set_package_version() { + local package=$(echo "$1" | sed 's/\//\\\//g') + local latest_version=$2 + + if [[ $package ]] && [[ $latest_version ]]; then + sed -E -i '' "s/(\"$package\": )\"[^\"]*\"/\1\"$latest_version\"/g" package.json + + echo "成功替换package.json文件中的 $package 版本号为 $latest_version" + fi + +} + +echo "检查最新版本..." + +lasterTaroVersion=$(npm view @tarojs/cli@beta version --registry=https://registry.npmjs.org) +lasterJdTaroVersion=$(npm view @jdtaro/taro-platform-jdharmony version --registry=http://registry.m.jd.com) +lasterJdTaroCppVersion=$(npm view @jdtaro/plugin-platform-jdharmony-cpp version --registry=http://registry.m.jd.com) + +echo "最新版本号为：" +if [[ $lasterTaroVersion ]]; then + echo " @tarojs/*: $lasterTaroVersion" +fi + +if [[ $lasterJdTaroVersion ]]; then + echo " @jdtaro/taro-platform-jdharmony: $lasterJdTaroVersion" +fi + +if [[ $lasterJdTaroCppVersion ]]; then + echo " @jdtaro/taro-platform-jdharmony: $lasterJdTaroCppVersion" +fi + +echo " +" + +if [ -f "package.json" ]; then + + set_package_version @tarojs/.+ $lasterTaroVersion + + set_package_version @jdtaro/taro-platform-jdharmony $lasterJdTaroVersion + + set_package_version @jdtaro/plugin-platform-jdharmony-cpp $lasterJdTaroCppVersion +else + echo "当前目录下没有package.json文件" +fi \ No newline at end of file From c0d435d9c5d023ce0bb6705bf0f19cc1df868697 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Fri, 13 Sep 2024 20:51:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E8=87=AA=E5=8A=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0taro=E7=89=88=E6=9C=AC=E7=9A=84=E8=84=9A=E6=9C=AC,=20?= =?UTF-8?q?=E9=80=82=E7=94=A8=E4=BA=8Ebeta=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 726e5704e0..85eae95d06 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,8 @@ "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", From 9ccf55cfa70bb9e40bb9a3adeb7c43e2035d4a64 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Fri, 13 Sep 2024 21:02:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=92=A4=E5=9B=9E=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/nutui-taro-demo/package.json | 44 +++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/nutui-taro-demo/package.json b/packages/nutui-taro-demo/package.json index 2478be3e30..7071bb3836 100644 --- a/packages/nutui-taro-demo/package.json +++ b/packages/nutui-taro-demo/package.json @@ -56,26 +56,26 @@ "@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.75", + "@jdtaro/taro-platform-jdharmony": "2.0.70", "@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.2", + "@tarojs/helper": "4.0.2", + "@tarojs/plugin-framework-react": "4.0.2", + "@tarojs/plugin-html": "4.0.2", + "@tarojs/plugin-platform-alipay": "4.0.2", + "@tarojs/plugin-platform-h5": "4.0.2", + "@tarojs/plugin-platform-jd": "4.0.2", + "@tarojs/plugin-platform-qq": "4.0.2", + "@tarojs/plugin-platform-swan": "4.0.2", + "@tarojs/plugin-platform-tt": "4.0.2", + "@tarojs/plugin-platform-weapp": "4.0.2", + "@tarojs/react": "4.0.2", + "@tarojs/router": "4.0.2", + "@tarojs/runtime": "4.0.2", + "@tarojs/shared": "4.0.2", + "@tarojs/taro": "4.0.2", + "@tarojs/taro-h5": "4.0.2", "babel-plugin-import": "^1.13.8", "lodash.isequal": "^4.5.0", "lodash.kebabcase": "^4.1.1", @@ -87,10 +87,10 @@ }, "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.2", + "@tarojs/plugin-platform-harmony-ets": "4.0.2", + "@tarojs/vite-runner": "4.0.2", + "@tarojs/webpack5-runner": "4.0.2", "@types/react": "^18.2.57", "@types/react-dom": "^18.2.19", "@types/react-router-dom": "^5.3.3",