Skip to content

Commit 627a3bf

Browse files
zzcrzzcr
committed
feat: 升级vue-cli版本和react版本，保证项目正常启动
1 parent 742682c commit 627a3bf

File tree

13 files changed

+8084
-10084
lines changed

13 files changed

+8084
-10084
lines changed

‎.eslintrc.js

-24
This file was deleted.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"babel-loader": "^9.1.3",
1818
"css-vars-ponyfill": "^2.4.8",
1919
"less": "^4.1.3",
20-
"less-loader": "^11.1.3",
2120
"react": "^18.2.0",
2221
"react-dom": "^18.2.0",
2322
"vue": "~2.6.14",
@@ -30,6 +29,7 @@
3029
"cp-cli": "^2.0.0",
3130
"cross-env": "^7.0.0",
3231
"express": "^4.17.1",
32+
"less-loader": "^11.1.3",
3333
"react-app-rewired": "^2.1.3",
3434
"react-scripts": "~5.0.1",
3535
"typescript": "*",

‎src/App.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { changeTheme, supportCssVars, enableCssVars, themeVars } from './theme'
33
import Todo from './views/Todo'
44
import tagVars from './theme/Tag'
55
import todoVars from './theme/Todo'
6-
import './style/app.scss'
6+
import './style/app.less'
77

88
export default () => {
99
const [todoColor, setTodoColor] = useState(() => themeVars(Object.keys(todoVars)[0]))

‎src/App.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import Todo from './views/Todo.vue'
1717
import { cssVars as tagVars } from './vue/Tag'
1818
import { cssVars as todoVars } from './vue/Todo'
1919
import { changeTheme, supportCssVars, enableCssVars, themeVars, combineVars, onResize } from './theme'
20-
import './style/app.scss'
20+
import './style/app.less'
2121
2222
export default {
2323
components: {

‎src/react/Todo/mobile.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import Tag from '../Tag'
3-
import '../../style/mobile.scss'
3+
import '../../style/mobile.less'
44

55
export default props => {
66
const { removeTag, value, keydown, input, tags, ref, $mode } = props

‎src/react/common/vue.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable react-hooks/rules-of-hooks */
21
import { useState, useEffect } from 'react'
32

43
const arrayProto = Object.create(Array.prototype)

‎src/style/app.scss ‎src/style/app.less

+34-34
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
#app {
2-
font-family: 'Avenir', Helvetica, Arial, sans-serif;
3-
-webkit-font-smoothing: antialiased;
4-
-moz-osx-font-smoothing: grayscale;
5-
text-align: center;
6-
color: #2c3e50;
7-
}
8-
9-
#nav {
10-
padding: 20px;
11-
a {
12-
font-weight: bold;
13-
color: #2c3e50;
14-
&.router-link-exact-active {
15-
color: #42b983;
16-
}
17-
}
18-
input {
19-
margin-right: 20px;
20-
}
21-
}
22-
23-
.todo-input {
24-
width: 587.53px !important;
25-
height: 36px !important;
26-
}
27-
28-
.tag-input {
29-
width: 498.7px !important;
30-
}
31-
32-
:root {
33-
--aui-card-color: #dadada;
34-
}
1+
#app {
2+
font-family: 'Avenir', Helvetica, Arial, sans-serif;
3+
-webkit-font-smoothing: antialiased;
4+
-moz-osx-font-smoothing: grayscale;
5+
text-align: center;
6+
color: #2c3e50;
7+
}
8+
9+
#nav {
10+
padding: 20px;
11+
a {
12+
font-weight: bold;
13+
color: #2c3e50;
14+
&.router-link-exact-active {
15+
color: #42b983;
16+
}
17+
}
18+
input {
19+
margin-right: 20px;
20+
}
21+
}
22+
23+
.todo-input {
24+
width: 587.53px !important;
25+
height: 36px !important;
26+
}
27+
28+
.tag-input {
29+
width: 498.7px !important;
30+
}
31+
32+
:root {
33+
--aui-card-color: #dadada;
34+
}

‎src/style/mobile.scss ‎src/style/mobile.less

+63-63
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,64 @@
1-
.todo-mobile {
2-
.tags-input {
3-
display: flex;
4-
flex-wrap: wrap;
5-
background-color: #fff;
6-
border-width: 1px;
7-
border-radius: 0.25rem;
8-
padding-left: 0.5rem;
9-
padding-right: 1rem;
10-
padding-top: 0.5rem;
11-
padding-bottom: 0.25rem;
12-
}
13-
14-
.tags-input-tag {
15-
display: inline-flex;
16-
line-height: 1;
17-
align-items: center;
18-
font-size: 0.875rem;
19-
background-color: #bcdefa;
20-
color: #1c3d5a;
21-
border-radius: 0.25rem;
22-
user-select: none;
23-
padding: 0.25rem;
24-
margin-right: 0.5rem;
25-
margin-bottom: 0.25rem;
26-
}
27-
28-
.tags-input-tag:last-of-type {
29-
margin-right: 0;
30-
}
31-
32-
.tags-input-remove {
33-
color: #2779bd;
34-
font-size: 1.125rem;
35-
line-height: 1;
36-
}
37-
38-
.tags-input-remove:first-child {
39-
margin-right: 0.25rem;
40-
}
41-
42-
.tags-input-remove:last-child {
43-
margin-left: 0.25rem;
44-
}
45-
46-
.tags-input-remove:focus {
47-
outline: 0;
48-
}
49-
50-
.tags-input-text {
51-
flex: 1;
52-
outline: 0;
53-
padding-top: 0.25rem;
54-
padding-bottom: 0.25rem;
55-
margin-left: 0.5rem;
56-
margin-bottom: 0.25rem;
57-
min-width: 10rem;
58-
}
59-
60-
.py-16 {
61-
padding-top: 4rem;
62-
padding-bottom: 4rem;
63-
}
1+
.todo-mobile {
2+
.tags-input {
3+
display: flex;
4+
flex-wrap: wrap;
5+
background-color: #fff;
6+
border-width: 1px;
7+
border-radius: 0.25rem;
8+
padding-left: 0.5rem;
9+
padding-right: 1rem;
10+
padding-top: 0.5rem;
11+
padding-bottom: 0.25rem;
12+
}
13+
14+
.tags-input-tag {
15+
display: inline-flex;
16+
line-height: 1;
17+
align-items: center;
18+
font-size: 0.875rem;
19+
background-color: #bcdefa;
20+
color: #1c3d5a;
21+
border-radius: 0.25rem;
22+
user-select: none;
23+
padding: 0.25rem;
24+
margin-right: 0.5rem;
25+
margin-bottom: 0.25rem;
26+
}
27+
28+
.tags-input-tag:last-of-type {
29+
margin-right: 0;
30+
}
31+
32+
.tags-input-remove {
33+
color: #2779bd;
34+
font-size: 1.125rem;
35+
line-height: 1;
36+
}
37+
38+
.tags-input-remove:first-child {
39+
margin-right: 0.25rem;
40+
}
41+
42+
.tags-input-remove:last-child {
43+
margin-left: 0.25rem;
44+
}
45+
46+
.tags-input-remove:focus {
47+
outline: 0;
48+
}
49+
50+
.tags-input-text {
51+
flex: 1;
52+
outline: 0;
53+
padding-top: 0.25rem;
54+
padding-bottom: 0.25rem;
55+
margin-left: 0.5rem;
56+
margin-bottom: 0.25rem;
57+
min-width: 10rem;
58+
}
59+
60+
.py-16 {
61+
padding-top: 4rem;
62+
padding-bottom: 4rem;
63+
}
6464
}

0 commit comments

Comments
 (0)