chore: move rc-util to @rc-component/util (#50)

* chore: move rc-util to @rc-components

* update

* fix

* fix

* Apply suggestion from @gemini-code-assist[bot]

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* remove babel

* change comment

---------

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

Author: yoyo837

now.json

@@ -29,17 +29,17 @@
     "coverage": "father test --coverage",
     "lint": "eslint src/ docs/ --ext .tsx,.ts,.jsx,.js",
     "now-build": "npm run build",
-    "prepublishOnly": "npm run compile && np --yolo --no-publish",
+    "prepublishOnly": "npm run compile && rc-np",
     "start": "dumi dev",
     "test": "rc-test",
     "tsc": "tsc --noEmit"
   },
   "dependencies": {
-    "@babel/runtime": "^7.10.1",
-    "rc-util": "^5.27.0"
+    "@rc-component/util": "^1.3.0"
   },
   "devDependencies": {
-    "@rc-component/father-plugin": "^1.0.0",
+    "@rc-component/father-plugin": "^2.0.2",
+    "@rc-component/np": "^1.0.4",
     "@types/jest": "^29.5.0",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
@@ -51,7 +51,6 @@
     "eslint-plugin-jest": "^28.2.0",
     "eslint-plugin-unicorn": "^52.0.0",
     "father": "^4.0.0",
-    "np": "^10.0.4",
     "rc-test": "^7.0.14",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",

package.json

@@ -1,11 +1,13 @@
-import { supportRef } from 'rc-util/lib/ref';
+import { supportRef } from '@rc-component/util/lib/ref';
 import * as React from 'react';
 
 export type CompareProps<T extends React.ComponentType<any>> = (
   prevProps: Readonly<React.ComponentProps<T>>,
   nextProps: Readonly<React.ComponentProps<T>>,
 ) => boolean;
 
+type ImmutableProps<T extends React.ComponentType<any>> = Omit<React.ComponentProps<T>, 'ref'>;
+
 /**
  * Create Immutable pair for `makeImmutable` and `responseImmutable`.
  */
@@ -32,24 +34,24 @@ export default function createImmutable() {
   function makeImmutable<T extends React.ComponentType<any>>(
     Component: T,
     shouldTriggerRender?: CompareProps<T>,
-  ): T {
+  ): React.ComponentType<React.ComponentProps<T>> {
     const refAble = supportRef(Component);
 
-    const ImmutableComponent = function (props: any, ref: any) {
+    const ImmutableComponent = (props: ImmutableProps<T>, ref: React.Ref<any>) => {
       const refProps = refAble ? { ref } : {};
       const renderTimesRef = React.useRef(0);
       const prevProps = React.useRef(props);
 
       // If parent has the context, we do not wrap it
       const mark = useImmutableMark();
       if (mark !== null) {
-        return <Component {...props} {...refProps} />;
+        return <Component {...(props as any)} {...refProps} />;
       }
 
       if (
-        // Always trigger re-render if not provide `notTriggerRender`
+        // Always trigger re-render if `shouldTriggerRender` is not provided
         !shouldTriggerRender ||
-        shouldTriggerRender(prevProps.current, props)
+        shouldTriggerRender(prevProps.current as any, props as any)
       ) {
         renderTimesRef.current += 1;
       }
@@ -58,7 +60,7 @@ export default function createImmutable() {
 
       return (
         <ImmutableContext.Provider value={renderTimesRef.current}>
-          <Component {...props} {...refProps} />
+          <Component {...(props as any)} {...refProps} />
         </ImmutableContext.Provider>
       );
     };
@@ -67,7 +69,9 @@ export default function createImmutable() {
       ImmutableComponent.displayName = `ImmutableRoot(${Component.displayName || Component.name})`;
     }
 
-    return refAble ? React.forwardRef(ImmutableComponent) : (ImmutableComponent as any);
+    return refAble
+      ? (React.forwardRef(ImmutableComponent) as React.ComponentType<React.ComponentProps<T>>)
+      : (ImmutableComponent as unknown as React.ComponentType<React.ComponentProps<T>>);
   }
 
   /**
@@ -77,14 +81,13 @@ export default function createImmutable() {
   function responseImmutable<T extends React.ComponentType<any>>(
     Component: T,
     propsAreEqual?: CompareProps<T>,
-  ): T {
+  ): React.ComponentType<React.ComponentProps<T>> {
     const refAble = supportRef(Component);
 
-    const ImmutableComponent = function (props: any, ref: any) {
+    const ImmutableComponent = (props: ImmutableProps<T>, ref: React.Ref<any>) => {
       const refProps = refAble ? { ref } : {};
       useImmutableMark();
-
-      return <Component {...props} {...refProps} />;
+      return <Component {...(props as any)} {...refProps} />;
     };
 
     if (process.env.NODE_ENV !== 'production') {
@@ -94,8 +97,12 @@ export default function createImmutable() {
     }
 
     return refAble
-      ? React.memo(React.forwardRef(ImmutableComponent), propsAreEqual)
-      : (React.memo(ImmutableComponent, propsAreEqual) as any);
+      ? (React.memo(React.forwardRef(ImmutableComponent), propsAreEqual) as React.ComponentType<
+          React.ComponentProps<T>
+        >)
+      : (React.memo(ImmutableComponent, propsAreEqual) as unknown as React.ComponentType<
+          React.ComponentProps<T>
+        >);
   }
 
   return {

src/Immutable.tsx

@@ -1,6 +1,6 @@
-import useEvent from 'rc-util/lib/hooks/useEvent';
-import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect';
-import isEqual from 'rc-util/lib/isEqual';
+import useEvent from '@rc-component/util/lib/hooks/useEvent';
+import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
+import isEqual from '@rc-component/util/lib/isEqual';
 import * as React from 'react';
 import { unstable_batchedUpdates } from 'react-dom';
 

src/context.tsx

@@ -8,15 +8,9 @@
     "skipLibCheck": true,
     "esModuleInterop": true,
     "paths": {
-      "@/*": [
-        "src/*"
-      ],
-      "@@/*": [
-        ".dumi/tmp/*"
-      ],
-      "@rc-component/context": [
-        "src/index.ts"
-      ]
+      "@/*": ["src/*"],
+      "@@/*": [".dumi/tmp/*"],
+      "@rc-component/context": ["src/index.ts"]
     }
   },
   "include": [".dumi/**/*", ".dumirc.ts", "**/*.ts", "**/*.tsx"]