Skip to content

chore: Use Vite instead of Webpack for development #4156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BrunoQuaresma merged 9 commits into from
Sep 23, 2022
Merged

chore: Use Vite instead of Webpack for development #4156

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fda44bf
chore: Use Vite instead of Webpack
Sep 22, 2022
62d1223
Remove console.log
Sep 22, 2022
376fec7
Fix vite
Sep 22, 2022
a82afdf
Make all routers lazy
Sep 22, 2022
fe2e85a
Merge branch 'bq/improve-load-time' into try-vite
Sep 22, 2022
1ae207b
Merge branch 'main' of github.com:coder/coder into try-vite
Sep 23, 2022
2c9544e
Remove module
Sep 23, 2022
67b5105
Minor improvements
Sep 23, 2022
835c5f3
Minor improvements
Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions site/src/AppRouter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useSelector } from "@xstate/react"
import { FeatureNames } from "api/types"
import { FullScreenLoader } from "components/Loader/FullScreenLoader"
import { RequirePermission } from "components/RequirePermission/RequirePermission"
import { SetupPage } from "pages/SetupPage/SetupPage"
import { TemplateSettingsPage } from "pages/TemplateSettingsPage/TemplateSettingsPage"
Expand All @@ -11,21 +12,23 @@ import { XServiceContext } from "xServices/StateContext"
import { AuthAndFrame } from "./components/AuthAndFrame/AuthAndFrame"
import { RequireAuth } from "./components/RequireAuth/RequireAuth"
import { SettingsLayout } from "./components/SettingsLayout/SettingsLayout"
import { IndexPage } from "./pages"
import { NotFoundPage } from "./pages/404Page/404Page"
import { CliAuthenticationPage } from "./pages/CliAuthPage/CliAuthPage"
import { HealthzPage } from "./pages/HealthzPage/HealthzPage"
import { LoginPage } from "./pages/LoginPage/LoginPage"
import { TemplatesPage } from "./pages/TemplatesPage/TemplatesPage"
import { AccountPage } from "./pages/UserSettingsPage/AccountPage/AccountPage"
import { SecurityPage } from "./pages/UserSettingsPage/SecurityPage/SecurityPage"
import { SSHKeysPage } from "./pages/UserSettingsPage/SSHKeysPage/SSHKeysPage"
import { CreateUserPage } from "./pages/UsersPage/CreateUserPage/CreateUserPage"
import { UsersPage } from "./pages/UsersPage/UsersPage"
import { WorkspaceBuildPage } from "./pages/WorkspaceBuildPage/WorkspaceBuildPage"
import { WorkspacePage } from "./pages/WorkspacePage/WorkspacePage"
import { WorkspaceSchedulePage } from "./pages/WorkspaceSchedulePage/WorkspaceSchedulePage"

const IndexPage = lazy(() => import("./pages"))
Comment thread
BrunoQuaresma marked this conversation as resolved.
Outdated
const NotFoundPage = lazy(() => import("./pages/404Page/404Page"))
const CliAuthenticationPage = lazy(() => import("./pages/CliAuthPage/CliAuthPage"))
const HealthzPage = lazy(() => import("./pages/HealthzPage/HealthzPage"))
const LoginPage = lazy(() => import("./pages/LoginPage/LoginPage"))
const TemplatesPage = lazy(() => import("./pages/TemplatesPage/TemplatesPage"))
const AccountPage = lazy(() => import("./pages/UserSettingsPage/AccountPage/AccountPage"))
const SecurityPage = lazy(() => import("./pages/UserSettingsPage/SecurityPage/SecurityPage"))
const SSHKeysPage = lazy(() => import("./pages/UserSettingsPage/SSHKeysPage/SSHKeysPage"))
const CreateUserPage = lazy(() => import("./pages/UsersPage/CreateUserPage/CreateUserPage"))
const UsersPage = lazy(() => import("./pages/UsersPage/UsersPage"))
const WorkspaceBuildPage = lazy(() => import("./pages/WorkspaceBuildPage/WorkspaceBuildPage"))
const WorkspacePage = lazy(() => import("./pages/WorkspacePage/WorkspacePage"))
const WorkspaceSchedulePage = lazy(
() => import("./pages/WorkspaceSchedulePage/WorkspaceSchedulePage"),
)
const WorkspaceAppErrorPage = lazy(
() => import("./pages/WorkspaceAppErrorPage/WorkspaceAppErrorPage"),
)
Expand All @@ -41,7 +44,7 @@ export const AppRouter: FC = () => {
const featureVisibility = useSelector(xServices.entitlementsXService, selectFeatureVisibility)

return (
<Suspense fallback={<></>}>
<Suspense fallback={<FullScreenLoader />}>
<Routes>
<Route
index
Expand Down
2 changes: 2 additions & 0 deletions site/src/pages/404Page/404Page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ const useStyles = makeStyles((theme) => ({
borderRight: theme.palette.divider,
},
}))

export default NotFoundPage
2 changes: 2 additions & 0 deletions site/src/pages/CliAuthPage/CliAuthPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ export const CliAuthenticationPage: React.FC<React.PropsWithChildren<unknown>> =
</>
)
}

export default CliAuthenticationPage
2 changes: 2 additions & 0 deletions site/src/pages/HealthzPage/HealthzPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ import { FC } from "react"
* accessible by humans and services.
*/
export const HealthzPage: FC = () => <div>ok</div>

export default HealthzPage
2 changes: 2 additions & 0 deletions site/src/pages/LoginPage/LoginPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,5 @@ export const LoginPage: React.FC = () => {
)
}
}

export default LoginPage
2 changes: 2 additions & 0 deletions site/src/pages/TemplatesPage/TemplatesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@ export const TemplatesPage: React.FC = () => {
</>
)
}

export default TemplatesPage
2 changes: 2 additions & 0 deletions site/src/pages/UserSettingsPage/AccountPage/AccountPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,5 @@ export const AccountPage: React.FC = () => {
</Section>
)
}

export default AccountPage
2 changes: 2 additions & 0 deletions site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,5 @@ export const SSHKeysPage: React.FC<React.PropsWithChildren<unknown>> = () => {
</>
)
}

export default SSHKeysPage
2 changes: 2 additions & 0 deletions site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,5 @@ export const SecurityPage: React.FC = () => {
</Section>
)
}

export default SecurityPage
2 changes: 2 additions & 0 deletions site/src/pages/UsersPage/CreateUserPage/CreateUserPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@ export const CreateUserPage: React.FC = () => {
</Margins>
)
}

export default CreateUserPage
2 changes: 2 additions & 0 deletions site/src/pages/UsersPage/UsersPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,3 +195,5 @@ export const UsersPage: FC<{ children?: ReactNode }> = () => {
</>
)
}

export default UsersPage
2 changes: 2 additions & 0 deletions site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ export const WorkspaceBuildPage: FC = () => {
</>
)
}

export default WorkspaceBuildPage
2 changes: 2 additions & 0 deletions site/src/pages/WorkspacePage/WorkspacePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,3 +162,5 @@ const useStyles = makeStyles((theme) => ({
margin: theme.spacing(2),
},
}))

export default WorkspacePage
2 changes: 2 additions & 0 deletions site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,5 @@ export const WorkspaceSchedulePage: React.FC = () => {
console.error("WorkspaceSchedulePage: unknown state :: ", scheduleState)
return <Navigate to="/" />
}

export default WorkspaceSchedulePage
2 changes: 2 additions & 0 deletions site/src/pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ import { Navigate } from "react-router-dom"
export const IndexPage: FC = () => {
return <Navigate to="/workspaces" replace />
}

export default IndexPage