Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump babel to ^7.21.4 #36815

Merged
merged 4 commits into from
Apr 28, 2023
Merged

Bump babel to ^7.21.4 #36815

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b35b3b4
Bump babel to ^7.21.4
renovate[bot] Apr 10, 2023
883fce9
Merge branch 'master' into renovate/babel
ZeeshanTamboli Apr 24, 2023
7e22d97
create @babel-ignore-comment-in-output tag to ignore the comments in …
ZeeshanTamboli Apr 24, 2023
fc63e44
resolve conflict
ZeeshanTamboli Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/data/material/customization/palette/CustomColor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ declare module '@mui/material/styles' {
}
}

// Update the Button's color prop options
// @babel-ignore-comment-in-output Update the Button's color prop options
declare module '@mui/material/Button' {
interface ButtonPropsColorOverrides {
neutral: true;
Expand Down
4 changes: 2 additions & 2 deletions docs/data/styles/basics/AdaptingHOC.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ const styles = {
interface MyButtonRawProps {
color: 'red' | 'blue';
}
// These are the props available inside MyButtonRaw
// They're different from MyButtonRawProps which are the props available for dynamic styling.
// @babel-ignore-comment-in-output These are the props available inside MyButtonRaw
// @babel-ignore-comment-in-output They're different from MyButtonRawProps which are the props available for dynamic styling.
type MyButtonRawInnerProps = MyButtonRawProps & WithStyles<typeof styles>;

function MyButtonRaw(
Expand Down
4 changes: 2 additions & 2 deletions docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"link-check": "node ./scripts/reportBrokenLinks.js"
},
"dependencies": {
"@babel/core": "^7.21.3",
"@babel/core": "^7.21.4",
"@babel/plugin-transform-object-assign": "^7.18.6",
"@babel/runtime-corejs2": "^7.21.0",
"@docsearch/react": "^3.3.3",
Expand Down Expand Up @@ -121,7 +121,7 @@
},
"devDependencies": {
"@babel/plugin-transform-react-constant-elements": "^7.21.3",
"@babel/preset-typescript": "^7.21.0",
"@babel/preset-typescript": "^7.21.4",
"@types/marked": "^4.0.8",
"@types/recharts": "^2.0.0",
"cross-fetch": "^3.1.5",
Expand Down
1 change: 1 addition & 0 deletions docs/scripts/formattedTSDemos.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const babelConfig = {
generatorOpts: { retainLines: true },
babelrc: false,
configFile: false,
shouldPrintComment: (comment) => !comment.startsWith(' @babel-ignore-comment-in-output'),
};

const workspaceRoot = path.join(__dirname, '../../');
Expand Down
16 changes: 8 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@
"devDependencies": {
"@argos-ci/core": "^0.8.0",
"@babel/cli": "^7.21.0",
"@babel/core": "^7.21.3",
"@babel/core": "^7.21.4",
"@babel/node": "^7.20.7",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-object-rest-spread": "^7.20.7",
"@babel/plugin-transform-object-assign": "^7.18.6",
"@babel/plugin-transform-react-constant-elements": "^7.21.3",
"@babel/plugin-transform-runtime": "^7.21.0",
"@babel/preset-env": "^7.20.2",
"@babel/plugin-transform-runtime": "^7.21.4",
"@babel/preset-env": "^7.21.4",
"@babel/preset-react": "^7.18.6",
"@babel/register": "^7.21.0",
"@emotion/react": "^11.10.6",
Expand Down Expand Up @@ -208,18 +208,18 @@
"yarn-deduplicate": "^3.1.0"
},
"resolutions": {
"**/@babel/core": "^7.21.3",
"**/@babel/code-frame": "^7.18.6",
"**/@babel/core": "^7.21.4",
"**/@babel/code-frame": "^7.21.4",
"**/@babel/plugin-proposal-class-properties": "^7.18.6",
"**/@babel/plugin-proposal-object-rest-spread": "^7.20.7",
"**/@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
"**/@babel/plugin-proposal-numeric-separator": "^7.18.6",
"**/@babel/plugin-proposal-optional-chaining": "^7.21.0",
"**/@babel/plugin-transform-destructuring": "npm:@minh.nguyen/plugin-transform-destructuring@^7.5.2",
"**/@babel/plugin-transform-runtime": "^7.21.0",
"**/@babel/preset-env": "^7.20.2",
"**/@babel/plugin-transform-runtime": "^7.21.4",
"**/@babel/preset-env": "^7.21.4",
"**/@babel/preset-react": "^7.18.6",
"**/@babel/preset-typescript": "^7.21.0",
"**/@babel/preset-typescript": "^7.21.4",
"**/@babel/runtime": "^7.21.0",
"**/@definitelytyped/header-parser": "^0.0.159",
"**/@definitelytyped/typescript-versions": "^0.0.159",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-docs-builder/package.json
View file
Open in desktop
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.21.3",
"@babel/core": "^7.21.4",
"@mui-internal/docs-utilities": "*",
"@mui/markdown": "^5.0.0",
"ast-types": "^0.14.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/mui-codemod/package.json
View file
Open in desktop
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.21.3",
"@babel/core": "^7.21.4",
"@babel/runtime": "^7.21.0",
"@babel/traverse": "^7.21.3",
"@babel/traverse": "^7.21.4",
"jscodeshift": "^0.13.1",
"jscodeshift-add-imports": "^1.0.10",
"yargs": "^17.7.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"react-is": "^18.2.0"
},
"devDependencies": {
"@babel/helper-module-imports": "^7.18.6",
"@babel/helper-module-imports": "^7.21.4",
"@types/babel-plugin-macros": "^3.1.0",
"babel-plugin-macros": "^3.1.0",
"babel-plugin-tester": "^11.0.4"
Expand Down
6 changes: 3 additions & 3 deletions packages/typescript-to-proptypes/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
"rimraf": "^3.0.2"
},
"dependencies": {
"@babel/core": "^7.21.3",
"@babel/core": "^7.21.4",
"@babel/plugin-syntax-class-properties": "^7.12.13",
"@babel/plugin-syntax-jsx": "^7.18.6",
"@babel/types": "^7.21.3",
"@babel/plugin-syntax-jsx": "^7.21.4",
"@babel/types": "^7.21.4",
"doctrine": "^3.0.0",
"lodash": "^4.17.21",
"typescript": "^4.9.5",
Expand Down
Loading