[react] roll back to react 17.x, since 18.2 requires some more work

And we don't want to break the release yet.
parent 771b75f7
let upstream = let upstream =
https://github.com/garganscript/package-sets/releases/download/v0.1.8/release.dhall https://github.com/garganscript/package-sets/releases/download/v0.1.7/release.dhall
sha256:3453eafc7b11376457dd1b6a2e69fb808701467e0e1733d8210ff1a6b836769f sha256:52886309e1f0158a85427f80c1e3d47ce747c5f14fcec671a81fe5c2c711a6db
let overrides = let overrides =
{ graphql-client = { graphql-client =
......
...@@ -23,7 +23,6 @@ here = R2.here "Gargantext.Components.App" ...@@ -23,7 +23,6 @@ here = R2.here "Gargantext.Components.App"
app :: R2.Leaf () app :: R2.Leaf ()
app = R2.leaf appCpt app = R2.leaf appCpt
appCpt :: R.Component () appCpt :: R.Component ()
appCpt = here.component "container" cpt where appCpt = here.component "container" cpt where
cpt _ _ = do cpt _ _ = do
...@@ -55,7 +54,6 @@ type HydrateStoreProps = ...@@ -55,7 +54,6 @@ type HydrateStoreProps =
hydrateStore :: R2.Leaf HydrateStoreProps hydrateStore :: R2.Leaf HydrateStoreProps
hydrateStore = R2.leaf hydrateStoreCpt hydrateStore = R2.leaf hydrateStoreCpt
hydrateStoreCpt :: R.Component HydrateStoreProps hydrateStoreCpt :: R.Component HydrateStoreProps
hydrateStoreCpt = here.component "hydrateStore" cpt where hydrateStoreCpt = here.component "hydrateStore" cpt where
cpt { cacheParams cpt { cacheParams
......
...@@ -297,9 +297,6 @@ useReductor f i j = ...@@ -297,9 +297,6 @@ useReductor f i j =
useReductor' :: forall s a. Actor s a -> s -> R.Hooks (Reductor s a) useReductor' :: forall s a. Actor s a -> s -> R.Hooks (Reductor s a)
useReductor' r = useReductor r pure useReductor' r = useReductor r pure
render :: R.Element -> DOM.Element -> Effect Unit
render e d = delay unit $ \_ -> pure $ R.reactDOM ... "render" $ args2 e d
addRootElement :: DOM.Element -> Effect Unit addRootElement :: DOM.Element -> Effect Unit
addRootElement = runEffectFn1 _addRootElement addRootElement = runEffectFn1 _addRootElement
......
...@@ -8,7 +8,8 @@ import Effect (Effect) ...@@ -8,7 +8,8 @@ import Effect (Effect)
import FFI.Simple ((...)) import FFI.Simple ((...))
import Gargantext.Components.App as App import Gargantext.Components.App as App
import Gargantext.Utils.Reactix as R2 import Gargantext.Utils.Reactix as R2
import Prelude (Unit, ($)) import Prelude (Unit, ($), bind)
import Reactix as R
here :: R2.Here here :: R2.Here
here = R2.here "Gargantext.Main" here = R2.here "Gargantext.Main"
...@@ -18,6 +19,7 @@ main = paint $ toMaybe (document ... "getElementById" $ [ "app" ]) ...@@ -18,6 +19,7 @@ main = paint $ toMaybe (document ... "getElementById" $ [ "app" ])
paint :: Maybe Element -> Effect Unit paint :: Maybe Element -> Effect Unit
paint Nothing = here.error "[main] Container not found" paint Nothing = here.error "[main] Container not found"
paint (Just c) = R2.render app c paint (Just c) = do
R.render app c
where where
app = App.app {} app = App.app {}
...@@ -7259,13 +7259,14 @@ react-bootstrap@^1.5.2: ...@@ -7259,13 +7259,14 @@ react-bootstrap@^1.5.2:
uncontrollable "^7.2.1" uncontrollable "^7.2.1"
warning "^4.0.3" warning "^4.0.3"
react-dom@^18.2.0: react-dom@^17.0.2:
version "18.2.0" version "17.0.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g== integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
dependencies: dependencies:
loose-envify "^1.1.0" loose-envify "^1.1.0"
scheduler "^0.23.0" object-assign "^4.1.1"
scheduler "^0.20.2"
react-error-overlay@6.0.9: react-error-overlay@6.0.9:
version "6.0.9" version "6.0.9"
...@@ -7747,12 +7748,13 @@ sass@^1.35.2: ...@@ -7747,12 +7748,13 @@ sass@^1.35.2:
dependencies: dependencies:
chokidar ">=3.0.0 <4.0.0" chokidar ">=3.0.0 <4.0.0"
scheduler@^0.23.0: scheduler@^0.20.2:
version "0.23.0" version "0.20.2"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw== integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
dependencies: dependencies:
loose-envify "^1.1.0" loose-envify "^1.1.0"
object-assign "^4.1.1"
secp256k1@^4.0.2: secp256k1@^4.0.2:
version "4.0.2" version "4.0.2"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment