Merge branch 'dependabot/npm_and_yarn/father-4.3.5' into dengfuping-i…

…cons
oceanbase · Oct 18, 2023 · e43dc9e · e43dc9e
2 parents 3b5ffa9 + 46239d1
commit e43dc9e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/packages/design/src/_util/genComponentStyleHook.ts b/packages/design/src/_util/genComponentStyleHook.ts
@@ -4,6 +4,8 @@ import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
 import { genComponentStyleHook as antGenComponentStyleHook } from 'antd/es/theme/internal';
 import type { GlobalToken } from 'antd/es/theme/interface';
 import type { OverrideTokenWithoutDerivative } from 'antd/es/theme/util/genComponentStyleHook';
+import { useContext } from 'react';
+import theme from '../theme';
 
 export type ComponentName = keyof ComponentTokenMap;
 
@@ -22,7 +24,10 @@ export function genComponentStyleHook(
       },
       getDefaultToken
     );
-    const [wrapSSR, hashId] = useStyle(prefixCls);
+    const [wrapSSR] = useStyle(prefixCls);
+    // use hashId from useToken, as hashId is '' when hashed is false
+    // ref: https://github.com/ant-design/ant-design/blob/master/components/theme/useToken.ts#L80
+    const { hashId } = theme.useToken();
     return {
       wrapSSR,
       hashId,

diff --git a/packages/design/src/badge/__tests__/__snapshots__/index.test.tsx.snap b/packages/design/src/badge/__tests__/__snapshots__/index.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`Badge status custom icon 1`] = `
 <span
-  class="ant-badge ant-badge-status css-dev-only-do-not-override-amq5gd"
+  class="ant-badge ant-badge-status"
   style="display: inline-block;"
 >
   <span
@@ -53,7 +53,7 @@ exports[`Badge status dot 1`] = `
 
 exports[`Badge status icon 1`] = `
 <span
-  class="ant-badge ant-badge-status css-dev-only-do-not-override-amq5gd"
+  class="ant-badge ant-badge-status"
   style="display: inline-block;"
 >
   <span

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -31,7 +31,7 @@
     "LICENSE"
   ],
   "scripts": {
-    "build": "father build"
+    "build": "NODE_OPTIONS=--max_old_space_size=4096 father build"
   },
   "dependencies": {
     "@ant-design/cssinjs": "^1.17.2",