Skip to content

Commit cc556ab

Browse files
Bowen7Bowen7
committed
feat: upgrade deps
1 parent 7832b2a commit cc556ab

38 files changed

+742
-2329
lines changed

‎package.json

+10-9
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@geist-ui/react": "^2.1.5",
7-
"@geist-ui/react-icons": "^1.0.1",
6+
"@geist-ui/core": "^2.3.8",
7+
"@geist-ui/icons": "^1.0.1",
88
"canvas": "^2.8.0",
99
"immer": "^9.0.6",
1010
"nanoid": "^3.1.16",
11-
"react": "^16.13.1",
12-
"react-dom": "^16.13.1",
11+
"react": "^17.0.2",
12+
"react-dom": "^17.0.2",
1313
"react-router-dom": "^5.2.0",
1414
"react-scripts": "4.0.3",
1515
"react-use": "^17.3.2",
1616
"styled-jsx": "3.3.0",
17-
"typescript": "~3.7.2"
17+
"typescript": "^4.5.4",
18+
"@babel/core": "^7.0.0"
1819
},
1920
"scripts": {
2021
"start": "react-app-rewired start",
@@ -41,14 +42,14 @@
4142
},
4243
"devDependencies": {
4344
"@babel/preset-env": "^7.14.2",
44-
"@babel/preset-react": "^7.13.13",
45-
"@babel/preset-typescript": "^7.13.0",
45+
"@babel/preset-react": "^7.14.5",
46+
"@babel/preset-typescript": "^7.14.5",
4647
"@svgr/webpack": "^5.5.0",
4748
"@types/gtag.js": "^0.0.7",
4849
"@types/jest": "^24.9.1",
4950
"@types/node": "^12.0.0",
50-
"@types/react": "^16.9.0",
51-
"@types/react-dom": "^16.9.0",
51+
"@types/react": "^17.0.2",
52+
"@types/react-dom": "^17.0.2",
5253
"@types/react-redux": "^7.1.9",
5354
"@types/react-router-dom": "^5.1.5",
5455
"@types/styled-jsx": "^2.2.8",

‎pnpm-lock.yaml

+641-2,242
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/App.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react"
22
import { BrowserRouter as Router, Switch } from "react-router-dom"
3-
import { GeistProvider, CssBaseline, useTheme } from "@geist-ui/react"
3+
import { GeistProvider, CssBaseline, useTheme } from "@geist-ui/core"
44
import Header from "@/modules/common/header"
55
import { useLocalStorage } from "react-use"
66
import Routes from "./routes"

‎src/atom/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import produce, { original } from "immer"
2-
import { Toast } from "@geist-ui/react/dist/use-toasts/use-toast"
2+
import { ToastInput } from "@geist-ui/core/dist/use-toasts/use-toast"
33
import {
44
AST,
55
removeIt,
@@ -30,7 +30,7 @@ export const groupNamesAtom = atom<string[]>([])
3030
export const undoStackAtom = atom<AST.Regex[]>([])
3131
export const redoStackAtom = atom<AST.Regex[]>([])
3232
export const editorCollapsedAtom = atom<boolean>(false)
33-
export const setToastsAtom = atom<(t: Toast) => void>(() => {})
33+
export const setToastsAtom = atom<(t: ToastInput) => void>(() => {})
3434

3535
const refreshGroupIndex = (ast: AST.Regex) => {
3636
let groupIndex = 0

‎src/components/cell/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react"
2-
import { useTheme } from "@geist-ui/react"
3-
import QuestionCircle from "@geist-ui/react-icons/questionCircle"
2+
import { useTheme } from "@geist-ui/core"
3+
import QuestionCircle from "@geist-ui/icons/questionCircle"
44
import mdnLinks, { MdnLinkKey } from "@/utils/links"
55

66
type ItemProps = {

‎src/components/icons/capturing-group.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react"
2-
import { useTheme } from "@geist-ui/react"
2+
import { useTheme } from "@geist-ui/core"
33

44
const CapturingGroup = () => {
55
const { palette } = useTheme()

‎src/components/icons/insert-after.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react"
2-
import { useTheme } from "@geist-ui/react"
2+
import { useTheme } from "@geist-ui/core"
33

44
const InsertAfter = () => {
55
const { palette } = useTheme()

‎src/components/icons/insert-before.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react"
2-
import { useTheme } from "@geist-ui/react"
2+
import { useTheme } from "@geist-ui/core"
33

44
const InsertBefore = () => {
55
const { palette } = useTheme()

‎src/components/icons/insert-branch.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react"
2-
import { useTheme } from "@geist-ui/react"
2+
import { useTheme } from "@geist-ui/core"
33

44
const InsertBranch = () => {
55
const { palette } = useTheme()

‎src/components/icons/lookahead.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react"
2-
import { useTheme } from "@geist-ui/react"
2+
import { useTheme } from "@geist-ui/core"
33

44
const Lookahead = () => {
55
const { palette } = useTheme()

‎src/components/icons/lookbehind.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react"
2-
import { useTheme } from "@geist-ui/react"
2+
import { useTheme } from "@geist-ui/core"
33

44
const Lookbehind = () => {
55
const { palette } = useTheme()

‎src/components/icons/named-capturing-group.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react"
2-
import { useTheme } from "@geist-ui/react"
2+
import { useTheme } from "@geist-ui/core"
33

44
const NamedCapturingGroup = () => {
55
const { palette } = useTheme()

‎src/components/icons/non-capturing-group.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react"
2-
import { useTheme } from "@geist-ui/react"
2+
import { useTheme } from "@geist-ui/core"
33

44
const NonCapturingGroup = () => {
55
const { palette } = useTheme()

‎src/components/input/index.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
import React, { useState } from "react"
2-
import { Input as GeistInput, useTheme } from "@geist-ui/react"
2+
import { Input as GeistInput, useTheme } from "@geist-ui/core"
33
import { withDebounce } from "@/utils/hocs"
44
const DebouncedInput = withDebounce<
55
HTMLInputElement,
66
React.ComponentProps<typeof GeistInput>
77
>(GeistInput, 500)
88

9-
type Props = React.ComponentProps<typeof DebouncedInput> & {
9+
type Props = Omit<
10+
React.ComponentProps<typeof DebouncedInput>,
11+
"enterKeyHint"
12+
> & {
1013
validation?: RegExp
1114
errMsg?: string
1215
}

‎src/components/legend-item/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react"
2-
import { useTheme } from "@geist-ui/react"
2+
import { useTheme } from "@geist-ui/core"
33
type Props = {
44
name: string
55
infos: {

‎src/components/range-input/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useState, useRef, useMemo } from "react"
2-
import { useClickAway, useTheme } from "@geist-ui/react"
3-
import { Trash2 } from "@geist-ui/react-icons"
2+
import { useClickAway, useTheme } from "@geist-ui/core"
3+
import Trash2 from "@geist-ui/icons/trash2"
44
import Input from "../input"
55
type Prop = {
66
start: string

‎src/components/range-option/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useState, useRef, useMemo } from "react"
2-
import { useClickAway, useTheme } from "@geist-ui/react"
3-
import { Trash2 } from "@geist-ui/react-icons"
2+
import { useClickAway, useTheme } from "@geist-ui/core"
3+
import Trash2 from "@geist-ui/icons/trash2"
44
import { AST } from "@/parser"
55
import RangeInput from "./input"
66
import { RangeError } from "./utils"

‎src/components/show-more/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react"
2-
import { useTheme } from "@geist-ui/react"
2+
import { useTheme } from "@geist-ui/core"
33
import { useLocalStorage } from "react-use"
4-
import ChevronDown from "@geist-ui/react-icons/chevronDown"
4+
import ChevronDown from "@geist-ui/icons/chevronDown"
55
type Props = {
66
id: string
77
}

‎src/modules/common/header/index.tsx

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from "react"
22
import { NavLink, Link } from "react-router-dom"
3-
import { useTheme, Select } from "@geist-ui/react"
4-
import Sun from "@geist-ui/react-icons/sun"
5-
import Moon from "@geist-ui/react-icons/moon"
3+
import { useTheme, Select } from "@geist-ui/core"
4+
import Sun from "@geist-ui/icons/sun"
5+
import Moon from "@geist-ui/icons/moon"
66
import { LogoSvg } from "@/assets"
77

88
type Props = {
@@ -40,7 +40,7 @@ const Header: React.FC<Props> = ({ onThemeChange, theme }) => {
4040
>
4141
Github
4242
</a>
43-
<Select value="en">
43+
<Select value="en" width="100px" disableMatchWidth scale={0.5}>
4444
<Select.Option value="en">English</Select.Option>
4545
<Select.Option value="cn">简体中文</Select.Option>
4646
</Select>
@@ -90,12 +90,15 @@ const Header: React.FC<Props> = ({ onThemeChange, theme }) => {
9090
}
9191
9292
.nav :global(:not(:last-child)) {
93-
margin-right: 48px;
93+
margin-right: 32px;
9494
}
9595
.nav :global(a) {
9696
color: ${palette.accents_4};
9797
font-size: 14px;
9898
}
99+
.nav :global(.select) {
100+
min-width: auto;
101+
}
99102
100103
header :global(svg) {
101104
vertical-align: middle;

‎src/modules/editor/edit-tab.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useEffect, useState } from "react"
2-
import { Divider, useTheme } from "@geist-ui/react"
2+
import { Divider, useTheme } from "@geist-ui/core"
33
import ContentEditor from "./features/content"
44
import Group from "./features/group"
55
import Expression from "./features/expression"
@@ -47,7 +47,7 @@ const InfoItem: React.FC<{ isLiteral: boolean }> = ({ isLiteral }) => {
4747
<>
4848
<div className="container">
4949
<Insert ast={ast} nodes={nodes} />
50-
<Divider />
50+
<Divider mt="24px" />
5151
<Expression expression={expression} />
5252
{content && (
5353
<ContentEditor content={content} id={id} quantifier={quantifier} />

‎src/modules/editor/features/content/back-ref.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useMemo } from "react"
2-
import { Select } from "@geist-ui/react"
2+
import { Select } from "@geist-ui/core"
33
import Cell from "@/components/cell"
44
import { dispatchUpdateContent, groupNamesAtom, useAtomValue } from "@/atom"
55

‎src/modules/editor/features/content/class-character.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useMemo } from "react"
2-
import { Spacer, Select, Code } from "@geist-ui/react"
2+
import { Spacer, Select, Code } from "@geist-ui/core"
33
import Input from "@/components/input"
44
import Cell from "@/components/cell"
55
import { characterClassTextMap, CharacterClassKey } from "@/parser"
@@ -59,13 +59,13 @@ const ClassCharacter: React.FC<Props> = ({ value }) => {
5959
<Select.Option value={value} key={value}>
6060
<div>
6161
<Code>{value}</Code>
62-
<Spacer x={0.5} inline />
62+
<Spacer w={0.5} inline />
6363
{text}
6464
</div>
6565
</Select.Option>
6666
))}
6767
</Select>
68-
<Spacer y={1} />
68+
<Spacer h={1} />
6969
{classKind === "\\xhh" && (
7070
<Input
7171
value={value}

‎src/modules/editor/features/content/index.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { useMemo } from "react"
2-
import { Select, useTheme, Spacer } from "@geist-ui/react"
2+
import { Select, useTheme, Spacer } from "@geist-ui/core"
33
import Cell from "@/components/cell"
44
import { AST } from "@/parser"
5-
import QuestionCircle from "@geist-ui/react-icons/questionCircle"
5+
import QuestionCircle from "@geist-ui/icons/questionCircle"
66
import mdnLinks, { isMdnLinkKey } from "@/utils/links"
77
import SimpleString from "./simple-string"
88
import ClassCharacter from "./class-character"
@@ -99,7 +99,7 @@ const ContentEditor: React.FC<Prop> = ({ content, id, quantifier }) => {
9999
</Select.Option>
100100
))}
101101
</Select>
102-
<Spacer inline x={0.5} />
102+
<Spacer inline h={0.5} />
103103
{isMdnLinkKey(content.kind) && (
104104
<a href={mdnLinks[content.kind]} target="_blank" rel="noreferrer">
105105
<QuestionCircle size={16} />

‎src/modules/editor/features/content/ranges.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react"
2-
import { useTheme, ButtonDropdown, Spacer, Checkbox } from "@geist-ui/react"
3-
import { CheckboxEvent } from "@geist-ui/react/dist/checkbox/checkbox"
2+
import { useTheme, ButtonDropdown, Spacer, Checkbox } from "@geist-ui/core"
3+
import { CheckboxEvent } from "@geist-ui/core/dist/checkbox/checkbox"
44
import RangeOption from "@/components/range-option"
55
import Cell from "@/components/cell"
66
import { AST } from "@/parser"
@@ -72,8 +72,8 @@ const Ranges: React.FC<Prop> = ({ ranges, negate }) => {
7272
/>
7373
))}
7474
</div>
75-
<Spacer y={0.5} />
76-
<ButtonDropdown size="small">
75+
<Spacer h={0.5} />
76+
<ButtonDropdown scale={0.75}>
7777
{commonUsedRanges.map(({ from, to, desc }, index) => (
7878
<ButtonDropdown.Item
7979
main={index === 0}

‎src/modules/editor/features/content/simple-string.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react"
2-
import { Note, Spacer, useToasts } from "@geist-ui/react"
2+
import { Note, Spacer, useToasts } from "@geist-ui/core"
33
import Input from "@/components/input"
44
import Cell from "@/components/cell"
55
import { AST } from "@/parser"
@@ -10,7 +10,7 @@ type Props = {
1010
quantifier: AST.Quantifier | null
1111
}
1212
const SimpleString: React.FC<Props> = ({ value, quantifier }) => {
13-
const [, setToast] = useToasts()
13+
const { setToast } = useToasts()
1414

1515
const handleChange = (value: string) => {
1616
if (value.length > 1 && quantifier) {
@@ -24,11 +24,11 @@ const SimpleString: React.FC<Props> = ({ value, quantifier }) => {
2424

2525
return (
2626
<Cell.Item label="Value">
27-
<Note type="secondary" small style={{ lineHeight: 1.5 }}>
27+
<Note type="secondary" style={{ lineHeight: 1.5 }} scale={0.5}>
2828
The input will be escaped automatically.
2929
</Note>
30-
<Spacer y={0.5} />
31-
<Input size="small" value={value} onChange={handleChange} />
30+
<Spacer h={0.5} />
31+
<Input value={value} onChange={handleChange} />
3232
</Cell.Item>
3333
)
3434
}

‎src/modules/editor/features/content/word-boundary.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react"
2-
import { Checkbox } from "@geist-ui/react"
3-
import { CheckboxEvent } from "@geist-ui/react/dist/checkbox/checkbox"
2+
import { Checkbox } from "@geist-ui/core"
3+
import { CheckboxEvent } from "@geist-ui/core/dist/checkbox/checkbox"
44
import Cell from "@/components/cell"
55
import { dispatchUpdateContent } from "@/atom"
66

‎src/modules/editor/features/group/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react"
2-
import { Select, Spacer } from "@geist-ui/react"
2+
import { Select, Spacer } from "@geist-ui/core"
33
import Input from "@/components/input"
44
import { AST } from "@/parser"
55
import Cell from "@/components/cell"
@@ -74,7 +74,7 @@ const GroupSelect: React.FC<GroupSelectProps> = ({ group }) => {
7474
</Select>
7575
{group.kind === "namedCapturing" && (
7676
<>
77-
<Spacer y={0.5} />
77+
<Spacer h={0.5} />
7878
<Input
7979
label="Group's name"
8080
value={group.name}

‎src/modules/editor/features/insert/index.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useMemo } from "react"
2-
import { Button, ButtonGroup, Tooltip } from "@geist-ui/react"
2+
import { Button, ButtonGroup, Tooltip } from "@geist-ui/core"
33
import Cell from "@/components/cell"
44
import ShowMore from "@/components/show-more"
55
import {
@@ -141,7 +141,7 @@ const Insert: React.FC<Props> = ({ ast, nodes }) => {
141141
</Cell>
142142
)}
143143
{groupOptions.length > 0 && (
144-
<Cell label="Group selection" question="group">
144+
<Cell label="Group selection" mdnLinkKey="group">
145145
<ButtonGroup>
146146
{groupOptions.map(({ value, desc, Icon }) => (
147147
<Button onClick={() => handleWrapGroup(value)} key={value}>
@@ -156,7 +156,7 @@ const Insert: React.FC<Props> = ({ ast, nodes }) => {
156156

157157
{lookAroundOptions.length > 0 && (
158158
<ShowMore id="lookAround">
159-
<Cell label="LookAround selection" question="lookAround">
159+
<Cell label="LookAround selection" mdnLinkKey="lookAround">
160160
<ButtonGroup>
161161
{lookAroundOptions.map(({ value, desc, Icon }) => (
162162
<Button

0 commit comments

Comments
 (0)