From df51053a21fbd01b10765a8c6c7fe24c0b38dac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Mon, 27 Jun 2022 11:10:46 +0800 Subject: [PATCH] feat: support umi@4 (#9956) * chore: prettier all code * chore: prettier all code * chore: prettier all code * chore: prettier all code * chore: prettier all code * fix error * remove Deploy CI * remove ie * remove unuse code * remove Deploy CI --- .dockerignore | 35 ----- .github/workflows/deploy.yml | 31 ---- .gitpod.yml | 6 - .stylelintrc.js | 3 - .vscode/extensions.json | 7 +- Dockerfile | 14 -- Dockerfile.dev | 12 -- Dockerfile.hub | 27 ---- README.ar-DZ.md | 14 +- README.fr-FR.md | 14 +- README.ja-JP.md | 14 +- README.md | 14 +- README.pt-BR.md | 14 +- README.ru-RU.md | 6 +- README.tr-TR.md | 14 +- README.zh-CN.md | 7 +- config/config.dev.ts | 15 -- config/config.ts | 28 ++-- docker/docker-compose.dev.yml | 14 -- docker/docker-compose.yml | 21 --- docker/nginx.conf | 24 --- mock/notices.ts | 16 +- package.json | 54 +++---- src/app.tsx | 18 +-- src/components/Footer/index.tsx | 5 +- src/components/NoticeIcon/index.tsx | 2 +- .../RightContent/AvatarDropdown.tsx | 8 +- src/components/RightContent/index.less | 11 -- src/components/RightContent/index.tsx | 2 +- src/components/index.md | 4 - src/global.less | 7 - src/global.tsx | 2 +- src/pages/404.tsx | 2 +- src/pages/Admin.tsx | 2 +- src/pages/TableList/components/UpdateForm.tsx | 2 +- src/pages/TableList/index.tsx | 2 +- src/pages/Welcome.tsx | 2 +- src/pages/user/Login/index.less | 6 +- src/pages/user/Login/index.tsx | 32 ++-- src/services/ant-design-pro/api.ts | 2 +- src/services/ant-design-pro/login.ts | 2 +- src/services/swagger/pet.ts | 137 ++++++++---------- src/services/swagger/store.ts | 24 ++- src/services/swagger/typings.d.ts | 110 ++++++++++---- src/services/swagger/user.ts | 108 ++++++-------- 45 files changed, 308 insertions(+), 586 deletions(-) delete mode 100644 .dockerignore delete mode 100644 .github/workflows/deploy.yml delete mode 100644 .gitpod.yml delete mode 100644 .stylelintrc.js delete mode 100644 Dockerfile delete mode 100644 Dockerfile.dev delete mode 100644 Dockerfile.hub delete mode 100644 config/config.dev.ts delete mode 100644 docker/docker-compose.dev.yml delete mode 100644 docker/docker-compose.yml delete mode 100644 docker/nginx.conf diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 8e90ca6d..00000000 --- a/.dockerignore +++ /dev/null @@ -1,35 +0,0 @@ -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. - -# dependencies -**/node_modules -/src/utils/request-temp.js - -# production -/.vscode - -# misc -.DS_Store -npm-debug.log* -yarn-error.log - -/coverage -.idea -yarn.lock -package-lock.json -*bak -.vscode - -# visual studio code -.history -*.log - -functions/mock -.temp/** - -# umi -.umi -.umi-production - -# screenshot -screenshot -.firebase \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index bcaa437f..00000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Deploy CI -on: - push: - branches: - - master - -jobs: - build-and-deploy: - runs-on: ubuntu-latest - steps: - - name: checkout - uses: actions/checkout@master - - - name: install - run: yarn - - - name: plugins - run: yarn add umi-plugin-pro - - - name: fetch-blocks - run: yarn run pro fetch-blocks - - - name: site - run: npm run build - - - name: Deploy - uses: peaceiris/actions-gh-pages@v3 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./dist - force_orphan: true diff --git a/.gitpod.yml b/.gitpod.yml deleted file mode 100644 index 32d8e645..00000000 --- a/.gitpod.yml +++ /dev/null @@ -1,6 +0,0 @@ -ports: - - port: 8000 - onOpen: open-preview -tasks: - - init: npm install - command: npm start diff --git a/.stylelintrc.js b/.stylelintrc.js deleted file mode 100644 index a1184de4..00000000 --- a/.stylelintrc.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - extends: [require.resolve('@umijs/fabric/dist/stylelint')], -}; diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 33f300da..164b332d 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,8 +1,3 @@ { - "recommendations": [ - "esbenp.prettier-vscode", - "dbaeumer.vscode-eslint", - "stylelint.vscode-stylelint", - "wangzy.sneak-mark" - ] + "recommendations": ["esbenp.prettier-vscode", "dbaeumer.vscode-eslint", "wangzy.sneak-mark"] } diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index f828e839..00000000 --- a/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM circleci/node:latest-browsers - -WORKDIR /usr/src/app/ -USER root -COPY package.json ./ -RUN yarn - -COPY ./ ./ - -RUN npm run test:e2e - -RUN npm run fetch:blocks - -CMD ["npm", "run", "build"] diff --git a/Dockerfile.dev b/Dockerfile.dev deleted file mode 100644 index 18446181..00000000 --- a/Dockerfile.dev +++ /dev/null @@ -1,12 +0,0 @@ -FROM node:latest - -WORKDIR /usr/src/app/ - -COPY package.json ./ -RUN npm install --silent --no-cache --registry=https://registry.npmmirror.com - -COPY ./ ./ - -RUN npm run fetch:blocks - -CMD ["npm", "run", "start"] diff --git a/Dockerfile.hub b/Dockerfile.hub deleted file mode 100644 index 94534d3e..00000000 --- a/Dockerfile.hub +++ /dev/null @@ -1,27 +0,0 @@ -FROM circleci/node:latest-browsers as builder - -WORKDIR /usr/src/app/ -USER root -COPY package.json ./ -RUN yarn - -COPY ./ ./ - -RUN npm run test:e2e - -RUN npm run fetch:blocks - -RUN npm run build - - -FROM nginx - -WORKDIR /usr/share/nginx/html/ - -COPY ./docker/nginx.conf /etc/nginx/conf.d/default.conf - -COPY --from=builder /usr/src/app/dist /usr/share/nginx/html/ - -EXPOSE 80 - -CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/README.ar-DZ.md b/README.ar-DZ.md index 2bb52a9a..dd4264d7 100644 --- a/README.ar-DZ.md +++ b/README.ar-DZ.md @@ -109,21 +109,13 @@ $ npm start # visit http://localhost:8000
-### استخدام ال Gitpod - -افتح المشروع في Gitpod (بيئة تطوير مجانية عبر الإنترنت لـ GitHub) وابدأ بكتابة الكود على الفور. - -[![افتح في Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/ant-design/ant-design-pro) - -المزيد من التعليمات في [توثيق](http://pro.ant.design/docs/getting-started). - ## دعم المتصفحات -المتصفحات الحديثة و IE11. +المتصفحات الحديثة و. -| [IE / Edge](http://godban.github.io/browsers-support-badges/)
IE / Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | +| [Edge](http://godban.github.io/browsers-support-badges/)
Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | | --- | --- | --- | --- | --- | -| IE11, Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions | +| Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions | ## المساهمة diff --git a/README.fr-FR.md b/README.fr-FR.md index fbb6ba8f..17da1bff 100644 --- a/README.fr-FR.md +++ b/README.fr-FR.md @@ -96,21 +96,13 @@ $ npm install $ npm start # visit http://localhost:8000 ``` -### Utilisation de Gitpod - -Ouvrez le projet avec Gitpod (environnement de développement gratuit pour GitHub) et commencez à coder immédiatement. - -[![Ouvrir dans Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/ant-design/ant-design-pro) - -Plus d'instructions dans la [documentation](http://pro.ant.design/docs/getting-started). - ## Support des navigateurs -Navigateurs modernes et IE11. +Navigateurs modernes. -| [IE / Edge](http://godban.github.io/browsers-support-badges/)
IE / Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | +| [Edge](http://godban.github.io/browsers-support-badges/)
Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | | --- | --- | --- | --- | --- | -| IE11, Edge | deux dernières versions | deux dernières versions | deux dernières versions | deux dernières versions | +| Edge | deux dernières versions | deux dernières versions | deux dernières versions | deux dernières versions | ## Contribution diff --git a/README.ja-JP.md b/README.ja-JP.md index 5355ec22..59fcaaf9 100644 --- a/README.ja-JP.md +++ b/README.ja-JP.md @@ -96,21 +96,13 @@ $ npm install $ npm start # http://localhost:8000 を開く ``` -### Gitpod を使う方法 - -Gitpod（GitHub 用の無料オンライン開発環境）でプロジェクトを開き、すぐにコーディングを開始できます。 - -[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/ant-design/ant-design-pro) - -その他の指示は [ドキュメント](http://pro.ant.design/docs/getting-started) を確認してください。 - ## サポートするブラウザー -モダンなブラウザと IE11。 +モダンなブラウザと。 -| [IE / Edge](http://godban.github.io/browsers-support-badges/)
IE / Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | +| [Edge](http://godban.github.io/browsers-support-badges/)
Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | | --- | --- | --- | --- | --- | -| IE11, Edge | 最新版から 2 バージョン | 最新版から 2 バージョン | 最新版から 2 バージョン | 最新版から 2 バージョン | +| Edge | 最新版から 2 バージョン | 最新版から 2 バージョン | 最新版から 2 バージョン | 最新版から 2 バージョン | ## 貢献する diff --git a/README.md b/README.md index 16b06c2f..4364f81f 100644 --- a/README.md +++ b/README.md @@ -100,21 +100,13 @@ $ npm install $ npm start # visit http://localhost:8000 ``` -### Use Gitpod - -Open the project in Gitpod (free online dev environment for GitHub) and start coding immediately. - -[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/ant-design/ant-design-pro) - -More instructions at [documentation](http://pro.ant.design/docs/getting-started). - ## Browsers support -Modern browsers and IE11. +Modern browsers. -| [IE / Edge](http://godban.github.io/browsers-support-badges/)
IE / Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | +| [Edge](http://godban.github.io/browsers-support-badges/)
Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | | --- | --- | --- | --- | --- | -| IE11, Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions | +| Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions | ## Contributing diff --git a/README.pt-BR.md b/README.pt-BR.md index 1948473c..856ee015 100644 --- a/README.pt-BR.md +++ b/README.pt-BR.md @@ -98,21 +98,13 @@ $ npm install $ npm start # visit http://localhost:8000 ``` -### Use Gitpod - -Abra o projeto no Gitpod (ambiente gratuito de desenvolvimento online para o GitHub) e comece a codificar imediatamente. - -[![Abra no Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/ant-design/ant-design-pro) - -Mais instruções na [documentação](http://pro.ant.design/docs/getting-started). - ## Suporte a navegadores -Navegadores modernos e IE11. +Navegadores modernos . -| [IE / Edge](http://godban.github.io/browsers-support-badges/)
IE / Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | +| [Edge](http://godban.github.io/browsers-support-badges/)
Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | | --- | --- | --- | --- | --- | -| IE11, Edge | últimas 2 versões | últimas 2 versões | últimas 2 versões | últimas 2 versões | +| Edge | últimas 2 versões | últimas 2 versões | últimas 2 versões | últimas 2 versões | ## Contribuindo diff --git a/README.ru-RU.md b/README.ru-RU.md index b7eada67..561fb705 100644 --- a/README.ru-RU.md +++ b/README.ru-RU.md @@ -94,11 +94,11 @@ $ npm start # visit http://localhost:8000 ## Совместимость -Современные браузеры и IE11. +Современные браузеры. -| [IE / Edge](http://godban.github.io/browsers-support-badges/)
IE / Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | +| [Edge](http://godban.github.io/browsers-support-badges/)
Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | | --- | --- | --- | --- | --- | -| IE11, Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions | +| Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions | ## Распространение diff --git a/README.tr-TR.md b/README.tr-TR.md index e0b3d129..9e6c1772 100644 --- a/README.tr-TR.md +++ b/README.tr-TR.md @@ -98,21 +98,13 @@ $ npm install $ npm start # visit http://localhost:8000 ``` -### Gitpod ile - -Projeyi Gitpod'da (GitHub için ücretsiz geliştirme ortamı) açın ve anında kodlamaya başlayın. - -[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/ant-design/ant-design-pro) - -Daha fazla talimat için [dokümantasyon](http://pro.ant.design/docs/getting-started) sayfasına göz atın. - ## Tarayıcı desteği -Modern internet tarayıcıları ve IE11. +Modern internet tarayıcıları . -| [IE / Edge](http://godban.github.io/browsers-support-badges/)
IE / Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | +| [Edge](http://godban.github.io/browsers-support-badges/)
Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | | --- | --- | --- | --- | --- | -| IE11, Edge | son 2 versiyon | son 2 versiyon | son 2 versiyon | son 2 versiyon | +| Edge | son 2 versiyon | son 2 versiyon | son 2 versiyon | son 2 versiyon | ## Destek diff --git a/README.zh-CN.md b/README.zh-CN.md index 3c084a59..0cdd9df5 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -22,6 +22,7 @@ Language : [🇺🇸](./README.md) | 🇨🇳 | [🇷🇺](./README.ru-RU.md) | ## 5.0 已经发布! 🎉🎉🎉 [Ant Design Pro 5.0.0](https://github.com/ant-design/ant-design-pro/issues/8656) + ## 特性 - :bulb: **TypeScript**: 应用程序级 JavaScript 的语言 @@ -95,11 +96,11 @@ $ npm start # visit http://localhost:8000 ## 支持环境 -现代浏览器及 IE11。 +现代浏览器。 -| [IE / Edge](http://godban.github.io/browsers-support-badges/)
IE / Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | +| [Edge](http://godban.github.io/browsers-support-badges/)
Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | | --- | --- | --- | --- | --- | -| IE11, Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions | +| Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions | ## 参与贡献 diff --git a/config/config.dev.ts b/config/config.dev.ts deleted file mode 100644 index ab0e590f..00000000 --- a/config/config.dev.ts +++ /dev/null @@ -1,15 +0,0 @@ -// https://umijs.org/config/ -import { defineConfig } from 'umi'; - -export default defineConfig({ - plugins: [ - // https://github.com/zthxxx/react-dev-inspector - 'react-dev-inspector/plugins/umi/react-inspector', - ], - // https://github.com/zthxxx/react-dev-inspector#inspector-loader-props - inspectorConfig: { - exclude: [], - babelPlugins: [], - babelOptions: {}, - }, -}); diff --git a/config/config.ts b/config/config.ts index d2883542..c5c306b0 100644 --- a/config/config.ts +++ b/config/config.ts @@ -1,7 +1,6 @@ // https://umijs.org/config/ -import { defineConfig } from 'umi'; +import { defineConfig } from '@umijs/max'; import { join } from 'path'; - import defaultSettings from './defaultSettings'; import proxy from './proxy'; import routes from './routes'; @@ -11,9 +10,9 @@ const { REACT_APP_ENV } = process.env; export default defineConfig({ hash: true, antd: {}, - dva: { - hmr: true, - }, + request: {}, + initialState: {}, + model: {}, layout: { // https://umijs.org/zh-CN/plugins/plugin-layout locale: true, @@ -28,9 +27,7 @@ export default defineConfig({ // default true, when it is true, will use `navigator.language` overwrite default baseNavigator: true, }, - dynamicImport: { - loading: '@ant-design/pro-layout/es/PageLoading', - }, + targets: { ie: 11, }, @@ -44,33 +41,26 @@ export default defineConfig({ // https://ant.design/docs/react/customize-theme-variable-cn 'root-entry-name': 'variable', }, - // esbuild is father build tools - // https://umijs.org/plugins/plugin-esbuild - esbuild: {}, - title: false, ignoreMomentLocale: true, proxy: proxy[REACT_APP_ENV || 'dev'], manifest: { basePath: '/', }, // Fast Refresh 热更新 - fastRefresh: {}, + fastRefresh: true, + presets: ['umi-presets-pro'], openAPI: [ { - requestLibPath: "import { request } from 'umi'", + requestLibPath: "import { request } from '@umijs/max'", // 或者使用在线的版本 // schemaPath: "https://gw.alipayobjects.com/os/antfincdn/M%24jrzTTYJN/oneapi.json" schemaPath: join(__dirname, 'oneapi.json'), mock: false, }, { - requestLibPath: "import { request } from 'umi'", + requestLibPath: "import { request } from '@umijs/max'", schemaPath: 'https://gw.alipayobjects.com/os/antfincdn/CA1dOm%2631B/openapi.json', projectName: 'swagger', }, ], - nodeModulesTransform: { type: 'none' }, - mfsu: {}, - webpack5: {}, - exportStatic: {}, }); diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml deleted file mode 100644 index 38ab39b6..00000000 --- a/docker/docker-compose.dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: '3.5' - -services: - ant-design-pro_dev: - ports: - - 8000:8000 - build: - context: ../ - dockerfile: Dockerfile.dev - container_name: 'ant-design-pro_dev' - volumes: - - ../src:/usr/src/app/src - - ../config:/usr/src/app/config - - ../mock:/usr/src/app/mock diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml deleted file mode 100644 index 13e12db8..00000000 --- a/docker/docker-compose.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: '3.5' - -services: - ant-design-pro_build: - build: ../ - container_name: 'ant-design-pro_build' - volumes: - - dist:/usr/src/app/dist - - ant-design-pro_web: - image: nginx - ports: - - 80:80 - container_name: 'ant-design-pro_web' - restart: unless-stopped - volumes: - - dist:/usr/share/nginx/html:ro - - ./nginx.conf:/etc/nginx/conf.d/default.conf - -volumes: - dist: diff --git a/docker/nginx.conf b/docker/nginx.conf deleted file mode 100644 index c4085845..00000000 --- a/docker/nginx.conf +++ /dev/null @@ -1,24 +0,0 @@ -server { - listen 80; - listen [::]:80; - absolute_redirect off; - - # gzip config - gzip on; - gzip_min_length 1k; - gzip_comp_level 9; - gzip_types text/plain text/css text/javascript application/json application/javascript application/x-javascript application/xml; - gzip_vary on; - gzip_disable "MSIE [1-6]\."; - - root /usr/share/nginx/html; - include /etc/nginx/mime.types; - location / { - try_files $uri $uri/ /index.html; - } - location /api { - proxy_pass https://proapi.azurewebsites.net; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - } -} diff --git a/mock/notices.ts b/mock/notices.ts index 732dd584..61858bdf 100644 --- a/mock/notices.ts +++ b/mock/notices.ts @@ -5,21 +5,21 @@ const getNotices = (req: Request, res: Response) => { data: [ { id: '000000001', - avatar: 'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png', + avatar: 'https://mdn.alipayobjects.com/yuyan_qk0oxh/afts/img/MSbDR4FR2MUAAAAAAAAAAAAAFl94AQBr', title: '你收到了 14 份新周报', datetime: '2017-08-09', type: 'notification', }, { id: '000000002', - avatar: 'https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png', + avatar: 'https://mdn.alipayobjects.com/yuyan_qk0oxh/afts/img/hX-PTavYIq4AAAAAAAAAAAAAFl94AQBr', title: '你推荐的 曲妮妮 已通过第三轮面试', datetime: '2017-08-08', type: 'notification', }, { id: '000000003', - avatar: 'https://gw.alipayobjects.com/zos/rmsportal/kISTdvpyTAhtGxpovNWd.png', + avatar: 'https://mdn.alipayobjects.com/yuyan_qk0oxh/afts/img/jHX5R5l3QjQAAAAAAAAAAAAAFl94AQBr', title: '这种模板可以区分多种通知类型', datetime: '2017-08-07', read: true, @@ -27,21 +27,21 @@ const getNotices = (req: Request, res: Response) => { }, { id: '000000004', - avatar: 'https://gw.alipayobjects.com/zos/rmsportal/GvqBnKhFgObvnSGkDsje.png', + avatar: 'https://mdn.alipayobjects.com/yuyan_qk0oxh/afts/img/Wr4mQqx6jfwAAAAAAAAAAAAAFl94AQBr', title: '左侧图标用于区分不同的类型', datetime: '2017-08-07', type: 'notification', }, { id: '000000005', - avatar: 'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png', + avatar: 'https://mdn.alipayobjects.com/yuyan_qk0oxh/afts/img/Mzj_TbcWUj4AAAAAAAAAAAAAFl94AQBr', title: '内容不要超过两行字，超出时自动截断', datetime: '2017-08-07', type: 'notification', }, { id: '000000006', - avatar: 'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg', + avatar: 'https://mdn.alipayobjects.com/yuyan_qk0oxh/afts/img/eXLzRbPqQE4AAAAAAAAAAAAAFl94AQBr', title: '曲丽丽 评论了你', description: '描述信息描述信息描述信息', datetime: '2017-08-07', @@ -50,7 +50,7 @@ const getNotices = (req: Request, res: Response) => { }, { id: '000000007', - avatar: 'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg', + avatar: 'https://mdn.alipayobjects.com/yuyan_qk0oxh/afts/img/w5mRQY2AmEEAAAAAAAAAAAAAFl94AQBr', title: '朱偏右 回复了你', description: '这种模板用于提醒谁与你发生了互动，左侧放『谁』的头像', datetime: '2017-08-07', @@ -59,7 +59,7 @@ const getNotices = (req: Request, res: Response) => { }, { id: '000000008', - avatar: 'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg', + avatar: 'https://mdn.alipayobjects.com/yuyan_qk0oxh/afts/img/wPadR5M9918AAAAAAAAAAAAAFl94AQBr', title: '标题', description: '这种模板用于提醒谁与你发生了互动，左侧放『谁』的头像', datetime: '2017-08-07', diff --git a/package.json b/package.json index 2ef0d9f3..d2a27e01 100644 --- a/package.json +++ b/package.json @@ -1,45 +1,36 @@ { "name": "ant-design-pro", - "version": "5.2.0", + "version": "6.0.0-beta.0", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { - "analyze": "cross-env ANALYZE=1 umi build", - "build": "umi build", + "postinstall": "max setup", + "analyze": "cross-env ANALYZE=1 max build", + "build": "max build", "deploy": "npm run build && npm run gh-pages", "dev": "npm run start:dev", - "docker-hub:build": "docker build -f Dockerfile.hub -t ant-design-pro ./", - "docker-prod:build": "docker-compose -f ./docker/docker-compose.yml build", - "docker-prod:dev": "docker-compose -f ./docker/docker-compose.yml up", - "docker:build": "docker-compose -f ./docker/docker-compose.dev.yml build", - "docker:dev": "docker-compose -f ./docker/docker-compose.dev.yml up", - "docker:push": "npm run docker-hub:build && npm run docker:tag && docker push antdesign/ant-design-pro", - "docker:tag": "docker tag ant-design-pro antdesign/ant-design-pro", "gh-pages": "gh-pages -d dist", "i18n-remove": "pro i18n-remove --locale=zh-CN --write", - "postinstall": "umi g tmp", - "lint": "umi g tmp && npm run lint:js && npm run lint:style && npm run lint:prettier && npm run tsc", + "lint": "npm run lint:js && npm run lint:prettier && npm run tsc", "lint-staged": "lint-staged", "lint-staged:js": "eslint --ext .js,.jsx,.ts,.tsx ", - "lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src && npm run lint:style", + "lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src ", "lint:js": "eslint --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src", "lint:prettier": "prettier -c --write \"src/**/*\" --end-of-line auto", - "lint:style": "stylelint --fix \"src/**/*.less\" --syntax less", - "openapi": "umi openapi", + "openapi": "max openapi", "playwright": "playwright install && playwright test", + "prepare": "husky install", "prettier": "prettier -c --write \"src/**/*\"", "serve": "umi-serve", - "start": "cross-env UMI_ENV=dev umi dev", - "start:dev": "cross-env REACT_APP_ENV=dev MOCK=none UMI_ENV=dev umi dev", - "start:no-mock": "cross-env MOCK=none UMI_ENV=dev umi dev", - "start:no-ui": "cross-env UMI_UI=none UMI_ENV=dev umi dev", - "start:pre": "cross-env REACT_APP_ENV=pre UMI_ENV=dev umi dev", - "start:test": "cross-env REACT_APP_ENV=test MOCK=none UMI_ENV=dev umi dev", - "test": "umi test", - "test:component": "umi test ./src/components", + "start": "cross-env UMI_ENV=dev max dev", + "start:dev": "cross-env REACT_APP_ENV=dev MOCK=none UMI_ENV=dev max dev", + "start:no-mock": "cross-env MOCK=none UMI_ENV=dev max dev", + "start:pre": "cross-env REACT_APP_ENV=pre UMI_ENV=dev max dev", + "start:test": "cross-env REACT_APP_ENV=test MOCK=none UMI_ENV=dev max dev", + "test": "max test", + "test:component": "max test ./src/components", "test:e2e": "node ./tests/run-tests.js", - "tsc": "tsc --noEmit", - "prepare": "husky install" + "tsc": "tsc --noEmit" }, "lint-staged": { "**/*.less": "stylelint --syntax less", @@ -67,8 +58,7 @@ "react": "^17.0.0", "react-dev-inspector": "^1.7.0", "react-dom": "^17.0.0", - "react-helmet-async": "^1.2.0", - "umi": "^3.5.0" + "react-helmet-async": "^1.2.0" }, "devDependencies": { "@ant-design/pro-cli": "^2.1.0", @@ -82,13 +72,8 @@ "@types/react-dom": "^17.0.0", "@types/react-helmet": "^6.1.0", "@umijs/fabric": "^2.11.1", - "@umijs/openapi": "^1.6.0", - "@umijs/plugin-blocks": "^2.2.0", - "@umijs/plugin-esbuild": "^1.4.0", - "@umijs/plugin-openapi": "^1.3.3", - "@umijs/preset-ant-design-pro": "^1.3.0", - "@umijs/preset-dumi": "^1.1.0", - "@umijs/preset-react": "^2.1.0", + "@umijs/max": "^4.0.0-rc.22", + "@umijs/openapi": "^1.3.0", "cross-env": "^7.0.0", "cross-port-killer": "^1.3.0", "detect-installer": "^1.0.0", @@ -102,6 +87,7 @@ "stylelint": "^13.0.0", "swagger-ui-dist": "^4.12.0", "typescript": "^4.5.0", + "umi-presets-pro": "1.0.1", "umi-serve": "^1.9.10" }, "engines": { diff --git a/src/app.tsx b/src/app.tsx index f72703eb..9d49faf6 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -1,21 +1,16 @@ import Footer from '@/components/Footer'; import RightContent from '@/components/RightContent'; -import { BookOutlined, LinkOutlined } from '@ant-design/icons'; +import { LinkOutlined } from '@ant-design/icons'; import type { Settings as LayoutSettings } from '@ant-design/pro-components'; -import { PageLoading, SettingDrawer } from '@ant-design/pro-components'; -import type { RunTimeLayoutConfig } from 'umi'; -import { history, Link } from 'umi'; +import { SettingDrawer } from '@ant-design/pro-components'; +import type { RunTimeLayoutConfig } from '@umijs/max'; +import { history, Link } from '@umijs/max'; import defaultSettings from '../config/defaultSettings'; import { currentUser as queryCurrentUser } from './services/ant-design-pro/api'; const isDev = process.env.NODE_ENV === 'development'; const loginPath = '/user/login'; -/** 获取用户信息比较慢的时候会展示一个 loading */ -export const initialStateConfig = { - loading: , -}; - /** * @see https://umijs.org/zh-CN/plugins/plugin-initial-state * */ @@ -60,6 +55,7 @@ export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) = footerRender: () =>