Skip to content

Commit b1adc18

Browse files
committed
Merge branch 'master' into use-digital-clock-on-all-date-time-pickers
2 parents 3a82a3c + 8af0c85 commit b1adc18

File tree

1,321 files changed

+33524
-9462
lines changed

Some content is hidden

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

1,321 files changed

+33524
-9462
lines changed

.codesandbox/ci.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"node": "20",
55
"packages": [
66
"packages/x-license",
7+
"packages/x-telemetry",
78
"packages/x-data-grid",
89
"packages/x-data-grid-pro",
910
"packages/x-data-grid-premium",
@@ -19,6 +20,7 @@
1920
],
2021
"publishDirectory": {
2122
"@mui/x-license": "packages/x-license/build",
23+
"@mui/x-telemetry": "packages/x-telemetry/build",
2224
"@mui/x-data-grid": "packages/x-data-grid/build",
2325
"@mui/x-data-grid-pro": "packages/x-data-grid-pro/build",
2426
"@mui/x-data-grid-premium": "packages/x-data-grid-premium/build",

.eslintrc.js

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const addReactCompilerRule = (packagesNames, isEnabled) =>
3737
!isEnabled
3838
? []
3939
: packagesNames.map((packageName) => ({
40-
files: [`packages/${packageName}/src/**/*{.ts,.tsx,.js}`],
40+
files: [`packages/${packageName}/src/**/*.?(c|m)[jt]s?(x)`],
4141
rules: {
4242
'react-compiler/react-compiler': 'error',
4343
},
@@ -58,7 +58,7 @@ const RESTRICTED_TOP_LEVEL_IMPORTS = [
5858
// It needs to know about the parent "no-restricted-imports" to not override them.
5959
const buildPackageRestrictedImports = (packageName, root, allowRootImports = true) => [
6060
{
61-
files: [`packages/${root}/src/**/*{.ts,.tsx,.js}`],
61+
files: [`packages/${root}/src/**/*.?(c|m)[jt]s?(x)`],
6262
excludedFiles: [
6363
'*.d.ts',
6464
'*.spec.ts',
@@ -95,8 +95,8 @@ const buildPackageRestrictedImports = (packageName, root, allowRootImports = tru
9595
: [
9696
{
9797
files: [
98-
`packages/${root}/src/**/*.test{.ts,.tsx,.js}`,
99-
`packages/${root}/src/**/*.spec{.ts,.tsx,.js}`,
98+
`packages/${root}/src/**/*.test.?(c|m)[jt]s?(x)`,
99+
`packages/${root}/src/**/*.spec.?(c|m)[jt]s?(x)`,
100100
],
101101
excludedFiles: ['*.d.ts'],
102102
rules: {
@@ -246,8 +246,8 @@ module.exports = {
246246
},
247247
},
248248
{
249-
files: ['packages/*/src/**/*{.ts,.tsx,.js}'],
250-
excludedFiles: ['*.d.ts', '*.spec.ts', '*.spec.tsx'],
249+
files: ['packages/*/src/**/*.?(c|m)[jt]s?(x)'],
250+
excludedFiles: ['*.d.ts', '*.spec.*'],
251251
rules: {
252252
'material-ui/mui-name-matches-component-name': [
253253
'error',
@@ -269,7 +269,7 @@ module.exports = {
269269
},
270270
},
271271
{
272-
files: ['docs/**/*{.ts,.tsx,.js}'],
272+
files: ['docs/**/*.?(c|m)[jt]s?(x)'],
273273
excludedFiles: ['*.d.ts'],
274274
rules: {
275275
'no-restricted-imports': [
@@ -287,6 +287,7 @@ module.exports = {
287287
'!@mui/internal-*/**',
288288

289289
// Exceptions (QUESTION: Keep or remove?)
290+
'!@mui/x-data-grid/internals/demo',
290291
'!@mui/x-date-pickers/internals/demo',
291292
'!@mui/x-tree-view/hooks/useTreeViewApiRef',
292293
// TODO: export this from /ButtonBase in core. This will break after we move to package exports
@@ -299,6 +300,12 @@ module.exports = {
299300
],
300301
},
301302
},
303+
{
304+
files: ['packages/x-telemetry/**/*{.tsx,.ts,.js}'],
305+
rules: {
306+
'no-console': 'off',
307+
},
308+
},
302309
...buildPackageRestrictedImports('@mui/x-charts', 'x-charts', false),
303310
...buildPackageRestrictedImports('@mui/x-charts-pro', 'x-charts-pro', false),
304311
...buildPackageRestrictedImports('@mui/x-codemod', 'x-codemod', false),
@@ -311,6 +318,7 @@ module.exports = {
311318
...buildPackageRestrictedImports('@mui/x-tree-view', 'x-tree-view', false),
312319
...buildPackageRestrictedImports('@mui/x-tree-view-pro', 'x-tree-view-pro', false),
313320
...buildPackageRestrictedImports('@mui/x-license', 'x-license'),
321+
...buildPackageRestrictedImports('@mui/x-telemetry', 'x-telemetry'),
314322

315323
...addReactCompilerRule(chartsPackages, ENABLE_REACT_COMPILER_PLUGIN_CHARTS),
316324
...addReactCompilerRule(dataGridPackages, ENABLE_REACT_COMPILER_PLUGIN_DATA_GRID),

.github/ISSUE_TEMPLATE/5.priority-support.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: 'Priority Support: SLA ⏰'
22
description: I'm an MUI X Premium user and we have purchased the Priority Support add-on. I can't find a solution to my problem with MUI X.
33
title: '[question] '
4-
labels: ['status: waiting for maintainer', 'support: commercial', 'support: unknown']
4+
labels: ['status: waiting for maintainer', 'support: priority']
55
body:
66
- type: markdown
77
attributes:

.github/workflows/check-if-pr-has-label.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Check PR type label
2+
3+
on:
4+
pull_request:
5+
types: [opened, reopened, labeled, unlabeled]
6+
7+
permissions:
8+
pull-requests: write
9+
contents: write
10+
11+
jobs:
12+
check-label:
13+
name: check PR labels
14+
# no need for a check if the PR is merged. That is done inside the reusable workflow
15+
uses: mui/mui-public/.github/workflows/prs_check-if-pr-has-type-label.yml@master
16+
permissions:
17+
pull-requests: write
18+
contents: write

.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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020
# Initializes the CodeQL tools for scanning.
2121
- name: Initialize CodeQL
22-
uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
22+
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
2323
with:
2424
languages: typescript
2525
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -29,4 +29,4 @@ jobs:
2929
# 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
3030
# queries: security-extended,security-and-quality
3131
- name: Perform CodeQL Analysis
32-
uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
32+
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10

.github/workflows/codspeed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
# Ensure we are running on the prod version of our libs
4848
- run: pnpm --filter "@mui/x-charts-pro..." build
4949
- name: Run benchmarks
50-
uses: CodSpeedHQ/action@1015f4f828ff74b7a950909897fe581d6ba868cc
50+
uses: CodSpeedHQ/action@63ae6025a0ffee97d7736a37c9192dbd6ed4e75f
5151
with:
5252
run: pnpm --filter @mui-x-internal/performance-charts test:performance
5353
token: ${{ secrets.CODSPEED_TOKEN }}

.github/workflows/scorecards.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
persist-credentials: false
2929

3030
- name: Run analysis
31-
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
31+
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
3232
with:
3333
results_file: results.sarif
3434
results_format: sarif
@@ -44,6 +44,6 @@ jobs:
4444

4545
# Upload the results to GitHub's code scanning dashboard.
4646
- name: Upload to code-scanning
47-
uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
47+
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
4848
with:
4949
sarif_file: results.sarif

0 commit comments

Comments
 (0)