Skip to content

Commit 7955842

Browse files
[docs] Fix duplicated Algolia records
1 parent 05ccbe3 commit 7955842

File tree

6 files changed

+128
-40
lines changed

6 files changed

+128
-40
lines changed

docs/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "docs",
3-
"version": "4.0.0-alpha.6",
3+
"version": "5.0.0-alpha.1",
44
"private": true,
55
"author": "Material-UI Team",
66
"license": "MIT",
@@ -24,11 +24,11 @@
2424
"@date-io/core": "^1.3.9",
2525
"@emotion/core": "^10.0.27",
2626
"@emotion/styled": "^10.0.27",
27-
"@material-ui/core": "^4.9.12",
28-
"@material-ui/docs": "^4.0.0-beta.3",
29-
"@material-ui/icons": "^4.9.1",
30-
"@material-ui/lab": "^4.0.0-alpha.56",
31-
"@material-ui/monorepo": "https://github.com/mui-org/material-ui.git#master",
27+
"@material-ui/core": "next",
28+
"@material-ui/docs": "next",
29+
"@material-ui/icons": "next",
30+
"@material-ui/lab": "next",
31+
"@material-ui/monorepo": "https://github.com/mui-org/material-ui.git#next",
3232
"@trendmicro/react-interpolate": "^0.5.5",
3333
"@types/autosuggest-highlight": "^3.1.0",
3434
"@types/css-mediaquery": "^0.1.0",

docs/src/pages/components/data-grid/rendering/AntDesignGrid.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function customCheckbox(theme) {
1313
height: 16,
1414
backgroundColor: 'transparent',
1515
border: `1px solid ${
16-
theme.palette.type === 'light' ? '#d9d9d9' : 'rgb(67, 67, 67)'
16+
theme.palette.mode === 'light' ? '#d9d9d9' : 'rgb(67, 67, 67)'
1717
}`,
1818
borderRadius: 2,
1919
},
@@ -54,7 +54,7 @@ const useStyles = makeStyles((theme) => ({
5454
root: {
5555
border: 0,
5656
color:
57-
theme.palette.type === 'light'
57+
theme.palette.mode === 'light'
5858
? 'rgba(0,0,0,.85)'
5959
: 'rgba(255,255,255,0.85)',
6060
fontFamily: [
@@ -72,24 +72,24 @@ const useStyles = makeStyles((theme) => ({
7272
WebkitFontSmoothing: 'auto',
7373
letterSpacing: 'normal',
7474
'& .MuiDataGrid-columnsContainer': {
75-
backgroundColor: theme.palette.type === 'light' ? '#fafafa' : '#1d1d1d',
75+
backgroundColor: theme.palette.mode === 'light' ? '#fafafa' : '#1d1d1d',
7676
},
7777
'& .MuiDataGrid-iconSeparator': {
7878
display: 'none',
7979
},
8080
'& .MuiDataGrid-colCell, .MuiDataGrid-cell': {
8181
borderRight: `1px solid ${
82-
theme.palette.type === 'light' ? '#f0f0f0' : '#303030'
82+
theme.palette.mode === 'light' ? '#f0f0f0' : '#303030'
8383
}`,
8484
},
8585
'& .MuiDataGrid-columnsContainer, .MuiDataGrid-cell': {
8686
borderBottom: `1px solid ${
87-
theme.palette.type === 'light' ? '#f0f0f0' : '#303030'
87+
theme.palette.mode === 'light' ? '#f0f0f0' : '#303030'
8888
}`,
8989
},
9090
'& .MuiDataGrid-cell': {
9191
color:
92-
theme.palette.type === 'light'
92+
theme.palette.mode === 'light'
9393
? 'rgba(0,0,0,.85)'
9494
: 'rgba(255,255,255,0.65)',
9595
},

docs/src/pages/components/data-grid/rendering/AntDesignGrid.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function customCheckbox(theme) {
1212
height: 16,
1313
backgroundColor: 'transparent',
1414
border: `1px solid ${
15-
theme.palette.type === 'light' ? '#d9d9d9' : 'rgb(67, 67, 67)'
15+
theme.palette.mode === 'light' ? '#d9d9d9' : 'rgb(67, 67, 67)'
1616
}`,
1717
borderRadius: 2,
1818
},
@@ -54,7 +54,7 @@ const useStyles = makeStyles((theme: Theme) =>
5454
root: {
5555
border: 0,
5656
color:
57-
theme.palette.type === 'light'
57+
theme.palette.mode === 'light'
5858
? 'rgba(0,0,0,.85)'
5959
: 'rgba(255,255,255,0.85)',
6060
fontFamily: [
@@ -72,24 +72,24 @@ const useStyles = makeStyles((theme: Theme) =>
7272
WebkitFontSmoothing: 'auto',
7373
letterSpacing: 'normal',
7474
'& .MuiDataGrid-columnsContainer': {
75-
backgroundColor: theme.palette.type === 'light' ? '#fafafa' : '#1d1d1d',
75+
backgroundColor: theme.palette.mode === 'light' ? '#fafafa' : '#1d1d1d',
7676
},
7777
'& .MuiDataGrid-iconSeparator': {
7878
display: 'none',
7979
},
8080
'& .MuiDataGrid-colCell, .MuiDataGrid-cell': {
8181
borderRight: `1px solid ${
82-
theme.palette.type === 'light' ? '#f0f0f0' : '#303030'
82+
theme.palette.mode === 'light' ? '#f0f0f0' : '#303030'
8383
}`,
8484
},
8585
'& .MuiDataGrid-columnsContainer, .MuiDataGrid-cell': {
8686
borderBottom: `1px solid ${
87-
theme.palette.type === 'light' ? '#f0f0f0' : '#303030'
87+
theme.palette.mode === 'light' ? '#f0f0f0' : '#303030'
8888
}`,
8989
},
9090
'& .MuiDataGrid-cell': {
9191
color:
92-
theme.palette.type === 'light'
92+
theme.palette.mode === 'light'
9393
? 'rgba(0,0,0,.85)'
9494
: 'rgba(255,255,255,0.65)',
9595
},

docs/src/pages/components/data-grid/rendering/CustomEmptyOverlayGrid.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ const useStyles = makeStyles((theme) => ({
77
root: {
88
flexDirection: 'column',
99
'& .ant-empty-img-1': {
10-
fill: theme.palette.type === 'light' ? '#aeb8c2' : '#262626',
10+
fill: theme.palette.mode === 'light' ? '#aeb8c2' : '#262626',
1111
},
1212
'& .ant-empty-img-2': {
13-
fill: theme.palette.type === 'light' ? '#f5f5f7' : '#595959',
13+
fill: theme.palette.mode === 'light' ? '#f5f5f7' : '#595959',
1414
},
1515
'& .ant-empty-img-3': {
16-
fill: theme.palette.type === 'light' ? '#dce0e6' : '#434343',
16+
fill: theme.palette.mode === 'light' ? '#dce0e6' : '#434343',
1717
},
1818
'& .ant-empty-img-4': {
19-
fill: theme.palette.type === 'light' ? '#fff' : '#1c1c1c',
19+
fill: theme.palette.mode === 'light' ? '#fff' : '#1c1c1c',
2020
},
2121
'& .ant-empty-img-5': {
22-
fillOpacity: theme.palette.type === 'light' ? '0.8' : '0.08',
23-
fill: theme.palette.type === 'light' ? '#f5f5f5' : '#fff',
22+
fillOpacity: theme.palette.mode === 'light' ? '0.8' : '0.08',
23+
fill: theme.palette.mode === 'light' ? '#f5f5f5' : '#fff',
2424
},
2525
},
2626
label: {

docs/src/pages/components/data-grid/rendering/CustomEmptyOverlayGrid.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ const useStyles = makeStyles((theme: Theme) =>
88
root: {
99
flexDirection: 'column',
1010
'& .ant-empty-img-1': {
11-
fill: theme.palette.type === 'light' ? '#aeb8c2' : '#262626',
11+
fill: theme.palette.mode === 'light' ? '#aeb8c2' : '#262626',
1212
},
1313
'& .ant-empty-img-2': {
14-
fill: theme.palette.type === 'light' ? '#f5f5f7' : '#595959',
14+
fill: theme.palette.mode === 'light' ? '#f5f5f7' : '#595959',
1515
},
1616
'& .ant-empty-img-3': {
17-
fill: theme.palette.type === 'light' ? '#dce0e6' : '#434343',
17+
fill: theme.palette.mode === 'light' ? '#dce0e6' : '#434343',
1818
},
1919
'& .ant-empty-img-4': {
20-
fill: theme.palette.type === 'light' ? '#fff' : '#1c1c1c',
20+
fill: theme.palette.mode === 'light' ? '#fff' : '#1c1c1c',
2121
},
2222
'& .ant-empty-img-5': {
23-
fillOpacity: theme.palette.type === 'light' ? '0.8' : '0.08',
24-
fill: theme.palette.type === 'light' ? '#f5f5f5' : '#fff',
23+
fillOpacity: theme.palette.mode === 'light' ? '0.8' : '0.08',
24+
fill: theme.palette.mode === 'light' ? '#f5f5f5' : '#fff',
2525
},
2626
},
2727
label: {

yarn.lock

+98-10
Original file line numberDiff line numberDiff line change
@@ -2811,13 +2811,32 @@
28112811
react-is "^16.8.0"
28122812
react-transition-group "^4.4.0"
28132813

2814-
"@material-ui/docs@^4.0.0-beta.3":
2815-
version "4.0.0-beta.3"
2816-
resolved "https://registry.yarnpkg.com/@material-ui/docs/-/docs-4.0.0-beta.3.tgz#8c37863a58b175e03d565a8c8a9ea25c64ba30f8"
2817-
integrity sha512-RLgfN41V+gnstWYrBsFfluH4qX8We9coMOhAe/vlJLsZ5pQxP2HEJFE/FGa2ImszezwCsG7DuCZigHRXoHTy9w==
2814+
"@material-ui/core@next":
2815+
version "5.0.0-alpha.11"
2816+
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-5.0.0-alpha.11.tgz#a31d0ea7cebf97ba190db0767f07891ab9a13b75"
2817+
integrity sha512-NIZNIswI4gBgpcOiYxtkaKmRZdJy2+e51p7OFAyXIfWB+CtNtXattPdz4MioCL3yaOwf7wZoJWyXbV0mjsDPVg==
28182818
dependencies:
28192819
"@babel/runtime" "^7.4.4"
2820-
"@material-ui/utils" "^4.9.6"
2820+
"@material-ui/styled-engine" "^5.0.0-alpha.11"
2821+
"@material-ui/styles" "^5.0.0-alpha.11"
2822+
"@material-ui/system" "^5.0.0-alpha.11"
2823+
"@material-ui/types" "^5.1.0"
2824+
"@material-ui/utils" "^5.0.0-alpha.8"
2825+
"@types/react-transition-group" "^4.2.0"
2826+
clsx "^1.0.4"
2827+
hoist-non-react-statics "^3.3.2"
2828+
popper.js "1.16.1-lts"
2829+
prop-types "^15.7.2"
2830+
react-is "^16.8.0"
2831+
react-transition-group "^4.4.0"
2832+
2833+
"@material-ui/docs@next":
2834+
version "5.0.0-alpha.1"
2835+
resolved "https://registry.yarnpkg.com/@material-ui/docs/-/docs-5.0.0-alpha.1.tgz#878e18e177e09324992345d1ef91dd5dbbd4d4aa"
2836+
integrity sha512-bSncXpossMxnzc+Jx4I2T0FBNK/NgIRFsqEXltYreRdd8hkFtT8e+QNSq+SxtsO2CRCkhDQ9wbt043Vqe3BAww==
2837+
dependencies:
2838+
"@babel/runtime" "^7.4.4"
2839+
"@material-ui/utils" "^5.0.0-alpha.1"
28212840
nprogress "^0.2.0"
28222841

28232842
"@material-ui/icons@^4.9.1":
@@ -2827,7 +2846,14 @@
28272846
dependencies:
28282847
"@babel/runtime" "^7.4.4"
28292848

2830-
"@material-ui/lab@^4.0.0-alpha.54", "@material-ui/lab@^4.0.0-alpha.56":
2849+
"@material-ui/icons@next":
2850+
version "5.0.0-alpha.11"
2851+
resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-5.0.0-alpha.11.tgz#ffefac5b4ba3e7895a57e29ff7f67eba4d9e4d0b"
2852+
integrity sha512-rQA599j0g1LHd88/zAx5YBSGR0iktSOwTRRaP2CXrxqoh5KvNqted2Kc3FPpe0rbeEIT1sCge5PDEKvov8fLUw==
2853+
dependencies:
2854+
"@babel/runtime" "^7.4.4"
2855+
2856+
"@material-ui/lab@^4.0.0-alpha.54":
28312857
version "4.0.0-alpha.56"
28322858
resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.56.tgz#ff63080949b55b40625e056bbda05e130d216d34"
28332859
integrity sha512-xPlkK+z/6y/24ka4gVJgwPfoCF4RCh8dXb1BNE7MtF9bXEBLN/lBxNTK8VAa0qm3V2oinA6xtUIdcRh0aeRtVw==
@@ -2838,14 +2864,27 @@
28382864
prop-types "^15.7.2"
28392865
react-is "^16.8.0"
28402866

2841-
"@material-ui/monorepo@https://github.com/mui-org/material-ui.git#master":
2842-
version "4.11.0"
2843-
resolved "https://github.com/mui-org/material-ui.git#4502b9bbe18e15c532940e3ef83b513721298b24"
2867+
"@material-ui/lab@next":
2868+
version "5.0.0-alpha.11"
2869+
resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-5.0.0-alpha.11.tgz#6c0f7063351aa328369ee9ab0a6f78e14e10aab3"
2870+
integrity sha512-HBJ6A0WIMssejjj9eSjFdtZA/OfyVHOV/wq3lpSFMSZpkk8QI+Tk9XtE6CaprGmTKPbOdPNKIWqbVvZq8oCtDQ==
2871+
dependencies:
2872+
"@babel/runtime" "^7.4.4"
2873+
"@material-ui/system" "^5.0.0-alpha.6"
2874+
"@material-ui/utils" "^5.0.0-alpha.8"
2875+
clsx "^1.0.4"
2876+
prop-types "^15.7.2"
2877+
react-is "^16.8.0"
28442878

28452879
"@material-ui/monorepo@https://github.com/mui-org/material-ui.git#next":
28462880
version "5.0.0-alpha.5"
28472881
resolved "https://github.com/mui-org/material-ui.git#f43417718baa7b25dd28ad32dc83f89bc19bef62"
28482882

2883+
"@material-ui/styled-engine@^5.0.0-alpha.11":
2884+
version "5.0.0-alpha.11"
2885+
resolved "https://registry.yarnpkg.com/@material-ui/styled-engine/-/styled-engine-5.0.0-alpha.11.tgz#a0a78935dd47fc1d0e76d7dbd7ced80978f453d4"
2886+
integrity sha512-BmA1YvtRa5W0jg3QAZMDa+6LZYQ2bQh87W3v1ZgmCq4hzsEDWPbP/EpKq+eSItG4NytUBJPW72ynNemZuzEdnQ==
2887+
28492888
"@material-ui/styles@^4.10.0":
28502889
version "4.10.0"
28512890
resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.10.0.tgz#2406dc23aa358217aa8cc772e6237bd7f0544071"
@@ -2868,6 +2907,28 @@
28682907
jss-plugin-vendor-prefixer "^10.0.3"
28692908
prop-types "^15.7.2"
28702909

2910+
"@material-ui/styles@^5.0.0-alpha.11":
2911+
version "5.0.0-alpha.11"
2912+
resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-5.0.0-alpha.11.tgz#23d45af3392d579c3ae2e6c47de4de7c3d0c6902"
2913+
integrity sha512-O2typCPhgdF8vrBdT5PZE/DdssVdZd+ObvFo7fzQ9uLjYCP8JHf5URTzbRb26LP3IM1eIjaaMOpiuhMyY2nQTA==
2914+
dependencies:
2915+
"@babel/runtime" "^7.4.4"
2916+
"@emotion/hash" "^0.8.0"
2917+
"@material-ui/types" "^5.1.0"
2918+
"@material-ui/utils" "^5.0.0-alpha.8"
2919+
clsx "^1.0.4"
2920+
csstype "^3.0.2"
2921+
hoist-non-react-statics "^3.3.2"
2922+
jss "^10.0.3"
2923+
jss-plugin-camel-case "^10.0.3"
2924+
jss-plugin-default-unit "^10.0.3"
2925+
jss-plugin-global "^10.0.3"
2926+
jss-plugin-nested "^10.0.3"
2927+
jss-plugin-props-sort "^10.0.3"
2928+
jss-plugin-rule-value-function "^10.0.3"
2929+
jss-plugin-vendor-prefixer "^10.0.3"
2930+
prop-types "^15.7.2"
2931+
28712932
"@material-ui/system@^4.9.14":
28722933
version "4.9.14"
28732934
resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.14.tgz#4b00c48b569340cefb2036d0596b93ac6c587a5f"
@@ -2878,6 +2939,15 @@
28782939
csstype "^2.5.2"
28792940
prop-types "^15.7.2"
28802941

2942+
"@material-ui/system@^5.0.0-alpha.11", "@material-ui/system@^5.0.0-alpha.6":
2943+
version "5.0.0-alpha.11"
2944+
resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-5.0.0-alpha.11.tgz#3ee5aaa5c8a4f621275e124ba3ea4344481d2a29"
2945+
integrity sha512-ChMZKY4ZW+4nAL5/vMb8jnCdCvjD7JXUCUbesKQoKMuA02qFM0aQZjfuQ7j2Q7oQUkIaSoqCsNjwQ8YvZz78Mg==
2946+
dependencies:
2947+
"@babel/runtime" "^7.4.4"
2948+
"@material-ui/utils" "^5.0.0-alpha.8"
2949+
prop-types "^15.7.2"
2950+
28812951
"@material-ui/types@^4.0.0":
28822952
version "4.1.1"
28832953
resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-4.1.1.tgz#b65e002d926089970a3271213a3ad7a21b17f02b"
@@ -2899,6 +2969,17 @@
28992969
prop-types "^15.7.2"
29002970
react-is "^16.8.0"
29012971

2972+
"@material-ui/utils@^5.0.0-alpha.1", "@material-ui/utils@^5.0.0-alpha.8":
2973+
version "5.0.0-alpha.8"
2974+
resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-5.0.0-alpha.8.tgz#521e143041805441c1e5fd15baaa0ece38e27bf6"
2975+
integrity sha512-g1uWRBLQtPUJ/C+tLx5XQ7Gn2u4/xysPWezy8/65G4iXt3pCPrbAmrb6qWbLUHNdGkwJ2/+wyaXKe5gs4fHNAg==
2976+
dependencies:
2977+
"@babel/runtime" "^7.4.4"
2978+
"@types/prop-types" "^15.7.3"
2979+
"@types/react-is" "^16.7.1"
2980+
prop-types "^15.7.2"
2981+
react-is "^16.8.0"
2982+
29022983
"@mdx-js/loader@^1.5.1":
29032984
version "1.6.6"
29042985
resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-1.6.6.tgz#de7438f3b18b097d66380f8698123a91c587a2f9"
@@ -5104,7 +5185,7 @@
51045185
resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.1.tgz#b6e98083f13faa1e5231bfa3bdb1b0feff536b6d"
51055186
integrity sha512-boy4xPNEtiw6N3abRhBi/e7hNvy3Tt8E9ZRAQrwAGzoCGZS/1wjo9KY7JHhnfnEsG5wSjDbymCozUM9a3ea7OQ==
51065187

5107-
"@types/prop-types@*":
5188+
"@types/prop-types@*", "@types/prop-types@^15.7.3":
51085189
version "15.7.3"
51095190
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
51105191
integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
@@ -5149,6 +5230,13 @@
51495230
dependencies:
51505231
"@types/react" "*"
51515232

5233+
"@types/react-is@^16.7.1":
5234+
version "16.7.1"
5235+
resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-16.7.1.tgz#d3f1c68c358c00ce116b55ef5410cf486dd08539"
5236+
integrity sha512-dMLFD2cCsxtDgMkTydQCM0PxDq8vwc6uN5M/jRktDfYvH3nQj6pjC9OrCXS2lKlYoYTNJorI/dI8x9dpLshexQ==
5237+
dependencies:
5238+
"@types/react" "*"
5239+
51525240
"@types/react-native@*":
51535241
version "0.62.17"
51545242
resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.62.17.tgz#78e630692557ae82a106dab7682560a8b541c49a"

0 commit comments

Comments
 (0)