Skip to content

Commit 6e9ab5c

Browse files
d-csd-cs
authored
Merge branch 'main' into feature/tri-12163-perfrun-store-route-run-keyed-waitpointsnapshot-reads
2 parents 70b2f86 + 73d966a commit 6e9ab5c

10 files changed

Lines changed: 10 additions & 385 deletions

File tree

‎.claude/rules/server-apps.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@ area: webapp
1414
type: fix
1515
---
1616
17-
Fix pages occasionally loading unstyled during deploys. The dashboard now recovers automatically.
17+
Brief description of what changed and why.
1818
EOF
1919
```
2020

2121
- **area**: `webapp` | `supervisor`
2222
- **type**: `feature` | `fix` | `improvement` | `breaking`
2323
- If the PR also touches `packages/`, just the changeset is sufficient (no `.server-changes/` needed).
24-
25-
The body ships **verbatim in user-facing release notes**. Keep it to 1–2 short sentences, non-technical, written for a dashboard user: describe what changed for them, never the implementation (no header names, endpoints, middleware, storage mechanisms, internal tools). See `.server-changes/README.md` for full guidance.

‎.env.example‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LOGIN_ORIGIN=http://localhost:3030
66
DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres?schema=public
77
# This sets the URL used for direct connections to the database and should only be needed in limited circumstances
88
# See: https://www.prisma.io/docs/reference/api-reference/prisma-schema-reference#fields:~:text=the%20shadow%20database.-,directUrl,-No
9-
DIRECT_URL=${DATABASE_URL}
9+
DIRECT_URL=postgresql://postgres:postgres@localhost:5432/postgres?schema=public
1010
# Dedicated run-ops database (@internal/run-ops-database). Only needed to run prisma commands
1111
# against it or to enable the run-ops split; start it with `docker compose --profile runops up`.
1212
RUN_OPS_DATABASE_URL=postgresql://postgres:postgres@localhost:5434/postgres?schema=public
@@ -166,4 +166,4 @@ POSTHOG_PROJECT_KEY=
166166
# Uncomment these to send metrics to the local Prometheus via OTEL Collector:
167167
# INTERNAL_OTEL_METRIC_EXPORTER_ENABLED=1
168168
# INTERNAL_OTEL_METRIC_EXPORTER_URL=http://localhost:4318/v1/metrics
169-
# INTERNAL_OTEL_METRIC_EXPORTER_INTERVAL_MS=15000
169+
# INTERNAL_OTEL_METRIC_EXPORTER_INTERVAL_MS=15000

‎.server-changes/remove-deprecated-realtime-stream-action.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
area: webapp
3+
type: improvement
4+
---
5+
6+
Remove the deprecated realtime stream write endpoint used by retired v3 task clients.

‎.server-changes/stale-deploy-asset-recovery.md‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎apps/webapp/app/components/StaleAssetRecovery.tsx‎

Lines changed: 0 additions & 272 deletions
This file was deleted.

‎apps/webapp/app/entry.server.tsx‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@ export default function handleRequest(
5454
) {
5555
const url = new URL(request.url);
5656

57-
// Stale documents reference /build asset hashes that 404 after a deploy —
58-
// always revalidate HTML. Route-set headers win.
59-
if (!responseHeaders.has("Cache-Control")) {
60-
responseHeaders.set("Cache-Control", "no-cache");
61-
}
62-
6357
if (url.pathname.startsWith("/login")) {
6458
responseHeaders.set("X-Frame-Options", "SAMEORIGIN");
6559
responseHeaders.set("Content-Security-Policy", "frame-ancestors 'self'");

‎apps/webapp/app/root.tsx‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import type { ToastMessage } from "~/models/message.server";
77
import { commitSession, getSession } from "~/models/message.server";
88
import tailwindStylesheetUrl from "~/tailwind.css";
99
import { RouteErrorDisplay } from "./components/ErrorDisplay";
10-
import { StaleAssetRecovery } from "./components/StaleAssetRecovery";
1110
import { AppContainer, MainCenteredContainer } from "./components/layout/AppLayout";
1211
import { ShortcutsProvider } from "./components/primitives/ShortcutsProvider";
1312
import { Toast } from "./components/primitives/Toast";
@@ -19,11 +18,6 @@ import { getUser } from "./services/session.server";
1918
import { getTimezonePreference } from "./services/preferences/uiPreferences.server";
2019
import { appEnvTitleTag } from "./utils";
2120

22-
// Derived here (not inside StaleAssetRecovery) so the shared component takes
23-
// the flag as a prop. NODE_ENV is statically replaced in browser bundles, and
24-
// the ErrorBoundary can't rely on loader data.
25-
const isProduction = process.env.NODE_ENV === "production";
26-
2721
export const links: LinksFunction = () => {
2822
return [{ rel: "stylesheet", href: tailwindStylesheetUrl }];
2923
};
@@ -105,7 +99,6 @@ export function ErrorBoundary() {
10599
<head>
106100
<meta charSet="utf-8" />
107101

108-
<StaleAssetRecovery isProduction={isProduction} />
109102
<Meta />
110103
<Links />
111104
</head>
@@ -132,7 +125,6 @@ export default function App() {
132125
<>
133126
<html lang="en" className="h-full" data-theme="dark">
134127
<head>
135-
<StaleAssetRecovery isProduction={isProduction} />
136128
<Meta />
137129
<Links />
138130
</head>

‎apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments/route.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ export default function Page() {
303303
<RuntimeIcon
304304
runtime={deployment.runtime}
305305
runtimeVersion={deployment.runtimeVersion}
306+
withLabel
306307
/>
307308
</TableCell>
308309
<TableCell to={path} isSelected={isSelected}>

0 commit comments

Comments
 (0)