Skip to content

Commit

Permalink
Merge branch 'mui:master' into feat/NumberField
Browse files Browse the repository at this point in the history
  • Loading branch information
atomiks authored Mar 20, 2024
2 parents 0c980aa + d34fab9 commit 585d357
Show file tree
Hide file tree
Showing 30 changed files with 2,401 additions and 1,906 deletions.
23 changes: 12 additions & 11 deletions .browserslistrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,41 @@
# `npx browserslist --mobile-to-desktop "> 0.5%, last 2 versions, Firefox ESR, not dead"` when the last major is released.
# On update, sync references where "#stable-snapshot" is mentioned in the codebase.
[stable]
and_chr 122
and_chr 121
and_chr 120
and_ff 123
and_ff 122
and_ff 121
and_qq 13.1
and_qq 14.9
and_uc 15.5
android 122
android 121
android 120
chrome 122
chrome 121
chrome 120
chrome 119
chrome 109
edge 122
edge 121
edge 120
firefox 123
firefox 122
firefox 121
firefox 115
ios_saf 17.4
ios_saf 17.3
ios_saf 17.2
ios_saf 17.1
ios_saf 16.6-16.7
ios_saf 16.3
ios_saf 16.1
ios_saf 15.6-15.8
kaios 3.0-3.1
kaios 2.5
op_mini all
op_mob 73
op_mob 80
opera 108
opera 107
opera 106
opera 105
safari 17.4
safari 17.3
safari 17.2
safari 17.1
safari 16.6
samsung 23
samsung 22

Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ module.exports = {
},
},
{
files: ['packages/mui-base/src/**/**{.ts,.tsx}'],
files: ['packages/mui-base/**/**{.ts,.tsx}'],
rules: {
'import/no-default-export': 'error',
'import/prefer-default-export': 'off',
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@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
uses: github/codeql-action/init@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.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@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
uses: github/codeql-action/analyze@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
6 changes: 4 additions & 2 deletions .github/workflows/no-response.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ on:
issue_comment:
types: [created]
schedule:
# Schedule for fifteen minutes after the hour, every hour
- cron: '15 * * * *'
# These runs in our repos are spread evenly throughout the day to avoid hitting rate limits.
# If you change this schedule, consider changing the remaining repositories as well.
# Runs at 9 am, 9 pm
- cron: '0 9,21 * * *'

permissions: {}

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@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
uses: github/codeql-action/upload-sarif@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
with:
sarif_file: results.sarif
34 changes: 17 additions & 17 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@
"@emotion/server": "^11.11.0",
"@emotion/styled": "^11.11.0",
"@mui/base": "workspace:*",
"@mui/docs": "^5.15.11",
"@mui/icons-material": "5.15.10",
"@mui/internal-markdown": "^1.0.0",
"@mui/internal-scripts": "^1.0.2",
"@mui/joy": "5.0.0-beta.28",
"@mui/material": "^5.15.10",
"@mui/material-nextjs": "^5.15.9",
"@mui/monorepo": "github:mui/material-ui#ad3a9364756881fef41bf01723a886ea1a823b0d",
"@mui/styles": "^5.15.9",
"@mui/system": "^5.15.9",
"@mui/types": "^7.2.13",
"@mui/utils": "5.15.11",
"@mui/docs": "5.15.14",
"@mui/icons-material": "5.15.14",
"@mui/internal-markdown": "^1.0.1",
"@mui/internal-scripts": "^1.0.3",
"@mui/joy": "5.0.0-beta.32",
"@mui/material": "5.15.14",
"@mui/material-nextjs": "5.15.11",
"@mui/monorepo": "github:mui/material-ui#db1e8b7ed21902dc8c308aa263b49eb69c3a7a59",
"@mui/styles": "5.15.14",
"@mui/system": "5.15.14",
"@mui/types": "7.2.14",
"@mui/utils": "5.15.14",
"@popperjs/core": "^2.11.8",
"@react-spring/web": "^9.7.3",
"autoprefixer": "^10.4.18",
Expand Down Expand Up @@ -82,15 +82,15 @@
"devDependencies": {
"@babel/plugin-transform-react-constant-elements": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@mui/internal-scripts": "^1.0.2",
"@mui-internal/docs-utils": "^1.0.2",
"@mui/internal-docs-utils": "^1.0.4",
"@mui/internal-scripts": "^1.0.3",
"@mui/internal-test-utils": "https://pkg.csb.dev/mui/material-ui/commit/fb183624/@mui/internal-test-utils",
"@types/autosuggest-highlight": "^3.2.3",
"@types/chai": "^4.3.12",
"@types/node": "^18.19.23",
"@types/node": "^18.19.24",
"@types/prop-types": "^15.7.11",
"@types/react": "^18.2.65",
"@types/react-dom": "^18.2.21",
"@types/react": "^18.2.66",
"@types/react-dom": "^18.2.22",
"@types/react-transition-group": "^4.4.10",
"@types/stylis": "^4.2.5",
"chai": "^4.4.1",
Expand Down
2 changes: 1 addition & 1 deletion docs/scripts/formattedTSDemos.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const {
createTypeScriptProjectBuilder,
} = require('@mui-internal/api-docs-builder/utils/createTypeScriptProject');
const yargs = require('yargs');
const { fixBabelGeneratorIssues, fixLineEndings } = require('@mui-internal/docs-utils');
const { fixBabelGeneratorIssues, fixLineEndings } = require('@mui/internal-docs-utils');
const { default: CORE_TYPESCRIPT_PROJECTS } = require('../../scripts/coreTypeScriptProjects');

const babelConfig = {
Expand Down
2 changes: 1 addition & 1 deletion docs/src/modules/components/ApiPage/list/ClassesList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import * as React from 'react';
import { styled } from '@mui/material/styles';
import kebabCase from 'lodash/kebabCase';
import { ComponentClassDefinition } from '@mui-internal/docs-utils';
import { ComponentClassDefinition } from '@mui/internal-docs-utils';
import { useTranslate } from '@mui/docs/i18n';
import ExpandableApiItem, {
ApiItemContaier,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable react/no-danger */
import * as React from 'react';
import { useTranslate } from '@mui/docs/i18n';
import { ComponentClassDefinition } from '@mui-internal/docs-utils';
import { ComponentClassDefinition } from '@mui/internal-docs-utils';
import Box from '@mui/material/Box';
import ToggleDisplayOption, {
ApiDisplayOptions,
Expand Down
2 changes: 1 addition & 1 deletion docs/src/modules/components/ApiPage/table/ClassesTable.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable react/no-danger */
import * as React from 'react';
import { ComponentClassDefinition } from '@mui-internal/docs-utils';
import { ComponentClassDefinition } from '@mui/internal-docs-utils';
import { styled, alpha } from '@mui/material/styles';
import {
brandingDarkTheme as darkTheme,
Expand Down
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@
"@googleapis/sheets": "^5.0.5",
"@slack/bolt": "^3.17.1",
"execa": "^8.0.1",
"google-auth-library": "^9.6.3"
"google-auth-library": "^9.7.0"
},
"devDependencies": {
"@argos-ci/core": "^1.5.4",
"@argos-ci/core": "^1.5.5",
"@babel/cli": "^7.23.9",
"@babel/core": "^7.24.0",
"@babel/node": "^7.23.9",
Expand All @@ -83,23 +83,23 @@
"@babel/preset-typescript": "^7.23.3",
"@babel/register": "^7.23.7",
"@mnajdova/enzyme-adapter-react-18": "^0.2.0",
"@mui-internal/docs-utils": "^1.0.2",
"@mui/internal-markdown": "^1.0.0",
"@mui/internal-scripts": "^1.0.2",
"@mui/internal-docs-utils": "^1.0.4",
"@mui/internal-markdown": "^1.0.1",
"@mui/internal-scripts": "^1.0.3",
"@mui/internal-test-utils": "https://pkg.csb.dev/mui/material-ui/commit/fb183624/@mui/internal-test-utils",
"@mui/material": "^5.15.10",
"@mui/monorepo": "github:mui/material-ui#ad3a9364756881fef41bf01723a886ea1a823b0d",
"@mui/utils": "^5.15.11",
"@mui/material": "5.15.14",
"@mui/monorepo": "github:mui/material-ui#db1e8b7ed21902dc8c308aa263b49eb69c3a7a59",
"@mui/utils": "5.15.14",
"@next/eslint-plugin-next": "^14.1.3",
"@octokit/rest": "^20.0.2",
"@playwright/test": "1.42.1",
"@types/enzyme": "^3.10.18",
"@types/fs-extra": "^11.0.4",
"@types/lodash": "^4.14.202",
"@types/lodash": "^4.17.0",
"@types/mocha": "^10.0.6",
"@types/node": "^18.19.23",
"@types/node": "^18.19.24",
"@types/prettier": "^2.7.3",
"@types/react": "^18.2.65",
"@types/react": "^18.2.66",
"@types/yargs": "^17.0.32",
"@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^7.2.0",
Expand Down Expand Up @@ -130,7 +130,7 @@
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-material-ui": "workspace:^",
"eslint-plugin-mocha": "^10.4.1",
"eslint-plugin-react": "^7.34.0",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react-hooks": "^4.6.0",
"fast-glob": "^3.3.2",
"fs-extra": "^11.2.0",
Expand All @@ -142,12 +142,12 @@
"karma-firefox-launcher": "^2.1.3",
"karma-mocha": "^2.0.1",
"karma-sourcemap-loader": "^0.4.0",
"karma-webpack": "^5.0.0",
"karma-webpack": "5.0.0",
"lerna": "^8.1.2",
"lodash": "^4.17.21",
"markdownlint-cli2": "^0.12.1",
"mocha": "^10.3.0",
"nx": "^18.0.8",
"nx": "^18.1.1",
"nyc": "^15.1.0",
"piscina": "^4.4.0",
"postcss-styled-syntax": "^0.6.4",
Expand Down Expand Up @@ -190,9 +190,9 @@
"@definitelytyped/header-parser": "^0.2.8",
"@definitelytyped/typescript-versions": "^0.1.1",
"@definitelytyped/utils": "^0.1.5",
"@types/node": "^18.19.23",
"@types/react": "^18.2.65",
"@types/react-dom": "18.2.21"
"@types/node": "^18.19.24",
"@types/react": "^18.2.66",
"@types/react-dom": "18.2.22"
},
"nyc": {
"include": [
Expand All @@ -207,7 +207,7 @@
},
"pnpm": {
"patchedDependencies": {
"@mui/[email protected].11": "patches/@[email protected].11.patch"
"@mui/[email protected].14": "patches/@[email protected].14.patch"
}
}
}
10 changes: 5 additions & 5 deletions packages/mui-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"dependencies": {
"@babel/runtime": "^7.24.0",
"@floating-ui/react-dom": "^2.0.8",
"@mui/types": "^7.2.13",
"@mui/utils": "^5.15.11",
"@mui/types": "^7.2.14",
"@mui/utils": "^5.15.14",
"@popperjs/core": "^2.11.8",
"clsx": "^2.1.0",
"prop-types": "^15.8.1"
Expand All @@ -55,16 +55,16 @@
"@types/chai": "^4.3.12",
"@types/chai-dom": "^1.11.3",
"@types/prop-types": "^15.7.11",
"@types/react": "18.2.65",
"@types/react-dom": "18.2.21",
"@types/react": "18.2.66",
"@types/react-dom": "18.2.22",
"@types/sinon": "^17.0.3",
"chai": "^4.4.1",
"fast-glob": "^3.3.2",
"lodash": "^4.17.21",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sinon": "^17.0.1",
"typescript": "^5.3.3"
"typescript": "^5.4.2"
},
"peerDependencies": {
"@types/react": "^17.0.0 || ^18.0.0",
Expand Down
9 changes: 0 additions & 9 deletions packages/mui-base/src/Input/Input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -241,15 +241,6 @@ Input.propTypes /* remove-proptypes */ = {
* The id of the `input` element.
*/
id: PropTypes.string,
/**
* @ignore
*/
inputRef: PropTypes.oneOfType([
PropTypes.func,
PropTypes.shape({
current: PropTypes.object,
}),
]),
/**
* Maximum number of rows to display when multiline option is set to true.
*/
Expand Down
Loading

0 comments on commit 585d357

Please sign in to comment.