Skip to content

Commit

Permalink
[core] Upgrade the dependencies (#12477)
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviertassinari authored Aug 11, 2018
1 parent 382b7ce commit 5e2ceed
Show file tree
Hide file tree
Showing 8 changed files with 244 additions and 766 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"isomorphic-fetch": "^2.2.1",
"jsdom": "^11.3.0",
"jss-rtl": "^0.2.1",
"karma": "^2.0.0",
"karma": "^3.0.0",
"karma-browserstack-launcher": "^1.3.0",
"karma-chrome-launcher": "^2.2.0",
"karma-mocha": "^1.3.0",
Expand Down Expand Up @@ -145,7 +145,7 @@
"redux": "^4.0.0",
"redux-logger": "^3.0.6",
"rimraf": "^2.6.2",
"rollup": "^0.63.0",
"rollup": "^0.64.0",
"rollup-plugin-babel": "^4.0.0-beta.4",
"rollup-plugin-commonjs": "^9.1.3",
"rollup-plugin-node-globals": "^1.2.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/material-ui/.size-snapshot.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"build/umd/material-ui.production.min.js": {
"bundled": 813603,
"minified": 303803,
"gzipped": 80119
"bundled": 814856,
"minified": 304238,
"gzipped": 80209
}
}
9 changes: 8 additions & 1 deletion packages/material-ui/src/FormHelperText/FormHelperText.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@ export interface FormHelperTextProps
required?: boolean;
}

export type FormHelperTextClassKey = 'root' | 'error' | 'disabled' | 'marginDense' | 'focused' | 'filled' | 'required';
export type FormHelperTextClassKey =
| 'root'
| 'error'
| 'disabled'
| 'marginDense'
| 'focused'
| 'filled'
| 'required';

declare const FormHelperText: React.ComponentType<FormHelperTextProps>;

Expand Down
9 changes: 8 additions & 1 deletion packages/material-ui/src/FormLabel/FormLabel.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@ export interface FormLabelProps extends StandardProps<FormLabelBaseProps, FormLa

export type FormLabelBaseProps = React.LabelHTMLAttributes<HTMLLabelElement>;

export type FormLabelClassKey = 'root' | 'focused' | 'disabled' | 'error' | 'filled' | 'required' | 'asterisk';
export type FormLabelClassKey =
| 'root'
| 'focused'
| 'disabled'
| 'error'
| 'filled'
| 'required'
| 'asterisk';

declare const FormLabel: React.ComponentType<FormLabelProps>;

Expand Down
14 changes: 8 additions & 6 deletions packages/material-ui/src/Popper/Popper.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ export type PopperPlacementType =
export interface PopperProps extends React.HTMLAttributes<HTMLDivElement> {
transition?: boolean;
anchorEl?: null | HTMLElement | ReferenceObject | ((element: HTMLElement) => HTMLElement);
children: React.ReactNode | ((
props: {
placement: PopperPlacementType;
TransitionProps?: TransitionProps;
},
) => React.ReactNode);
children:
| React.ReactNode
| ((
props: {
placement: PopperPlacementType;
TransitionProps?: TransitionProps;
},
) => React.ReactNode);
container?: PortalProps['container'];
disablePortal?: PortalProps['disablePortal'];
keepMounted?: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,9 @@ describe('<SwipeableDrawer />', () => {

afterEach(() => {
reset();
wrapper.unmount();
if (wrapper.length > 0) {
wrapper.unmount();
}
});

const bodyWidth = document.body.offsetWidth;
Expand Down
3 changes: 1 addition & 2 deletions packages/material-ui/src/styles/createTypography.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ export default function createTypography(palette: Object, typography: Object | F
// Apply the CSS properties to all the variants.
allVariants,
...other
} =
typeof typography === 'function' ? typography(palette) : typography;
} = typeof typography === 'function' ? typography(palette) : typography;

const coef = fontSize / 14;
function pxToRem(value) {
Expand Down
Loading

0 comments on commit 5e2ceed

Please sign in to comment.