Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb2796a9

Browse files
Kira-Pilotkylecarbs
authored andcommitted
chore: remove react imports (#1867)
reolves#1856
1 parent13f5c75 commitb2796a9

File tree

177 files changed

+192
-293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+192
-293
lines changed

‎site/.eslintrc.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ rules:
114114
react/jsx-curly-brace-presence:
115115
-error
116116
-children:ignore
117+
# https://reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html#eslint
118+
react/jsx-uses-react:"off"
119+
react/react-in-jsx-scope:"off"
117120
settings:
118121
react:
119122
version:detect

‎site/src/AppRouter.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
importReactfrom"react"
1+
import{FC,lazy,Suspense}from"react"
22
import{Route,Routes}from"react-router-dom"
33
import{AuthAndFrame}from"./components/AuthAndFrame/AuthAndFrame"
44
import{RequireAuth}from"./components/RequireAuth/RequireAuth"
@@ -19,12 +19,12 @@ import { WorkspaceBuildPage } from "./pages/WorkspaceBuildPage/WorkspaceBuildPag
1919
import{WorkspacePage}from"./pages/WorkspacePage/WorkspacePage"
2020
import{WorkspaceSchedulePage}from"./pages/WorkspaceSchedulePage/WorkspaceSchedulePage"
2121

22-
constTerminalPage=React.lazy(()=>import("./pages/TerminalPage/TerminalPage"))
23-
constWorkspacesPage=React.lazy(()=>import("./pages/WorkspacesPage/WorkspacesPage"))
24-
constCreateWorkspacePage=React.lazy(()=>import("./pages/CreateWorkspacePage/CreateWorkspacePage"))
22+
constTerminalPage=lazy(()=>import("./pages/TerminalPage/TerminalPage"))
23+
constWorkspacesPage=lazy(()=>import("./pages/WorkspacesPage/WorkspacesPage"))
24+
constCreateWorkspacePage=lazy(()=>import("./pages/CreateWorkspacePage/CreateWorkspacePage"))
2525

26-
exportconstAppRouter:React.FC=()=>(
27-
<React.Suspensefallback={<></>}>
26+
exportconstAppRouter:FC=()=>(
27+
<Suspensefallback={<></>}>
2828
<Routes>
2929
<Routepath="/">
3030
<Route
@@ -159,5 +159,5 @@ export const AppRouter: React.FC = () => (
159159
<Routepath="*"element={<NotFoundPage/>}/>
160160
</Route>
161161
</Routes>
162-
</React.Suspense>
162+
</Suspense>
163163
)

‎site/src/Main.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import{inspect}from"@xstate/inspect"
2-
importReactfrom"react"
32
importReactDOMfrom"react-dom"
43
import{Interpreter}from"xstate"
54
import{App}from"./app"

‎site/src/__mocks__/react-markdown.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
importReactfrom"react"
1+
import{FC}from"react"
22

3-
constReactMarkdown:React.FC=({ children})=>{
3+
constReactMarkdown:FC=({ children})=>{
44
return<divdata-testid="markdown">{children}</div>
55
}
66

‎site/src/app.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
importCssBaselinefrom"@material-ui/core/CssBaseline"
22
importThemeProviderfrom"@material-ui/styles/ThemeProvider"
3-
importReactfrom"react"
3+
import{FC}from"react"
44
import{BrowserRouterasRouter}from"react-router-dom"
55
import{SWRConfig}from"swr"
66
import{AppRouter}from"./AppRouter"
@@ -10,7 +10,7 @@ import { dark } from "./theme"
1010
import"./theme/globalFonts"
1111
import{XServiceProvider}from"./xServices/StateContext"
1212

13-
exportconstApp:React.FC=()=>{
13+
exportconstApp:FC=()=>{
1414
return(
1515
<Router>
1616
<SWRConfig

‎site/src/components/AuthAndFrame/AuthAndFrame.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
importReactfrom"react"
1+
import{FC}from"react"
22
import{Footer}from"../Footer/Footer"
33
import{Navbar}from"../Navbar/Navbar"
44
import{RequireAuth}from"../RequireAuth/RequireAuth"
@@ -10,7 +10,7 @@ interface AuthAndFrameProps {
1010
/**
1111
* Wraps page in RequireAuth and renders it between Navbar and Footer
1212
*/
13-
exportconstAuthAndFrame:React.FC<AuthAndFrameProps>=({ children})=>(
13+
exportconstAuthAndFrame:FC<AuthAndFrameProps>=({ children})=>(
1414
<RequireAuth>
1515
<>
1616
<Navbar/>

‎site/src/components/AvatarData/AvatarData.stories.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import{Story}from"@storybook/react"
2-
importReactfrom"react"
32
import{AvatarData,AvatarDataProps}from"./AvatarData"
43

54
exportdefault{

‎site/src/components/AvatarData/AvatarData.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
importAvatarfrom"@material-ui/core/Avatar"
22
importLinkfrom"@material-ui/core/Link"
33
import{makeStyles}from"@material-ui/core/styles"
4-
importReactfrom"react"
4+
import{FC}from"react"
55
import{LinkasRouterLink}from"react-router-dom"
66
import{combineClasses}from"../../util/combineClasses"
77
import{firstLetter}from"../../util/firstLetter"
@@ -12,7 +12,7 @@ export interface AvatarDataProps {
1212
link?:string
1313
}
1414

15-
exportconstAvatarData:React.FC<AvatarDataProps>=({ title, subtitle, link})=>{
15+
exportconstAvatarData:FC<AvatarDataProps>=({ title, subtitle, link})=>{
1616
conststyles=useStyles()
1717

1818
return(

‎site/src/components/BorderedMenu/BorderedMenu.stories.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import{Story}from"@storybook/react"
2-
importReactfrom"react"
32
import{BorderedMenuRow}from"../BorderedMenuRow/BorderedMenuRow"
43
import{BuildingIcon}from"../Icons/BuildingIcon"
54
import{UsersOutlinedIcon}from"../Icons/UsersOutlinedIcon"

‎site/src/components/BorderedMenu/BorderedMenu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
importPopover,{PopoverProps}from"@material-ui/core/Popover"
22
import{fade,makeStyles}from"@material-ui/core/styles"
3-
importReactfrom"react"
3+
import{FC}from"react"
44

55
typeBorderedMenuVariant="admin-dropdown"|"user-dropdown"
66

77
exporttypeBorderedMenuProps=Omit<PopoverProps,"variant">&{
88
variant?:BorderedMenuVariant
99
}
1010

11-
exportconstBorderedMenu:React.FC<BorderedMenuProps>=({ children, variant, ...rest})=>{
11+
exportconstBorderedMenu:FC<BorderedMenuProps>=({ children, variant, ...rest})=>{
1212
conststyles=useStyles()
1313

1414
return(

‎site/src/components/BorderedMenuRow/BorderedMenuRow.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import ListItem from "@material-ui/core/ListItem"
22
import{makeStyles}from"@material-ui/core/styles"
33
importSvgIconfrom"@material-ui/core/SvgIcon"
44
importCheckIconfrom"@material-ui/icons/Check"
5-
importReactfrom"react"
5+
import{FC}from"react"
66
import{NavLink}from"react-router-dom"
77
import{ellipsizeText}from"../../util/ellipsizeText"
88
import{Typography}from"../Typography/Typography"
@@ -26,7 +26,7 @@ interface BorderedMenuRowProps {
2626
onClick?:()=>void
2727
}
2828

29-
exportconstBorderedMenuRow:React.FC<BorderedMenuRowProps>=({
29+
exportconstBorderedMenuRow:FC<BorderedMenuRowProps>=({
3030
active,
3131
description,
3232
Icon,

‎site/src/components/BuildsTable/BuildsTable.stories.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import{ComponentMeta,Story}from"@storybook/react"
2-
importReactfrom"react"
32
import{MockBuilds}from"../../testHelpers/entities"
43
import{BuildsTable,BuildsTableProps}from"./BuildsTable"
54

‎site/src/components/BuildsTable/BuildsTable.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import TableCell from "@material-ui/core/TableCell"
66
importTableHeadfrom"@material-ui/core/TableHead"
77
importTableRowfrom"@material-ui/core/TableRow"
88
importuseThemefrom"@material-ui/styles/useTheme"
9-
importReactfrom"react"
9+
import{FC}from"react"
1010
import{useNavigate}from"react-router-dom"
1111
import*asTypesGenfrom"../../api/typesGenerated"
1212
import{displayWorkspaceBuildDuration,getDisplayStatus}from"../../util/workspace"
@@ -27,7 +27,7 @@ export interface BuildsTableProps {
2727
className?:string
2828
}
2929

30-
exportconstBuildsTable:React.FC<BuildsTableProps>=({ builds, className})=>{
30+
exportconstBuildsTable:FC<BuildsTableProps>=({ builds, className})=>{
3131
constisLoading=!builds
3232
consttheme:Theme=useTheme()
3333
constnavigate=useNavigate()

‎site/src/components/CliAuthToken/CliAuthToken.stories.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import{Story}from"@storybook/react"
2-
importReactfrom"react"
32
import{CliAuthToken,CliAuthTokenProps}from"./CliAuthToken"
43

54
exportdefault{

‎site/src/components/CliAuthToken/CliAuthToken.test.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import{screen}from"@testing-library/react"
2-
importReactfrom"react"
32
import{render}from"../../testHelpers/renderHelpers"
43
import{CliAuthToken}from"./CliAuthToken"
54

‎site/src/components/CliAuthToken/CliAuthToken.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
importPaperfrom"@material-ui/core/Paper"
22
import{makeStyles}from"@material-ui/core/styles"
33
importTypographyfrom"@material-ui/core/Typography"
4-
importReactfrom"react"
4+
import{FC}from"react"
55
import{CodeExample}from"../CodeExample/CodeExample"
66

77
exportinterfaceCliAuthTokenProps{
88
sessionToken:string
99
}
1010

11-
exportconstCliAuthToken:React.FC<CliAuthTokenProps>=({ sessionToken})=>{
11+
exportconstCliAuthToken:FC<CliAuthTokenProps>=({ sessionToken})=>{
1212
conststyles=useStyles()
1313
return(
1414
<PaperclassName={styles.container}>

‎site/src/components/CodeBlock/CodeBlock.stories.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import{Story}from"@storybook/react"
2-
importReactfrom"react"
32
import{CodeBlock,CodeBlockProps}from"./CodeBlock"
43

54
constsampleLines=`Successfully assigned coder/image-jcws7 to cluster-1

‎site/src/components/CodeBlock/CodeBlock.test.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import{screen}from"@testing-library/react"
2-
importReactfrom"react"
32
import{render}from"../../testHelpers/renderHelpers"
43
import{CodeBlock}from"./CodeBlock"
54

‎site/src/components/CodeBlock/CodeBlock.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import{makeStyles}from"@material-ui/core/styles"
2-
importReactfrom"react"
2+
import{FC,Fragment,ReactElement}from"react"
33
import{MONOSPACE_FONT_FAMILY}from"../../theme/constants"
44
import{combineClasses}from"../../util/combineClasses"
55

66
exportinterfaceCodeBlockProps{
77
lines:string[]
8-
ctas?:React.ReactElement[]
8+
ctas?:ReactElement[]
99
className?:string
1010
}
1111

12-
exportconstCodeBlock:React.FC<CodeBlockProps>=({ lines, ctas, className=""})=>{
12+
exportconstCodeBlock:FC<CodeBlockProps>=({ lines, ctas, className=""})=>{
1313
conststyles=useStyles()
1414

1515
return(
@@ -24,7 +24,7 @@ export const CodeBlock: React.FC<CodeBlockProps> = ({ lines, ctas, className = "
2424
{ctas&&ctas.length&&(
2525
<divclassName={styles.ctaBar}>
2626
{ctas.map((cta,i)=>{
27-
return<React.Fragmentkey={i}>{cta}</React.Fragment>
27+
return<Fragmentkey={i}>{cta}</Fragment>
2828
})}
2929
</div>
3030
)}

‎site/src/components/CodeExample/CodeExample.stories.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import{Story}from"@storybook/react"
2-
importReactfrom"react"
32
import{CodeExample,CodeExampleProps}from"./CodeExample"
43

54
constsampleCode=`echo "Hello, world"`

‎site/src/components/CodeExample/CodeExample.test.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import{screen}from"@testing-library/react"
2-
importReactfrom"react"
32
import{render}from"../../testHelpers/renderHelpers"
43
import{CodeExample}from"./CodeExample"
54

‎site/src/components/CodeExample/CodeExample.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import{makeStyles}from"@material-ui/core/styles"
2-
importReactfrom"react"
2+
import{FC}from"react"
33
import{MONOSPACE_FONT_FAMILY}from"../../theme/constants"
44
import{CopyButton}from"../CopyButton/CopyButton"
55

@@ -10,7 +10,7 @@ export interface CodeExampleProps {
1010
/**
1111
* Component to show single-line code examples, with a copy button
1212
*/
13-
exportconstCodeExample:React.FC<CodeExampleProps>=({ code})=>{
13+
exportconstCodeExample:FC<CodeExampleProps>=({ code})=>{
1414
conststyles=useStyles()
1515

1616
return(

‎site/src/components/ConfirmDialog/ConfirmDialog.stories.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import{ComponentMeta,Story}from"@storybook/react"
2-
importReactfrom"react"
32
import{ConfirmDialog,ConfirmDialogProps}from"./ConfirmDialog"
43

54
exportdefault{

‎site/src/components/ConfirmDialog/ConfirmDialog.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import{fireEvent,render}from"@testing-library/react"
2-
importReactfrom"react"
2+
import{FC}from"react"
33
import{act}from"react-dom/test-utils"
44
import{WrapperComponent}from"../../testHelpers/renderHelpers"
55
import{ConfirmDialog,ConfirmDialogProps}from"./ConfirmDialog"
66

77
namespaceHelpers{
8-
exportconstComponent:React.FC<ConfirmDialogProps>=(props:ConfirmDialogProps)=>{
8+
exportconstComponent:FC<ConfirmDialogProps>=(props:ConfirmDialogProps)=>{
99
return(
1010
<WrapperComponent>
1111
<ConfirmDialog{...props}/>

‎site/src/components/CreateUserForm/CreateUserForm.stories.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import{action}from"@storybook/addon-actions"
22
import{Story}from"@storybook/react"
3-
importReactfrom"react"
43
import{CreateUserForm,CreateUserFormProps}from"./CreateUserForm"
54

65
exportdefault{

‎site/src/components/CreateUserForm/CreateUserForm.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
importFormHelperTextfrom"@material-ui/core/FormHelperText"
22
importTextFieldfrom"@material-ui/core/TextField"
33
import{FormikContextType,FormikErrors,useFormik}from"formik"
4-
importReactfrom"react"
4+
import{FC}from"react"
55
import*asYupfrom"yup"
66
import*asTypesGenfrom"../../api/typesGenerated"
77
import{getFormHelpers,nameValidator,onChangeTrimmed}from"../../util/formUtils"
@@ -34,7 +34,7 @@ const validationSchema = Yup.object({
3434
username:nameValidator(Language.usernameLabel),
3535
})
3636

37-
exportconstCreateUserForm:React.FC<CreateUserFormProps>=({
37+
exportconstCreateUserForm:FC<CreateUserFormProps>=({
3838
onSubmit,
3939
onCancel,
4040
formErrors,

‎site/src/components/DropdownArrows/DropdownArrows.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import{fade,makeStyles,Theme}from"@material-ui/core/styles"
22
importKeyboardArrowDownfrom"@material-ui/icons/KeyboardArrowDown"
33
importKeyboardArrowUpfrom"@material-ui/icons/KeyboardArrowUp"
4-
importReactfrom"react"
4+
import{FC}from"react"
55

66
constuseStyles=makeStyles((theme:Theme)=>({
77
arrowIcon:{
@@ -15,12 +15,12 @@ const useStyles = makeStyles((theme: Theme) => ({
1515
},
1616
}))
1717

18-
exportconstOpenDropdown:React.FC=()=>{
18+
exportconstOpenDropdown:FC=()=>{
1919
conststyles=useStyles()
2020
return<KeyboardArrowDownclassName={styles.arrowIcon}/>
2121
}
2222

23-
exportconstCloseDropdown:React.FC=()=>{
23+
exportconstCloseDropdown:FC=()=>{
2424
conststyles=useStyles()
2525
return<KeyboardArrowUpclassName={`${styles.arrowIcon}${styles.arrowIconUp}`}/>
2626
}

‎site/src/components/EmptyState/EmptyState.test.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import{screen}from"@testing-library/react"
2-
importReactfrom"react"
32
import{render}from"../../testHelpers/renderHelpers"
43
import{EmptyState}from"./EmptyState"
54

‎site/src/components/EmptyState/EmptyState.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
importBoxfrom"@material-ui/core/Box"
22
import{makeStyles}from"@material-ui/core/styles"
33
importTypographyfrom"@material-ui/core/Typography"
4-
importReactfrom"react"
4+
import{FC,ReactNode}from"react"
55

66
exportinterfaceEmptyStateProps{
77
/** Text Message to display, placed inside Typography component */
88
message:string
99
/** Longer optional description to display below the message */
1010
description?:string
11-
cta?:React.ReactNode
11+
cta?:ReactNode
1212
}
1313

1414
/**
@@ -19,7 +19,7 @@ export interface EmptyStateProps {
1919
* EmptyState's props extend the [Material UI Box component](https://material-ui.com/components/box/)
2020
* that you can directly pass props through to to customize the shape and layout of it.
2121
*/
22-
exportconstEmptyState:React.FC<EmptyStateProps>=(props)=>{
22+
exportconstEmptyState:FC<EmptyStateProps>=(props)=>{
2323
const{ message, description, cta, ...boxProps}=props
2424
conststyles=useStyles()
2525

‎site/src/components/EnterpriseSnackbar/EnterpriseSnackbar.stories.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import{Story}from"@storybook/react"
2-
importReactfrom"react"
32
import{EnterpriseSnackbar,EnterpriseSnackbarProps}from"./EnterpriseSnackbar"
43

54
exportdefault{

‎site/src/components/EnterpriseSnackbar/EnterpriseSnackbar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import IconButton from "@material-ui/core/IconButton"
22
importSnackbar,{SnackbarPropsasMuiSnackbarProps}from"@material-ui/core/Snackbar"
33
import{makeStyles}from"@material-ui/core/styles"
44
importCloseIconfrom"@material-ui/icons/Close"
5-
importReactfrom"react"
5+
import{FC}from"react"
66
import{combineClasses}from"../../util/combineClasses"
77

88
typeEnterpriseSnackbarVariant="error"|"info"
@@ -25,7 +25,7 @@ export interface EnterpriseSnackbarProps extends MuiSnackbarProps {
2525
*
2626
* See original component's Material UI documentation here: https://material-ui.com/components/snackbars/
2727
*/
28-
exportconstEnterpriseSnackbar:React.FC<EnterpriseSnackbarProps>=({
28+
exportconstEnterpriseSnackbar:FC<EnterpriseSnackbarProps>=({
2929
onClose,
3030
variant="info",
3131
ContentProps={},

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp