Skip to content

[pull] main from coder:main #251

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.

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
merged 3 commits into from
Aug 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 33 deletions site/.storybook/main.js

This file was deleted.

29 changes: 29 additions & 0 deletions site/.storybook/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
export default {
stories: ["../src/**/*.stories.tsx"],

addons: [
"@chromatic-com/storybook",
"@storybook/addon-docs",
"@storybook/addon-links",
"@storybook/addon-themes",
"storybook-addon-remix-react-router",
],

staticDirs: ["../static"],

framework: {
name: "@storybook/react-vite",
options: {},
},

async viteFinal(config) {
// Storybook seems to strip this setting out of our Vite config. We need to
// put it back in order to be able to access Storybook with Coder Desktop or
// port sharing.
config.server = {
...config.server,
allowedHosts: [".coder", ".dev.coder.com"],
};
return config;
},
} satisfies import("@storybook/react-vite").StorybookConfig;
3 changes: 1 addition & 2 deletions site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,7 @@
"ts-proto": "1.164.0",
"typescript": "5.6.3",
"vite": "6.3.5",
"vite-plugin-checker": "0.9.3",
"vite-plugin-turbosnap": "1.0.3"
"vite-plugin-checker": "0.9.3"
},
"browserslist": ["chrome 110", "firefox 111", "safari 16.0"],
"resolutions": {
Expand Down
8 changes: 0 additions & 8 deletions site/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions site/src/modules/dashboard/DashboardLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ export const DashboardLayout: FC = () => {
{canViewDeployment && <LicenseBanner />}
<AnnouncementBanners />

<div className="flex flex-col h-screen">
<div className="flex flex-col min-h-screen">
<Navbar />

<div className="flex flex-col flex-1 min-h-0">
<div className="flex flex-col flex-1 min-h-0 pb-12">
<Suspense fallback={<Loader />}>
<Outlet />
</Suspense>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ export const DeploymentBannerView: FC<DeploymentBannerViewProps> = ({

return (
<div
className="w-full"
css={{
position: "sticky",
lineHeight: 1,
Expand Down
Loading