Skip to content

Commit c9f76a5

Browse files
committed
Merge branch 'master' of github.com:mui/material-ui into fix/types-theme-components2
2 parents 3b62912 + 8ea1738 commit c9f76a5

File tree

329 files changed

+3794
-4386
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

329 files changed

+3794
-4386
lines changed

.circleci/config.yml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ default-job: &default-job
2727
description: The version of typescript to be used
2828
type: string
2929
default: stable
30-
test-gate:
31-
description: A particular type of tests that should be run
32-
type: string
33-
default: undefined
3430
e2e-base-url:
3531
description: The base url for running end-to-end test
3632
type: string
@@ -44,7 +40,6 @@ default-job: &default-job
4440
BROWSERSTACK_ENABLED: << parameters.browserstack-enabled >>
4541
REACT_VERSION: << parameters.react-version >>
4642
TYPESCRIPT_VERSION: << parameters.typescript-version >>
47-
TEST_GATE: << parameters.test-gate >>
4843
AWS_REGION_ARTIFACTS: eu-central-1
4944
COREPACK_ENABLE_DOWNLOAD_PROMPT: '0'
5045
DANGER_DISABLE_TRANSPILATION: 'true'
@@ -224,11 +219,6 @@ jobs:
224219
command: |
225220
pnpm extract-error-codes
226221
git add -A && git diff --exit-code --staged
227-
- run:
228-
name: '`pnpm docs:link-check` changes committed?'
229-
command: |
230-
pnpm docs:link-check
231-
git add -A && git diff --exit-code --staged
232222
test_types:
233223
<<: *default-job
234224
resource_class: 'medium+'
@@ -326,31 +316,6 @@ jobs:
326316
command: pnpm test:e2e-website
327317
environment:
328318
PLAYWRIGHT_TEST_BASE_URL: << parameters.e2e-base-url >>
329-
test_profile:
330-
<<: *default-job
331-
docker:
332-
- image: mcr.microsoft.com/playwright:v1.56.1-noble
333-
steps:
334-
- checkout
335-
- install_js:
336-
browsers: true
337-
- run:
338-
name: Tests real browsers
339-
# Run a couple of times for a better sample.
340-
# TODO: hack something together where we can compile once and run multiple times e.g. by abusing watchmode.
341-
command: |
342-
# Running on chrome only since actual times are innaccurate anyway
343-
# The other reason is that browserstack allows little concurrency so it's likely that we're starving other runs.
344-
pnpm test:karma:profile --browsers chrome,chromeHeadless
345-
pnpm test:karma:profile --browsers chrome,chromeHeadless
346-
pnpm test:karma:profile --browsers chrome,chromeHeadless
347-
pnpm test:karma:profile --browsers chrome,chromeHeadless
348-
pnpm test:karma:profile --browsers chrome,chromeHeadless
349-
# Persist reports for inspection in https://frontend-public.mui.com/
350-
- store_artifacts:
351-
# see karma.conf.profile.js reactProfilerReporter.outputDir
352-
path: tmp/react-profiler-report/karma
353-
destination: react-profiler-report/karma
354319
test_regressions:
355320
<<: *default-job
356321
docker:
@@ -685,12 +650,6 @@ workflows:
685650
<<: *default-context
686651
requires:
687652
- test_bundling_prepare
688-
profile:
689-
when:
690-
equal: [profile, << pipeline.parameters.workflow >>]
691-
jobs:
692-
- test_profile:
693-
<<: *default-context
694653

695654
# This workflow can be triggered manually on the PR
696655
react-17:

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
4343
- run: pnpm install
4444
- name: Cache Next.js build
45-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
45+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
4646
with:
4747
path: docs/.next/cache
4848
key: ${{ runner.os }}-nextjs-${{ hashFiles('pnpm-lock.yaml') }}-${{ hashFiles('docs/**/*.js', 'docs/**/*.ts', 'docs/**/*.tsx', 'docs/**/*.jsx', 'docs/**/*.json', 'docs/**/*.md', 'docs/**/*.mdx') }}

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2020
# Initializes the CodeQL tools for scanning.
2121
- name: Initialize CodeQL
22-
uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
22+
uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
2323
with:
2424
languages: typescript
2525
config-file: ./.github/codeql/codeql-config.yml
@@ -30,4 +30,4 @@ jobs:
3030
# 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
3131
# queries: security-extended,security-and-quality
3232
- name: Perform CodeQL Analysis
33-
uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
33+
uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3

.github/workflows/mark-duplicate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
issues: write
1515
steps:
1616
- name: Mark duplicate
17-
uses: actions-cool/issues-helper@45d75b6cf72bf4f254be6230cb887ad002702491 # v3.6.3
17+
uses: actions-cool/issues-helper@9861779a695cf1898bd984c727f685f351cfc372 # v3.7.2
1818
with:
1919
actions: 'mark-duplicate'
2020
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ jobs:
4040
publish_results: true
4141
# Upload the results to GitHub's code scanning dashboard.
4242
- name: Upload to code-scanning
43-
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
43+
uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
4444
with:
4545
sarif_file: results.sarif

docs/.link-check-errors.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

docs/babel.config.js

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import * as React from 'react';
2+
import Box from '@mui/material/Box';
3+
import NumberField from './components/NumberField';
4+
5+
export default function FieldDemo() {
6+
return (
7+
<Box sx={{ display: 'grid', gap: 4 }}>
8+
<NumberField label="Number Field" min={10} max={40} />
9+
<NumberField
10+
label="Small and Error"
11+
min={10}
12+
max={40}
13+
size="small"
14+
defaultValue={100}
15+
error
16+
/>
17+
</Box>
18+
);
19+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import * as React from 'react';
2+
import Box from '@mui/material/Box';
3+
import NumberField from './components/NumberField';
4+
5+
export default function FieldDemo() {
6+
return (
7+
<Box sx={{ display: 'grid', gap: 4 }}>
8+
<NumberField label="Number Field" min={10} max={40} />
9+
<NumberField
10+
label="Small and Error"
11+
min={10}
12+
max={40}
13+
size="small"
14+
defaultValue={100}
15+
error
16+
/>
17+
</Box>
18+
);
19+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<NumberField label="Number Field" min={10} max={40} />
2+
<NumberField
3+
label="Small and Error"
4+
min={10}
5+
max={40}
6+
size="small"
7+
defaultValue={100}
8+
error
9+
/>

0 commit comments

Comments
 (0)