@rc-component/util 1.1.0 → 1.2.1

package/es/Dom/dynamicCSS.js

@@ -83,8 +83,11 @@ export function injectCSS(css, option = {}) {
   return styleNode;
 }
 function findExistNode(key, option = {}) {
-  const container = getContainer(option);
-  return (option.styles || findStyles(container)).find(node => node.getAttribute(getMark(option)) === key);
+  let {
+    styles
+  } = option;
+  styles ||= findStyles(getContainer(option));
+  return styles.find(node => node.getAttribute(getMark(option)) === key);
 }
 export function removeCSS(key, option = {}) {
   const existNode = findExistNode(key, option);

package/es/React/render.d.ts

@@ -4,10 +4,6 @@ declare const MARK = "__rc_react_root__";
 type ContainerType = (Element | DocumentFragment) & {
     [MARK]?: Root;
 };
-/** @private Test usage. Not work in prod */
-export declare function _r(node: React.ReactElement, container: ContainerType): void;
 export declare function render(node: React.ReactElement, container: ContainerType): void;
-/** @private Test usage. Not work in prod */
-export declare function _u(container: ContainerType): void;
 export declare function unmount(container: ContainerType): Promise<void>;
 export {};

package/es/React/render.js

@@ -1,83 +1,19 @@
-import * as ReactDOM from 'react-dom';
-// Let compiler not to search module usage
-const fullClone = {
-  ...ReactDOM
-};
-const {
-  version,
-  render: reactRender,
-  unmountComponentAtNode
-} = fullClone;
-let createRoot;
-try {
-  const mainVersion = Number((version || '').split('.')[0]);
-  if (mainVersion >= 18) {
-    ({
-      createRoot
-    } = fullClone);
-  }
-} catch (e) {
-  // Do nothing;
-}
-function toggleWarning(skip) {
-  const {
-    __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED
-  } = fullClone;
-  if (__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED && typeof __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED === 'object') {
-    __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.usingClientEntryPoint = skip;
-  }
-}
+import { createRoot } from 'react-dom/client';
 const MARK = '__rc_react_root__';
 
 // ========================== Render ==========================
 
-function modernRender(node, container) {
-  toggleWarning(true);
+export function render(node, container) {
   const root = container[MARK] || createRoot(container);
-  toggleWarning(false);
   root.render(node);
   container[MARK] = root;
 }
-function legacyRender(node, container) {
-  reactRender?.(node, container);
-}
-
-/** @private Test usage. Not work in prod */
-export function _r(node, container) {
-  if (process.env.NODE_ENV !== 'production') {
-    return legacyRender(node, container);
-  }
-}
-export function render(node, container) {
-  if (createRoot) {
-    modernRender(node, container);
-    return;
-  }
-  legacyRender(node, container);
-}
 
 // ========================= Unmount ==========================
-async function modernUnmount(container) {
+export async function unmount(container) {
   // Delay to unmount to avoid React 18 sync warning
   return Promise.resolve().then(() => {
     container[MARK]?.unmount();
     delete container[MARK];
   });
-}
-function legacyUnmount(container) {
-  unmountComponentAtNode(container);
-}
-
-/** @private Test usage. Not work in prod */
-export function _u(container) {
-  if (process.env.NODE_ENV !== 'production') {
-    return legacyUnmount(container);
-  }
-}
-export async function unmount(container) {
-  if (createRoot !== undefined) {
-    // Delay to unmount to avoid React 18 sync warning
-    return modernUnmount(container);
-  }
-  legacyUnmount(container);
 }

package/es/ref.js

@@ -1,7 +1,8 @@
-import { isValidElement } from 'react';
+import { isValidElement, version } from 'react';
 import { ForwardRef, isMemo } from 'react-is';
 import useMemo from "./hooks/useMemo";
 import isFragment from "./React/isFragment";
+const ReactMajorVersion = Number(version.split('.')[0]);
 export const fillRef = (ref, node) => {
   if (typeof ref === 'function') {
     ref(node);
@@ -35,7 +36,7 @@ export const supportRef = nodeOrComponent => {
   }
 
   // React 19 no need `forwardRef` anymore. So just pass if is a React element.
-  if (isReactElement(nodeOrComponent) && nodeOrComponent.props.propertyIsEnumerable('ref')) {
+  if (isReactElement(nodeOrComponent) && ReactMajorVersion >= 19) {
     return true;
   }
   const type = isMemo(nodeOrComponent) ? nodeOrComponent.type.type : nodeOrComponent.type;

package/lib/Dom/dynamicCSS.js

@@ -93,8 +93,11 @@ function injectCSS(css, option = {}) {
   return styleNode;
 }
 function findExistNode(key, option = {}) {
-  const container = getContainer(option);
-  return (option.styles || findStyles(container)).find(node => node.getAttribute(getMark(option)) === key);
+  let {
+    styles
+  } = option;
+  styles ||= findStyles(getContainer(option));
+  return styles.find(node => node.getAttribute(getMark(option)) === key);
 }
 function removeCSS(key, option = {}) {
   const existNode = findExistNode(key, option);

package/lib/React/render.d.ts

@@ -4,10 +4,6 @@ declare const MARK = "__rc_react_root__";
 type ContainerType = (Element | DocumentFragment) & {
     [MARK]?: Root;
 };
-/** @private Test usage. Not work in prod */
-export declare function _r(node: React.ReactElement, container: ContainerType): void;
 export declare function render(node: React.ReactElement, container: ContainerType): void;
-/** @private Test usage. Not work in prod */
-export declare function _u(container: ContainerType): void;
 export declare function unmount(container: ContainerType): Promise<void>;
 export {};

package/lib/React/render.js

@@ -3,92 +3,24 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._r = _r;
-exports._u = _u;
 exports.render = render;
 exports.unmount = unmount;
-var ReactDOM = _interopRequireWildcard(require("react-dom"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-// Let compiler not to search module usage
-const fullClone = {
-  ...ReactDOM
-};
-const {
-  version,
-  render: reactRender,
-  unmountComponentAtNode
-} = fullClone;
-let createRoot;
-try {
-  const mainVersion = Number((version || '').split('.')[0]);
-  if (mainVersion >= 18) {
-    ({
-      createRoot
-    } = fullClone);
-  }
-} catch (e) {
-  // Do nothing;
-}
-function toggleWarning(skip) {
-  const {
-    __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED
-  } = fullClone;
-  if (__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED && typeof __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED === 'object') {
-    __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.usingClientEntryPoint = skip;
-  }
-}
+var _client = require("react-dom/client");
 const MARK = '__rc_react_root__';
 
 // ========================== Render ==========================
 
-function modernRender(node, container) {
-  toggleWarning(true);
-  const root = container[MARK] || createRoot(container);
-  toggleWarning(false);
+function render(node, container) {
+  const root = container[MARK] || (0, _client.createRoot)(container);
   root.render(node);
   container[MARK] = root;
 }
-function legacyRender(node, container) {
-  reactRender?.(node, container);
-}
-
-/** @private Test usage. Not work in prod */
-function _r(node, container) {
-  if (process.env.NODE_ENV !== 'production') {
-    return legacyRender(node, container);
-  }
-}
-function render(node, container) {
-  if (createRoot) {
-    modernRender(node, container);
-    return;
-  }
-  legacyRender(node, container);
-}
 
 // ========================= Unmount ==========================
-async function modernUnmount(container) {
+async function unmount(container) {
   // Delay to unmount to avoid React 18 sync warning
   return Promise.resolve().then(() => {
     container[MARK]?.unmount();
     delete container[MARK];
   });
-}
-function legacyUnmount(container) {
-  unmountComponentAtNode(container);
-}
-
-/** @private Test usage. Not work in prod */
-function _u(container) {
-  if (process.env.NODE_ENV !== 'production') {
-    return legacyUnmount(container);
-  }
-}
-async function unmount(container) {
-  if (createRoot !== undefined) {
-    // Delay to unmount to avoid React 18 sync warning
-    return modernUnmount(container);
-  }
-  legacyUnmount(container);
 }

package/lib/ref.js

@@ -9,6 +9,7 @@ var _reactIs = require("react-is");
 var _useMemo = _interopRequireDefault(require("./hooks/useMemo"));
 var _isFragment = _interopRequireDefault(require("./React/isFragment"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const ReactMajorVersion = Number(_react.version.split('.')[0]);
 const fillRef = (ref, node) => {
   if (typeof ref === 'function') {
     ref(node);
@@ -45,7 +46,7 @@ const supportRef = nodeOrComponent => {
   }
 
   // React 19 no need `forwardRef` anymore. So just pass if is a React element.
-  if (isReactElement(nodeOrComponent) && nodeOrComponent.props.propertyIsEnumerable('ref')) {
+  if (isReactElement(nodeOrComponent) && ReactMajorVersion >= 19) {
     return true;
   }
   const type = (0, _reactIs.isMemo)(nodeOrComponent) ? nodeOrComponent.type.type : nodeOrComponent.type;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/util",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "Common Utils For React Component",
   "keywords": [
     "react",
@@ -27,7 +27,7 @@
     "coverage": "npm test -- --coverage",
     "lint": "eslint src/ --ext .tsx,.ts & eslint tests/ --ext .tsx,.ts",
     "prepare": "husky install",
-    "prepublishOnly": "npm run compile && np --yolo --no-publish",
+    "prepublishOnly": "npm run compile && rc-np",
     "start": "dumi dev",
     "test": "rc-test"
   },
@@ -42,6 +42,7 @@
   },
   "devDependencies": {
     "@rc-component/father-plugin": "^2.0.1",
+    "@rc-component/np": "^1.0.3",
     "@testing-library/react": "^16.0.0",
     "@types/jest": "^29.4.0",
     "@types/node": "^22.5.5",
@@ -60,7 +61,6 @@
     "glob": "^9.2.1",
     "husky": "^9.1.6",
     "lint-staged": "^15.1.0",
-    "np": "^10.0.2",
     "prettier": "^3.3.2",
     "rc-test": "^7.0.14",
     "react": "^18.0.0",