Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/mui/material-ui into fix/…
Browse files Browse the repository at this point in the history
…gen-css-vars-order
  • Loading branch information
siriwatknp committed Sep 16, 2024
2 parents 1945364 + 081b14e commit 9085e7c
Show file tree
Hide file tree
Showing 33 changed files with 383 additions and 350 deletions.
26 changes: 13 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ jobs:
<<: *default-job
resource_class: 'medium+'
docker:
- image: mcr.microsoft.com/playwright:v1.46.1-focal
- image: mcr.microsoft.com/playwright:v1.47.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -423,7 +423,7 @@ jobs:
test_e2e:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.46.1-focal
- image: mcr.microsoft.com/playwright:v1.47.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -437,7 +437,7 @@ jobs:
# NOTE: This workflow runs after successful docs deploy. See /test/e2e-website/README.md#ci
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.46.1-focal
- image: mcr.microsoft.com/playwright:v1.47.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -452,7 +452,7 @@ jobs:
test_profile:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.46.1-focal
- image: mcr.microsoft.com/playwright:v1.47.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -479,7 +479,7 @@ jobs:
test_regressions:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.46.1-focal
- image: mcr.microsoft.com/playwright:v1.47.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -539,7 +539,7 @@ jobs:
<<: *default-job
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack4/
docker:
- image: mcr.microsoft.com/playwright:v1.46.1-focal
- image: mcr.microsoft.com/playwright:v1.47.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -563,7 +563,7 @@ jobs:
<<: *default-job
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack5/
docker:
- image: mcr.microsoft.com/playwright:v1.46.1-focal
- image: mcr.microsoft.com/playwright:v1.47.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -587,7 +587,7 @@ jobs:
<<: *default-job
working_directory: /tmp/material-ui/test/bundling/fixtures/create-react-app/
docker:
- image: mcr.microsoft.com/playwright:v1.46.1-focal
- image: mcr.microsoft.com/playwright:v1.47.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -611,7 +611,7 @@ jobs:
<<: *default-job
working_directory: /tmp/material-ui/test/bundling/fixtures/snowpack/
docker:
- image: mcr.microsoft.com/playwright:v1.46.1-focal
- image: mcr.microsoft.com/playwright:v1.47.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -635,7 +635,7 @@ jobs:
<<: *default-job
working_directory: /tmp/material-ui/test/bundling/fixtures/vite/
docker:
- image: mcr.microsoft.com/playwright:v1.46.1-focal
- image: mcr.microsoft.com/playwright:v1.47.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -659,7 +659,7 @@ jobs:
<<: *default-job
working_directory: /tmp/material-ui/test/bundling/fixtures/esbuild/
docker:
- image: mcr.microsoft.com/playwright:v1.46.1-focal
- image: mcr.microsoft.com/playwright:v1.47.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -687,7 +687,7 @@ jobs:
<<: *default-job
working_directory: /tmp/material-ui/test/bundling/fixtures/gatsby/
docker:
- image: mcr.microsoft.com/playwright:v1.46.1-focal
- image: mcr.microsoft.com/playwright:v1.47.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -788,7 +788,7 @@ jobs:
test_benchmark:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.46.1-focal
- image: mcr.microsoft.com/playwright:v1.47.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
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@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
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@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
with:
sarif_file: results.sarif
6 changes: 3 additions & 3 deletions apps/pigment-css-vite-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"@mui/material": "workspace:^",
"@mui/system": "workspace:^",
"clsx": "^2.1.1",
"playwright": "^1.46.1",
"playwright": "^1.47.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-error-boundary": "^4.0.13",
"react-router-dom": "^6.26.1"
"react-router-dom": "^6.26.2"
},
"devDependencies": {
"@babel/preset-react": "^7.24.7",
Expand All @@ -30,7 +30,7 @@
"@types/react": "^18.3.4",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.1",
"postcss": "^8.4.45",
"postcss": "^8.4.47",
"postcss-combine-media-query": "^1.0.1",
"vite": "5.4.2",
"vite-plugin-pages": "^0.32.3",
Expand Down
2 changes: 1 addition & 1 deletion benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"express": "^4.19.2",
"fs-extra": "^11.2.0",
"jss": "^10.10.0",
"playwright": "^1.46.1",
"playwright": "^1.47.1",
"prop-types": "^15.8.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand Down
14 changes: 14 additions & 0 deletions docs/data/material/components/table/table.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,20 @@ Tables display information in a way that's easy to scan, so that users can look

{{"component": "@mui/docs/ComponentLinkHeader"}}

## Introduction

Tables are implemented using a collection of related components:

- `<TableContainer />`: A wrapper that provides horizontally scrolling behavior for the `<Table />` component.
- `<Table />`: The main component for the table element. Renders as a `<table>` by default.
- `<TableHead />`: The container for the header row(s) of `<Table />`. Renders as a `<thead>` by default.
- `<TableBody />`: The container for the body rows of `<Table />`. Renders as a `<tbody>` by default.
- `<TableRow />`: A row in a table. Can be used in `<TableHead />`, `<TableBody />`, or `<TableFooter />`. Renders as a `<tr>` by default.
- `<TableCell />`: A cell in a table. Can be used in `<TableRow />` . Renders as a `<th>` in `<TableHead />` and `<td>` in `<TableBody />` by default.
- `<TableFooter />`: An optional container for the footer row(s) of the table. Renders as a `<tfoot>` by default.
- `<TablePagination />`: A component that provides controls for paginating table data. See the ['Sorting & selecting' example](#sorting-amp-selecting) and ['Custom Table Pagination Action' example](#custom-pagination-actions).
- `<TableSortLabel />`: A component used to display sorting controls for column headers, allowing users to sort data in ascending or descending order. See the ['Sorting & selecting' example](#sorting-amp-selecting).

## Basic table

A simple example with no frills.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Feel free to submit a pull request!

### Layout

- [MUI Treasury Layout](https://mui-treasury.com/?path=/docs/layout-introduction--docs): Components to handle the overall layout of a page. Check out examples such as [a legacy.reactjs.org clone](https://mui-treasury.com/?path=/story/layout-app-reactlegacy--react-legacy).
- [MUI Treasury Layout](https://mui-treasury.com/?path=/docs/layout-v6-introduction--docs): Components to handle the overall layout of a page. Check out examples such as [a legacy.reactjs.org clone](https://mui-treasury.com/?path=/story/layout-v6-app-react-legacy--react-legacy).

### Image

Expand Down
26 changes: 13 additions & 13 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@
"@mui/system": "workspace:^",
"@mui/types": "workspace:^",
"@mui/utils": "workspace:^",
"@mui/x-charts": "7.16.0",
"@mui/x-data-grid": "7.16.0",
"@mui/x-data-grid-generator": "7.16.0",
"@mui/x-data-grid-premium": "7.16.0",
"@mui/x-data-grid-pro": "7.16.0",
"@mui/x-date-pickers": "7.16.0",
"@mui/x-date-pickers-pro": "7.16.0",
"@mui/x-license": "7.16.0",
"@mui/x-tree-view": "7.16.0",
"@mui/x-charts": "7.17.0",
"@mui/x-data-grid": "7.17.0",
"@mui/x-data-grid-generator": "7.17.0",
"@mui/x-data-grid-premium": "7.17.0",
"@mui/x-data-grid-pro": "7.17.0",
"@mui/x-date-pickers": "7.17.0",
"@mui/x-date-pickers-pro": "7.17.0",
"@mui/x-license": "7.17.0",
"@mui/x-tree-view": "7.17.0",
"@popperjs/core": "^2.11.8",
"@react-spring/web": "^9.7.4",
"@toolpad/core": "^0.5.2",
Expand Down Expand Up @@ -84,7 +84,7 @@
"next": "^14.2.8",
"notistack": "3.0.1",
"nprogress": "^0.2.0",
"postcss": "^8.4.45",
"postcss": "^8.4.47",
"postcss-import": "^16.1.0",
"prop-types": "^15.8.1",
"react": "^18.3.1",
Expand All @@ -95,7 +95,7 @@
"react-intersection-observer": "^9.13.1",
"react-is": "^18.3.1",
"react-number-format": "^5.4.2",
"react-router-dom": "^6.26.1",
"react-router-dom": "^6.26.2",
"react-runner": "^1.0.5",
"react-simple-code-editor": "^0.14.1",
"react-spring": "^9.7.4",
Expand Down Expand Up @@ -134,9 +134,9 @@
"cross-fetch": "^4.0.0",
"gm": "^1.25.0",
"marked": "^13.0.3",
"playwright": "^1.46.1",
"playwright": "^1.47.1",
"prettier": "^3.3.3",
"tailwindcss": "^3.4.10",
"tailwindcss": "^3.4.11",
"yargs": "^17.7.2"
}
}
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,12 @@
"dependencies": {
"@googleapis/sheets": "^9.3.1",
"@netlify/functions": "^2.8.1",
"@slack/bolt": "^3.21.2",
"@slack/bolt": "^3.21.4",
"execa": "^9.3.1",
"google-auth-library": "^9.14.1"
},
"devDependencies": {
"@argos-ci/core": "^2.5.0",
"@argos-ci/core": "^2.8.1",
"@babel/cli": "^7.25.6",
"@babel/core": "^7.25.2",
"@babel/node": "^7.25.0",
Expand All @@ -123,14 +123,14 @@
"@mui/joy": "workspace:*",
"@mui/material": "workspace:^",
"@mui/utils": "workspace:^",
"@next/eslint-plugin-next": "^14.2.8",
"@next/eslint-plugin-next": "^14.2.11",
"@octokit/rest": "^21.0.2",
"@pigment-css/react": "0.0.22",
"@playwright/test": "1.46.1",
"@playwright/test": "1.47.1",
"@types/babel__core": "^7.20.5",
"@types/fs-extra": "^11.0.4",
"@types/lodash": "^4.17.7",
"@types/mocha": "^10.0.7",
"@types/mocha": "^10.0.8",
"@types/node": "^20.16.5",
"@types/react": "^18.3.4",
"@types/yargs": "^17.0.33",
Expand Down Expand Up @@ -192,7 +192,7 @@
"stylelint-config-standard": "^34.0.0",
"stylelint-processor-styled-components": "^1.10.0",
"terser-webpack-plugin": "^5.3.10",
"tsx": "^4.19.0",
"tsx": "^4.19.1",
"typescript": "^5.5.4",
"webpack": "^5.94.0",
"webpack-bundle-analyzer": "^4.10.2",
Expand Down
4 changes: 2 additions & 2 deletions packages-internal/test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
"jsdom": "^24.0.0",
"lodash": "^4.17.21",
"mocha": "^10.7.3",
"playwright": "^1.46.1",
"playwright": "^1.47.1",
"prop-types": "^15.8.1",
"sinon": "^18.0.0"
"sinon": "^18.0.1"
},
"devDependencies": {
"@types/chai": "^4.3.19",
Expand Down
4 changes: 2 additions & 2 deletions packages/api-docs-builder-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
},
"devDependencies": {
"@types/chai": "^4.3.19",
"@types/mocha": "^10.0.7",
"@types/mocha": "^10.0.8",
"@types/node": "^20.16.5",
"@types/sinon": "^17.0.3",
"chai": "^4.5.0",
"sinon": "^18.0.0",
"sinon": "^18.0.1",
"typescript": "^5.5.4"
}
}
4 changes: 2 additions & 2 deletions packages/api-docs-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
"@types/chai": "^4.3.19",
"@types/doctrine": "^0.0.9",
"@types/mdast": "4.0.4",
"@types/mocha": "^10.0.7",
"@types/mocha": "^10.0.8",
"@types/node": "^20.16.5",
"@types/react-docgen": "workspace:*",
"@types/sinon": "^17.0.3",
"chai": "^4.5.0",
"sinon": "^18.0.0"
"sinon": "^18.0.1"
}
}
2 changes: 1 addition & 1 deletion packages/feedback/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
"claudia": "^5.14.1"
},
"optionalDependencies": {
"aws-sdk": "^2.1677.0"
"aws-sdk": "^2.1691.0"
}
}
2 changes: 1 addition & 1 deletion packages/mui-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"lodash": "^4.17.21",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sinon": "^18.0.0"
"sinon": "^18.0.1"
},
"peerDependencies": {
"@types/react": "^17.0.0 || ^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-codemod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@babel/traverse": "^7.25.6",
"jscodeshift": "^0.16.1",
"jscodeshift-add-imports": "^1.0.11",
"postcss": "^8.4.45",
"postcss": "^8.4.47",
"postcss-cli": "^11.0.0",
"yargs": "^17.7.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-envinfo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"build": "node scripts/build"
},
"dependencies": {
"envinfo": "^7.13.0"
"envinfo": "^7.14.0"
},
"devDependencies": {
"@types/chai": "^4.3.19",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-joy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"next": "^14.2.8",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sinon": "^18.0.0"
"sinon": "^18.0.1"
},
"peerDependencies": {
"@emotion/react": "^11.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-lab/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"chai": "^4.5.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sinon": "^18.0.0"
"sinon": "^18.0.1"
},
"peerDependencies": {
"@emotion/react": "^11.5.0",
Expand Down
Loading

0 comments on commit 9085e7c

Please sign in to comment.