From 6a928503aaf5778a51dc352f1fdd93060c300634 Mon Sep 17 00:00:00 2001 From: xg15472 Date: Mon, 21 Oct 2024 17:35:01 +0800 Subject: [PATCH] =?UTF-8?q?antd=20=E5=B1=9E=E6=80=A7=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hyperse-antd.code-workspace | 4 +- packages/antd/flatjs-forge.config.ts | 12 ++--- packages/antd/package.json | 2 +- .../antd/src/dialog-drawer/dialog-drawer.tsx | 10 ++-- .../antd/src/fba-app/dialog-drawer/index.tsx | 10 ++-- .../{antd-demo => demo-antd}/CHANGELOG.md | 0 packages/{antd-demo => demo-antd}/README.md | 0 .../certificate/README.md | 0 .../{antd-demo => demo-antd}/eslint.config.js | 0 .../flatjs-evolve.config.ts | 12 ++--- .../lint-staged.config.mjs | 0 .../{antd-demo => demo-antd}/mocks/index.mjs | 0 .../{antd-demo => demo-antd}/package.json | 5 +- .../antd/utils/bundle37423a9cf75fed0dd119.js | 0 .../antd/utils/bundle8590a442c77477fdf2c3.css | 0 .../public/hyperse/antd/utils/index-me.html | 0 .../public/hyperse/antd/utils/index.html | 0 .../{antd-demo => demo-antd}/src/.gitkeep | 0 .../src/utils => demo-antd/src/home}/Demo.tsx | 0 .../utils => demo-antd/src/home}/index.less | 0 .../utils => demo-antd/src/home}/index.tsx | 0 .../tailwind.config.cjs | 0 .../{antd-demo => demo-antd}/tsconfig.json | 5 +- .../{antd-demo => demo-antd}/vitest.config.ts | 0 packages/pro-layout/flatjs-forge.config.ts | 21 ++++---- packages/pro-layout/package.json | 2 +- packages/utils/flatjs-forge.config.ts | 11 +--- yarn.lock | 50 +++++++++---------- 28 files changed, 66 insertions(+), 78 deletions(-) rename packages/{antd-demo => demo-antd}/CHANGELOG.md (100%) rename packages/{antd-demo => demo-antd}/README.md (100%) rename packages/{antd-demo => demo-antd}/certificate/README.md (100%) rename packages/{antd-demo => demo-antd}/eslint.config.js (100%) rename packages/{antd-demo => demo-antd}/flatjs-evolve.config.ts (93%) rename packages/{antd-demo => demo-antd}/lint-staged.config.mjs (100%) rename packages/{antd-demo => demo-antd}/mocks/index.mjs (100%) rename packages/{antd-demo => demo-antd}/package.json (92%) rename packages/{antd-demo => demo-antd}/public/hyperse/antd/utils/bundle37423a9cf75fed0dd119.js (100%) rename packages/{antd-demo => demo-antd}/public/hyperse/antd/utils/bundle8590a442c77477fdf2c3.css (100%) rename packages/{antd-demo => demo-antd}/public/hyperse/antd/utils/index-me.html (100%) rename packages/{antd-demo => demo-antd}/public/hyperse/antd/utils/index.html (100%) rename packages/{antd-demo => demo-antd}/src/.gitkeep (100%) rename packages/{antd-demo/src/utils => demo-antd/src/home}/Demo.tsx (100%) rename packages/{antd-demo/src/utils => demo-antd/src/home}/index.less (100%) rename packages/{antd-demo/src/utils => demo-antd/src/home}/index.tsx (100%) rename packages/{antd-demo => demo-antd}/tailwind.config.cjs (100%) rename packages/{antd-demo => demo-antd}/tsconfig.json (78%) rename packages/{antd-demo => demo-antd}/vitest.config.ts (100%) diff --git a/hyperse-antd.code-workspace b/hyperse-antd.code-workspace index 4a65ff3..c226e08 100644 --- 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 index 0cf6058..be135fc 100644 --- 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 index 86ff423..81e34b6 100644 --- 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 index 6336993..4f1793e 100644 --- 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 index dcad40e..f89c2ed 100644 --- 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) => { { ? [ '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 b/packages/demo-antd/lint-staged.config.mjs similarity index 100% rename from packages/antd-demo/lint-staged.config.mjs rename to packages/demo-antd/lint-staged.config.mjs diff --git a/packages/antd-demo/mocks/index.mjs b/packages/demo-antd/mocks/index.mjs similarity index 100% rename from packages/antd-demo/mocks/index.mjs rename to packages/demo-antd/mocks/index.mjs diff --git a/packages/antd-demo/package.json b/packages/demo-antd/package.json similarity index 92% rename from packages/antd-demo/package.json rename to packages/demo-antd/package.json index 2a4daf8..36fb64c 100644 --- a/packages/antd-demo/package.json +++ b/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/packages/antd-demo/public/hyperse/antd/utils/bundle37423a9cf75fed0dd119.js b/packages/demo-antd/public/hyperse/antd/utils/bundle37423a9cf75fed0dd119.js similarity index 100% rename from packages/antd-demo/public/hyperse/antd/utils/bundle37423a9cf75fed0dd119.js rename to packages/demo-antd/public/hyperse/antd/utils/bundle37423a9cf75fed0dd119.js diff --git a/packages/antd-demo/public/hyperse/antd/utils/bundle8590a442c77477fdf2c3.css b/packages/demo-antd/public/hyperse/antd/utils/bundle8590a442c77477fdf2c3.css similarity index 100% rename from packages/antd-demo/public/hyperse/antd/utils/bundle8590a442c77477fdf2c3.css rename to packages/demo-antd/public/hyperse/antd/utils/bundle8590a442c77477fdf2c3.css diff --git a/packages/antd-demo/public/hyperse/antd/utils/index-me.html b/packages/demo-antd/public/hyperse/antd/utils/index-me.html similarity index 100% rename from packages/antd-demo/public/hyperse/antd/utils/index-me.html rename to packages/demo-antd/public/hyperse/antd/utils/index-me.html diff --git a/packages/antd-demo/public/hyperse/antd/utils/index.html b/packages/demo-antd/public/hyperse/antd/utils/index.html similarity index 100% rename from packages/antd-demo/public/hyperse/antd/utils/index.html rename to packages/demo-antd/public/hyperse/antd/utils/index.html diff --git a/packages/antd-demo/src/.gitkeep b/packages/demo-antd/src/.gitkeep similarity index 100% rename from packages/antd-demo/src/.gitkeep rename to packages/demo-antd/src/.gitkeep diff --git a/packages/antd-demo/src/utils/Demo.tsx b/packages/demo-antd/src/home/Demo.tsx similarity index 100% rename from packages/antd-demo/src/utils/Demo.tsx rename to packages/demo-antd/src/home/Demo.tsx diff --git a/packages/antd-demo/src/utils/index.less b/packages/demo-antd/src/home/index.less similarity index 100% rename from packages/antd-demo/src/utils/index.less rename to packages/demo-antd/src/home/index.less diff --git a/packages/antd-demo/src/utils/index.tsx b/packages/demo-antd/src/home/index.tsx similarity index 100% rename from packages/antd-demo/src/utils/index.tsx rename to packages/demo-antd/src/home/index.tsx diff --git a/packages/antd-demo/tailwind.config.cjs b/packages/demo-antd/tailwind.config.cjs similarity index 100% rename from packages/antd-demo/tailwind.config.cjs rename to packages/demo-antd/tailwind.config.cjs diff --git a/packages/antd-demo/tsconfig.json b/packages/demo-antd/tsconfig.json similarity index 78% rename from packages/antd-demo/tsconfig.json rename to packages/demo-antd/tsconfig.json index 4d689b4..d960165 100644 --- a/packages/antd-demo/tsconfig.json +++ b/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 b/packages/demo-antd/vitest.config.ts similarity index 100% rename from packages/antd-demo/vitest.config.ts rename to packages/demo-antd/vitest.config.ts diff --git a/packages/pro-layout/flatjs-forge.config.ts b/packages/pro-layout/flatjs-forge.config.ts index ea13885..3098e74 100644 --- 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 index 94002b2..93eb0bf 100644 --- 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 index 3767ad1..246041e 100644 --- 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 index 8f2b2d5..ec8c9c6 100644 --- 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"