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.

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 #31897

Merged
merged 3 commits into from
Aug 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"typescript:transpile:dev": "echo 'Use `yarn docs:typescript'` instead && exit 1"
},
"dependencies": {
"@babel/core": "^7.17.5",
"@babel/plugin-transform-object-assign": "^7.16.7",
"@babel/runtime-corejs2": "^7.17.2",
"@babel/core": "^7.18.13",
"@babel/plugin-transform-object-assign": "^7.18.6",
"@babel/runtime-corejs2": "^7.18.9",
"@date-io/core": "^2.13.1",
"@date-io/date-fns-jalali": "^2.13.1",
"@docsearch/react": "^3.2.1",
Expand Down Expand Up @@ -123,8 +123,8 @@
"webpack-bundle-analyzer": "^4.5.0"
},
"devDependencies": {
"@babel/plugin-transform-react-constant-elements": "^7.17.6",
"@babel/preset-typescript": "^7.16.7",
"@babel/plugin-transform-react-constant-elements": "^7.18.12",
"@babel/preset-typescript": "^7.18.6",
"@types/marked": "^4.0.6",
"@types/recharts": "^2.0.0",
"cross-fetch": "^3.1.5",
Expand Down
4 changes: 2 additions & 2 deletions docs/scripts/ApiBuilders/ComponentApiBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,10 @@ async function annotateComponentDefinition(api: ReactApi) {
.join('\n')}`,
);
}
if (jsdocBlock != null) {
if (jsdocBlock?.start != null && jsdocBlock?.end != null) {
start = jsdocBlock.start;
end = jsdocBlock.end;
} else if (node.start !== null) {
} else if (node.start != null) {
start = node.start - 1;
end = start;
}
Expand Down
46 changes: 23 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,17 @@
"validate-declarations": "babel-node --extensions \".ts\" scripts/validateTypescriptDeclarations.ts"
},
"devDependencies": {
"@babel/cli": "^7.17.6",
"@babel/core": "^7.17.5",
"@babel/node": "^7.16.8",
"@babel/plugin-proposal-class-properties": "^7.16.7",
"@babel/plugin-proposal-object-rest-spread": "^7.17.3",
"@babel/plugin-transform-object-assign": "^7.16.7",
"@babel/plugin-transform-react-constant-elements": "^7.17.6",
"@babel/plugin-transform-runtime": "^7.17.0",
"@babel/preset-env": "^7.16.11",
"@babel/preset-react": "^7.16.7",
"@babel/register": "^7.17.0",
"@babel/cli": "^7.18.10",
"@babel/core": "^7.18.13",
"@babel/node": "^7.18.10",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-object-rest-spread": "^7.18.9",
"@babel/plugin-transform-object-assign": "^7.18.6",
"@babel/plugin-transform-react-constant-elements": "^7.18.12",
"@babel/plugin-transform-runtime": "^7.18.10",
"@babel/preset-env": "^7.18.10",
"@babel/preset-react": "^7.18.6",
"@babel/register": "^7.18.9",
"@emotion/react": "^11.10.0",
"@emotion/styled": "^11.10.0",
"@mnajdova/enzyme-adapter-react-18": "^0.2.0",
Expand Down Expand Up @@ -197,19 +197,19 @@
"yarn-deduplicate": "^3.1.0"
},
"resolutions": {
"**/@babel/core": "^7.17.5",
"**/@babel/code-frame": "^7.16.7",
"**/@babel/plugin-proposal-class-properties": "^7.16.7",
"**/@babel/plugin-proposal-object-rest-spread": "^7.17.3",
"**/@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
"**/@babel/plugin-proposal-numeric-separator": "^7.16.7",
"**/@babel/plugin-proposal-optional-chaining": "^7.16.7",
"**/@babel/core": "^7.18.13",
"**/@babel/code-frame": "^7.18.6",
"**/@babel/plugin-proposal-class-properties": "^7.18.6",
"**/@babel/plugin-proposal-object-rest-spread": "^7.18.9",
"**/@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
"**/@babel/plugin-proposal-numeric-separator": "^7.18.6",
"**/@babel/plugin-proposal-optional-chaining": "^7.18.9",
"**/@babel/plugin-transform-destructuring": "npm:@minh.nguyen/plugin-transform-destructuring@^7.5.2",
"**/@babel/plugin-transform-runtime": "^7.17.0",
"**/@babel/preset-env": "^7.16.11",
"**/@babel/preset-react": "^7.16.7",
"**/@babel/preset-typescript": "^7.16.7",
"**/@babel/runtime": "^7.17.2",
"**/@babel/plugin-transform-runtime": "^7.18.10",
"**/@babel/preset-env": "^7.18.10",
"**/@babel/preset-react": "^7.18.6",
"**/@babel/preset-typescript": "^7.18.6",
"**/@babel/runtime": "^7.18.9",
"**/@definitelytyped/typescript-versions": "^0.0.124",
"**/@types/react": "^18.0.9",
"**/@types/react-is": "^17.0.3",
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.17.2",
"@babel/runtime": "^7.18.9",
"@emotion/is-prop-valid": "^1.2.0",
"@mui/types": "^7.1.5",
"@mui/utils": "^5.9.3",
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.17.5",
"@babel/runtime": "^7.17.2",
"@babel/traverse": "^7.17.3",
"@babel/core": "^7.18.13",
"@babel/runtime": "^7.18.9",
"@babel/traverse": "^7.18.13",
"jscodeshift": "^0.13.1",
"jscodeshift-add-imports": "^1.0.10",
"yargs": "^17.5.1"
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.17.2",
"@babel/runtime": "^7.18.9",
"@mui/utils": "^5.9.3",
"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.17.2"
"@babel/runtime": "^7.18.9"
},
"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.17.2",
"@babel/runtime": "^7.18.9",
"@mui/base": "5.0.0-alpha.94",
"@mui/core-downloads-tracker": "^5.10.2",
"@mui/system": "^5.10.2",
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.17.2",
"@babel/runtime": "^7.18.9",
"@mui/base": "5.0.0-alpha.94",
"@mui/system": "^5.10.2",
"@mui/utils": "^5.9.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.17.2",
"@babel/runtime": "^7.18.9",
"@mui/base": "5.0.0-alpha.94",
"@mui/material": "^5.10.2",
"@mui/system": "^5.10.2",
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.17.2",
"@babel/runtime": "^7.18.9",
"@mui/base": "5.0.0-alpha.94",
"@mui/core-downloads-tracker": "^5.10.2",
"@mui/system": "^5.10.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/Backdrop/Backdrop.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export interface BackdropTypeMap<P = {}, D extends React.ElementType = 'div'> {

type BackdropRootProps = NonNullable<BackdropTypeMap['props']['componentsProps']>['root'];

export const BackdropRoot: React.FC<BackdropRootProps>;
export declare const BackdropRoot: React.FC<BackdropRootProps>;

/**
*
Expand Down
4 changes: 2 additions & 2 deletions packages/mui-material/src/Badge/Badge.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ export type BadgeTypeMap<
type BadgeRootProps = NonNullable<BadgeTypeMap['props']['componentsProps']>['root'];
type BadgeBadgeProps = NonNullable<BadgeTypeMap['props']['componentsProps']>['badge'];

export const BadgeRoot: React.FC<BadgeRootProps>;
export const BadgeMark: React.FC<BadgeBadgeProps>;
export declare const BadgeRoot: React.FC<BadgeRootProps>;
export declare const BadgeMark: React.FC<BadgeBadgeProps>;

/**
*
Expand Down
4 changes: 2 additions & 2 deletions packages/mui-material/src/Modal/Modal.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export type ModalTypeMap<D extends React.ElementType = 'div', P = {}> = ExtendMo

type ModalRootProps = NonNullable<ModalTypeMap['props']['componentsProps']>['root'];

export const ModalRoot: React.FC<ModalRootProps>;
export declare const ModalRoot: React.FC<ModalRootProps>;

export type ModalClassKey = keyof NonNullable<ModalTypeMap['props']['classes']>;

Expand Down Expand Up @@ -66,7 +66,7 @@ declare const Modal: ExtendModalUnstyled<ModalTypeMap>;

export type ModalClasses = Record<ModalClassKey, string>;

export const modalClasses: ModalClasses;
export declare const modalClasses: ModalClasses;

export type ModalProps<
D extends React.ElementType = ModalTypeMap['defaultComponent'],
Expand Down
18 changes: 9 additions & 9 deletions packages/mui-material/src/Slider/Slider.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ type SliderTrackProps = NonNullable<SliderTypeMap['props']['componentsProps']>['
type SliderThumbProps = NonNullable<SliderTypeMap['props']['componentsProps']>['thumb'];
type SliderInputProps = NonNullable<SliderTypeMap['props']['componentsProps']>['input'];

export const SliderRoot: React.FC<SliderRootProps>;
export const SliderMark: React.FC<SliderMarkProps>;
export const SliderMarkLabel: React.FC<SliderMarkLabelProps>;
export const SliderRail: React.FC<SliderRailProps>;
export const SliderTrack: React.FC<SliderTrackProps>;
export const SliderThumb: React.FC<SliderThumbProps>;
export const SliderValueLabel: React.FC<SliderValueLabelProps>;
export const SliderInput: React.FC<SliderInputProps>;
export declare const SliderRoot: React.FC<SliderRootProps>;
export declare const SliderMark: React.FC<SliderMarkProps>;
export declare const SliderMarkLabel: React.FC<SliderMarkLabelProps>;
export declare const SliderRail: React.FC<SliderRailProps>;
export declare const SliderTrack: React.FC<SliderTrackProps>;
export declare const SliderThumb: React.FC<SliderThumbProps>;
export declare const SliderValueLabel: React.FC<SliderValueLabelProps>;
export declare const SliderInput: React.FC<SliderInputProps>;

/**
*
Expand All @@ -97,6 +97,6 @@ export type SliderProps<

export type SliderClasses = Record<SliderClassKey, string>;

export const sliderClasses: SliderClasses;
export declare const sliderClasses: SliderClasses;

export default Slider;
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.17.2",
"@babel/runtime": "^7.18.9",
"@mui/utils": "^5.9.3",
"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.17.2",
"@babel/runtime": "^7.18.9",
"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.17.2",
"@babel/runtime": "^7.18.9",
"@emotion/cache": "^11.10.1",
"csstype": "^3.1.0",
"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.17.2",
"@babel/runtime": "^7.18.9",
"@emotion/hash": "^0.9.0",
"@mui/private-theming": "^5.9.3",
"@mui/types": "^7.1.5",
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.17.2",
"@babel/runtime": "^7.18.9",
"@mui/private-theming": "^5.9.3",
"@mui/styled-engine": "^5.10.2",
"@mui/types": "^7.1.5",
Expand Down
20 changes: 10 additions & 10 deletions packages/mui-system/src/Box/Box.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export type SimpleStyleFunction<PropKey extends keyof any> = StyleFunction<
> & { filterProps: string[] };

// borders.js
export const borders: SimpleStyleFunction<
export declare const borders: SimpleStyleFunction<
| 'border'
| 'borderTop'
| 'borderRight'
Expand All @@ -28,11 +28,11 @@ export const borders: SimpleStyleFunction<
| 'borderRadius'
>;

export const display: SimpleStyleFunction<
export declare const display: SimpleStyleFunction<
'display' | 'displayPrint' | 'overflow' | 'textOverflow' | 'visibility' | 'whiteSpace'
>;

export const flexbox: SimpleStyleFunction<
export declare const flexbox: SimpleStyleFunction<
| 'flexBasis'
| 'flexDirection'
| 'flexWrap'
Expand All @@ -48,7 +48,7 @@ export const flexbox: SimpleStyleFunction<
| 'justifySelf'
>;

export const grid: SimpleStyleFunction<
export declare const grid: SimpleStyleFunction<
| 'gap'
| 'columnGap'
| 'rowGap'
Expand All @@ -63,15 +63,15 @@ export const grid: SimpleStyleFunction<
| 'gridArea'
>;

export const palette: SimpleStyleFunction<'bgcolor' | 'color'>;
export declare const palette: SimpleStyleFunction<'bgcolor' | 'color'>;

export const positions: SimpleStyleFunction<
export declare const positions: SimpleStyleFunction<
'zIndex' | 'position' | 'top' | 'right' | 'bottom' | 'left'
>;

export const shadows: SimpleStyleFunction<'boxShadow'>;
export declare const shadows: SimpleStyleFunction<'boxShadow'>;

export const sizing: SimpleStyleFunction<
export declare const sizing: SimpleStyleFunction<
| 'width'
| 'maxWidth'
| 'minWidth'
Expand All @@ -83,7 +83,7 @@ export const sizing: SimpleStyleFunction<
| 'boxSizing'
>;

export const spacing: SimpleStyleFunction<
export declare const spacing: SimpleStyleFunction<
| 'm'
| 'mt'
| 'mr'
Expand Down Expand Up @@ -114,7 +114,7 @@ export const spacing: SimpleStyleFunction<
| 'paddingY'
>;

export const typography: SimpleStyleFunction<
export declare const typography: SimpleStyleFunction<
| 'typography'
| 'fontFamily'
| 'fontSize'
Expand Down
4 changes: 2 additions & 2 deletions packages/mui-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@
"react": "^17.0.0 || ^18.0.0"
},
"dependencies": {
"@babel/runtime": "^7.17.2",
"@babel/runtime": "^7.18.9",
"@types/prop-types": "^15.7.5",
"@types/react-is": "^16.7.1 || ^17.0.0",
"prop-types": "^15.8.1",
"react-is": "^18.2.0"
},
"devDependencies": {
"@babel/helper-module-imports": "^7.16.7",
"@babel/helper-module-imports": "^7.18.6",
"@types/babel-plugin-macros": "^2.8.5",
"babel-plugin-macros": "^3.1.0",
"babel-plugin-tester": "^10.1.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/typescript-to-proptypes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
"rimraf": "^3.0.2"
},
"dependencies": {
"@babel/core": "^7.17.5",
"@babel/core": "^7.18.13",
"@babel/plugin-syntax-class-properties": "^7.12.13",
"@babel/plugin-syntax-jsx": "^7.16.7",
"@babel/types": "^7.17.0",
"@babel/plugin-syntax-jsx": "^7.18.6",
"@babel/types": "^7.18.13",
"doctrine": "^3.0.0",
"lodash": "^4.17.21",
"typescript": "^4.6.4",
Expand Down
4 changes: 3 additions & 1 deletion tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
"no-redundant-jsdoc": false,
"semicolon": [true, "always", "ignore-bound-class-methods"],
// rules conflicting with eslint
"prefer-template": false
"prefer-template": false,
// rules conflicting with babel
"strict-export-declare-modifiers": false
}
}