Browse Source

chore: update dependencies and config (#11532)

pull/11534/head
afc163 8 months ago
committed by GitHub
parent
commit
bd5130a635
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 4
      config/config.ts
  2. 10
      package.json
  3. 16
      src/app.tsx
  4. 2
      src/typings.d.ts

4
config/config.ts

@ -7,7 +7,7 @@ import proxy from './proxy';
import routes from './routes';
const { REACT_APP_ENV = 'dev' } = process.env;
const { UMI_ENV = 'dev' } = process.env;
/**
* @name 使
@ -61,7 +61,7 @@ export default defineConfig({
* @doc https://umijs.org/docs/guides/proxy
* @doc https://umijs.org/docs/api/config#proxy
*/
proxy: proxy[REACT_APP_ENV as keyof typeof proxy],
proxy: proxy[UMI_ENV as keyof typeof proxy],
/**
* @name
* @description state

10
package.json

@ -19,13 +19,13 @@
"openapi": "max openapi",
"prepare": "husky",
"preview": "npm run build && max preview --port 8000",
"record": "cross-env NODE_ENV=development REACT_APP_ENV=test max record --scene=login",
"record": "cross-env NODE_ENV=development UMI_ENV=test max record --scene=login",
"serve": "umi-serve",
"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",
"start:dev": "cross-env UMI_ENV=dev MOCK=none max dev",
"start:no-mock": "cross-env MOCK=none max dev",
"start:pre": "cross-env UMI_ENV=pre MOCK=none max dev",
"start:test": "cross-env UMI_ENV=test MOCK=none max dev",
"test": "jest",
"test:coverage": "npm run jest -- --coverage",
"test:update": "npm run jest -- -u",

16
src/app.tsx

@ -16,8 +16,8 @@ import defaultSettings from '../config/defaultSettings';
import { errorConfig } from './requestErrorConfig';
import '@ant-design/v5-patch-for-react-19';
const isDev =
process.env.NODE_ENV === 'development' || process.env.CI;
const isDev = process.env.NODE_ENV === 'development';
const isDevOrTest = isDev || process.env.CI;
const loginPath = '/user/login';
/**
@ -73,9 +73,9 @@ export const layout: RunTimeLayoutConfig = ({
avatarProps: {
src: initialState?.currentUser?.avatar,
title: <AvatarName />,
render: (_, avatarChildren) => {
return <AvatarDropdown>{avatarChildren}</AvatarDropdown>;
},
render: (_, avatarChildren) => (
<AvatarDropdown>{avatarChildren}</AvatarDropdown>
),
},
waterMarkProps: {
content: initialState?.currentUser?.name,
@ -108,7 +108,7 @@ export const layout: RunTimeLayoutConfig = ({
width: '331px',
},
],
links: isDev
links: isDevOrTest
? [
<Link key="openapi" to="/umi/plugin/openapi" target="_blank">
<LinkOutlined />
@ -125,7 +125,7 @@ export const layout: RunTimeLayoutConfig = ({
return (
<>
{children}
{isDev && (
{isDevOrTest && (
<SettingDrawer
disableUrlParams
enableDarkTheme
@ -151,6 +151,6 @@ export const layout: RunTimeLayoutConfig = ({
* @doc https://umijs.org/docs/max/request#配置
*/
export const request: RequestConfig = {
baseURL: 'https://proapi.azurewebsites.net',
baseURL: isDev ? '' : 'https://proapi.azurewebsites.net',
...errorConfig,
};

2
src/typings.d.ts

@ -14,5 +14,3 @@ declare module 'omit.js';
declare module 'numeral';
declare module 'mockjs';
declare module 'react-fittext';
declare const REACT_APP_ENV: 'test' | 'dev' | 'pre' | false;

Loading…
Cancel
Save