feat: replace utils library

pansyjs · Aug 29, 2022 · 3989c35 · 3989c35
1 parent d3f1cb1
commit 3989c35
Show file tree

Hide file tree

Showing 35 changed files with 77 additions and 93 deletions.
diff --git a/hooks/useClickAway/package.json b/hooks/useClickAway/package.json
@@ -15,7 +15,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@pansy/shared": "^1.2.0",
+    "@pansy/shared": "^1.3.1",
     "@pansy/hook-utils": "0.3.0",
     "@pansy/use-latest": "0.2.4"
   },

diff --git a/hooks/useControllableValue/package.json b/hooks/useControllableValue/package.json
@@ -15,7 +15,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@pansy/shared": "^1.2.0",
+    "@pansy/shared": "^1.3.1",
     "@pansy/use-memoized-fn": "0.2.5",
     "@pansy/use-update": "0.2.4"
   },

diff --git a/hooks/useCookieState/package.json b/hooks/useCookieState/package.json
@@ -16,7 +16,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@pansy/shared": "^1.2.0",
+    "@pansy/shared": "^1.3.1",
     "@pansy/use-memoized-fn": "0.2.5",
     "@types/js-cookie": "^2.x.x",
     "js-cookie": "^2.x.x"

diff --git a/hooks/useCreation/package.json b/hooks/useCreation/package.json
@@ -16,6 +16,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
+    "@pansy/shared": "^1.3.1",
     "@pansy/hook-utils": "0.3.0"
   },
   "publishConfig": {

diff --git a/hooks/useCreation/src/index.ts b/hooks/useCreation/src/index.ts
@@ -1,6 +1,6 @@
 import type { DependencyList } from 'react';
 import { useRef } from 'react';
-import { depsAreSame } from '@pansy/hook-utils';
+import { depsAreSame } from '@pansy/shared/react';
 
 export function useCreation<T>(factory: () => T, deps: DependencyList) {
   const { current } = useRef({

diff --git a/hooks/useDocumentVisibility/package.json b/hooks/useDocumentVisibility/package.json
@@ -15,6 +15,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
+    "@pansy/shared": "^1.3.1",
     "@pansy/hook-utils": "0.3.0",
     "@pansy/use-event-listener": "0.2.8"
   },

diff --git a/hooks/useDocumentVisibility/src/index.ts b/hooks/useDocumentVisibility/src/index.ts
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { useEventListener } from '@pansy/use-event-listener';
-import { isBrowser } from '@pansy/hook-utils';
+import { isBrowser } from '@pansy/shared';
 
 type VisibilityState = 'hidden' | 'visible' | 'prerender' | undefined;
 
@@ -14,7 +14,7 @@ const getVisibility = () => {
  * 监听页面是否可见
  * @returns
  */
- export function useDocumentVisibility(): VisibilityState {
+export function useDocumentVisibility(): VisibilityState {
   const [documentVisibility, setDocumentVisibility] = useState(() => getVisibility());
 
   useEventListener(

diff --git a/hooks/useEventListener/package.json b/hooks/useEventListener/package.json
@@ -15,7 +15,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@pansy/shared": "^1.2.0",
+    "@pansy/shared": "^1.3.1",
     "@pansy/hook-utils": "0.3.0",
     "@pansy/use-latest": "0.2.4"
   },

diff --git a/hooks/useHover/package.json b/hooks/useHover/package.json
@@ -15,7 +15,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@pansy/shared": "^1.2.0",
+    "@pansy/shared": "^1.3.1",
     "@pansy/use-boolean": "0.2.5",
     "@pansy/use-event-listener": "0.2.8"
   },

diff --git a/hooks/useInViewport/package.json b/hooks/useInViewport/package.json
@@ -15,7 +15,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@pansy/shared": "^1.2.0",
+    "@pansy/shared": "^1.3.1",
     "@pansy/hook-utils": "0.3.0",
     "intersection-observer": "^0.12.0"
   },

diff --git a/hooks/useKeyPress/package.json b/hooks/useKeyPress/package.json
@@ -16,7 +16,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@pansy/shared": "^1.2.0",
+    "@pansy/shared": "^1.3.1",
     "@pansy/hook-utils": "0.3.0",
     "@pansy/use-latest": "0.2.4"
   },

diff --git a/hooks/useLocalStorageState/package.json b/hooks/useLocalStorageState/package.json
@@ -15,6 +15,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
+    "@pansy/shared": "^1.3.1",
     "@pansy/hook-utils": "0.3.0"
   },
   "publishConfig": {

diff --git a/hooks/useLocalStorageState/src/index.ts b/hooks/useLocalStorageState/src/index.ts
@@ -1,4 +1,5 @@
-import { createUseStorageState, isBrowser } from '@pansy/hook-utils';
+import { createUseStorageState } from '@pansy/hook-utils';
+import { isBrowser } from '@pansy/shared';
 
 /**
  * 将状态存储在 localStorage 中的 Hook

diff --git a/hooks/useMouse/package.json b/hooks/useMouse/package.json
@@ -16,7 +16,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@pansy/shared": "^1.2.0",
+    "@pansy/shared": "^1.3.1",
     "@pansy/use-event-listener": "0.2.8",
     "@pansy/use-raf-state": "0.2.5"
   },

diff --git a/hooks/useRequest/package.json b/hooks/useRequest/package.json
@@ -16,7 +16,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@pansy/shared": "^1.2.0",
+    "@pansy/shared": "^1.3.1",
     "@pansy/hook-utils": "0.3.0",
     "@pansy/use-creation": "0.1.4",
     "@pansy/use-latest": "0.2.4",

diff --git a/hooks/useRequest/src/utils/isDocumentVisible.ts b/hooks/useRequest/src/utils/isDocumentVisible.ts
@@ -1,7 +1,7 @@
-import { canUseDom } from '@pansy/hook-utils';
+import { isBrowser } from '@pansy/shared';
 
 export function isDocumentVisible(): boolean {
-  if (canUseDom()) {
+  if (isBrowser) {
     return document.visibilityState !== 'hidden';
   }
   return true;

diff --git a/hooks/useRequest/src/utils/isOnline.ts b/hooks/useRequest/src/utils/isOnline.ts
@@ -1,7 +1,7 @@
-import { canUseDom } from '@pansy/hook-utils';
+import { isBrowser } from '@pansy/shared';
 
 export function isOnline(): boolean {
-  if (canUseDom() && typeof navigator.onLine !== 'undefined') {
+  if (isBrowser && typeof navigator.onLine !== 'undefined') {
     return navigator.onLine;
   }
   return true;

diff --git a/hooks/useRequest/src/utils/subscribeFocus.ts b/hooks/useRequest/src/utils/subscribeFocus.ts
@@ -1,4 +1,4 @@
-import { canUseDom } from '@pansy/hook-utils';
+import { isBrowser } from '@pansy/shared';
 
 import { isDocumentVisible } from './isDocumentVisible';
 import { isOnline } from './isOnline';
@@ -13,7 +13,7 @@ export function subscribeFocus(listener: () => void) {
   };
 }
 
-if (canUseDom()) {
+if (isBrowser) {
   const revalidate = () => {
     if (!isDocumentVisible() || !isOnline()) return;
     for (let i = 0; i < listeners.length; i++) {

diff --git a/hooks/useRequest/src/utils/subscribeReVisible.ts b/hooks/useRequest/src/utils/subscribeReVisible.ts
@@ -1,4 +1,4 @@
-import { canUseDom } from '@pansy/hook-utils';
+import { isBrowser } from '@pansy/shared';
 
 import { isDocumentVisible, } from './isDocumentVisible';
 
@@ -12,7 +12,7 @@ export function subscribeReVisible(listener: () => void) {
   };
 }
 
-if (canUseDom()) {
+if (isBrowser) {
   const revalidate = () => {
     if (!isDocumentVisible()) return;
     for (let i = 0; i < listeners.length; i++) {

diff --git a/hooks/useScroll/package.json b/hooks/useScroll/package.json
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@pansy/hook-utils": "0.3.0",
-    "@pansy/shared": "^1.2.0",
+    "@pansy/shared": "^1.3.1",
     "@pansy/use-latest": "0.2.4",
     "@pansy/use-raf-state": "0.2.5"
   },

diff --git a/hooks/useScrollLock/package.json b/hooks/useScrollLock/package.json
@@ -18,7 +18,7 @@
   "dependencies": {
     "@pansy/use-get-state": "^0.2.5",
     "@pansy/use-event-listener": "^0.2.8",
-    "@pansy/shared": "^1.2.0"
+    "@pansy/shared": "^1.3.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",

diff --git a/hooks/useSessionStorageState/package.json b/hooks/useSessionStorageState/package.json
@@ -15,6 +15,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
+    "@pansy/shared": "^1.3.1",
     "@pansy/hook-utils": "0.3.0"
   },
   "publishConfig": {

diff --git a/hooks/useSessionStorageState/src/index.ts b/hooks/useSessionStorageState/src/index.ts
@@ -1,4 +1,5 @@
-import { isBrowser, createUseStorageState } from '@pansy/hook-utils';
+import { createUseStorageState } from '@pansy/hook-utils';
+import { isBrowser } from '@pansy/shared';
 
 /**
  * 将状态存储在 sessionStorage 中的 Hook

diff --git a/hooks/useSize/package.json b/hooks/useSize/package.json
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@juggle/resize-observer": "^3.3.1",
-    "@pansy/shared": "^1.2.0",
+    "@pansy/shared": "^1.3.1",
     "@pansy/hook-utils": "0.3.0",
     "@pansy/use-raf-state": "0.2.5"
   },

diff --git a/hooks/useTitle/package.json b/hooks/useTitle/package.json
@@ -15,6 +15,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
+    "@pansy/shared": "^1.3.1",
     "@pansy/hook-utils": "0.3.0",
     "@pansy/use-unmount": "0.2.5"
   },

diff --git a/hooks/useTitle/src/index.ts b/hooks/useTitle/src/index.ts
@@ -1,6 +1,6 @@
 import { useEffect, useRef } from 'react';
 import { useUnmount } from '@pansy/use-unmount';
-import { isBrowser } from '@pansy/hook-utils';
+import { isBrowser } from '@pansy/shared';
 
 export interface Options {
   /** 组件卸载时，是否恢复上一个页面标题 */

diff --git a/hooks/useWatermark/package.json b/hooks/useWatermark/package.json
@@ -15,7 +15,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@pansy/shared": "^1.2.0",
+    "@pansy/shared": "^1.3.1",
     "@pansy/hook-utils": "0.3.0",
     "@pansy/use-memoized-fn": "0.2.5",
     "@pansy/use-unmount": "0.2.5",

diff --git a/hooks/utils/package.json b/hooks/utils/package.json
@@ -15,7 +15,7 @@
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@pansy/shared": "^1.2.0",
+    "@pansy/shared": "^1.3.1",
     "@pansy/use-memoized-fn": "0.2.5",
     "@pansy/use-unmount": "0.2.5",
     "@pansy/use-update-effect": "0.2.4",

diff --git a/hooks/utils/src/index.ts b/hooks/utils/src/index.ts
@@ -1,13 +1,10 @@
 export { createUpdateEffect } from '@pansy/use-update-effect';
 export { createUseStorageState } from './utils/createUseStorageState';
-export { depsAreSame } from './utils/depsAreSame';
-export { isBrowser } from './utils/isBrowser';
 export {
   createEffectWithTarget,
   useEffectWithTarget,
   useLayoutEffectWithTarget
 } from './utils/useEffectWithTarget';
-export { canUseDom } from './utils/canUseDom';
 export { useIsomorphicLayoutEffectWithTarget } from './utils/useIsomorphicLayoutEffectWithTarget';
 export { useDeepCompareEffectWithTarget } from './utils/useDeepCompareWithTarget';
 

diff --git a/hooks/utils/src/utils/canUseDom.ts b/hooks/utils/src/utils/canUseDom.ts
diff --git a/hooks/utils/src/utils/depsAreSame.ts b/hooks/utils/src/utils/depsAreSame.ts
diff --git a/hooks/utils/src/utils/isBrowser.ts b/hooks/utils/src/utils/isBrowser.ts
diff --git a/hooks/utils/src/utils/useEffectWithTarget.ts b/hooks/utils/src/utils/useEffectWithTarget.ts
@@ -1,7 +1,6 @@
 import { useEffect, useLayoutEffect, useRef } from 'react';
 import { useUnmount } from '@pansy/use-unmount';
-import { depsAreSame } from './depsAreSame';
-import { getTargetElement } from '@pansy/shared/react';
+import { getTargetElement, depsAreSame } from '@pansy/shared/react';
 
 import type { DependencyList, EffectCallback } from 'react';
 import type { BasicTarget } from '@pansy/shared/react';

diff --git a/hooks/utils/src/utils/useIsomorphicLayoutEffectWithTarget.ts b/hooks/utils/src/utils/useIsomorphicLayoutEffectWithTarget.ts
@@ -1,4 +1,4 @@
-import { isBrowser } from './isBrowser';
+import { isBrowser } from '@pansy/shared';
 import { useEffectWithTarget, useLayoutEffectWithTarget } from './useEffectWithTarget';
 
 export const useIsomorphicLayoutEffectWithTarget = isBrowser