Skip to content

Commit 55934a8

Browse files
authored
Merge pull request #100 from reasonml-community/next
Next (@rescript/react)
2 parents a290703 + a01b775 commit 55934a8

File tree

6 files changed

+18
-10
lines changed

6 files changed

+18
-10
lines changed

.npmignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
**/__tests__/**
12
.bsb.lock
23
*.bs.js
34
.gitattributes
@@ -15,7 +16,6 @@ EXAMPLES/
1516
lib/
1617
node_modules/
1718
package-lock.json
18-
README.md
1919
TODO
2020
yarn.lock
2121
yarn-error.log

EXAMPLES/bsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
"rescript-apollo-client",
3232
"@reasonml-community/graphql-ppx",
3333
"@ryyppy/rescript-promise",
34-
"reason-react"
34+
"@rescript/react"
3535
]
3636
}

EXAMPLES/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"devDependencies": {
1313
"@reasonml-community/graphql-ppx": "1.0.0",
14-
"bs-platform": "8.2.0",
14+
"bs-platform": "9.0.0",
1515
"graphql-client-example-server": "1.2.0",
1616
"html-webpack-plugin": "4.3.0",
1717
"webpack": "4.43.0",
@@ -20,13 +20,13 @@
2020
},
2121
"dependencies": {
2222
"@apollo/client": "3.3.7",
23+
"@rescript/react": "0.10.1",
2324
"@ryyppy/rescript-promise": "0.0.2",
2425
"graphql": "15.3.0",
2526
"react": "16.13.1",
2627
"react-dom": "16.13.1",
2728
"reason-promise": "1.1.1",
28-
"reason-react": "0.9.1",
29-
"rescript-apollo-client": "1.1.2",
29+
"rescript-apollo-client": "2.0.1",
3030
"subscriptions-transport-ws": "0.9.16"
3131
}
3232
}

EXAMPLES/src/WebpackEntry.res

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
ReactDOMRe.renderToElementWithId(<App />, "root")
1+
switch ReactDOM.querySelector("#root") {
2+
| Some(root) => ReactDOM.render(<App />, root)
3+
| None => ()
4+
}

bsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
}
1818
],
1919
"suffix": ".bs.js",
20-
"bs-dependencies": ["@reasonml-community/graphql-ppx", "reason-react"]
20+
"bs-dependencies": ["@reasonml-community/graphql-ppx", "@rescript/react"]
2121
}

package.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "rescript-apollo-client",
33
"description": "ReScript bindings for the Apollo Client ecosystem",
4-
"version": "1.1.2",
4+
"version": "2.0.1",
55
"keywords": [
66
"Apollo",
77
"BuckleScript",
@@ -27,13 +27,18 @@
2727
"jest": "26.5.3",
2828
"react": "^16.13.1",
2929
"react-dom": "^16.13.1",
30-
"reason-react": "^0.9.1",
30+
"@rescript/react": "^0.10.1",
3131
"subscriptions-transport-ws": "^0.9.17"
3232
},
3333
"peerDependencies": {
3434
"@apollo/client": "^3.3.0",
3535
"@reasonml-community/graphql-ppx": "^1.0.0",
3636
"bs-platform": "^8.2.0 || ^9.0.0",
37-
"reason-react": "^0.8.0 || ^0.9.0"
37+
"@rescript/react": "^0.10.1"
38+
},
39+
"peerDependenciesMeta": {
40+
"bs-platform": {
41+
"optional": true
42+
}
3843
}
3944
}

0 commit comments

Comments
 (0)