diff --git a/.github/workflows/beta-release.yaml b/.github/workflows/beta-release.yaml index 4dab14ff..9b7a9be8 100644 --- a/.github/workflows/beta-release.yaml +++ b/.github/workflows/beta-release.yaml @@ -1,21 +1,28 @@ name: Beta Release on: - workflow_call: + pull_request: + types: [opened, synchronize, reopened, ready_for_review] jobs: beta_release: + if: github.event.pull_request.draft == false && github.event.pull_request.head.repo.fork == false runs-on: ubuntu-latest + concurrency: + group: beta-release-${{ github.event.pull_request.number }} + cancel-in-progress: true permissions: contents: read id-token: write + issues: write + pull-requests: write steps: - uses: actions/checkout@v4 with: ref: ${{ github.head_ref }} - uses: actions/setup-node@v4 with: - node-version: '20.x' + node-version: '24.14.0' registry-url: 'https://registry.npmjs.org' cache: 'yarn' @@ -36,7 +43,14 @@ jobs: GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }} - name: Release a new beta version - run: npm publish --tag beta --provenance --access public + run: npm publish --tag beta --access public + + - name: Upload npm debug logs + if: failure() + uses: actions/upload-artifact@v4 + with: + name: npm-debug-logs + path: /home/runner/.npm/_logs - uses: actions/github-script@v6 with: diff --git a/.github/workflows/bundlesize.yaml b/.github/workflows/bundlesize.yaml deleted file mode 100644 index 4ece4d9b..00000000 --- a/.github/workflows/bundlesize.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: Bundlesize - -on: - workflow_call: - -jobs: - bundlesize: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 - - - name: Install dev dependencies - run: yarn install - - - name: Build ReactTooltip component package - run: yarn build - - - name: Bundlesize - run: yarn run bundlesize diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 8790539f..c8e350f9 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -12,15 +12,6 @@ jobs: if: 'github.event.pull_request.draft == false' uses: ./.github/workflows/lint.yaml - bundlesize: - if: 'github.event.pull_request.draft == false' - uses: ./.github/workflows/bundlesize.yaml - - beta_release: - uses: ./.github/workflows/beta-release.yaml - # allow the children job to have access to the secrets of the repository - secrets: inherit - fail_if_pull_request_is_draft: if: github.event.pull_request.draft == true runs-on: ubuntu-18.04 diff --git a/package.json b/package.json index fc06cbb9..74232d3f 100644 --- a/package.json +++ b/package.json @@ -12,17 +12,18 @@ "stylelint": "stylelint \"src/**/*.css\"", "prettier": "prettier --config ./.prettierrc.json --write \"src/**/*{.js,.jsx,.ts,.tsx,.css}\"", "prepare": "husky install", - "bundlesize": "bundlesize", "esbuild": "esbuild", "test": "jest", - "postbuild": "npm run types && npm run bundlesize", "prepublishOnly": "npm run build" }, "types": "dist/react-tooltip.d.ts", "license": "MIT", "private": false, "author": "ReactTooltip", - "repository": "https://github.com/ReactTooltip/react-tooltip", + "repository": { + "type": "git", + "url": "https://github.com/ReactTooltip/react-tooltip" + }, "keywords": [ "react", "react-component", @@ -64,7 +65,6 @@ "@types/react-test-renderer": "^18.0.0", "@typescript-eslint/eslint-plugin": "5.54.0", "@typescript-eslint/parser": "5.54.0", - "bundlesize": "^0.18.1", "css-loader": "6.7.3", "esbuild": "0.17.11", "esbuild-css-modules-plugin": "^2.7.1", diff --git a/src/components/Tooltip/Tooltip.tsx b/src/components/Tooltip/Tooltip.tsx index 95fcb974..a050dc24 100644 --- a/src/components/Tooltip/Tooltip.tsx +++ b/src/components/Tooltip/Tooltip.tsx @@ -926,7 +926,15 @@ const Tooltip = ({ }} ref={tooltipRef} > - {actualContent} + + {actualContent} +