chore: merge branch 'beta-3' into feat/v3-scroll-shadow

This commit is contained in:
Tianen Pang 2025-12-08 15:22:38 +08:00
commit 3f3778f542
No known key found for this signature in database
GPG Key ID: 84C345E7CC5DF12F
9 changed files with 1658 additions and 1875 deletions

View File

@ -4,6 +4,8 @@ on:
pull_request: pull_request:
branches: branches:
- canary - canary
- v3
- 'beta-*'
jobs: jobs:
build: build:
@ -19,18 +21,6 @@ jobs:
- name: Build packages - name: Build packages
run: pnpm build run: pnpm build
tests:
name: Tests
runs-on: ubuntu-latest
steps:
- name: Checkout branch
uses: actions/checkout@v4
- name: Install
uses: ./.github/common-actions/install
- name: Run tests
run: pnpm test
eslint: eslint:
name: ESLint name: ESLint
@ -45,18 +35,6 @@ jobs:
- name: Run ESLint - name: Run ESLint
run: pnpm lint run: pnpm lint
prettier:
name: Prettier
runs-on: ubuntu-latest
steps:
- name: Checkout branch
uses: actions/checkout@v4
- name: Install
uses: ./.github/common-actions/install
- name: Run prettier
run: pnpm format:check
types: types:
name: TypeScript name: TypeScript
@ -75,9 +53,14 @@ jobs:
name: Continuous Release name: Continuous Release
if: github.repository == 'heroui-inc/heroui' if: github.repository == 'heroui-inc/heroui'
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write
steps: steps:
- name: Checkout branch - name: Checkout branch
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install - name: Install
uses: ./.github/common-actions/install uses: ./.github/common-actions/install
@ -86,4 +69,4 @@ jobs:
run: pnpm build run: pnpm build
- name: Release - name: Release
run: pnpx pkg-pr-new publish --compact --pnpm './packages/components/*' './packages/core/*' './packages/hooks/*' './packages/utilities/*' run: pnpx pkg-pr-new publish --pnpm './packages/styles' './packages/react'

View File

@ -1,43 +0,0 @@
name: Commitlint
on:
push:
branches: [main, canary, v3]
pull_request:
branches: [main, canary, v3]
permissions:
contents: read
pull-requests: read
jobs:
commitlint:
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install dependencies
uses: ./.github/common-actions/install
- name: Print versions
run: |
git --version
node --version
pnpm --version
pnpm commitlint --version
- name: Run commitlint
id: run_commitlint
uses: wagoid/commitlint-github-action@v6
env:
NODE_PATH: ${{ github.workspace }}/node_modules
with:
configFile: commitlint.config.mjs
- name: Show outputs
if: ${{ always() }}
run: echo ${{ toJSON(steps.run_commitlint.outputs.results) }}

View File

@ -10,12 +10,8 @@ const withMDX = createMDX();
const config: NextConfig = { const config: NextConfig = {
compress: true, compress: true,
eslint: {
ignoreDuringBuilds: true,
},
experimental: { experimental: {
optimizePackageImports: ["@heroui/react"], optimizePackageImports: ["@heroui/react"],
reactCompiler: true,
}, },
async headers() { async headers() {
return [ return [
@ -54,6 +50,7 @@ const config: NextConfig = {
fullUrl: true, fullUrl: true,
}, },
}, },
reactCompiler: true,
reactStrictMode: true, reactStrictMode: true,
async redirects() { async redirects() {
return [ return [

View File

@ -32,15 +32,15 @@
"gray-matter": "4.0.3", "gray-matter": "4.0.3",
"lucide-react": "0.544.0", "lucide-react": "0.544.0",
"motion": "12.23.22", "motion": "12.23.22",
"next": "15.5.4", "next": "16.0.7",
"next-themes": "0.4.6", "next-themes": "0.4.6",
"react": "19.2.0", "react": "19.2.1",
"react-aria-components": "1.13.0", "react-aria-components": "1.13.0",
"react-dom": "19.2.0", "react-dom": "19.2.1",
"remark": "15.0.1", "remark": "15.0.1",
"remark-gfm": "4.0.1", "remark-gfm": "4.0.1",
"remark-mdx": "3.1.1", "remark-mdx": "3.1.1",
"shiki": "3.13.0", "shiki": "3.19.0",
"tailwind-merge": "3.4.0", "tailwind-merge": "3.4.0",
"tailwind-variants": "3.2.2", "tailwind-variants": "3.2.2",
"ts-morph": "27.0.2", "ts-morph": "27.0.2",
@ -53,10 +53,11 @@
"@tailwindcss/postcss": "4.1.17", "@tailwindcss/postcss": "4.1.17",
"@types/color-convert": "2.0.4", "@types/color-convert": "2.0.4",
"@types/mdx": "2.0.13", "@types/mdx": "2.0.13",
"@types/react": "19.2.6", "@types/react": "19.2.7",
"@types/react-dom": "19.2.3", "@types/react-dom": "19.2.3",
"babel-plugin-react-compiler": "1.0.0", "babel-plugin-react-compiler": "1.0.0",
"postcss": "8.5.6", "postcss": "8.5.6",
"source-map-support": "0.5.21",
"tailwindcss": "4.1.17" "tailwindcss": "4.1.17"
} }
} }

View File

@ -105,9 +105,15 @@
"typescript-eslint": "8.45.0", "typescript-eslint": "8.45.0",
"vitest": "3.2.4" "vitest": "3.2.4"
}, },
"pnpm": {
"overrides": {
"shiki": "3.19.0",
"ts-morph": "27.0.2"
}
},
"engines": { "engines": {
"node": ">=20.x", "node": ">=20.x",
"pnpm": ">=10.x" "pnpm": ">=10.x"
}, },
"packageManager": "pnpm@10.20.0" "packageManager": "pnpm@10.24.0"
} }

View File

@ -37,7 +37,7 @@
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://github.com/heroui-inc/heroui.git", "url": "https://github.com/heroui-inc/heroui.git",
"directory": "packages/react" "directory": "packages/react"
}, },
"bugs": { "bugs": {
@ -73,11 +73,11 @@
"@react-stately/data": "3.14.1", "@react-stately/data": "3.14.1",
"@storybook/react": "8.6.12", "@storybook/react": "8.6.12",
"@types/fs-extra": "11.0.4", "@types/fs-extra": "11.0.4",
"@types/react": "19.2.6", "@types/react": "19.2.7",
"@types/react-dom": "19.2.3", "@types/react-dom": "19.2.3",
"fs-extra": "11.3.2", "fs-extra": "11.3.2",
"react": "19.2.0", "react": "19.2.1",
"react-dom": "19.2.0", "react-dom": "19.2.1",
"tailwindcss": "4.1.17" "tailwindcss": "4.1.17"
}, },
"peerDependencies": { "peerDependencies": {

View File

@ -13,8 +13,8 @@
"dependencies": { "dependencies": {
"@heroui/react": "workspace:*", "@heroui/react": "workspace:*",
"@heroui/styles": "workspace:*", "@heroui/styles": "workspace:*",
"react": "19.1.1", "react": "19.2.1",
"react-dom": "19.1.1" "react-dom": "19.2.1"
}, },
"devDependencies": { "devDependencies": {
"@heroui/standard": "workspace:*", "@heroui/standard": "workspace:*",
@ -32,8 +32,8 @@
"@storybook/theming": "8.6.12", "@storybook/theming": "8.6.12",
"@tailwindcss/postcss": "4.1.13", "@tailwindcss/postcss": "4.1.13",
"@tailwindcss/vite": "4.1.13", "@tailwindcss/vite": "4.1.13",
"@types/react": "19.1.15", "@types/react": "19.2.7",
"@types/react-dom": "19.1.9", "@types/react-dom": "19.2.3",
"@vitejs/plugin-react": "5.0.3", "@vitejs/plugin-react": "5.0.3",
"glob": "11.0.3", "glob": "11.0.3",
"postcss": "8.5.6", "postcss": "8.5.6",

View File

@ -4,6 +4,11 @@
"description": "HeroUI core styles and Tailwind plugin", "description": "HeroUI core styles and Tailwind plugin",
"author": "HeroUI <support@heroui.com>", "author": "HeroUI <support@heroui.com>",
"homepage": "https://heroui.com", "homepage": "https://heroui.com",
"repository": {
"type": "git",
"url": "https://github.com/heroui-inc/heroui.git",
"directory": "packages/styles"
},
"license": "MIT", "license": "MIT",
"type": "module", "type": "module",
"main": "./index.css", "main": "./index.css",

3412
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff