Commit 31efd937 authored by 陈帅's avatar 陈帅

Upgrade scaffolding

fix #4637, ci is hung up

up deps
parent e5dad691
const fabric = require('@umijs/fabric'); const { strictEslint } = require('@umijs/fabric');
module.exports = { module.exports = {
...fabric.default, ...strictEslint,
rules: {
...fabric.default.rules,
},
globals: { globals: {
ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: true, ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: true,
page: true, page: true,
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
"not ie <= 10" "not ie <= 10"
], ],
"dependencies": { "dependencies": {
"@ant-design/pro-layout": "^4.5.0", "@ant-design/pro-layout": "^4.5.7",
"@antv/data-set": "^0.10.2", "@antv/data-set": "^0.10.2",
"antd": "^3.19.1", "antd": "^3.19.1",
"classnames": "^2.2.6", "classnames": "^2.2.6",
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
"path-to-regexp": "^3.0.0", "path-to-regexp": "^3.0.0",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"qs": "^6.7.0", "qs": "^6.7.0",
"rc-animate": "^2.8.3",
"react": "^16.8.6", "react": "^16.8.6",
"react-container-query": "^0.11.0", "react-container-query": "^0.11.0",
"react-copy-to-clipboard": "^5.0.1", "react-copy-to-clipboard": "^5.0.1",
...@@ -76,10 +75,10 @@ ...@@ -76,10 +75,10 @@
"react-media": "^1.9.2", "react-media": "^1.9.2",
"react-media-hook2": "^1.0.5", "react-media-hook2": "^1.0.5",
"redux": "^4.0.1", "redux": "^4.0.1",
"umi": "^2.7.2", "umi": "^2.8.7",
"umi-plugin-pro-block": "^1.3.2", "umi-plugin-pro-block": "^1.3.2",
"umi-plugin-react": "^1.8.2", "umi-plugin-react": "^1.9.5",
"umi-request": "^1.0.7" "umi-request": "^1.0.8"
}, },
"devDependencies": { "devDependencies": {
"@ant-design/colors": "^3.1.0", "@ant-design/colors": "^3.1.0",
...@@ -91,8 +90,7 @@ ...@@ -91,8 +90,7 @@
"@types/react": "^16.8.19", "@types/react": "^16.8.19",
"@types/react-document-title": "^2.0.3", "@types/react-document-title": "^2.0.3",
"@types/react-dom": "^16.8.4", "@types/react-dom": "^16.8.4",
"@umijs/fabric": "^1.0.4", "@umijs/fabric": "^1.1.0",
"babel-eslint": "^10.0.1",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"check-prettier": "^1.0.3", "check-prettier": "^1.0.3",
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
......
import { Avatar, Icon, Menu, Spin } from 'antd'; import { Avatar, Icon, Menu, Spin } from 'antd';
import { ConnectProps, ConnectState } from '@/models/connect';
import { ClickParam } from 'antd/es/menu'; import { ClickParam } from 'antd/es/menu';
import { CurrentUser } from '@/models/user';
import { FormattedMessage } from 'umi-plugin-react/locale'; import { FormattedMessage } from 'umi-plugin-react/locale';
import React from 'react'; import React from 'react';
import { connect } from 'dva'; import { connect } from 'dva';
import router from 'umi/router'; import router from 'umi/router';
import { ConnectProps, ConnectState } from '@/models/connect';
import { CurrentUser } from '@/models/user';
import HeaderDropdown from '../HeaderDropdown'; import HeaderDropdown from '../HeaderDropdown';
import styles from './index.less'; import styles from './index.less';
......
import { ConnectProps, ConnectState } from '@/models/connect';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Tag, message } from 'antd'; import { Tag, message } from 'antd';
import { CurrentUser } from '@/models/user';
import NoticeIcon from '../NoticeIcon';
import { NoticeItem } from '@/models/global';
import { connect } from 'dva'; import { connect } from 'dva';
import { formatMessage } from 'umi-plugin-react/locale'; import { formatMessage } from 'umi-plugin-react/locale';
import groupBy from 'lodash/groupBy'; import groupBy from 'lodash/groupBy';
import moment from 'moment'; import moment from 'moment';
import { NoticeItem } from '@/models/global';
import NoticeIcon from '../NoticeIcon';
import { CurrentUser } from '@/models/user';
import { ConnectProps, ConnectState } from '@/models/connect';
import styles from './index.less'; import styles from './index.less';
export interface GlobalHeaderRightProps extends ConnectProps { export interface GlobalHeaderRightProps extends ConnectProps {
......
import { ConnectProps, ConnectState } from '@/models/connect';
import { Icon, Tooltip } from 'antd'; import { Icon, Tooltip } from 'antd';
import React from 'react';
import { connect } from 'dva';
import { formatMessage } from 'umi-plugin-react/locale';
import { ConnectProps, ConnectState } from '@/models/connect';
import Avatar from './AvatarDropdown'; import Avatar from './AvatarDropdown';
import HeaderSearch from '../HeaderSearch'; import HeaderSearch from '../HeaderSearch';
import React from 'react';
import SelectLang from '../SelectLang'; import SelectLang from '../SelectLang';
import { connect } from 'dva';
import { formatMessage } from 'umi-plugin-react/locale';
import styles from './index.less'; import styles from './index.less';
export type SiderTheme = 'light' | 'dark'; export type SiderTheme = 'light' | 'dark';
......
import { ConnectProps, ConnectState } from '@/models/connect';
import { DefaultFooter, MenuDataItem, getMenuData, getPageTitle } from '@ant-design/pro-layout'; import { DefaultFooter, MenuDataItem, getMenuData, getPageTitle } from '@ant-design/pro-layout';
import DocumentTitle from 'react-document-title'; import DocumentTitle from 'react-document-title';
import Link from 'umi/link'; import Link from 'umi/link';
import React from 'react'; import React from 'react';
import SelectLang from '@/components/SelectLang';
import { connect } from 'dva'; import { connect } from 'dva';
import { formatMessage } from 'umi-plugin-react/locale'; import { formatMessage } from 'umi-plugin-react/locale';
import SelectLang from '@/components/SelectLang';
import { ConnectProps, ConnectState } from '@/models/connect';
import logo from '../assets/logo.svg'; import logo from '../assets/logo.svg';
import styles from './UserLayout.less'; import styles from './UserLayout.less';
......
import { Effect } from './connect.d';
import { NoticeIconData } from '@/components/NoticeIcon';
import { Reducer } from 'redux'; import { Reducer } from 'redux';
import { Subscription } from 'dva'; import { Subscription } from 'dva';
import { Effect } from './connect.d';
import { NoticeIconData } from '@/components/NoticeIcon';
import { queryNotices } from '@/services/user'; import { queryNotices } from '@/services/user';
export interface NoticeItem extends NoticeIconData { export interface NoticeItem extends NoticeIconData {
......
import { Reducer } from 'redux'; import { Reducer } from 'redux';
// eslint-disable-next-line eslint-comments/disable-enable-pair
/* eslint-disable promise/catch-or-return */
import { message } from 'antd'; import { message } from 'antd';
import defaultSettings, { DefaultSettings } from '../../config/defaultSettings'; import defaultSettings, { DefaultSettings } from '../../config/defaultSettings';
import themeColorClient from '../components/SettingDrawer/themeColorClient'; import themeColorClient from '../components/SettingDrawer/themeColorClient';
......
import { queryCurrent, query as queryUsers } from '@/services/user';
import { Effect } from 'dva'; import { Effect } from 'dva';
import { Reducer } from 'redux'; import { Reducer } from 'redux';
import { queryCurrent, query as queryUsers } from '@/services/user';
export interface CurrentUser { export interface CurrentUser {
avatar?: string; avatar?: string;
name?: string; name?: string;
......
import { ConnectProps, ConnectState, Route, UserModelState } from '@/models/connect';
import Authorized from '@/utils/Authorized';
import React from 'react'; import React from 'react';
import Redirect from 'umi/redirect'; import Redirect from 'umi/redirect';
import { connect } from 'dva'; import { connect } from 'dva';
import pathToRegexp from 'path-to-regexp'; import pathToRegexp from 'path-to-regexp';
import Authorized from '@/utils/Authorized';
import { ConnectProps, ConnectState, Route, UserModelState } from '@/models/connect';
interface AuthComponentProps extends ConnectProps { interface AuthComponentProps extends ConnectProps {
user: UserModelState; user: UserModelState;
......
...@@ -12,7 +12,6 @@ declare module '*.jpeg'; ...@@ -12,7 +12,6 @@ declare module '*.jpeg';
declare module '*.gif'; declare module '*.gif';
declare module '*.bmp'; declare module '*.bmp';
declare module '*.tiff'; declare module '*.tiff';
declare module 'rc-animate';
declare module 'omit.js'; declare module 'omit.js';
declare module 'react-copy-to-clipboard'; declare module 'react-copy-to-clipboard';
declare module 'react-fittext'; declare module 'react-fittext';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment