diff --git a/.github/workflows/release-beta.yml b/.github/workflows/release-beta.yml index 99f6c858e1..60b5440ad1 100644 --- a/.github/workflows/release-beta.yml +++ b/.github/workflows/release-beta.yml @@ -1,6 +1,7 @@ name: Release 3x Beta on: +# pull_request: push: branches: - feat_v3.x @@ -8,16 +9,16 @@ on: jobs: release-3x-beta: - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - NPM_CONFIG_PROVENANCE: true - RELEASE_TAG: beta - runs-on: ubuntu-latest + permissions: + contents: write + id-token: write + steps: - uses: actions/checkout@v4 with: fetch-depth: 0 +# ref: ${{ github.event.pull_request.head.sha }} - name: Get commit message run: | @@ -36,12 +37,13 @@ jobs: - name: Get Tag message if: contains( env.COMMIT_MESSAGE , '-beta') run: echo "RELEASE_TAG=beta" >> $GITHUB_ENV - +# - name: Install pnpm run: npm i -g pnpm@10 - uses: actions/setup-node@v4 with: + registry-url: 'https://registry.npmjs.org' node-version: '20' cache: 'pnpm' @@ -62,19 +64,13 @@ jobs: fi - name: Run Release @nutui/nutui-react + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} if: env.ABORT != 'true' - run: | - cd ./release/h5 || exit 1 - if ! npm publish --tag ${{ env.RELEASE_TAG }}; then - echo "发布 @nutui/nutui-react 失败" - exit 1 - fi + run: pnpm --dir ./release/h5 publish:beta - name: Run Releases @nutui/nutui-react-taro + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} if: env.ABORT != 'true' - run: | - cd ./release/taro || exit 1 - if ! npm publish --tag ${{ env.RELEASE_TAG }}; then - echo "发布 @nutui/nutui-react-taro 失败" - exit 1 - fi \ No newline at end of file + run: pnpm --dir ./release/taro publish:beta diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d723043724..df8993aa69 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,18 +8,22 @@ on: jobs: release-3x: - env: - NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} - NPM_CONFIG_PROVENANCE: true runs-on: ubuntu-latest + permissions: + contents: write + id-token: write + steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Install pnpm run: npm i -g pnpm@10 - uses: actions/setup-node@v4 with: + registry-url: 'https://registry.npmjs.org' node-version: '20' cache: 'pnpm' @@ -39,19 +43,13 @@ jobs: fi - name: Run Release @nutui/nutui-react + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} if: env.ABORT != 'true' - run: | - cd ./release/h5 || exit 1 - if ! npm publish --tag ${{ env.RELEASE_TAG }}; then - echo "发布 @nutui/nutui-react 失败" - exit 1 - fi + run: pnpm --dir ./release/h5 publish - name: Run Releases @nutui/nutui-react-taro + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} if: env.ABORT != 'true' - run: | - cd ./release/taro || exit 1 - if ! npm publish --tag ${{ env.RELEASE_TAG }}; then - echo "发布 @nutui/nutui-react-taro 失败" - exit 1 - fi + run: pnpm --dir ./release/taro publish diff --git a/package.json b/package.json index 6ae770f08e..49e38230c6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nutui/nutui-react-taro", - "version": "3.0.0-beta.13", + "version": "3.0.0-beta.14", "style": "dist/style.css", "main": "dist/nutui.react.umd.js", "module": "dist/es/packages/nutui.react.build.js", diff --git a/scripts/build-taro.mjs b/scripts/build-taro.mjs index f9594c14f8..c6737fea61 100644 --- a/scripts/build-taro.mjs +++ b/scripts/build-taro.mjs @@ -421,6 +421,10 @@ function generateReleasePackageJson() { main: packageJson.main, module: packageJson.module, typings: packageJson.typings, + scripts: { + "publish:beta": "npm publish --tag=beta --access public --no-git-checks", + "publish:latest": "npm publish --access public --no-git-checks" + }, sideEffects: packageJson.sideEffects, description: packageJson.description, keywords: packageJson.keywords, diff --git a/scripts/build.mjs b/scripts/build.mjs index 2bafb75bfe..20c23701c8 100644 --- a/scripts/build.mjs +++ b/scripts/build.mjs @@ -360,6 +360,10 @@ function generateReleasePackageJson() { main: packageJson.main, module: packageJson.module, typings: packageJson.typings, + scripts: { + "publish:beta": "npm publish --tag=beta --access public --no-git-checks", + "publish:latest": "npm publish --access public --no-git-checks" + }, sideEffects: packageJson.sideEffects, description: packageJson.description, keywords: packageJson.keywords, diff --git a/src/packages/configprovider/types.ts b/src/packages/configprovider/types.ts index e5babad739..5ba2151ea5 100644 --- a/src/packages/configprovider/types.ts +++ b/src/packages/configprovider/types.ts @@ -189,7 +189,6 @@ export type NutCSSVariables = | 'nutuiPickerTitleCancelFontSize' | 'nutuiPickerTitleOkColor' | 'nutuiPickerTitleOkFontSize' - | 'nutuiPickerListHeight' | 'nutuiPickerItemHeight' | 'nutuiPickerItemTextColor' | 'nutuiPickerItemTextFontSize'