Skip to content

Commit

Permalink
Merge pull request ml-in-barcelona#7 from ManasJayanth/prometheansacr…
Browse files Browse the repository at this point in the history
…ifice/update-dependencies
  • Loading branch information
davesnx authored May 26, 2024
2 parents 6b10172 + 4585ec9 commit 102fc72
Show file tree
Hide file tree
Showing 231 changed files with 3,064 additions and 25,167 deletions.
2 changes: 1 addition & 1 deletion client/app.re
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ module Counter = {
};

switch (ReactDOM.querySelector("#root")) {
| Some(el) => ReactDOM.hydrate(<Shared_js.App />, el)
| Some(el) => ignore @@ ReactDOM.Client.hydrateRoot(el, <Shared_js.App />)
| None => ()
};
15 changes: 4 additions & 11 deletions client/dune
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,16 @@
(alias client)
(target app)
(modules app)
(libraries melange shared_js reason_react bs_css bs_css_emotion)
(libraries melange shared_js reason-react styled-ppx.css styled-ppx.emotion)
(preprocess
(pps reactjs-jsx-ppx))
(pps melange.ppx reason-react-ppx))
(module_systems commonjs))

(melange.emit
(alias client)
(target header)
(modules header)
(libraries melange shared_js reason_react bs_css bs_css_emotion)
(libraries melange shared_js reason-react styled-ppx.css styled-ppx.emotion)
(preprocess
(pps reactjs-jsx-ppx))
(module_systems commonjs))

(melange.emit
(alias client)
(target hash)
(modules hash)
(libraries melange server-reason-react.hash)
(pps melange.ppx reason-react-ppx))
(module_systems commonjs))
1 change: 0 additions & 1 deletion client/hash.re

This file was deleted.

2 changes: 1 addition & 1 deletion client/header.re
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
switch (ReactDOM.querySelector("#root")) {
| Some(el) => ReactDOM.hydrate(<Shared_js.Ahrefs />, el)
| Some(el) => ignore @@ ReactDOM.Client.hydrateRoot(el, <Shared_js.Ahrefs />)
| None => ()
};
41 changes: 25 additions & 16 deletions esy.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,39 @@
{
"name": "fullstack-reason-react-demo",
"dependencies": {
"ocaml": "4.14.x",
"ocaml": "5.x",
"@opam/conf-libssl": "3",
"@opam/dream": "1.0.0~alpha4",
"@opam/dream": "*",
"@opam/dune": "*",
"@opam/melange": "*",
"@opam/reason": "*",
"@opam/reactjs-jsx-ppx": "*",
"@opam/rescript-syntax": "*",
"@opam/melange-compiler-libs": "*",
"server-reason-react": "*"
"@opam/styled-ppx": "*",
"@opam/reason-react": "*",
"@opam/reason-react-ppx": "*",
"@opam/server-reason-react": "*"
},
"devDependencies": {
"@opam/ocaml-lsp-server": "1.15.1-4.14"
"@opam/ocaml-lsp-server": "*"
},
"resolutions": {
"esy-openssl": "esy-packages/esy-openssl#619ae2d",
"@opam/reactjs-jsx-ppx": "melange-re/melange:reactjs-jsx-ppx.opam#ebc038332c16e331ee4ab9017426e63461157cdd",
"server-reason-react":
"ml-in-barcelona/server-reason-react:server-reason-react.opam#16fac6cfec3c711e06006ef6efbd23e1fbbdfacd",
"@opam/dune": "ocaml/dune:dune.opam#418a4e7f17b7f2e491fb0ef775fc3a7277b267c7",
"@opam/melange": "melange-re/melange:melange.opam#ebc038332c16e331ee4ab9017426e63461157cdd",
"@opam/melange-compiler-libs": "melange-re/melange-compiler-libs:melange-compiler-libs.opam#575ac4c24b296ea897821f9aaee1146ff258c704",
"@opam/rescript-syntax": "melange-re/melange:rescript-syntax.opam#ebc038332c16e331ee4ab9017426e63461157cdd",
"@opam/reason": "reasonml/reason:reason.opam#0ce98e0cb1b07eecba948a27006787b33d93f0ed"
"esy-gmp": "esy-packages/esy-gmp:package.json#58aa36e793a20f24da415a4ee98223c596bd546e",
"@opam/conf-libssl": {
"version": "opam:4",
"override": {
"dependencies": {
"esy-openssl": "*"
}
}
},
"@opam/conf-pkg-config": {
"source": "no-source:",
"override": {
"dependencies": {
"esy-pkg-config": "*"
}
}
},
"esy-openssl": "ManasJayanth/esy-openssl:esy.json#9fa3c66632d4e5861a0a11c62f9237bba2af6f68"
},
"installConfig": { "pnp": false },
"esy": {
Expand Down
Loading

0 comments on commit 102fc72

Please sign in to comment.