Skip to content

Render react 18 #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 6, 2023
Merged

Render react 18 #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d54a787
Updated core renderer to use createRoot and hydrateRoot per the React…
Jan 6, 2023
4223055
Version bump
Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 23 additions & 15 deletions .core/app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
* -----------------------------------------------------------------------------
*/
import React from 'react';
import ReactDOM from 'react-dom';
import _ from 'underscore';
import op from 'object-path';
import deps from 'dependencies';
import 'externals';
import { createRoot, hydrateRoot } from 'react-dom/client';

/**
* -----------------------------------------------------------------------------
Expand Down Expand Up @@ -154,12 +153,11 @@ export const App = async () => {

// Render the React Components
if (bindPoints.length > 0) {
bindPoints.forEach(item => {
ReactDOM.render(
bindPoints.forEach(item =>
createRoot(item.element).render(
<AppContexts>{item.component}</AppContexts>,
item.element,
);
});
),
);
}

// ensure router DOM Element is on the page
Expand All @@ -179,14 +177,24 @@ export const App = async () => {
);
console.log(...message);

ReactDOM[ssr ? 'hydrate' : 'render'](
<AppContexts>
<Zone zone='reactium-provider' />
<Router history={Reactium.Routing.history} />
<Zone zone='reactium-provider-after' />
</AppContexts>,
appElement,
);
if (ssr) {
hydrateRoot(
appElement,
<AppContexts>
<Zone zone='reactium-provider' />
<Router history={Reactium.Routing.history} />
<Zone zone='reactium-provider-after' />
</AppContexts>,
);
} else {
createRoot(appElement).render(
<AppContexts>
<Zone zone='reactium-provider' />
<Router history={Reactium.Routing.history} />
<Zone zone='reactium-provider-after' />
</AppContexts>,
);
}

/**
* @api {Hook} app-ready app-ready
Expand Down
2 changes: 1 addition & 1 deletion .core/reactium-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const globby = require('./globby-patch');
const rootPath = path.resolve(__dirname, '..');
const gulpConfig = require('./gulp.config');

const version = '4.1.12';
const version = '4.1.13';

const defaultLibraryExternals = {
axios: {
Expand Down