Skip to content

Commit

Permalink
Merge branch 'master' into fix/slider-types
Browse files Browse the repository at this point in the history
  • Loading branch information
seloner authored Jan 3, 2025
2 parents 15ae9de + 58434ca commit 2bff7c2
Show file tree
Hide file tree
Showing 22 changed files with 2,056 additions and 1,787 deletions.
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@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
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@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
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@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
with:
sarif_file: results.sarif
13 changes: 13 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Security policy

## Supported versions

The versions of the project that are currently supported with security updates.

| Base UI version | Release | Supported |
| --------------: | :--------- | :----------------- |
| <1.0.0 | 2024-12-17 | :white_check_mark: |

## Reporting a vulnerability

You can report a vulnerability by contacting us via email at [[email protected]](mailto:[email protected]).
2 changes: 1 addition & 1 deletion docs/next-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
42 changes: 21 additions & 21 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"author": "MUI Team",
"license": "MIT",
"scripts": {
"build": "rimraf ./export && cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=8192 next build --profile",
"build": "rimraf ./export && cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=8192 next build",
"build:clean": "rimraf .next && pnpm build",
"dev": "next dev --port 3005",
"deploy": "git push -f material-ui-docs master:latest",
Expand All @@ -18,17 +18,17 @@
"@babel/runtime": "^7.26.0",
"@babel/runtime-corejs3": "^7.26.0",
"@base-ui-components/react": "workspace:*",
"@emotion/cache": "^11.13.5",
"@emotion/react": "^11.13.5",
"@emotion/cache": "^11.14.0",
"@emotion/react": "^11.14.0",
"@emotion/server": "^11.11.0",
"@emotion/styled": "^11.13.5",
"@emotion/styled": "^11.14.0",
"@mdx-js/loader": "^3.1.0",
"@mdx-js/mdx": "^3.1.0",
"@mdx-js/react": "^3.1.0",
"@mui/system": "6.2.0",
"@next/mdx": "^15.0.3",
"@mui/system": "6.3.0",
"@next/mdx": "^15.1.3",
"@react-spring/web": "^9.7.5",
"@stefanprobst/rehype-extract-toc": "^2.2.0",
"@stefanprobst/rehype-extract-toc": "^2.2.1",
"@types/mdx": "^2.0.13",
"babel-plugin-module-resolver": "^5.0.2",
"babel-plugin-optimize-clsx": "^2.6.2",
Expand All @@ -45,16 +45,16 @@
"hast-util-to-string": "^3.0.1",
"lodash": "^4.17.21",
"lz-string": "^1.5.0",
"next": "15.0.3",
"next": "15.1.3",
"postcss": "^8.4.49",
"postcss-custom-media": "^11.0.5",
"postcss-import": "^16.1.0",
"prop-types": "^15.8.1",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-dom": "19.0.0-rc-fb9a90fa48-20240614",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-error-boundary": "^4.1.2",
"react-is": "19.0.0-rc-fb9a90fa48-20240614",
"react-router-dom": "^6.28.0",
"react-is": "^19.0.0",
"react-router-dom": "^6.28.1",
"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.24.0",
"shiki": "^1.25.1",
"to-vfile": "^8.0.0",
"unist-util-visit": "^5.0.0",
"unist-util-visit-parents": "^6.0.1",
Expand All @@ -75,22 +75,22 @@
"@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.29",
"@mui/internal-test-utils": "^1.0.22",
"@mui/internal-scripts": "^1.0.31",
"@mui/internal-test-utils": "^1.0.24",
"@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.67",
"@types/prop-types": "^15.7.13",
"@types/react": "npm:types-react@19.0.0-rc.1",
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.1",
"@types/node": "^18.19.69",
"@types/prop-types": "^15.7.14",
"@types/react": "^19.0.2",
"@types/react-dom": "^19.0.2",
"@types/unist": "^3.0.3",
"chai": "^4.5.0",
"framer-motion": "^11.12.0",
"framer-motion": "^11.15.0",
"fs-extra": "^11.2.0",
"mdast-util-mdx-jsx": "^3.1.3",
"prettier": "^3.4.1",
"prettier": "^3.4.2",
"rimraf": "^5.0.10",
"serve": "^14.2.4",
"tailwindcss": "4.0.0-beta.2",
Expand Down
4 changes: 2 additions & 2 deletions docs/src/app/not-found.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ export default function NotFound() {
<Logo className="mb-8 ml-px" aria-label="Base UI" />
<h1 className="NotFoundHeading">404</h1>
<p className="NotFoundCaption">
This page couldnt be found. Please return to the docs or create a
This page couldn't be found. Please return to the docs or create a
corresponding issue on GitHub.
</p>
<div className="flex flex-col items-start gap-2">
<Link
className="-m-1 inline-flex items-center gap-1 p-1"
href="/react/components/accordion"
href="/react/overview/quick-start"
>
Documentation <ArrowRightIcon />
</Link>
Expand Down
62 changes: 31 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,30 +61,30 @@
"inline-scripts": "tsx ./scripts/inlineScripts.mts"
},
"devDependencies": {
"@argos-ci/core": "^2.11.0",
"@babel/cli": "^7.25.9",
"@argos-ci/core": "^2.12.0",
"@babel/cli": "^7.26.4",
"@babel/core": "^7.26.0",
"@babel/node": "^7.26.0",
"@babel/plugin-transform-react-constant-elements": "^7.25.9",
"@babel/plugin-transform-runtime": "^7.25.9",
"@babel/preset-env": "^7.26.0",
"@babel/preset-react": "^7.25.9",
"@babel/preset-react": "^7.26.3",
"@babel/preset-typescript": "^7.26.0",
"@babel/register": "^7.25.9",
"@mui/internal-docs-utils": "^1.0.16",
"@mui/internal-markdown": "^1.0.22",
"@mui/internal-scripts": "^1.0.29",
"@mui/internal-test-utils": "^1.0.22",
"@mui/monorepo": "github:mui/material-ui#6b5d751b0c7f46919cca75238b3da7ee751ac8a6",
"@next/eslint-plugin-next": "^14.2.18",
"@octokit/rest": "^20.1.1",
"@mui/internal-markdown": "^1.0.23",
"@mui/internal-scripts": "^1.0.31",
"@mui/internal-test-utils": "^1.0.24",
"@mui/monorepo": "github:mui/material-ui#v6.3.0",
"@next/eslint-plugin-next": "^14.2.22",
"@octokit/rest": "^21.0.2",
"@playwright/test": "1.49.1",
"@tailwindcss/postcss": "4.0.0-beta.2",
"@types/fs-extra": "^11.0.4",
"@types/lodash": "^4.17.13",
"@types/mocha": "^10.0.10",
"@types/node": "^18.19.67",
"@types/react": "npm:types-react@19.0.0-rc.1",
"@types/node": "^18.19.69",
"@types/react": "^19.0.2",
"@types/url-join": "^4.0.3",
"@types/yargs": "^17.0.33",
"@typescript-eslint/eslint-plugin": "^7.18.0",
Expand All @@ -102,7 +102,7 @@
"babel-plugin-react-remove-properties": "^0.3.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"chai-dom": "^1.12.0",
"chalk": "^5.3.0",
"chalk": "^5.4.1",
"compression-webpack-plugin": "^11.1.0",
"concurrently": "^8.2.2",
"cross-env": "^7.0.3",
Expand All @@ -114,14 +114,14 @@
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-typescript": "^18.0.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-import-resolver-typescript": "^3.7.0",
"eslint-plugin-babel": "^5.3.1",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-material-ui": "workspace:^",
"eslint-plugin-mocha": "^10.5.0",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react": "^7.37.3",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-testing-library": "^6.5.0",
"execa": "^8.0.1",
Expand All @@ -139,57 +139,57 @@
"karma-webpack": "^5.0.1",
"lerna": "^8.1.9",
"lodash": "^4.17.21",
"markdownlint-cli2": "^0.16.0",
"markdownlint-cli2": "^0.17.1",
"mocha": "^10.8.2",
"nx": "^18.3.5",
"nyc": "^15.1.0",
"piscina": "^4.7.0",
"piscina": "^4.8.0",
"postcss": "^8.4.49",
"postcss-loader": "^8.1.1",
"postcss-styled-syntax": "^0.6.4",
"prettier": "^3.4.1",
"prettier": "^3.4.2",
"prettier-plugin-tailwindcss": "^0.6.9",
"pretty-quick": "^4.0.0",
"process": "^0.11.10",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react": "^19.0.0",
"react-docgen": "^5.4.3",
"react-dom": "19.0.0-rc-fb9a90fa48-20240614",
"react-dom": "^19.0.0",
"recast": "^0.23.9",
"remark": "^15.0.1",
"rimraf": "^5.0.10",
"serve": "^14.2.4",
"style-loader": "^4.0.0",
"stylelint": "^16.4.0",
"stylelint": "^16.12.0",
"stylelint-config-standard": "^36.0.1",
"tailwindcss": "4.0.0-beta.2",
"terser": "^5.31.0",
"terser-webpack-plugin": "^5.3.10",
"terser": "^5.37.0",
"terser-webpack-plugin": "^5.3.11",
"tsc-alias": "^1.8.10",
"tsx": "^4.8.2",
"tsx": "^4.19.2",
"typescript": "^5.7.2",
"unist-util-visit": "^5.0.0",
"url-join": "4.0.1",
"vitest": "^2.1.8",
"webpack": "^5.91.0",
"webpack": "^5.97.1",
"webpack-bundle-analyzer": "^4.10.2",
"webpack-cli": "^5.1.4",
"yargs": "^17.7.2"
},
"packageManager": "pnpm@9.14.4",
"packageManager": "pnpm@9.15.2",
"engines": {
"pnpm": "9.14.4"
"pnpm": "9.15.2"
},
"resolutions": {
"@babel/core": "^7.26.0",
"@babel/plugin-transform-runtime": "^7.25.9",
"@babel/preset-env": "^7.26.0",
"@babel/preset-react": "^7.25.9",
"@babel/preset-react": "^7.26.3",
"@babel/preset-typescript": "^7.26.0",
"@babel/runtime": "^7.26.0",
"@babel/types": "^7.26.0",
"@types/node": "^18.19.67",
"@types/react": "npm:types-react@19.0.0-rc.1",
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.1"
"@babel/types": "^7.26.3",
"@types/node": "^18.19.69",
"@types/react": "^19.0.2",
"@types/react-dom": "^19.0.2"
},
"nyc": {
"include": [
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-material-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"devDependencies": {
"@types/eslint": "^8.56.12",
"@typescript-eslint/experimental-utils": "^5.62.0",
"@typescript-eslint/parser": "^8.18.0"
"@typescript-eslint/parser": "^8.19.0"
},
"scripts": {
"test": "cd ../../ && cross-env NODE_ENV=test mocha 'packages/eslint-plugin-material-ui/**/*.test.js' --timeout 3000"
Expand Down
1 change: 1 addition & 0 deletions packages/react/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.tsbuildinfo
21 changes: 11 additions & 10 deletions packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"build": "pnpm build:node && pnpm build:stable && pnpm build:types && pnpm build:copy-files && pnpm build:manifest",
"build:node": "node ../../scripts/build.mjs node",
"build:stable": "node ../../scripts/build.mjs stable",
"build:copy-files": "node ../../scripts/copyFiles.mjs",
"build:copy-files": "node ../../scripts/copyFiles.mjs ./.npmignore:./.npmignore",
"build:types": "tsx ../../scripts/buildTypes.mjs --project tsconfig.build.json --copy build/cjs",
"build:manifest": "tsx ./scripts/createPackageManifest.mts",
"test:package": "publint ./build && attw --pack ./build",
Expand All @@ -84,30 +84,31 @@
"use-sync-external-store": "^1.4.0"
},
"devDependencies": {
"@arethetypeswrong/cli": "^0.17.1",
"@mui/internal-test-utils": "^1.0.22",
"@arethetypeswrong/cli": "^0.17.2",
"@mui/internal-test-utils": "^1.0.24",
"@testing-library/react": "^16.1.0",
"@testing-library/user-event": "^14.5.2",
"@types/chai": "^4.3.20",
"@types/chai-dom": "^1.11.3",
"@types/prop-types": "^15.7.14",
"@types/react": "npm:types-react@19.0.0-rc.1",
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.1",
"@types/react": "^19.0.2",
"@types/react-dom": "^19.0.2",
"@types/sinon": "^17.0.3",
"@types/use-sync-external-store": "^0.0.6",
"chai": "^4.5.0",
"fs-extra": "^11.2.0",
"lodash": "^4.17.21",
"publint": "^0.2.12",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-dom": "19.0.0-rc-fb9a90fa48-20240614",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-router-dom": "^6.28.1",
"sinon": "^19.0.2",
"typescript": "^5.7.2"
},
"peerDependencies": {
"@types/react": "^17.0.0 || ^18.0.0 || ^19.0 || ^19.0.0-rc",
"react": "^17.0.0 || ^18.0.0 || ^19.0 || ^19.0.0-rc",
"react-dom": "^17.0.0 || ^18.0.0 || ^19.0 || ^19.0.0-rc"
"@types/react": "^17 || ^18 || ^19",
"react": "^17 || ^18 || ^19",
"react-dom": "^17 || ^18 || ^19"
},
"peerDependenciesMeta": {
"@types/react": {
Expand Down
Loading

0 comments on commit 2bff7c2

Please sign in to comment.