Skip to content

Commit

Permalink
Merge branch 'next' into renovate/playwright
Browse files Browse the repository at this point in the history
  • Loading branch information
cherniavskii committed Dec 29, 2022
2 parents 3678b02 + 64c9393 commit 1a0da4e
Show file tree
Hide file tree
Showing 17 changed files with 410 additions and 409 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@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@a669cc5936cc5e1b6a362ec1ff9e410dc570d190 # v2.1.36
uses: github/codeql-action/init@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37
with:
languages: typescript
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -29,4 +29,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@a669cc5936cc5e1b6a362ec1ff9e410dc570d190 # v2.1.36
uses: github/codeql-action/analyze@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37
4 changes: 2 additions & 2 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
persist-credentials: false

- name: Run analysis
uses: ossf/scorecard-action@99c53751e09b9529366343771cc321ec74e9bd3d # v2.0.6
uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -44,6 +44,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@a669cc5936cc5e1b6a362ec1ff9e410dc570d190 # v2.1.36
uses: github/codeql-action/upload-sarif@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@emotion/styled": "^11.10.5",
"@material-ui/core": "^5.0.0-beta.5",
"@material-ui/icons": "^5.0.0-beta.5",
"@mui/material": "^5.10.17",
"@mui/material": "^5.11.2",
"@mui/x-data-grid": "^4.0.0",
"@visx/xychart": "^2.16.0",
"ag-grid-community": "^28.2.1",
Expand Down
19 changes: 9 additions & 10 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,24 @@
"typescript:transpile:dev": "cross-env BABEL_ENV=development babel-node --extensions \".tsx,.ts,.js\" scripts/formattedTSDemos --watch"
},
"dependencies": {
"@babel/core": "^7.20.5",
"@babel/core": "^7.20.7",
"@babel/plugin-transform-object-assign": "^7.18.6",
"@babel/runtime-corejs2": "^7.20.6",
"@babel/runtime-corejs2": "^7.20.7",
"@date-io/date-fns-jalali": "^2.16.0",
"@docsearch/react": "^3.3.0",
"@emotion/cache": "^11.10.5",
"@emotion/react": "^11.10.5",
"@emotion/server": "^11.10.0",
"@emotion/styled": "^11.10.5",
"@mui/icons-material": "^5.10.16",
"@mui/joy": "^5.0.0-alpha.57",
"@mui/material": "^5.10.17",
"@mui/icons-material": "^5.11.0",
"@mui/joy": "^5.0.0-alpha.60",
"@mui/material": "^5.11.2",
"@mui/styles": "^5.10.16",
"@mui/utils": "^5.10.16",
"@mui/utils": "^5.11.2",
"@trendmicro/react-interpolate": "^0.5.5",
"@types/lodash": "^4.14.191",
"@types/react-dom": "^18.0.9",
"@types/react-router-dom": "^5.3.3",
"address": "^1.2.1",
"ast-types": "^0.14.2",
"autoprefixer": "^10.4.13",
"babel-plugin-module-resolver": "^4.1.0",
Expand All @@ -62,9 +61,9 @@
"luxon": "^3.1.1",
"lz-string": "^1.4.4",
"markdown-to-jsx": "^7.1.8",
"marked": "^4.2.4",
"marked": "^4.2.5",
"moment": "^2.29.4",
"next": "^13.0.2",
"next": "^13.1.1",
"nprogress": "^0.2.0",
"postcss": "^8.4.19",
"prismjs": "^1.29.0",
Expand All @@ -73,7 +72,7 @@
"react": "^18.2.0",
"react-docgen": "^5.4.3",
"react-dom": "^18.2.0",
"react-hook-form": "^7.40.0",
"react-hook-form": "^7.41.2",
"react-is": "^18.2.0",
"react-router": "^6.4.5",
"react-router-dom": "^6.4.5",
Expand Down
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,28 +66,28 @@
},
"devDependencies": {
"@argos-ci/core": "^0.6.2",
"@babel/cli": "^7.19.3",
"@babel/core": "^7.20.5",
"@babel/node": "^7.20.5",
"@babel/cli": "^7.20.7",
"@babel/core": "^7.20.7",
"@babel/node": "^7.20.7",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-object-rest-spread": "^7.20.2",
"@babel/plugin-proposal-object-rest-spread": "^7.20.7",
"@babel/plugin-transform-object-assign": "^7.18.6",
"@babel/plugin-transform-react-constant-elements": "^7.20.2",
"@babel/plugin-transform-runtime": "^7.19.6",
"@babel/preset-env": "^7.20.2",
"@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "^7.18.6",
"@babel/register": "^7.18.9",
"@babel/traverse": "^7.20.5",
"@babel/types": "^7.20.5",
"@babel/traverse": "^7.20.10",
"@babel/types": "^7.20.7",
"@emotion/cache": "^11.10.5",
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@mnajdova/enzyme-adapter-react-18": "^0.2.0",
"@mui/icons-material": "^5.10.16",
"@mui/material": "^5.10.17",
"@mui/icons-material": "^5.11.0",
"@mui/material": "^5.11.2",
"@mui/monorepo": "https://github.com/mui/material-ui.git#master",
"@mui/utils": "^5.10.16",
"@mui/utils": "^5.11.2",
"@octokit/plugin-retry": "^4.0.3",
"@octokit/rest": "^19.0.5",
"@playwright/test": "1.29.1",
Expand All @@ -96,16 +96,16 @@
"@types/chai": "^4.3.4",
"@types/chai-dom": "^1.11.0",
"@types/enzyme": "^3.10.12",
"@types/mocha": "^10.0.0",
"@types/mocha": "^10.0.1",
"@types/node": "^18.11.13",
"@types/prettier": "^2.7.1",
"@types/react": "^18.0.26",
"@types/react-dom": "^18.0.9",
"@types/requestidlecallback": "^0.3.5",
"@types/sinon": "^10.0.13",
"@types/yargs": "^17.0.17",
"@typescript-eslint/eslint-plugin": "^5.46.1",
"@typescript-eslint/parser": "^5.46.1",
"@typescript-eslint/eslint-plugin": "^5.47.1",
"@typescript-eslint/parser": "^5.47.1",
"axe-core": "4.5.2",
"babel-loader": "^9.1.0",
"babel-plugin-istanbul": "^6.1.1",
Expand Down Expand Up @@ -151,7 +151,7 @@
"karma-webpack": "^5.0.0",
"lerna": "^6.1.0",
"markdownlint-cli2": "^0.5.1",
"mocha": "^10.1.0",
"mocha": "^10.2.0",
"nyc": "^15.1.0",
"patch-package": "^6.5.0",
"playwright": "^1.29.1",
Expand All @@ -162,15 +162,15 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"serve": "^14.1.2",
"sinon": "^15.0.0",
"sinon": "^15.0.1",
"stream-browserify": "^3.0.0",
"string-replace-loader": "^3.1.0",
"typescript": "^4.9.4",
"util": "^0.12.5",
"webpack": "^5.75.0",
"webpack-cli": "^5.0.1",
"yargs": "^17.6.2",
"yarn-deduplicate": "^5.0.2"
"yarn-deduplicate": "^6.0.1"
},
"setupFiles": [
"<rootDir>/src/setupTests.js"
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-plugin-material-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"main": "src/index.js",
"devDependencies": {
"@types/eslint": "^8.4.10",
"@typescript-eslint/experimental-utils": "^5.46.1",
"@typescript-eslint/parser": "^5.46.1"
"@typescript-eslint/experimental-utils": "^5.47.1",
"@typescript-eslint/parser": "^5.47.1"
},
"scripts": {
"test": "cd ../../ && cross-env NODE_ENV=test mocha 'packages/eslint-plugin-material-ui/**/*.test.js' --timeout 3000"
Expand Down
4 changes: 2 additions & 2 deletions packages/grid/x-data-grid-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"directory": "packages/grid/x-data-grid-generator"
},
"dependencies": {
"@babel/runtime": "^7.20.6",
"@mui/base": "^5.0.0-alpha.109",
"@babel/runtime": "^7.20.7",
"@mui/base": "^5.0.0-alpha.112",
"@mui/x-data-grid-premium": "6.0.0-alpha.13",
"chance": "^1.1.9",
"clsx": "^1.2.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/grid/x-data-grid-premium/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
"directory": "packages/grid/x-data-grid-premium"
},
"dependencies": {
"@babel/runtime": "^7.20.6",
"@mui/utils": "^5.10.16",
"@babel/runtime": "^7.20.7",
"@mui/utils": "^5.11.2",
"@mui/x-data-grid": "6.0.0-alpha.13",
"@mui/x-data-grid-pro": "6.0.0-alpha.13",
"@mui/x-license-pro": "6.0.0-alpha.9",
Expand Down
4 changes: 2 additions & 2 deletions packages/grid/x-data-grid-pro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
"directory": "packages/grid/x-data-grid-pro"
},
"dependencies": {
"@babel/runtime": "^7.20.6",
"@mui/utils": "^5.10.16",
"@babel/runtime": "^7.20.7",
"@mui/utils": "^5.11.2",
"@mui/x-data-grid": "6.0.0-alpha.13",
"@mui/x-license-pro": "6.0.0-alpha.9",
"@types/format-util": "^1.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/grid/x-data-grid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"directory": "packages/grid/x-data-grid"
},
"dependencies": {
"@babel/runtime": "^7.20.6",
"@mui/utils": "^5.10.16",
"@babel/runtime": "^7.20.7",
"@mui/utils": "^5.11.2",
"clsx": "^1.2.1",
"prop-types": "^15.8.1",
"reselect": "^4.1.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid/src/components/menu/GridMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function GridMenu(props: GridMenuProps) {
apiRef.current.publishEvent(eventName, { target });
}, [apiRef, open, target]);

const handleExited = (popperOnExited: (() => {}) | undefined) => (node: HTMLElement) => {
const handleExited = (popperOnExited: (() => void) | undefined) => (node: HTMLElement) => {
if (popperOnExited) {
popperOnExited();
}
Expand Down
6 changes: 3 additions & 3 deletions packages/x-codemod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
"url": "https://opencollective.com/mui"
},
"dependencies": {
"@babel/core": "^7.20.5",
"@babel/runtime": "^7.20.6",
"@babel/traverse": "^7.20.5",
"@babel/core": "^7.20.7",
"@babel/runtime": "^7.20.7",
"@babel/traverse": "^7.20.10",
"jscodeshift": "0.13.1",
"jscodeshift-add-imports": "^1.0.10",
"yargs": "^17.6.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/x-date-pickers-pro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
"directory": "packages/x-date-pickers-pro"
},
"dependencies": {
"@babel/runtime": "^7.20.6",
"@babel/runtime": "^7.20.7",
"@date-io/date-fns": "^2.16.0",
"@date-io/dayjs": "^2.16.0",
"@date-io/luxon": "^2.16.1",
"@date-io/moment": "^2.16.1",
"@mui/utils": "^5.10.16",
"@mui/utils": "^5.11.2",
"@mui/x-date-pickers": "6.0.0-alpha.13",
"@mui/x-license-pro": "6.0.0-alpha.9",
"clsx": "^1.2.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/x-date-pickers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"directory": "packages/x-date-pickers"
},
"dependencies": {
"@babel/runtime": "^7.20.6",
"@babel/runtime": "^7.20.7",
"@date-io/core": "^2.16.0",
"@date-io/date-fns": "^2.16.0",
"@date-io/date-fns-jalali": "^2.16.0",
Expand All @@ -53,7 +53,7 @@
"@date-io/jalaali": "^2.16.1",
"@date-io/luxon": "^2.16.1",
"@date-io/moment": "^2.16.1",
"@mui/utils": "^5.10.16",
"@mui/utils": "^5.11.2",
"@types/react-transition-group": "^4.4.5",
"clsx": "^1.2.1",
"prop-types": "^15.8.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export interface PickersPopperSlotsComponent
* Custom component for trapping the focus inside the views on desktop.
* @default TrapFocus from @mui/material
*/
DesktopTrapFocus?: React.ElementType<MuiTrapFocusProps>;
DesktopTrapFocus?: React.JSXElementConstructor<MuiTrapFocusProps>;
/**
* Custom component for the popper inside which the views are rendered on desktop.
* @default Popper from @mui/material
Expand Down
4 changes: 2 additions & 2 deletions packages/x-license-pro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"directory": "packages/x-license-pro"
},
"dependencies": {
"@babel/runtime": "^7.20.6",
"@mui/utils": "^5.10.16"
"@babel/runtime": "^7.20.7",
"@mui/utils": "^5.11.2"
},
"peerDependencies": {
"react": "^17.0.2 || ^18.0.0"
Expand Down
Loading

0 comments on commit 1a0da4e

Please sign in to comment.