antd 属性升级

hyperse-io · Oct 21, 2024 · 6a92850 · 6a92850
1 parent bda975e
commit 6a92850
Show file tree

Hide file tree

Showing 28 changed files with 66 additions and 78 deletions.
diff --git a/hyperse-antd.code-workspace b/hyperse-antd.code-workspace
@@ -17,8 +17,8 @@
       "path": "packages/pro-layout",
     },
     {
-      "name": "demo",
-      "path": "packages/antd-demo",
+      "name": "demo-antd",
+      "path": "packages/demo-antd",
     },
   ],
   "extensions": {

diff --git a/packages/antd/flatjs-forge.config.ts b/packages/antd/flatjs-forge.config.ts
@@ -57,15 +57,9 @@ export default defineConfig({
         return `@ant-design/icons/es/icons/${transformedMethodName}.js`;
       },
     },
-    {
-      libraryName: '@dimjs/utils',
-    },
-    {
-      libraryName: '@dimjs/lang',
-    },
-    {
-      libraryName: '@wove/react',
-    },
+    { libraryName: '@dimjs/utils' },
+    { libraryName: '@dimjs/lang' },
+    { libraryName: '@wove/react' },
   ],
   plugin: {
     extraPlugins: [stylingPlugin],

diff --git a/packages/antd/package.json b/packages/antd/package.json
@@ -486,7 +486,7 @@
     "@hyperse/utils": ">=1.0.0",
     "@wove/react": ">=2.0.2",
     "ahooks": ">=3.7.11",
-    "antd": ">=5.11.0",
+    "antd": ">=5.21.4",
     "dayjs": ">=1.11.9",
     "react": ">=18.2.0",
     "react-dom": ">=18.2.0"

diff --git a/packages/antd/src/dialog-drawer/dialog-drawer.tsx b/packages/antd/src/dialog-drawer/dialog-drawer.tsx
@@ -187,18 +187,16 @@ const ModalRender = (props: BodyAppendDivElementProps & DialogDrawerProps) => {
           maskClosable={true}
           destroyOnClose
           onClose={onClose}
-          // 5.13.0 新增 styles.wrapper，并废弃 contentWrapperStyle drawerStyle maskStyle 属性
-          contentWrapperStyle={{ maxWidth: customSize?.maxWidth }}
           footer={operatePosition === 'footer' ? newOperateRender : null}
           {...otherProps}
           width={customSize?.width}
           styles={{
             ...otherProps.styles,
             body: { ...innerBodyStyle, ...otherProps.styles?.body },
-            // wrapper: {
-            //   maxWidth: customSize?.maxWidth,
-            //   ...otherProps.styles?.wrapper,
-            // },
+            wrapper: {
+              maxWidth: customSize?.maxWidth,
+              ...otherProps.styles?.wrapper,
+            },
           }}
           extra={operatePosition === 'header' ? newOperateRender : extraRender}
           open={open}

diff --git a/packages/antd/src/fba-app/dialog-drawer/index.tsx b/packages/antd/src/fba-app/dialog-drawer/index.tsx
@@ -186,17 +186,15 @@ export const FbaAppDrawer = (props: FbaAppDrawerProps) => {
       <Drawer
         maskClosable={true}
         destroyOnClose
-        // 5.13.0 新增 styles.wrapper，并废弃 contentWrapperStyle drawerStyle maskStyle 属性
-        contentWrapperStyle={{ maxWidth: customSize?.maxWidth }}
         footer={operatePosition === 'footer' ? newOperateRender : null}
         {...otherProps}
         width={customSize?.width}
         styles={{
           ...otherProps.styles,
-          // wrapper: {
-          //   maxWidth: customSize?.maxWidth,
-          //   ...otherProps.styles?.wrapper,
-          // },
+          wrapper: {
+            maxWidth: customSize?.maxWidth,
+            ...otherProps.styles?.wrapper,
+          },
         }}
         className={classNames('app-dialog-drawer', otherProps.className)}
         extra={operatePosition === 'header' ? newOperateRender : extraRender}

diff --git a/packages/antd-demo/CHANGELOG.md → packages/demo-antd/CHANGELOG.md b/packages/antd-demo/CHANGELOG.md → packages/demo-antd/CHANGELOG.md
diff --git a/packages/antd-demo/README.md → packages/demo-antd/README.md b/packages/antd-demo/README.md → packages/demo-antd/README.md
diff --git a/packages/antd-demo/certificate/README.md → packages/demo-antd/certificate/README.md b/packages/antd-demo/certificate/README.md → packages/demo-antd/certificate/README.md
diff --git a/packages/antd-demo/eslint.config.js → packages/demo-antd/eslint.config.js b/packages/antd-demo/eslint.config.js → packages/demo-antd/eslint.config.js
diff --git a/packages/antd-demo/flatjs-evolve.config.ts → packages/demo-antd/flatjs-evolve.config.ts b/packages/antd-demo/flatjs-evolve.config.ts → packages/demo-antd/flatjs-evolve.config.ts
@@ -23,12 +23,12 @@ const getHeadBeforeScripts = (serveMode: boolean) => {
       ? [
           'https://cdnjs.cloudflare.com/ajax/libs/react/18.2.0/umd/react.development.js',
           'https://cdnjs.cloudflare.com/ajax/libs/react-dom/18.2.0/umd/react-dom.development.min.js',
-          'https://cdnjs.cloudflare.com/ajax/libs/antd/5.20.5/antd.js',
+          'https://cdnjs.cloudflare.com/ajax/libs/antd/5.21.4/antd.js',
         ]
       : [
           'https://cdnjs.cloudflare.com/ajax/libs/react/18.2.0/umd/react.development.js',
           'https://cdnjs.cloudflare.com/ajax/libs/react-dom/18.2.0/umd/react-dom.production.min.js',
-          'https://cdnjs.cloudflare.com/ajax/libs/antd/5.20.5/antd.min.js',
+          'https://cdnjs.cloudflare.com/ajax/libs/antd/5.21.4/antd.min.js',
         ]),
   ];
 };
@@ -89,9 +89,9 @@ export default defineConfig((env) => ({
       {
         libraryName: '@dimjs/utils',
       },
-      {
-        libraryName: '@hyperse/antd',
-      },
+      // {
+      //   libraryName: '@hyperse/antd',
+      // },
     ],
   },
   multiHtmlCdn: {
@@ -112,7 +112,7 @@ export default defineConfig((env) => ({
   },
   entryMap: getEntryMap(env.command === 'serve', [
     {
-      name: 'utils',
+      name: 'home',
       options: {
         title: '',
       },

diff --git a/packages/antd-demo/lint-staged.config.mjs → packages/demo-antd/lint-staged.config.mjs b/packages/antd-demo/lint-staged.config.mjs → packages/demo-antd/lint-staged.config.mjs
diff --git a/packages/antd-demo/mocks/index.mjs → packages/demo-antd/mocks/index.mjs b/packages/antd-demo/mocks/index.mjs → packages/demo-antd/mocks/index.mjs
diff --git a/packages/antd-demo/package.json → packages/demo-antd/package.json b/packages/antd-demo/package.json → packages/demo-antd/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@hyperse/antd-demo",
+  "name": "@hyperse/demo-antd",
   "version": "1.0.0",
   "private": true,
   "type": "module",
@@ -24,7 +24,8 @@
     "test-task": "vitest run",
     "test-unit": "vitest run --passWithNoTests",
     "test-watch": "vitest watch --ui",
-    "typecheck": "tsc --project ./tsconfig.json --noEmit"
+    "typecheck": "tsc --project ./tsconfig.json --noEmit",
+    "serve": "npx flat serve evolve"
   },
   "dependencies": {
     "@dimjs/lang": "^2.0.0",

diff --git a/.../antd/utils/bundle37423a9cf75fed0dd119.js → .../antd/utils/bundle37423a9cf75fed0dd119.js b/.../antd/utils/bundle37423a9cf75fed0dd119.js → .../antd/utils/bundle37423a9cf75fed0dd119.js
diff --git a/...antd/utils/bundle8590a442c77477fdf2c3.css → ...antd/utils/bundle8590a442c77477fdf2c3.css b/...antd/utils/bundle8590a442c77477fdf2c3.css → ...antd/utils/bundle8590a442c77477fdf2c3.css
diff --git a/...o/public/hyperse/antd/utils/index-me.html → ...d/public/hyperse/antd/utils/index-me.html b/...o/public/hyperse/antd/utils/index-me.html → ...d/public/hyperse/antd/utils/index-me.html
diff --git a/...demo/public/hyperse/antd/utils/index.html → ...antd/public/hyperse/antd/utils/index.html b/...demo/public/hyperse/antd/utils/index.html → ...antd/public/hyperse/antd/utils/index.html
diff --git a/packages/antd-demo/src/.gitkeep → packages/demo-antd/src/.gitkeep b/packages/antd-demo/src/.gitkeep → packages/demo-antd/src/.gitkeep
diff --git a/packages/antd-demo/src/utils/Demo.tsx → packages/demo-antd/src/home/Demo.tsx b/packages/antd-demo/src/utils/Demo.tsx → packages/demo-antd/src/home/Demo.tsx
diff --git a/packages/antd-demo/src/utils/index.less → packages/demo-antd/src/home/index.less b/packages/antd-demo/src/utils/index.less → packages/demo-antd/src/home/index.less
diff --git a/packages/antd-demo/src/utils/index.tsx → packages/demo-antd/src/home/index.tsx b/packages/antd-demo/src/utils/index.tsx → packages/demo-antd/src/home/index.tsx
diff --git a/packages/antd-demo/tailwind.config.cjs → packages/demo-antd/tailwind.config.cjs b/packages/antd-demo/tailwind.config.cjs → packages/demo-antd/tailwind.config.cjs
diff --git a/packages/antd-demo/tsconfig.json → packages/demo-antd/tsconfig.json b/packages/antd-demo/tsconfig.json → packages/demo-antd/tsconfig.json
@@ -9,7 +9,10 @@
     "incremental": true,
     "module": "ESNext",
     "target": "ESNext",
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "paths": {
+      "@hyperse/antd": ["../antd/src/index.ts"]
+    }
   },
   "exclude": ["node_modules", "**/.*/", "dist", "build", "public"]
 }
diff --git a/packages/antd-demo/vitest.config.ts → packages/demo-antd/vitest.config.ts b/packages/antd-demo/vitest.config.ts → packages/demo-antd/vitest.config.ts
diff --git a/packages/pro-layout/flatjs-forge.config.ts b/packages/pro-layout/flatjs-forge.config.ts
@@ -42,17 +42,18 @@ export default defineConfig({
   },
   modularImports: [
     {
-      libraryName: '@dimjs/utils',
-    },
-    {
-      libraryName: '@dimjs/lang',
-    },
-    {
-      libraryName: '@wove/react',
-    },
-    {
-      libraryName: '@hyperse/antd',
+      libraryName: '@ant-design/icons',
+      libraryDirectory: 'es/icons',
+      transformToDefaultImport: true,
+      camel2DashComponentName: false, // default: true
+      customName(transformedMethodName) {
+        return `@ant-design/icons/es/icons/${transformedMethodName}.js`;
+      },
     },
+    { libraryName: '@dimjs/utils' },
+    { libraryName: '@dimjs/lang' },
+    { libraryName: '@wove/react' },
+    { libraryName: '@hyperse/antd' },
   ],
   plugin: {
     extraPlugins: [stylingPlugin],

diff --git a/packages/pro-layout/package.json b/packages/pro-layout/package.json
@@ -69,7 +69,7 @@
     "@hyperse/utils": ">=1.0.0",
     "@wove/react": ">=2.0.2",
     "ahooks": ">=3.7.11",
-    "antd": ">=5.11.0",
+    "antd": ">=5.21.4",
     "dayjs": ">=1.11.9",
     "react": ">=18.2.0",
     "react-dom": ">=18.2.0",

diff --git a/packages/utils/flatjs-forge.config.ts b/packages/utils/flatjs-forge.config.ts
@@ -11,15 +11,8 @@ export default defineConfig({
       dtsFile.split('/').length <= 1 && /index.d.ts/.test(dtsFile),
   },
   modularImports: [
-    {
-      libraryName: '@dimjs/utils',
-    },
-    {
-      libraryName: '@dimjs/lang',
-    },
-    {
-      libraryName: '@wove/react',
-    },
+    { libraryName: '@dimjs/utils' },
+    { libraryName: '@dimjs/lang' },
   ],
   output: {
     format: 'esm',

diff --git a/yarn.lock b/yarn.lock
@@ -3320,31 +3320,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@hyperse/antd-demo@workspace:packages/antd-demo":
-  version: 0.0.0-use.local
-  resolution: "@hyperse/antd-demo@workspace:packages/antd-demo"
-  dependencies:
-    "@dimjs/lang": "npm:^2.0.0"
-    "@dimjs/model": "npm:^2.0.1"
-    "@dimjs/model-react": "npm:^2.0.1"
-    "@dimjs/utils": "npm:^2.0.2"
-    "@flatjs/cli": "npm:2.1.9"
-    "@hyperse/antd": "workspace:*"
-    "@hyperse/eslint-config-hyperse": "npm:^1.1.3"
-    "@hyperse/utils": "workspace:*"
-    "@types/react": "npm:^18.3.11"
-    "@types/react-dom": "npm:^18.3.1"
-    "@wove/react": "npm:^2.0.2"
-    antd: "npm:^5.21.4"
-    eslint: "npm:^9.13.0"
-    react: "npm:^18.3.1"
-    react-dom: "npm:^18.3.1"
-    typescript: "npm:5.6.3"
-    vite-tsconfig-paths: "npm:5.0.1"
-    vitest: "npm:2.1.3"
-  languageName: unknown
-  linkType: soft
-
 "@hyperse/antd-monorepo@workspace:.":
   version: 0.0.0-use.local
   resolution: "@hyperse/antd-monorepo@workspace:."
@@ -3435,6 +3410,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@hyperse/demo-antd@workspace:packages/demo-antd":
+  version: 0.0.0-use.local
+  resolution: "@hyperse/demo-antd@workspace:packages/demo-antd"
+  dependencies:
+    "@dimjs/lang": "npm:^2.0.0"
+    "@dimjs/model": "npm:^2.0.1"
+    "@dimjs/model-react": "npm:^2.0.1"
+    "@dimjs/utils": "npm:^2.0.2"
+    "@flatjs/cli": "npm:2.1.9"
+    "@hyperse/antd": "workspace:*"
+    "@hyperse/eslint-config-hyperse": "npm:^1.1.3"
+    "@hyperse/utils": "workspace:*"
+    "@types/react": "npm:^18.3.11"
+    "@types/react-dom": "npm:^18.3.1"
+    "@wove/react": "npm:^2.0.2"
+    antd: "npm:^5.21.4"
+    eslint: "npm:^9.13.0"
+    react: "npm:^18.3.1"
+    react-dom: "npm:^18.3.1"
+    typescript: "npm:5.6.3"
+    vite-tsconfig-paths: "npm:5.0.1"
+    vitest: "npm:2.1.3"
+  languageName: unknown
+  linkType: soft
+
 "@hyperse/eslint-config-hyperse@npm:^1.1.3":
   version: 1.1.3
   resolution: "@hyperse/eslint-config-hyperse@npm:1.1.3"