wood/clash-and-dashboard
1
0
Fork 0
mirror of https://github.com/woodchen-ink/clash-and-dashboard.git synced 2025-07-18 14:01:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore: fix tslint & update dependencies

Browse Source
This commit is contained in:
Dreamacro 2018-10-21 23:49:40 +08:00
parent f4653a40ec
commit e6b0e9a4ed
4 changed files with 716 additions and 569 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1243
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

28
package.json
View File

@ -20,7 +20,7 @@
"build": "npm run clean-dist && webpack -p --config=configs/webpack/prod.js", "build": "npm run clean-dist && webpack -p --config=configs/webpack/prod.js",
"clean-dist": "rm -f -r -d dist", "clean-dist": "rm -f -r -d dist",
"lint": "npm run lint:ts && npm run lint:sass", "lint": "npm run lint:ts && npm run lint:sass",
"lint:ts": "tslint './src/**/*.ts*' --format stylish --force", "lint:ts": "tslint './src/**/*.ts*' --format stylish",
"lint:sass": "stylelint ./src/**/*.scss", "lint:sass": "stylelint ./src/**/*.scss",
"start": "npm run start-dev", "start": "npm run start-dev",
"start-dev": "webpack-dev-server --config=configs/webpack/dev.js" "start-dev": "webpack-dev-server --config=configs/webpack/dev.js"
@ -30,26 +30,26 @@
"@babel/core": "^7.1.2", "@babel/core": "^7.1.2",
"@babel/preset-env": "^7.1.0", "@babel/preset-env": "^7.1.0",
"@babel/preset-react": "^7.0.0", "@babel/preset-react": "^7.0.0",
"@types/node": "^10.11.4", "@types/node": "^10.12.0",
"@types/react": "^16.4.15", "@types/react": "^16.4.18",
"@types/react-dom": "^16.0.8", "@types/react-dom": "^16.0.9",
"@types/react-i18next": "^7.8.2", "@types/react-i18next": "^7.8.3",
"@types/react-router-dom": "^4.3.1", "@types/react-router-dom": "^4.3.1",
"@types/react-sortable-hoc": "^0.6.4", "@types/react-sortable-hoc": "^0.6.4",
"@types/yaml": "^1.0.0", "@types/yaml": "^1.0.0",
"autoprefixer": "^9.1.5", "autoprefixer": "^9.2.1",
"awesome-typescript-loader": "^5.2.1", "awesome-typescript-loader": "^5.2.1",
"babel-loader": "^8.0.4", "babel-loader": "^8.0.4",
"css-loader": "^1.0.0", "css-loader": "^1.0.0",
"file-loader": "^2.0.0", "file-loader": "^2.0.0",
"html-webpack-plugin": "^3.2.0", "html-webpack-plugin": "^3.2.0",
"image-webpack-loader": "^4.3.1", "image-webpack-loader": "^4.4.0",
"offline-plugin": "^5.0.5", "offline-plugin": "^5.0.5",
"postcss-loader": "^3.0.0", "postcss-loader": "^3.0.0",
"react-addons-test-utils": "^15.6.2", "react-addons-test-utils": "^15.6.2",
"react-hot-loader": "^4.3.11", "react-hot-loader": "^4.3.11",
"sass-loader": "^7.1.0", "sass-loader": "^7.1.0",
"style-loader": "^0.23.0", "style-loader": "^0.23.1",
"stylelint": "^9.6.0", "stylelint": "^9.6.0",
"stylelint-config-standard": "^18.2.0", "stylelint-config-standard": "^18.2.0",
"stylelint-webpack-plugin": "^0.10.5", "stylelint-webpack-plugin": "^0.10.5",
@ -57,7 +57,7 @@
"tslint-config-standard": "^8.0.1", "tslint-config-standard": "^8.0.1",
"tslint-loader": "^3.6.0", "tslint-loader": "^3.6.0",
"uglifyjs-webpack-plugin": "^2.0.1", "uglifyjs-webpack-plugin": "^2.0.1",
"webpack": "^4.20.2", "webpack": "^4.22.0",
"webpack-cli": "^3.1.2", "webpack-cli": "^3.1.2",
"webpack-dev-middleware": "^3.4.0", "webpack-dev-middleware": "^3.4.0",
"webpack-dev-server": "^3.1.9", "webpack-dev-server": "^3.1.9",
@ -68,20 +68,20 @@
"axios": "^0.18.0", "axios": "^0.18.0",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"dayjs": "^1.7.7", "dayjs": "^1.7.7",
"i18next": "^11.9.0", "i18next": "^11.10.0",
"i18next-browser-languagedetector": "^2.2.3", "i18next-browser-languagedetector": "^2.2.3",
"immer": "^1.7.2", "immer": "^1.7.2",
"ini": "^1.3.5", "ini": "^1.3.5",
"mobx": "^5.5.0", "mobx": "^5.5.1",
"mobx-react": "^5.2.8", "mobx-react": "^5.3.4",
"mobx-react-router": "^4.0.5", "mobx-react-router": "^4.0.5",
"node-sass": "^4.9.3", "node-sass": "^4.9.4",
"react": "^16.5.2", "react": "^16.5.2",
"react-dom": "^16.5.2", "react-dom": "^16.5.2",
"react-i18next": "^7.12.0", "react-i18next": "^7.12.0",
"react-router-dom": "^4.3.1", "react-router-dom": "^4.3.1",
"react-sortable-hoc": "^0.8.3", "react-sortable-hoc": "^0.8.3",
"typescript": "^3.1.1", "typescript": "^3.1.3",
"yaml": "^1.0.0" "yaml": "^1.0.0"
} }
} }

6
src/components/Select/index.tsx
View File

@ -44,7 +44,7 @@ export class Select extends React.Component<SelectProps, SelectState> {
super(props) super(props)
} }
componentDidUpdate() { componentDidUpdate () {
console.log('update') console.log('update')
} }
@ -62,7 +62,7 @@ export class Select extends React.Component<SelectProps, SelectState> {
document.body.removeChild(this.$container) document.body.removeChild(this.$container)
document.removeEventListener('click', this.handleGlobalClick, true) document.removeEventListener('click', this.handleGlobalClick, true)
} }
shouldComponentUpdate(nextProps, nextState) { shouldComponentUpdate (nextProps, nextState) {
if (nextProps.value === this.props.value && nextState.showDropDownList === this.state.showDropDownList) { if (nextProps.value === this.props.value && nextState.showDropDownList === this.state.showDropDownList) {
return false return false
} }
@ -72,7 +72,7 @@ export class Select extends React.Component<SelectProps, SelectState> {
handleShowDropList = () => { handleShowDropList = () => {
if (!this.state.hasCreateDropList) { if (!this.state.hasCreateDropList) {
this.setState({ this.setState({
hasCreateDropList: true, hasCreateDropList: true
}) })
} }
this.setState({ this.setState({

8
src/containers/Rules/index.tsx
View File

@ -1,7 +1,7 @@
import * as React from 'react' import * as React from 'react'
import produce from 'immer' import produce from 'immer'
import { translate } from 'react-i18next' import { translate } from 'react-i18next'
import { SortableContainer, SortableElement, SortableHandle, arrayMove } from 'react-sortable-hoc' import { SortableElement, SortableHandle, arrayMove } from 'react-sortable-hoc'
import { Header, Icon, Card, Row, Col, Select, Option, Input } from '@components' import { Header, Icon, Card, Row, Col, Select, Option, Input } from '@components'
import { I18nProps, RuleType } from '@models' import { I18nProps, RuleType } from '@models'
import './style.scss' import './style.scss'
@ -66,7 +66,7 @@ class Rules extends React.Component<I18nProps, RulesState> {
{ type: RuleType['DOMAIN-SUFFIX'], payload: 'twitter.com', proxy: 'HKG' }, { type: RuleType['DOMAIN-SUFFIX'], payload: 'twitter.com', proxy: 'HKG' },
{ type: RuleType['DOMAIN'], payload: 'pornhub.com', proxy: 'HKG' }, { type: RuleType['DOMAIN'], payload: 'pornhub.com', proxy: 'HKG' },
{ type: RuleType['DOMAIN-SUFFIX'], payload: 'twitter.com', proxy: 'HKG' }, { type: RuleType['DOMAIN-SUFFIX'], payload: 'twitter.com', proxy: 'HKG' },
{ type: RuleType['DOMAIN'], payload: 'pornhub.com', proxy: 'HKG' }, { type: RuleType['DOMAIN'], payload: 'pornhub.com', proxy: 'HKG' }
], ],
proxies: { proxies: {
DIRECT: { type: 'Direct' }, DIRECT: { type: 'Direct' },
@ -227,7 +227,7 @@ class Rules extends React.Component<I18nProps, RulesState> {
render () { render () {
const { t } = this.props const { t } = this.props
const { rules } = this.state const { rules } = this.state
const SortableList = SortableContainer<{ rules: Rule[] }>(this.renderRules) // const SortableList = SortableContainer<{ rules: Rule[] }>(this.renderRules)
return ( return (
<div className="page"> <div className="page">
<Header title={t('title')} > <Header title={t('title')} >
@ -237,7 +237,7 @@ class Rules extends React.Component<I18nProps, RulesState> {
<Card className="rules-card"> <Card className="rules-card">
<div className="rules"> <div className="rules">
{ {
rules.map((rule: Rule, index )=> this.renderRuleItem(rule, index)) rules.map((rule: Rule, index) => this.renderRuleItem(rule, index))
} }
{/* <SortableList rules={rules} onSortEnd={this.onSortEnd} useDragHandle={true} /> */} {/* <SortableList rules={rules} onSortEnd={this.onSortEnd} useDragHandle={true} /> */}
</div> </div>