Skip to content

Commit

Permalink
Merge branch 'master' into fix/modal-dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
atomiks authored Feb 4, 2025
2 parents 9e72f08 + f323fc6 commit ffb36f6
Show file tree
Hide file tree
Showing 165 changed files with 5,110 additions and 2,173 deletions.
100 changes: 37 additions & 63 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
version: 2.1
orbs:
aws-cli: circleci/aws-cli@4.2.3
aws-s3: circleci/aws-s3@4.1.0

parameters:
browserstack-force:
Expand All @@ -16,31 +13,17 @@ parameters:
description: The name of the workflow to run
type: string
default: pipeline
e2e-base-url:
description: The base url for running end-to-end test
type: string
default: ''

default-job: &default-job
parameters:
react-version:
description: The version of react to be used
type: string
default: << pipeline.parameters.react-version >>
test-gate:
description: A particular type of tests that should be run
type: string
default: undefined
e2e-base-url:
description: The base url for running end-to-end test
type: string
default: << pipeline.parameters.e2e-base-url >>
environment:
# expose it globally otherwise we have to thread it from each job to the install command
BROWSERSTACK_FORCE: << pipeline.parameters.browserstack-force >>
REACT_VERSION: << parameters.react-version >>
TEST_GATE: << parameters.test-gate >>
AWS_REGION_ARTIFACTS: eu-central-1
COREPACK_ENABLE_DOWNLOAD_PROMPT: '0'
working_directory: /tmp/base-ui
docker:
Expand Down Expand Up @@ -72,6 +55,11 @@ commands:
default: stable

steps:
- run:
name: Set npm registry public signing keys
command: |
echo "export COREPACK_INTEGRITY_KEYS='$(curl https://registry.npmjs.org/-/npm/v1/keys | jq -c '{npm: .keys}')'" >> $BASH_ENV
- when:
condition: << parameters.browsers >>
steps:
Expand Down Expand Up @@ -172,7 +160,10 @@ jobs:
- install_js:
react-version: << parameters.react-version >>
- run:
name: Eslint
name: 'Prettier'
command: pnpm prettier --check
- run:
name: ESlint
command: pnpm eslint:ci
- run:
name: Stylelint
Expand All @@ -189,9 +180,6 @@ jobs:
- checkout
- install_js:
react-version: << parameters.react-version >>
- run:
name: '`pnpm prettier` changes committed?'
command: pnpm prettier --check
- run:
name: Generate PropTypes
command: pnpm proptypes
Expand All @@ -214,6 +202,11 @@ jobs:
command: |
pnpm docs:link-check
git add -A && git diff --exit-code --staged
- run:
name: '`pnpm inline-scripts changes committed?'
command: |
pnpm inline-scripts
git add -A && git diff --exit-code --staged
test_types:
<<: *default-job
resource_class: 'medium+'
Expand Down Expand Up @@ -245,18 +238,12 @@ jobs:
- run:
name: Resolve typescript version
command: |
pnpm add typescript@next -d -w
pnpm update -r typescript@next
# log a patch for maintainers who want to check out this change
git --no-pager diff HEAD
- run:
name: Tests TypeScript definitions
command: |
# ignore build failures
# it's expected that typescript@next fails since the lines of the errors
# change frequently. This build is monitored regardless of its status
set +e
pnpm typescript
exit 0
command: pnpm typescript
- restore_cache:
name: Restore generated declaration files
keys:
Expand All @@ -282,7 +269,7 @@ jobs:
<<: *default-job
resource_class: 'medium+'
docker:
- image: mcr.microsoft.com/playwright:v1.49.1-noble
- image: mcr.microsoft.com/playwright:v1.50.0-noble
steps:
- checkout
- install_js:
Expand All @@ -307,7 +294,7 @@ jobs:
test_regressions:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.49.1-noble
- image: mcr.microsoft.com/playwright:v1.50.0-noble
steps:
- checkout
- install_js:
Expand All @@ -322,7 +309,7 @@ jobs:
test_e2e:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.49.1-noble
- image: mcr.microsoft.com/playwright:v1.50.0-noble
steps:
- checkout
- install_js:
Expand Down Expand Up @@ -350,71 +337,58 @@ jobs:
command: pnpm -r test:package

workflows:
version: 2
pipeline:
when:
equal: [pipeline, << pipeline.parameters.workflow >>]
jobs:
- checkout:
<<: *default-context
name: 'Checkout'
- test_unit:
<<: *default-context
name: 'JSDOM tests'
requires:
- checkout
- Checkout
- test_lint:
<<: *default-context
name: 'Linting'
requires:
- checkout
- Checkout
- test_static:
<<: *default-context
name: 'Generated files verification'
requires:
- checkout
- Checkout
- test_types:
<<: *default-context
name: 'Typechecking'
requires:
- checkout
- Checkout
- test_browser:
<<: *default-context
name: 'Browser tests'
requires:
- checkout
- Checkout
- test_regressions:
<<: *default-context
name: 'Regression tests'
requires:
- checkout
- Checkout
- test_e2e:
<<: *default-context
name: 'E2E tests'
requires:
- checkout
- test_bundle_size_monitor:
<<: *default-context
requires:
- checkout
- Checkout
# - test_bundle_size_monitor:
# <<: *default-context
# name: 'Bundle size monitor'
# requires:
# - checkout
- test_package:
<<: *default-context
name: 'Package verification'
requires:
- checkout
react-17:
triggers:
- schedule:
cron: '0 0 * * *'
filters:
branches:
only:
- master
jobs:
- test_unit:
<<: *default-context
react-version: ^17.0.0
- test_browser:
<<: *default-context
react-version: ^17.0.0
- test_regressions:
<<: *default-context
react-version: ^17.0.0
- Checkout
react-18:
when:
equal: [pipeline, << pipeline.parameters.workflow >>]
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/1.bug.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
name: 'Bug report'
about: 'File a bug report.'
labels: ['status: waiting for maintainer']
---

# Bug report
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/2.feature-request.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
name: 'Feature request'
about: 'Suggest a new component or an enhancement for an existing component.'
labels: ['status: waiting for maintainer']
---

# Feature request
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/3.get-help.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
name: 'Get help'
about: 'Ask a question.'
labels: ['status: waiting for maintainer']
---

# Get help
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/4.docs-feedback.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
name: 'Docs feedback'
about: 'Help us improve Base UI documentation.'
labels: ['status: waiting for maintainer']
---

# Docs feedback
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Set up pnpm
uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d # v3.0.0
- name: Use Node.js 18.x
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version: 18
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
with:
languages: typescript
config-file: ./.github/codeql/codeql-config.yml
Expand All @@ -30,4 +30,4 @@ jobs:
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
2 changes: 1 addition & 1 deletion .github/workflows/maintenance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
steps:
- run: echo "${{ github.actor }}"
- name: check if prs are dirty
uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168 # v3.0.2
uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
with:
dirtyLabel: 'PR: out-of-date'
removeOnDirtyLabel: 'PR: ready to ship'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
with:
sarif_file: results.sarif
30 changes: 15 additions & 15 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"link-check": "tsx ./scripts/reportBrokenLinks.mts"
},
"dependencies": {
"@babel/core": "^7.26.0",
"@babel/runtime": "^7.26.0",
"@babel/runtime-corejs3": "^7.26.0",
"@babel/core": "^7.26.7",
"@babel/runtime": "^7.26.7",
"@babel/runtime-corejs3": "^7.26.7",
"@base-ui-components/react": "workspace:*",
"@emotion/cache": "^11.14.0",
"@emotion/react": "^11.14.0",
Expand All @@ -25,8 +25,8 @@
"@mdx-js/loader": "^3.1.0",
"@mdx-js/mdx": "^3.1.0",
"@mdx-js/react": "^3.1.0",
"@mui/system": "6.3.0",
"@next/mdx": "^15.1.3",
"@mui/system": "6.4.2",
"@next/mdx": "^15.1.6",
"@react-spring/web": "^9.7.5",
"@stefanprobst/rehype-extract-toc": "^2.2.1",
"@types/mdx": "^2.0.13",
Expand All @@ -46,15 +46,15 @@
"lodash": "^4.17.21",
"lz-string": "^1.5.0",
"next": "15.1.3",
"postcss": "^8.4.49",
"postcss": "^8.5.1",
"postcss-custom-media": "^11.0.5",
"postcss-import": "^16.1.0",
"prop-types": "^15.8.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-error-boundary": "^4.1.2",
"react-is": "^19.0.0",
"react-router-dom": "^6.28.1",
"react-router-dom": "^7.1.5",
"react-runner": "^1.0.5",
"rehype-pretty-code": "^0.14.0",
"remark": "^15.0.1",
Expand All @@ -65,7 +65,7 @@
"remark-rehype": "^11.1.1",
"remark-typography": "0.6.21",
"scroll-into-view-if-needed": "3.1.0",
"shiki": "^1.25.1",
"shiki": "^1.29.2",
"to-vfile": "^8.0.0",
"unist-util-visit": "^5.0.0",
"unist-util-visit-parents": "^6.0.1",
Expand All @@ -75,21 +75,21 @@
"@babel/plugin-transform-react-constant-elements": "^7.25.9",
"@babel/preset-typescript": "^7.26.0",
"@mui/internal-docs-utils": "^1.0.16",
"@mui/internal-scripts": "^1.0.31",
"@mui/internal-test-utils": "^1.0.24",
"@mui/internal-scripts": "^1.0.33",
"@mui/internal-test-utils": "^1.0.26",
"@tailwindcss/postcss": "4.0.0-beta.2",
"@types/chai": "^4.3.20",
"@types/gtag.js": "^0.0.20",
"@types/hast": "^3.0.4",
"@types/node": "^18.19.69",
"@types/node": "^18.19.74",
"@types/prop-types": "^15.7.14",
"@types/react": "^19.0.2",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.2",
"@types/unist": "^3.0.3",
"chai": "^4.5.0",
"framer-motion": "^11.15.0",
"fs-extra": "^11.2.0",
"mdast-util-mdx-jsx": "^3.1.3",
"framer-motion": "^11.18.2",
"fs-extra": "^11.3.0",
"mdast-util-mdx-jsx": "^3.2.0",
"prettier": "^3.4.2",
"rimraf": "^5.0.10",
"serve": "^14.2.4",
Expand Down
6 changes: 6 additions & 0 deletions docs/reference/generated/checkbox-indicator.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@
"data-touched": {
"description": "Present when the checkbox has been touched (when wrapped in Field.Root)."
},
"data-filled": {
"description": "Present when the checkbox is checked (when wrapped in Field.Root)."
},
"data-focused": {
"description": "Present when the checkbox is focused (when wrapped in Field.Root)."
},
"data-starting-style": {
"description": "Present when the checkbox indicator is animating in."
},
Expand Down
Loading

0 comments on commit ffb36f6

Please sign in to comment.