Skip to content

Commit c2ae3d7

Browse files
cknittcknitt
authored
Merge pull request #128 from cca-io/publish-2.1.0
Publish 2.1.0
2 parents ccf66b6 + c3c0774 commit c2ae3d7

File tree

15 files changed

+89
-49
lines changed

15 files changed

+89
-49
lines changed

‎.github/workflows/release-ppx.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: bs_material_ui_ppx pipeline
22

33
on:
44
push:
5-
paths:
6-
- 'public/bs-material-ui-ppx/package.json'
5+
tags:
6+
- v*
77

88
jobs:
99
build:

‎build.sh

+3-6
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,22 @@ git pull
55
rm -rf output
66

77
cd tools/json-schema-parser
8-
yarn
98
yarn build
109

1110
cd $pwd
1211

1312
cd tools/component-extractor
14-
yarn
1513
yarn build
1614

1715
cd $pwd
1816

1917
cd tools/binding-generator
20-
yarn
2118
yarn build
2219

2320
cd $pwd
2421

25-
cd public/bs-material-ui-ppx
26-
yarn
27-
yarn build
22+
# Usually the PPX stays compatible and does not need to be rebuilt.
23+
# cd public/bs-material-ui-ppx
24+
# esy build
2825

2926
cd $pwd

‎documentation/docs/changelog.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ title: Changelog
1616

1717
## 2.1.0
1818

19-
- :rocket: Updated to MaterialUi v4.11.3
19+
- :rocket: Updated to MaterialUi v4.11.4
20+
- :rocket: Added StylesProvider
2021
- :boom: Switched to the new `@rescript/react` package (keep on `2.0.0` if you
2122
need legacy support)
2223

‎documentation/docusaurus.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module.exports = {
2828
{ to: 'docs/examples', label: 'Examples', position: 'left' },
2929
{
3030
href: 'https://material-ui.com/versions/#stable-versions',
31-
label: 'Currently on MUI version: v4.11.3',
31+
label: 'Currently on MUI version: v4.11.4',
3232
position: 'right',
3333
},
3434
{ to: 'docs/contributing', label: 'Contributing', position: 'right' },

‎public/bs-material-ui-lab/package.json

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@jsiebern/bs-material-ui-lab",
3-
"version": "2.0.3",
3+
"version": "2.1.0",
44
"description": "This library provides Reason bindings for material-ui-lab.",
55
"keywords": [
66
"bucklescript",
@@ -30,20 +30,17 @@
3030
"/bsconfig.json"
3131
],
3232
"peerDependencies": {
33-
"@material-ui/core": "4.11.3",
34-
"@material-ui/lab": "^4.0.0-alpha.57",
33+
"@material-ui/core": "4.11.4",
34+
"@material-ui/lab": "^4.0.0-alpha.58",
3535
"@rescript/react": "^0.10",
3636
"bs-platform": "^9.0.2",
3737
"@jsiebern/bs-material-ui": "^2.1.0"
3838
},
3939
"devDependencies": {
40-
"@material-ui/core": "4.11.3",
41-
"@material-ui/lab": "^4.0.0-alpha.57",
40+
"@material-ui/core": "4.11.4",
41+
"@material-ui/lab": "^4.0.0-alpha.58",
4242
"bs-platform": "^9.0.2",
4343
"parcel-bundler": "^1.12.4",
4444
"@rescript/react": "^0.10"
45-
},
46-
"dependencies": {
47-
"@jsiebern/bs-material-ui": "^2.1.0"
4845
}
4946
}

‎public/bs-material-ui-ppx/dev_tests/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"dependencies": {
1616
"@jsiebern/bs-material-ui": "file:../../bs-material-ui/",
17-
"@material-ui/core": "4.11.3",
17+
"@material-ui/core": "4.11.4",
1818
"@rescript/react": "^0.10"
1919
}
2020
}

‎public/bs-material-ui-ppx/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
],
1616
"description": "This is a ppx for using the withStyles component in @jsiebern/bs-material-ui",
1717
"peerDependencies": {
18-
"@material-ui/core": "4.11.3",
18+
"@material-ui/core": "4.11.4",
1919
"@rescript/react": "^0.10",
2020
"bs-platform": "^9.0.2",
21-
"@jsiebern/bs-material-ui": "^2.0.0"
21+
"@jsiebern/bs-material-ui": "^2.1.0"
2222
},
2323
"publishConfig": {
2424
"access": "public"

‎public/bs-material-ui/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@jsiebern/bs-material-ui",
3-
"version": "2.0.2",
3+
"version": "2.1.0",
44
"description": "This library provides Reason bindings for material-ui.",
55
"keywords": [
66
"bucklescript",
@@ -29,14 +29,14 @@
2929
"/bsconfig.json"
3030
],
3131
"peerDependencies": {
32-
"@material-ui/core": "4.11.3",
32+
"@material-ui/core": "4.11.4",
3333
"@rescript/react": "^0.10",
3434
"bs-platform": "^9.0.2"
3535
},
3636
"devDependencies": {
3737
"@babel/helper-call-delegate": "^7.10.4",
3838
"@jsiebern/bs-material-ui-ppx": "^2.0.1",
39-
"@material-ui/core": "4.11.3",
39+
"@material-ui/core": "4.11.4",
4040
"@material-ui/icons": "4.11.2",
4141
"@mscharley/bs-material-ui-icons": "^2.0.0",
4242
"@rescript/react": "^0.10",
@@ -45,7 +45,6 @@
4545
"clsx": "^1.0.4"
4646
},
4747
"dependencies": {
48-
"@jsiebern/bs-material-ui": "^2.1.0",
4948
"react": "^17.0.2",
5049
"react-dom": "^17.0.2"
5150
}

‎public/bs-material-ui/src/MaterialUi.re

+1
Original file line numberDiff line numberDiff line change
@@ -127,4 +127,5 @@ module ThemeOptions = MaterialUi_ThemeOptions;
127127
module ThemeProvider = MaterialUi_ThemeProvider;
128128
module ThemeHelpers = MaterialUi_ThemeHelpers;
129129
module MuiThemeProvider = MaterialUi_ThemeProvider;
130+
module StylesProvider = MaterialUi_StylesProvider;
130131
module WithStyles = MaterialUi_WithStyles;

‎public/bs-material-ui/src/MaterialUi_Avatar.re

+29
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
module Classes = {
2+
type t = {
3+
.
4+
"root": option(string),
5+
"colorDefault": option(string),
6+
"circle": option(string),
7+
"circular": option(string),
8+
"rounded": option(string),
9+
"square": option(string),
10+
"img": option(string),
11+
"fallback": option(string),
12+
};
13+
[@bs.obj]
14+
external make:
15+
(
16+
~root: string=?,
17+
~colorDefault: string=?,
18+
~circle: string=?,
19+
~circular: string=?,
20+
~rounded: string=?,
21+
~square: string=?,
22+
~img: string=?,
23+
~fallback: string=?,
24+
unit
25+
) =>
26+
t;
27+
};
28+
129
module Component: {
230
type t;
331
let string: string => t;
@@ -19,6 +47,7 @@ external make:
1947
(
2048
~alt: string=?,
2149
~children: 'children=?,
50+
~classes: Classes.t=?,
2251
~className: string=?,
2352
~component: Component.t=?,
2453
~imgProps: Js.t({..})=?,

‎public/bs-material-ui/src/MaterialUi_StylesProvider.re

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[@react.component] [@bs.module "@material-ui/core/styles"]
2+
external make:
3+
(
4+
~disableGeneration: bool=?,
5+
~generateClassName: unit => string=?,
6+
~injectFirst: bool=?,
7+
~jss: Js.t({..})=?,
8+
~children: 'children
9+
) =>
10+
React.element =
11+
"StylesProvider";

‎tools/binding-generator/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"@jsiebern/json-schema-parser": "^0.0.11",
1414
"@jsiebern/mui-component-extractor": "1.0.0",
15-
"@material-ui/core": "4.11.3",
15+
"@material-ui/core": "4.11.4",
1616
"bs-platform": "^9.0.2",
1717
"lodash": "~4.17.11",
1818
"react-dom": "^16.8.6",

‎tools/binding-generator/src/fixed-modules/MaterialUi_StylesProvider.re

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[@react.component] [@bs.module "@material-ui/core/styles"]
2+
external make:
3+
(
4+
~disableGeneration: bool=?,
5+
~generateClassName: unit => string=?,
6+
~injectFirst: bool=?,
7+
~jss: Js.t({..})=?,
8+
~children: 'children
9+
) =>
10+
React.element =
11+
"StylesProvider";

‎tools/binding-generator/src/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ const parseInit = () => {
7676
module ThemeProvider = MaterialUi_ThemeProvider;
7777
module ThemeHelpers = MaterialUi_ThemeHelpers;
7878
module MuiThemeProvider = MaterialUi_ThemeProvider;
79+
module StylesProvider = MaterialUi_StylesProvider;
7980
module WithStyles = MaterialUi_WithStyles;
8081
`,
8182
);

‎yarn.lock

+16-23
Original file line numberDiff line numberDiff line change
@@ -1751,22 +1751,15 @@
17511751
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
17521752
integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
17531753

1754-
"@jsiebern/bs-material-ui@^2.1.0":
1755-
version "2.0.2"
1756-
dependencies:
1757-
"@jsiebern/bs-material-ui" "^2.1.0"
1758-
react "^17.0.2"
1759-
react-dom "^17.0.2"
1760-
1761-
"@material-ui/[email protected]":
1762-
version "4.11.3"
1763-
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.3.tgz#f22e41775b0bd075e36a7a093d43951bf7f63850"
1764-
integrity sha512-Adt40rGW6Uds+cAyk3pVgcErpzU/qxc7KBR94jFHBYretU4AtWZltYcNsbeMn9tXL86jjVL1kuGcIHsgLgFGRw==
1754+
"@material-ui/[email protected]":
1755+
version "4.11.4"
1756+
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.4.tgz#4fb9fe5dec5dcf780b687e3a40cff78b2b9640a4"
1757+
integrity sha512-oqb+lJ2Dl9HXI9orc6/aN8ZIAMkeThufA5iZELf2LQeBn2NtjVilF5D2w7e9RpntAzDb4jK5DsVhkfOvFY/8fg==
17651758
dependencies:
17661759
"@babel/runtime" "^7.4.4"
1767-
"@material-ui/styles" "^4.11.3"
1760+
"@material-ui/styles" "^4.11.4"
17681761
"@material-ui/system" "^4.11.3"
1769-
"@material-ui/types" "^5.1.0"
1762+
"@material-ui/types" "5.1.0"
17701763
"@material-ui/utils" "^4.11.2"
17711764
"@types/react-transition-group" "^4.2.0"
17721765
clsx "^1.0.4"
@@ -1783,25 +1776,25 @@
17831776
dependencies:
17841777
"@babel/runtime" "^7.4.4"
17851778

1786-
"@material-ui/lab@^4.0.0-alpha.57":
1787-
version "4.0.0-alpha.57"
1788-
resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.57.tgz#e8961bcf6449e8a8dabe84f2700daacfcafbf83a"
1789-
integrity sha512-qo/IuIQOmEKtzmRD2E4Aa6DB4A87kmY6h0uYhjUmrrgmEAgbbw9etXpWPVXuRK6AGIQCjFzV6WO2i21m1R4FCw==
1779+
"@material-ui/lab@^4.0.0-alpha.58":
1780+
version "4.0.0-alpha.58"
1781+
resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.58.tgz#c7ebb66f49863c5acbb20817163737caa299fafc"
1782+
integrity sha512-GKHlJqLxUeHH3L3dGQ48ZavYrqGOTXkFkiEiuYMAnAvXAZP4rhMIqeHOPXSUQan4Bd8QnafDcpovOSLnadDmKw==
17901783
dependencies:
17911784
"@babel/runtime" "^7.4.4"
17921785
"@material-ui/utils" "^4.11.2"
17931786
clsx "^1.0.4"
17941787
prop-types "^15.7.2"
17951788
react-is "^16.8.0 || ^17.0.0"
17961789

1797-
"@material-ui/styles@^4.11.3":
1798-
version "4.11.3"
1799-
resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.3.tgz#1b8d97775a4a643b53478c895e3f2a464e8916f2"
1800-
integrity sha512-HzVzCG+PpgUGMUYEJ2rTEmQYeonGh41BYfILNFb/1ueqma+p1meSdu4RX6NjxYBMhf7k+jgfHFTTz+L1SXL/Zg==
1790+
"@material-ui/styles@^4.11.4":
1791+
version "4.11.4"
1792+
resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.4.tgz#eb9dfccfcc2d208243d986457dff025497afa00d"
1793+
integrity sha512-KNTIZcnj/zprG5LW0Sao7zw+yG3O35pviHzejMdcSGCdWbiO8qzRgOYL8JAxAsWBKOKYwVZxXtHWaB5T2Kvxew==
18011794
dependencies:
18021795
"@babel/runtime" "^7.4.4"
18031796
"@emotion/hash" "^0.8.0"
1804-
"@material-ui/types" "^5.1.0"
1797+
"@material-ui/types" "5.1.0"
18051798
"@material-ui/utils" "^4.11.2"
18061799
clsx "^1.0.4"
18071800
csstype "^2.5.2"
@@ -1826,7 +1819,7 @@
18261819
csstype "^2.5.2"
18271820
prop-types "^15.7.2"
18281821

1829-
"@material-ui/types@^5.1.0":
1822+
"@material-ui/[email protected]":
18301823
version "5.1.0"
18311824
resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2"
18321825
integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==

0 commit comments

Comments
 (0)