Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into renovate/react-ro…
Browse files Browse the repository at this point in the history
…uter-dom-6.x
  • Loading branch information
michaldudak committed Feb 8, 2023
2 parents a20c9f4 + 156a684 commit f5fdb6a
Show file tree
Hide file tree
Showing 25 changed files with 102 additions and 100 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ jobs:
os: [macos-latest, windows-latest, ubuntu-latest]
steps:
- run: echo "${{ github.actor }}"
- uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
with:
# fetch all tags which are required for `yarn release:changelog`
fetch-depth: 0
- name: Use Node.js 14.x
uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
with:
node-version: 14
cache: 'yarn' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
security-events: write
steps:
- name: Checkout repository
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37
uses: github/codeql-action/init@39d8d7e78f59cf6b40ac3b9fbebef0c753d7c9e5 # v2.2.2
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@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37
uses: github/codeql-action/analyze@39d8d7e78f59cf6b40ac3b9fbebef0c753d7c9e5 # v2.2.2
2 changes: 1 addition & 1 deletion .github/workflows/mark-duplicate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
issues: write
steps:
- name: mark-duplicate
uses: actions-cool/issues-helper@275328970dbc3bfc3bc43f5fe741bf3638300c0a # v3.3.3
uses: actions-cool/issues-helper@65840f57fe2b3b9a796776577b6b19d2a16adc72 # v3.4.0
with:
actions: 'mark-duplicate'
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
with:
persist-credentials: false

Expand All @@ -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@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37
uses: github/codeql-action/upload-sarif@39d8d7e78f59cf6b40ac3b9fbebef0c753d7c9e5 # v2.2.2
with:
sarif_file: results.sarif
15 changes: 9 additions & 6 deletions docs/data/material/components/text-fields/FormattedInputs.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import { IMaskInput } from 'react-imask';
import NumberFormat from 'react-number-format';
import { NumericFormat } from 'react-number-format';
import Box from '@mui/material/Box';
import Input from '@mui/material/Input';
import InputLabel from '@mui/material/InputLabel';
Expand Down Expand Up @@ -29,11 +29,14 @@ TextMaskCustom.propTypes = {
onChange: PropTypes.func.isRequired,
};

const NumberFormatCustom = React.forwardRef(function NumberFormatCustom(props, ref) {
const NumericFormatCustom = React.forwardRef(function NumericFormatCustom(
props,
ref,
) {
const { onChange, ...other } = props;

return (
<NumberFormat
<NumericFormat
{...other}
getInputRef={ref}
onValueChange={(values) => {
Expand All @@ -45,13 +48,13 @@ const NumberFormatCustom = React.forwardRef(function NumberFormatCustom(props, r
});
}}
thousandSeparator
isNumericString
valueIsNumericString
prefix="$"
/>
);
});

NumberFormatCustom.propTypes = {
NumericFormatCustom.propTypes = {
name: PropTypes.string.isRequired,
onChange: PropTypes.func.isRequired,
};
Expand Down Expand Up @@ -94,7 +97,7 @@ export default function FormattedInputs() {
name="numberformat"
id="formatted-numberformat-input"
InputProps={{
inputComponent: NumberFormatCustom,
inputComponent: NumericFormatCustom,
}}
variant="standard"
/>
Expand Down
49 changes: 24 additions & 25 deletions docs/data/material/components/text-fields/FormattedInputs.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { IMaskInput } from 'react-imask';
import NumberFormat, { InputAttributes } from 'react-number-format';
import { NumericFormat, NumericFormatProps } from 'react-number-format';
import Box from '@mui/material/Box';
import Input from '@mui/material/Input';
import InputLabel from '@mui/material/InputLabel';
Expand Down Expand Up @@ -30,30 +30,29 @@ const TextMaskCustom = React.forwardRef<HTMLElement, CustomProps>(
},
);

const NumberFormatCustom = React.forwardRef<
NumberFormat<InputAttributes>,
CustomProps
>(function NumberFormatCustom(props, ref) {
const { onChange, ...other } = props;
const NumericFormatCustom = React.forwardRef<NumericFormatProps, CustomProps>(
function NumericFormatCustom(props, ref) {
const { onChange, ...other } = props;

return (
<NumberFormat
{...other}
getInputRef={ref}
onValueChange={(values) => {
onChange({
target: {
name: props.name,
value: values.value,
},
});
}}
thousandSeparator
isNumericString
prefix="$"
/>
);
});
return (
<NumericFormat
{...other}
getInputRef={ref}
onValueChange={(values) => {
onChange({
target: {
name: props.name,
value: values.value,
},
});
}}
thousandSeparator
valueIsNumericString
prefix="$"
/>
);
},
);

interface State {
textmask: string;
Expand Down Expand Up @@ -98,7 +97,7 @@ export default function FormattedInputs() {
name="numberformat"
id="formatted-numberformat-input"
InputProps={{
inputComponent: NumberFormatCustom as any,
inputComponent: NumericFormatCustom as any,
}}
variant="standard"
/>
Expand Down
6 changes: 3 additions & 3 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
"link-check": "node ./scripts/reportBrokenLinks.js"
},
"dependencies": {
"@babel/core": "^7.20.7",
"@babel/core": "^7.20.12",
"@babel/plugin-transform-object-assign": "^7.18.6",
"@babel/runtime-corejs2": "^7.20.7",
"@babel/runtime-corejs2": "^7.20.13",
"@docsearch/react": "^3.3.2",
"@emotion/cache": "^11.10.5",
"@emotion/react": "^11.10.5",
Expand Down Expand Up @@ -101,7 +101,7 @@
"react-imask": "^6.4.3",
"react-intersection-observer": "^9.4.1",
"react-is": "^18.2.0",
"react-number-format": "^4.9.4",
"react-number-format": "^5.1.3",
"react-router-dom": "^6.8.1",
"react-runner": "^1.0.3",
"react-simple-code-editor": "^0.13.1",
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"devDependencies": {
"@argos-ci/core": "^0.7.3",
"@babel/cli": "^7.20.7",
"@babel/core": "^7.20.7",
"@babel/core": "^7.20.12",
"@babel/node": "^7.20.7",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-object-rest-spread": "^7.20.7",
Expand Down Expand Up @@ -205,7 +205,7 @@
"yarn-deduplicate": "^3.1.0"
},
"resolutions": {
"**/@babel/core": "^7.20.7",
"**/@babel/core": "^7.20.12",
"**/@babel/code-frame": "^7.18.6",
"**/@babel/plugin-proposal-class-properties": "^7.18.6",
"**/@babel/plugin-proposal-object-rest-spread": "^7.20.7",
Expand All @@ -217,7 +217,7 @@
"**/@babel/preset-env": "^7.20.2",
"**/@babel/preset-react": "^7.18.6",
"**/@babel/preset-typescript": "^7.18.6",
"**/@babel/runtime": "^7.20.7",
"**/@babel/runtime": "^7.20.13",
"**/@definitelytyped/header-parser": "^0.0.147",
"**/@definitelytyped/typescript-versions": "^0.0.147",
"**/@definitelytyped/utils": "^0.0.147",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-docs-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"typescript": "tsc -p tsconfig.json"
},
"dependencies": {
"@babel/core": "^7.20.7",
"@babel/core": "^7.20.12",
"@mui-internal/docs-utilities": "*",
"@mui/markdown": "^5.0.0",
"ast-types": "^0.14.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
}
},
"dependencies": {
"@babel/runtime": "^7.20.7",
"@babel/runtime": "^7.20.13",
"@emotion/is-prop-valid": "^1.2.0",
"@mui/types": "^7.2.3",
"@mui/utils": "^5.11.7",
Expand Down
6 changes: 3 additions & 3 deletions packages/mui-codemod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
"url": "https://opencollective.com/mui"
},
"dependencies": {
"@babel/core": "^7.20.7",
"@babel/runtime": "^7.20.7",
"@babel/traverse": "^7.20.10",
"@babel/core": "^7.20.12",
"@babel/runtime": "^7.20.13",
"@babel/traverse": "^7.20.13",
"jscodeshift": "^0.13.1",
"jscodeshift-add-imports": "^1.0.10",
"yargs": "^17.6.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
}
},
"dependencies": {
"@babel/runtime": "^7.20.7",
"@babel/runtime": "^7.20.13",
"@mui/utils": "^5.11.7",
"nprogress": "^0.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-icons-material/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
}
},
"dependencies": {
"@babel/runtime": "^7.20.7"
"@babel/runtime": "^7.20.13"
},
"devDependencies": {
"fs-extra": "^10.1.0",
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 @@ -56,7 +56,7 @@
}
},
"dependencies": {
"@babel/runtime": "^7.20.7",
"@babel/runtime": "^7.20.13",
"@mui/base": "5.0.0-alpha.117",
"@mui/core-downloads-tracker": "^5.11.8",
"@mui/system": "^5.11.8",
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 @@ -60,7 +60,7 @@
}
},
"dependencies": {
"@babel/runtime": "^7.20.7",
"@babel/runtime": "^7.20.13",
"@mui/base": "5.0.0-alpha.117",
"@mui/system": "^5.11.8",
"@mui/types": "^7.2.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material-next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
}
},
"dependencies": {
"@babel/runtime": "^7.20.7",
"@babel/runtime": "^7.20.13",
"@mui/base": "5.0.0-alpha.117",
"@mui/material": "^5.11.8",
"@mui/system": "^5.11.8",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
}
},
"dependencies": {
"@babel/runtime": "^7.20.7",
"@babel/runtime": "^7.20.13",
"@mui/base": "5.0.0-alpha.117",
"@mui/core-downloads-tracker": "^5.11.8",
"@mui/system": "^5.11.8",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-private-theming/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
}
},
"dependencies": {
"@babel/runtime": "^7.20.7",
"@babel/runtime": "^7.20.13",
"@mui/utils": "^5.11.7",
"prop-types": "^15.8.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-styled-engine-sc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"typescript": "tslint -p tsconfig.json \"{src,test}/**/*.{spec,d}.{ts,tsx}\" && tsc -p tsconfig.json"
},
"dependencies": {
"@babel/runtime": "^7.20.7",
"@babel/runtime": "^7.20.13",
"prop-types": "^15.8.1"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-styled-engine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"typescript": "tslint -p tsconfig.json \"{src,test}/**/*.{spec,d}.{ts,tsx}\" && tsc -p tsconfig.json"
},
"dependencies": {
"@babel/runtime": "^7.20.7",
"@babel/runtime": "^7.20.13",
"@emotion/cache": "^11.10.5",
"csstype": "^3.1.1",
"prop-types": "^15.8.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-styles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
}
},
"dependencies": {
"@babel/runtime": "^7.20.7",
"@babel/runtime": "^7.20.13",
"@emotion/hash": "^0.9.0",
"@mui/private-theming": "^5.11.7",
"@mui/types": "^7.2.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-system/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
}
},
"dependencies": {
"@babel/runtime": "^7.20.7",
"@babel/runtime": "^7.20.13",
"@mui/private-theming": "^5.11.7",
"@mui/styled-engine": "^5.11.8",
"@mui/types": "^7.2.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"react": "^17.0.0 || ^18.0.0"
},
"dependencies": {
"@babel/runtime": "^7.20.7",
"@babel/runtime": "^7.20.13",
"@types/prop-types": "^15.7.5",
"@types/react-is": "^16.7.1 || ^17.0.0",
"prop-types": "^15.8.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/typescript-to-proptypes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"typescript": "tsc -p tsconfig.json"
},
"devDependencies": {
"@types/babel__core": "^7.1.20",
"@types/babel__core": "^7.20.0",
"@types/doctrine": "^0.0.5",
"@types/lodash": "^4.14.191",
"@types/node": "^16.18.12",
Expand All @@ -33,7 +33,7 @@
"rimraf": "^3.0.2"
},
"dependencies": {
"@babel/core": "^7.20.7",
"@babel/core": "^7.20.12",
"@babel/plugin-syntax-class-properties": "^7.12.13",
"@babel/plugin-syntax-jsx": "^7.18.6",
"@babel/types": "^7.20.7",
Expand Down
Loading

0 comments on commit f5fdb6a

Please sign in to comment.