Skip to content

Commit

Permalink
[styles] Fix IE 11 issue
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviertassinari committed Mar 24, 2019
1 parent ae31efe commit 49857df
Show file tree
Hide file tree
Showing 6 changed files with 708 additions and 453 deletions.
2 changes: 1 addition & 1 deletion .yarnrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
--install.frozen-lockfile true

network-timeout 150000
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@
"@types/react-dom": "^16.0.9",
"@types/react-router-dom": "^4.3.1",
"@types/react-select": "^2.0.14",
"@types/react-swipeable-views": "^0.12.2",
"@types/react-swipeable-views": "^0.13.0",
"@types/react-text-mask": "^5.4.2",
"@types/styled-components": "^4.1.11",
"argos-cli": "^0.0.9",
"argos-cli": "^0.1.1",
"autoprefixer": "^9.0.0",
"autosuggest-highlight": "^3.1.1",
"babel-core": "^7.0.0-bridge.0",
Expand All @@ -102,7 +102,7 @@
"chai": "^4.1.2",
"classnames": "^2.2.6",
"clean-css": "^4.1.11",
"clipboard-copy": "^2.0.0",
"clipboard-copy": "^3.0.0",
"cross-env": "^5.1.1",
"css-loader": "^2.0.0",
"css-mediaquery": "^0.1.2",
Expand Down Expand Up @@ -137,7 +137,7 @@
"jsonlint": "^1.6.3",
"jss-plugin-template": "^10.0.0-alpha.12",
"jss-rtl": "^0.2.1",
"karma": "4.0.0",
"karma": "^4.0.1",
"karma-browserstack-launcher": "^1.3.0",
"karma-chrome-launcher": "^2.2.0",
"karma-mocha": "^1.3.0",
Expand All @@ -152,8 +152,8 @@
"material-ui-popup-state": "^1.0.1",
"mocha": "^5.0.0",
"next": "canary",
"next-plugin-transpile-modules": "^1.1.0",
"notistack": "^0.4.0",
"next-plugin-transpile-modules": "^2.0.0",
"notistack": "^0.5.0",
"nyc": "^13.0.0",
"postcss": "^7.0.0",
"prettier": "^1.8.2",
Expand All @@ -170,8 +170,8 @@
"react-inspector": "^2.2.2",
"react-number-format": "^4.0.0",
"react-redux": "^6.0.0",
"react-router": "^4.2.0",
"react-router-dom": "^4.2.2",
"react-router": "^5.0.0",
"react-router-dom": "^5.0.0",
"react-select": "^2.0.0",
"react-swipeable-views": "^0.13.0",
"react-test-renderer": "^16.8.5",
Expand Down
16 changes: 8 additions & 8 deletions packages/material-ui-styles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
"clsx": "^1.0.2",
"deepmerge": "^3.0.0",
"hoist-non-react-statics": "^3.2.1",
"jss": "^10.0.0-alpha.12",
"jss-plugin-camel-case": "^10.0.0-alpha.12",
"jss-plugin-default-unit": "^10.0.0-alpha.12",
"jss-plugin-global": "^10.0.0-alpha.12",
"jss-plugin-nested": "^10.0.0-alpha.12",
"jss-plugin-props-sort": "^10.0.0-alpha.12",
"jss-plugin-rule-value-function": "^10.0.0-alpha.12",
"jss-plugin-vendor-prefixer": "^10.0.0-alpha.12",
"jss": "^10.0.0-alpha.16",
"jss-plugin-camel-case": "^10.0.0-alpha.16",
"jss-plugin-default-unit": "^10.0.0-alpha.16",
"jss-plugin-global": "^10.0.0-alpha.16",
"jss-plugin-nested": "^10.0.0-alpha.16",
"jss-plugin-props-sort": "^10.0.0-alpha.16",
"jss-plugin-rule-value-function": "^10.0.0-alpha.16",
"jss-plugin-vendor-prefixer": "^10.0.0-alpha.16",
"prop-types": "^15.7.2",
"warning": "^4.0.1"
},
Expand Down
9 changes: 8 additions & 1 deletion packages/material-ui/scripts/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,14 @@ const commonjsOptions = {
ignoreGlobal: true,
include: /node_modules/,
namedExports: {
'../../node_modules/prop-types/index.js': ['elementType'],
'../../node_modules/prop-types/index.js': [
'elementType',
'bool',
'func',
'object',
'oneOfType',
'element',
],
'../../node_modules/react-is/index.js': [
'ForwardRef',
'isLazy',
Expand Down
4 changes: 0 additions & 4 deletions test/utils/init.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import enzyme from 'enzyme/build/index';
import Adapter from 'enzyme-adapter-react-16';
import consoleError from './consoleError';
import React from 'react';

// Waiting for https://github.com/airbnb/enzyme/issues/1875
React.memo = x => x;

consoleError();

Expand Down
Loading

0 comments on commit 49857df

Please sign in to comment.