Skip to content

Use latest createRoot API #1194

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

Closed
wants to merge 1 commit into from
Closed

Use latest createRoot API #1194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@

#### Bug Fixes

## 2.6.3

#### Bug Fixes

- Support React 18 createRoot API #1194

## 2.6.2

#### New Features
Expand Down
42 changes: 33 additions & 9 deletions lib/assets/javascripts/react_ujs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
(function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object')
module.exports = factory(require("react-dom"), require("react"), require("react-dom/server"));
module.exports = factory(require("react-dom"), require("react"), require("react-dom/server"), (function webpackLoadOptionalExternalModule() { try { return require("react-dom/client"); } catch(e) {} }()));
else if(typeof define === 'function' && define.amd)
define(["react-dom", "react", "react-dom/server"], factory);
define(["react-dom", "react", "react-dom/server", "react-dom/client"], factory);
else if(typeof exports === 'object')
exports["ReactRailsUJS"] = factory(require("react-dom"), require("react"), require("react-dom/server"));
exports["ReactRailsUJS"] = factory(require("react-dom"), require("react"), require("react-dom/server"), (function webpackLoadOptionalExternalModule() { try { return require("react-dom/client"); } catch(e) {} }()));
else
root["ReactRailsUJS"] = factory(root["ReactDOM"], root["React"], root["ReactDOMServer"]);
})(this, function(__WEBPACK_EXTERNAL_MODULE_1__, __WEBPACK_EXTERNAL_MODULE_5__, __WEBPACK_EXTERNAL_MODULE_6__) {
root["ReactRailsUJS"] = factory(root["ReactDOM"], root["React"], root["ReactDOMServer"], root["ReactDOMClient"]);
})(this, function(__WEBPACK_EXTERNAL_MODULE_1__, __WEBPACK_EXTERNAL_MODULE_5__, __WEBPACK_EXTERNAL_MODULE_6__, __WEBPACK_EXTERNAL_MODULE_14__) {
return /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
Expand Down Expand Up @@ -210,21 +210,38 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/* harmony export (immutable) */ __webpack_exports__["reactHydrate"] = reactHydrate;
/* harmony export (immutable) */ __webpack_exports__["createReactRootLike"] = createReactRootLike;
const ReactDOM = __webpack_require__(1)
var ReactDOMClient = ReactDOM

// React 18+.
const supportsReactCreateRoot = ReactDOM.version && parseInt(ReactDOM.version.split('.')[0], 10) >= 18;
if (supportsReactCreateRoot) {
// This will never throw an exception, but it's the way to tell Webpack the dependency is optional
// https://github.com/webpack/webpack/issues/339#issuecomment-47739112
// Unfortunately, it only converts the error to a warning.
try {
// eslint-disable-next-line global-require,import/no-unresolved
ReactDOMClient = __webpack_require__(14)
} catch (e) {
// We should never get here, but if we do, we'll just use the default ReactDOM
// and live with the warning.
ReactDOMClient = ReactDOM;
}
}

function supportsHydration() {
return typeof ReactDOM.hydrate === "function" || typeof ReactDOM.hydrateRoot === "function"
return typeof ReactDOM.hydrate === "function" || typeof ReactDOMClient.hydrateRoot === "function"
}

function reactHydrate(node, component) {
if (typeof ReactDOM.hydrateRoot === "function") {
return ReactDOM.hydrateRoot(node, component)
if (typeof ReactDOMClient.hydrateRoot === "function") {
return ReactDOMClient.hydrateRoot(node, component)
} else {
return ReactDOM.hydrate(component, node)
}
}

function createReactRootLike(node) {
return ReactDOM.createRoot ? ReactDOM.createRoot(node) : legacyReactRootLike(node)
return ReactDOMClient.createRoot ? ReactDOMClient.createRoot(node) : legacyReactRootLike(node)
}

function legacyReactRootLike(node) {
Expand Down Expand Up @@ -556,6 +573,13 @@ module.exports = function(reqctx) {
}


/***/ }),
/* 14 */
/***/ (function(module, exports) {

if(typeof __WEBPACK_EXTERNAL_MODULE_14__ === 'undefined') {var e = new Error("Cannot find module \"undefined\""); e.code = 'MODULE_NOT_FOUND'; throw e;}
module.exports = __WEBPACK_EXTERNAL_MODULE_14__;

/***/ })
/******/ ]);
});
42 changes: 33 additions & 9 deletions react_ujs/dist/react_ujs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
(function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object')
module.exports = factory(require("react-dom"), require("react"), require("react-dom/server"));
module.exports = factory(require("react-dom"), require("react"), require("react-dom/server"), (function webpackLoadOptionalExternalModule() { try { return require("react-dom/client"); } catch(e) {} }()));
else if(typeof define === 'function' && define.amd)
define(["react-dom", "react", "react-dom/server"], factory);
define(["react-dom", "react", "react-dom/server", "react-dom/client"], factory);
else if(typeof exports === 'object')
exports["ReactRailsUJS"] = factory(require("react-dom"), require("react"), require("react-dom/server"));
exports["ReactRailsUJS"] = factory(require("react-dom"), require("react"), require("react-dom/server"), (function webpackLoadOptionalExternalModule() { try { return require("react-dom/client"); } catch(e) {} }()));
else
root["ReactRailsUJS"] = factory(root["ReactDOM"], root["React"], root["ReactDOMServer"]);
})(this, function(__WEBPACK_EXTERNAL_MODULE_1__, __WEBPACK_EXTERNAL_MODULE_5__, __WEBPACK_EXTERNAL_MODULE_6__) {
root["ReactRailsUJS"] = factory(root["ReactDOM"], root["React"], root["ReactDOMServer"], root["ReactDOMClient"]);
})(this, function(__WEBPACK_EXTERNAL_MODULE_1__, __WEBPACK_EXTERNAL_MODULE_5__, __WEBPACK_EXTERNAL_MODULE_6__, __WEBPACK_EXTERNAL_MODULE_14__) {
return /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
Expand Down Expand Up @@ -210,21 +210,38 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/* harmony export (immutable) */ __webpack_exports__["reactHydrate"] = reactHydrate;
/* harmony export (immutable) */ __webpack_exports__["createReactRootLike"] = createReactRootLike;
const ReactDOM = __webpack_require__(1)
var ReactDOMClient = ReactDOM

// React 18+.
const supportsReactCreateRoot = ReactDOM.version && parseInt(ReactDOM.version.split('.')[0], 10) >= 18;
if (supportsReactCreateRoot) {
// This will never throw an exception, but it's the way to tell Webpack the dependency is optional
// https://github.com/webpack/webpack/issues/339#issuecomment-47739112
// Unfortunately, it only converts the error to a warning.
try {
// eslint-disable-next-line global-require,import/no-unresolved
ReactDOMClient = __webpack_require__(14)
} catch (e) {
// We should never get here, but if we do, we'll just use the default ReactDOM
// and live with the warning.
ReactDOMClient = ReactDOM;
}
}

function supportsHydration() {
return typeof ReactDOM.hydrate === "function" || typeof ReactDOM.hydrateRoot === "function"
return typeof ReactDOM.hydrate === "function" || typeof ReactDOMClient.hydrateRoot === "function"
}

function reactHydrate(node, component) {
if (typeof ReactDOM.hydrateRoot === "function") {
return ReactDOM.hydrateRoot(node, component)
if (typeof ReactDOMClient.hydrateRoot === "function") {
return ReactDOMClient.hydrateRoot(node, component)
} else {
return ReactDOM.hydrate(component, node)
}
}

function createReactRootLike(node) {
return ReactDOM.createRoot ? ReactDOM.createRoot(node) : legacyReactRootLike(node)
return ReactDOMClient.createRoot ? ReactDOMClient.createRoot(node) : legacyReactRootLike(node)
}

function legacyReactRootLike(node) {
Expand Down Expand Up @@ -556,6 +573,13 @@ module.exports = function(reqctx) {
}


/***/ }),
/* 14 */
/***/ (function(module, exports) {

if(typeof __WEBPACK_EXTERNAL_MODULE_14__ === 'undefined') {var e = new Error("Cannot find module \"undefined\""); e.code = 'MODULE_NOT_FOUND'; throw e;}
module.exports = __WEBPACK_EXTERNAL_MODULE_14__;

/***/ })
/******/ ]);
});
25 changes: 21 additions & 4 deletions react_ujs/src/renderHelpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,36 @@
const ReactDOM = require("react-dom")
var ReactDOMClient = ReactDOM

// React 18+.
const supportsReactCreateRoot = ReactDOM.version && parseInt(ReactDOM.version.split('.')[0], 10) >= 18;
if (supportsReactCreateRoot) {
// This will never throw an exception, but it's the way to tell Webpack the dependency is optional
// https://github.com/webpack/webpack/issues/339#issuecomment-47739112
// Unfortunately, it only converts the error to a warning.
try {
// eslint-disable-next-line global-require,import/no-unresolved
ReactDOMClient = require("react-dom/client")
} catch (e) {
// We should never get here, but if we do, we'll just use the default ReactDOM
// and live with the warning.
ReactDOMClient = ReactDOM;
}
}

export function supportsHydration() {
return typeof ReactDOM.hydrate === "function" || typeof ReactDOM.hydrateRoot === "function"
return typeof ReactDOM.hydrate === "function" || typeof ReactDOMClient.hydrateRoot === "function"
}

export function reactHydrate(node, component) {
if (typeof ReactDOM.hydrateRoot === "function") {
return ReactDOM.hydrateRoot(node, component)
if (typeof ReactDOMClient.hydrateRoot === "function") {
return ReactDOMClient.hydrateRoot(node, component)
} else {
return ReactDOM.hydrate(component, node)
}
}

export function createReactRootLike(node) {
return ReactDOM.createRoot ? ReactDOM.createRoot(node) : legacyReactRootLike(node)
return ReactDOMClient.createRoot ? ReactDOMClient.createRoot(node) : legacyReactRootLike(node)
}

function legacyReactRootLike(node) {
Expand Down
6 changes: 6 additions & 0 deletions react_ujs/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ module.exports = {
commonjs: 'react-dom',
amd: 'react-dom'
},
'react-dom/client': {
root: 'ReactDOMClient',
commonjs2: 'react-dom/client',
commonjs: 'react-dom/client',
amd: 'react-dom/client'
},
'react-dom/server': {
root: 'ReactDOMServer',
commonjs2: 'react-dom/server',
Expand Down
Loading