Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
revert: roll back Deno build migration (#2323-#2326) (#2328)
Maximilian Kaskea07b8a666a13
diff --git a/.github/workflows/check.yml b/.github/workflows/check.ymldeleted file mode 100644index 19510a393..000000000--- a/.github/workflows/check.yml+++ /dev/null@@ -1,39 +0,0 @@-name: Check-on:- push:- branches:- - "main"- pull_request:- branches: [main]--jobs:- check:- name: π Check- runs-on: ubuntu-latest- timeout-minutes: 15- env:- TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}- TURBO_TEAM: ${{ secrets.TURBO_TEAM }}- steps:- - name: β¬οΈ Checkout repo- uses: actions/checkout@v6-- - name: Set up pnpm- uses: pnpm/action-setup@v6-- - name: β Setup node- uses: actions/setup-node@v6- with:- node-version: 24- cache: "pnpm"-- - name: π¦ Setup Deno- uses: denoland/setup-deno@v2- with:- deno-version: v2.x-- - name: π₯ Download deps- run: pnpm install-- - name: π Check- run: pnpm checkdiff --git a/.github/workflows/dx.yml b/.github/workflows/dx.ymlindex 766bae466..24e16afa6 100644--- a/.github/workflows/dx.yml+++ b/.github/workflows/dx.yml@@ -41,10 +41,10 @@ jobs:- name: π₯ Download depsrun: pnpm install- - name: π¦ Setup Deno- uses: denoland/setup-deno@v2+ - name: π₯ Install bun+ uses: oven-sh/setup-bun@v2with:- deno-version: v2.x+ bun-version: latest- name: π₯ DX taskrun: pnpm dxdiff --git a/.github/workflows/test.yml b/.github/workflows/test.ymlindex 915d6aa7e..60003b7a4 100644--- a/.github/workflows/test.yml+++ b/.github/workflows/test.yml@@ -30,7 +30,7 @@ jobs:uses: actions/checkout@v6- name: Set up pnpm- uses: pnpm/action-setup@v6+ uses: pnpm/action-setup@v4- name: β Setup nodeuses: actions/setup-node@v6@@ -38,10 +38,10 @@ jobs:node-version: 24cache: "pnpm"- - name: π¦ Setup Deno- uses: denoland/setup-deno@v2+ - name: π₯ Install bun+ uses: oven-sh/setup-bun@v2with:- deno-version: v2.x+ bun-version: latest- name: π₯ Download depsrun: pnpm installdiff --git a/apps/dashboard/env.ts b/apps/dashboard/env.tsindex dab63f5f4..dbb28b166 100644--- a/apps/dashboard/env.ts+++ b/apps/dashboard/env.ts@@ -1 +1,2 @@-await Deno.copyFile("./.env.example", "./.env");+const file = Bun.file("./.env.example");+await Bun.write("./.env", file);diff --git a/apps/screenshot-service/package.json b/apps/screenshot-service/package.jsonindex 4bd7feb41..63c739841 100644--- a/apps/screenshot-service/package.json+++ b/apps/screenshot-service/package.json@@ -2,7 +2,6 @@"name": "@openstatus/screenshot-service","version": "0.0.1","scripts": {- "check": "deno check --sloppy-imports .","dev": "bun run --hot src/index.ts","start": "NODE_ENV=production bun run src/index.ts"},diff --git a/apps/server/.gitignore b/apps/server/.gitignoreindex c1fbf070a..3c3629e64 100644--- a/apps/server/.gitignore+++ b/apps/server/.gitignore@@ -1,5 +1 @@node_modules-app-src/_serve.bundle.mjs-.deno_compile_bundle_*.mjs-app.tmp-*diff --git a/apps/server/Dockerfile b/apps/server/Dockerfileindex 178df2225..f4c19c32f 100644--- a/apps/server/Dockerfile+++ b/apps/server/Dockerfile@@ -3,9 +3,9 @@# See https://github.com/lenra-io/dofigen# install-FROM node@sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc AS install+FROM node@sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf AS installLABEL \- org.opencontainers.image.base.digest="sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc" \+ org.opencontainers.image.base.digest="sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf" \org.opencontainers.image.base.name="docker.io/node:24-slim" \org.opencontainers.image.stage="install"WORKDIR /app/@@ -48,14 +48,14 @@ RUN \--mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \<<EOFcorepack enable pnpm-pnpm install --prod --frozen-lockfile --filter=@openstatus/server... --verbose+pnpm install --prod --frozen-lockfile --verboseEOF# build-FROM denoland/deno@sha256:8d24854de78a79c56e74b49aa4c5996c60e1fe3730efba8fbdd2692c582e6e29 AS build+FROM oven/bun@sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7 AS buildLABEL \- org.opencontainers.image.base.digest="sha256:8d24854de78a79c56e74b49aa4c5996c60e1fe3730efba8fbdd2692c582e6e29" \- org.opencontainers.image.base.name="docker.io/denoland/deno:2.9.0" \+ org.opencontainers.image.base.digest="sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7" \+ org.opencontainers.image.base.name="docker.io/oven/bun:1.3.11" \org.opencontainers.image.stage="build"ENV NODE_ENV="production"WORKDIR /app/apps/server@@ -74,17 +74,15 @@ COPY \--from=install \--link \"/app/packages" "/app/packages"-RUN <<EOF-deno bundle --platform=deno --minify --sloppy-imports --node-modules-dir=manual --output src/_serve.bundle.mjs src/serve.ts-deno compile --no-check -A --node-modules-dir=none --include static/openapi.yaml --include static/openapi-v1.json --output app src/_serve.bundle.mjs-EOF+RUN bun build --compile --sourcemap src/index.ts --outfile=app# runtime-FROM registry.access.redhat.com/hi/curl@sha256:848b81ab5d5e55371d7193fd4f1ea7b605d14dbb039344ffad34a4c1f0d880f4 AS runtime+FROM debian@sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604 AS runtimeLABEL \io.dofigen.version="2.8.0" \org.opencontainers.image.authors="OpenStatus Team" \- org.opencontainers.image.base.digest="sha256:848b81ab5d5e55371d7193fd4f1ea7b605d14dbb039344ffad34a4c1f0d880f4" \+ org.opencontainers.image.base.digest="sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604" \+ org.opencontainers.image.base.name="docker.io/debian:bullseye-slim" \org.opencontainers.image.description="REST API server with Hono framework for OpenStatus" \org.opencontainers.image.source="https://github.com/openstatusHQ/openstatus" \org.opencontainers.image.title="OpenStatus Server" \@@ -95,6 +93,12 @@ COPY \--chmod=555 \--link \"/app/apps/server/app" "/bin/"+USER 0:0+RUN <<EOF+apt-get update+apt-get install -y --no-install-recommends curl+rm -rf /var/lib/apt/lists/*+EOFUSER 1000:1000EXPOSE 3000HEALTHCHECK \@@ -102,5 +106,5 @@ HEALTHCHECK \--timeout=10s \--start-period=30s \--retries=3 \- CMD ["curl", "-f", "http://localhost:3000/ping"]+ CMD curl -f http://localhost:3000/ping || exit 1ENTRYPOINT ["/bin/app"]diff --git a/apps/server/bunfig.toml b/apps/server/bunfig.tomlnew file mode 100644index 000000000..80d3c2f2b--- /dev/null+++ b/apps/server/bunfig.toml@@ -0,0 +1,2 @@+[test]+preload = ["./src/libs/test/preload.ts"]diff --git a/apps/server/deno.jsonc b/apps/server/deno.jsoncdeleted file mode 100644index d3de83dde..000000000--- a/apps/server/deno.jsonc+++ /dev/null@@ -1,6 +0,0 @@-/* Needed to fix the import aliases */-{- "imports": {- "@/": "./src/",- },-}diff --git a/apps/server/docker-compose.yaml b/apps/server/docker-compose.yamlindex afed6f359..c125ea8dd 100644--- a/apps/server/docker-compose.yaml+++ b/apps/server/docker-compose.yaml@@ -8,5 +8,3 @@ services:- 3000:3000image: servercommand: .- env_file:- - ../../.env.dockerdiff --git a/apps/server/dofigen.lock b/apps/server/dofigen.lockindex a16e75938..b2a4213e3 100644--- a/apps/server/dofigen.lock+++ b/apps/server/dofigen.lock@@ -10,18 +10,47 @@ effective: |- /packages/api- /packages/integrations/vercelbuilders:+ build:+ fromImage:+ path: oven/bun+ digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7+ label:+ org.opencontainers.image.stage: build+ org.opencontainers.image.base.name: docker.io/oven/bun:1.3.11+ org.opencontainers.image.base.digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7+ workdir: /app/apps/server+ env:+ NODE_ENV: production+ copy:+ - paths:+ - .+ target: /app/+ - fromBuilder: install+ paths:+ - /app/node_modules+ target: /app/node_modules+ - fromBuilder: install+ paths:+ - /app/apps/server/node_modules+ target: /app/apps/server/node_modules+ - fromBuilder: install+ paths:+ - /app/packages+ target: /app/packages+ run:+ - bun build --compile --sourcemap src/index.ts --outfile=appinstall:fromImage:path: node- digest: sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc+ digest: sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecflabel:org.opencontainers.image.base.name: docker.io/node:24-slim+ org.opencontainers.image.base.digest: sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecforg.opencontainers.image.stage: install- org.opencontainers.image.base.digest: sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fcworkdir: /app/run:- corepack enable pnpm- - pnpm install --prod --frozen-lockfile --filter=@openstatus/server... --verbose+ - pnpm install --prod --frozen-lockfile --verbosecache:- target: /root/.local/share/pnpm/storebind:@@ -95,49 +124,18 @@ effective: |source: packages/services/package.json- target: packages/importers/package.jsonsource: packages/importers/package.json- build:- fromImage:- path: denoland/deno- digest: sha256:8d24854de78a79c56e74b49aa4c5996c60e1fe3730efba8fbdd2692c582e6e29- label:- org.opencontainers.image.base.name: docker.io/denoland/deno:2.9.0- org.opencontainers.image.base.digest: sha256:8d24854de78a79c56e74b49aa4c5996c60e1fe3730efba8fbdd2692c582e6e29- org.opencontainers.image.stage: build- workdir: /app/apps/server- env:- NODE_ENV: production- copy:- - paths:- - .- target: /app/- - fromBuilder: install- paths:- - /app/node_modules- target: /app/node_modules- - fromBuilder: install- paths:- - /app/apps/server/node_modules- target: /app/apps/server/node_modules- - fromBuilder: install- paths:- - /app/packages- target: /app/packages- run:- - deno bundle --platform=deno --minify --sloppy-imports --node-modules-dir=manual --output src/_serve.bundle.mjs src/serve.ts- - deno compile --no-check -A --node-modules-dir=none --include static/openapi.yaml --include static/openapi-v1.json --output app src/_serve.bundle.mjsfromImage:- host: registry.access.redhat.com- port: 443- path: hi/curl- digest: sha256:848b81ab5d5e55371d7193fd4f1ea7b605d14dbb039344ffad34a4c1f0d880f4+ path: debian+ digest: sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604label:- org.opencontainers.image.authors: OpenStatus Team- org.opencontainers.image.base.digest: sha256:848b81ab5d5e55371d7193fd4f1ea7b605d14dbb039344ffad34a4c1f0d880f4io.dofigen.version: 2.8.0+ org.opencontainers.image.authors: OpenStatus Teamorg.opencontainers.image.source: https://github.com/openstatusHQ/openstatusorg.opencontainers.image.title: OpenStatus Server+ org.opencontainers.image.base.digest: sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604org.opencontainers.image.vendor: OpenStatusorg.opencontainers.image.description: REST API server with Hono framework for OpenStatus+ org.opencontainers.image.base.name: docker.io/debian:bullseye-slimuser:user: '1000'group: '1000'@@ -147,29 +145,37 @@ effective: |- /app/apps/server/apptarget: /bin/chmod: '555'+ root:+ run:+ - apt-get update+ - apt-get install -y --no-install-recommends curl+ - rm -rf /var/lib/apt/lists/*entrypoint:- /bin/appexpose:- port: 3000healthcheck:- cmd: '["curl", "-f", "http://localhost:3000/ping"]'+ cmd: curl -f http://localhost:3000/ping || exit 1interval: 30stimeout: 10sstart: 30sretries: 3images:docker.io:+ oven:+ bun:+ 1.3.11:+ digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7library:node:24-slim:- digest: sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc- denoland:- deno:- 2.9.0:- digest: sha256:8d24854de78a79c56e74b49aa4c5996c60e1fe3730efba8fbdd2692c582e6e29+ digest: sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf+ debian:+ bullseye-slim:+ digest: sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604resources:dofigen.yml:- hash: f9fb4559e02833a2518fbd89165716c9584bd11d24e8a6103a98a959b5a6ae0c+ hash: 4ad3de79c65a09ba1ba428b29a15ab9131c66e271eb7c4376b4fdcc825ebd770content: |# Files to exclude from Docker contextignore:@@ -228,13 +234,13 @@ resources:- packages/importers/package.jsonrun:- corepack enable pnpm- - pnpm install --prod --frozen-lockfile --filter=@openstatus/server... --verbose+ - pnpm install --prod --frozen-lockfile --verbosecache:- /root/.local/share/pnpm/store- # Stage 2: Build application (compile to binary with Deno)+ # Stage 2: Build application (compile to binary)build:- fromImage: denoland/deno:2.9.0+ fromImage: oven/bun:1.3.11workdir: /app/apps/serverlabels:org.opencontainers.image.stage: build@@ -251,15 +257,10 @@ resources:- fromBuilder: installsource: /app/packagestarget: /app/packages- # 1) bundle to a self-contained mjs; manual node_modules resolves pnpm catalog: + workspace deps, sloppy-imports the extensionless relative imports.- # 2) compile the bundle with node-modules-dir=none so node_modules is NOT embedded β keeps the binary ~110MB instead of ~390MB.- run:- - deno bundle --platform=deno --minify --sloppy-imports --node-modules-dir=manual --output src/_serve.bundle.mjs src/serve.ts- - deno compile --no-check -A --node-modules-dir=none --include static/openapi.yaml --include static/openapi-v1.json --output app src/_serve.bundle.mjs+ run: bun build --compile --sourcemap src/index.ts --outfile=app- # Runtime stage: distroless glibc base that already ships curl (for the healthcheck).- # Pinned to the multi-arch index digest of hi/curl:latest β dofigen mis-resolves this registry's tag to an unpullable digest.- fromImage: registry.access.redhat.com/hi/curl@sha256:848b81ab5d5e55371d7193fd4f1ea7b605d14dbb039344ffad34a4c1f0d880f4+ # Runtime stage+ fromImage: debian:bullseye-slim# Metadata labelslabels:@@ -276,19 +277,26 @@ resources:target: /bin/chmod: "555"+ # Install curl for health checks+ root:+ run:+ - apt-get update+ - apt-get install -y --no-install-recommends curl+ - rm -rf /var/lib/apt/lists/*+# Security: run as non-root useruser: "1000:1000"# Expose portexpose: "3000"- # Health check β exec form (JSON array) because the base has no shell for CMD-SHELL+ # Health checkhealthcheck:interval: 30stimeout: 10sstart: 30sretries: 3- cmd: '["curl", "-f", "http://localhost:3000/ping"]'+ cmd: curl -f http://localhost:3000/ping || exit 1# Start applicationentrypoint: /bin/appdiff --git a/apps/server/dofigen.yml b/apps/server/dofigen.ymlindex e0cb1c89b..bdb9641f6 100644--- a/apps/server/dofigen.yml+++ b/apps/server/dofigen.yml@@ -55,13 +55,13 @@ builders:- packages/importers/package.jsonrun:- corepack enable pnpm- - pnpm install --prod --frozen-lockfile --filter=@openstatus/server... --verbose+ - pnpm install --prod --frozen-lockfile --verbosecache:- /root/.local/share/pnpm/store- # Stage 2: Build application (compile to binary with Deno)+ # Stage 2: Build application (compile to binary)build:- fromImage: denoland/deno:2.9.0+ fromImage: oven/bun:1.3.11workdir: /app/apps/serverlabels:org.opencontainers.image.stage: build@@ -78,15 +78,10 @@ builders:- fromBuilder: installsource: /app/packagestarget: /app/packages- # 1) bundle to a self-contained mjs; manual node_modules resolves pnpm catalog: + workspace deps, sloppy-imports the extensionless relative imports.- # 2) compile the bundle with node-modules-dir=none so node_modules is NOT embedded β keeps the binary ~110MB instead of ~390MB.- run:- - deno bundle --platform=deno --minify --sloppy-imports --node-modules-dir=manual --output src/_serve.bundle.mjs src/serve.ts- - deno compile --no-check -A --node-modules-dir=none --include static/openapi.yaml --include static/openapi-v1.json --output app src/_serve.bundle.mjs+ run: bun build --compile --sourcemap src/index.ts --outfile=app-# Runtime stage: distroless glibc base that already ships curl (for the healthcheck).-# Pinned to the multi-arch index digest of hi/curl:latest β dofigen mis-resolves this registry's tag to an unpullable digest.-fromImage: registry.access.redhat.com/hi/curl@sha256:848b81ab5d5e55371d7193fd4f1ea7b605d14dbb039344ffad34a4c1f0d880f4+# Runtime stage+fromImage: debian:bullseye-slim# Metadata labelslabels:@@ -103,19 +98,26 @@ copy:target: /bin/chmod: "555"+# Install curl for health checks+root:+ run:+ - apt-get update+ - apt-get install -y --no-install-recommends curl+ - rm -rf /var/lib/apt/lists/*+# Security: run as non-root useruser: "1000:1000"# Expose portexpose: "3000"-# Health check β exec form (JSON array) because the base has no shell for CMD-SHELL+# Health checkhealthcheck:interval: 30stimeout: 10sstart: 30sretries: 3- cmd: '["curl", "-f", "http://localhost:3000/ping"]'+ cmd: curl -f http://localhost:3000/ping || exit 1# Start applicationentrypoint: /bin/appdiff --git a/apps/server/env.ts b/apps/server/env.tsindex dab63f5f4..dbb28b166 100644--- a/apps/server/env.ts+++ b/apps/server/env.ts@@ -1 +1,2 @@-await Deno.copyFile("./.env.example", "./.env");+const file = Bun.file("./.env.example");+await Bun.write("./.env", file);diff --git a/apps/server/package.json b/apps/server/package.jsonindex ad42e967c..818f415d3 100644--- a/apps/server/package.json+++ b/apps/server/package.json@@ -5,12 +5,12 @@"type": "module","main": "src/index.ts","scripts": {- "env": "deno run -A env.ts",- "dev": "deno run -A --watch --sloppy-imports src/serve.ts",- "start": "NODE_ENV=production deno run -A --sloppy-imports src/serve.ts",- "test": "deno test --parallel -A --no-check --sloppy-imports --env-file=.env.test --import-map=test.importmap.json --ignore=src/routes/slack && deno test -A --no-check --sloppy-imports --env-file=.env.test --import-map=test.importmap.json src/routes/slack",- "check": "deno check --sloppy-imports src/serve.ts",- "eval:mcp": "deno run -A --sloppy-imports src/routes/mcp/evals/run.ts"+ "env": "bun env.ts",+ "dev": "bun run --hot src/index.ts",+ "start": "NODE_ENV=production bun run src/index.ts",+ "test": "bun test",+ "tsc": "tsc --noEmit",+ "eval:mcp": "bun run src/routes/mcp/evals/run.ts"},"dependencies": {"@ai-sdk/anthropic": "catalog:",@@ -52,9 +52,7 @@"@openstatus/tracker": "workspace:*","@openstatus/upstash": "workspace:*","@openstatus/utils": "workspace:*",- "@opentelemetry/exporter-logs-otlp-http": "catalog:","@opentelemetry/resources": "catalog:",- "@opentelemetry/sdk-logs": "catalog:","@opentelemetry/semantic-conventions": "catalog:","@scalar/hono-api-reference": "catalog:","@slack/web-api": "catalog:",@@ -71,11 +69,9 @@},"devDependencies": {"@openstatus/locales": "workspace:*",- "@openstatus/test-utils": "workspace:*","@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@types/validator": "catalog:",+ "bun-types": "catalog:","dotenv": "catalog:"}}diff --git a/apps/server/src/index.ts b/apps/server/src/index.tsindex 1debaeaf2..8c6dc0fa6 100644--- a/apps/server/src/index.ts+++ b/apps/server/src/index.ts@@ -10,13 +10,7 @@ import {withContext,} from "@logtape/logtape";import { getOpenTelemetrySink } from "@logtape/otel";-import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";import { resourceFromAttributes } from "@opentelemetry/resources";-import {- BatchLogRecordProcessor,- LoggerProvider,-} from "@opentelemetry/sdk-logs";-import { ATTR_SERVICE_NAME } from "@opentelemetry/semantic-conventions";import { ATTR_DEPLOYMENT_ENVIRONMENT_NAME } from "@opentelemetry/semantic-conventions/incubating";import { Scalar } from "@scalar/hono-api-reference";import { Hono } from "hono";@@ -25,6 +19,7 @@ import { prettyJSON } from "hono/pretty-json";import { requestId } from "hono/request-id";import openapiV1Json from "../static/openapi-v1.json" with { type: "json" };+import openapiYaml from "../static/openapi.yaml" with { type: "text" };import { env } from "./env";import { handleError } from "./libs/errors";import { mcpRoute } from "./routes/mcp";@@ -47,39 +42,23 @@ export const app = new Hono<Env>({const logger = getLogger("api-server");const otelLogger = getLogger("api-server-otel");-const openapiYaml = await Deno.readTextFile(- new URL("../static/openapi.yaml", import.meta.url),-);-/*** Configure logging asynchronously without blocking module initialization.* This allows tests to import `app` immediately.*/-// Build the LoggerProvider with a static OTLP exporter import so `deno bundle`-// includes it. Letting @logtape/otel create the exporter triggers a dynamic-// import of a bare specifier, which the compiled --node-modules-dir=none binary-// can't resolve.-const loggerProvider = new LoggerProvider({- resource: resourceFromAttributes({- [ATTR_SERVICE_NAME]: "openstatus-server",+const defaultLogger = getOpenTelemetrySink({+ serviceName: "openstatus-server",+ otlpExporterConfig: {+ url: "https://eu-central-1.aws.edge.axiom.co/v1/logs",+ headers: {+ Authorization: `Bearer ${env.AXIOM_TOKEN}`,+ "X-Axiom-Dataset": env.AXIOM_DATASET,+ },+ },+ additionalResource: resourceFromAttributes({[ATTR_DEPLOYMENT_ENVIRONMENT_NAME]: env.NODE_ENV,}),- processors: [- new BatchLogRecordProcessor(- new OTLPLogExporter({- url: "https://eu-central-1.aws.edge.axiom.co/v1/logs",- headers: {- Authorization: `Bearer ${env.AXIOM_TOKEN}`,- "X-Axiom-Dataset": env.AXIOM_DATASET,- },- }),- ),- ],-});--const defaultLogger = getOpenTelemetrySink({- loggerProvider,});await configure({@@ -187,7 +166,7 @@ app.use("*", async (c, next) => {// Console logging only for errors in productionif (env.NODE_ENV !== "production" || c.res.status >= 500) {logger.info("request", {- request_id: reqId,+ request_id: requestId,method: c.req.method,path: c.req.path,status_code: c.res.status,@@ -284,6 +263,13 @@ app.route("/mcp", mcpRoute);* create incidents, and send notifications.*/-if (process.env.NODE_ENV === "development") {- showRoutes(app, { verbose: true, colorize: true });-}+const isDev = process.env.NODE_ENV === "development";+const port = 3000;++if (isDev) showRoutes(app, { verbose: true, colorize: true });++logger.info("Starting server", { port, environment: env.NODE_ENV });++const server = { port, fetch: app.fetch };++export default server;diff --git a/apps/server/src/libs/middlewares/require-scope.test.ts b/apps/server/src/libs/middlewares/require-scope.test.tsindex f1f0962a6..05818307b 100644--- a/apps/server/src/libs/middlewares/require-scope.test.ts+++ b/apps/server/src/libs/middlewares/require-scope.test.ts@@ -1,6 +1,6 @@+import { describe, expect, test } from "bun:test";+import type { Scope } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";import { Hono } from "hono";import type { Variables } from "@/types";diff --git a/apps/server/src/libs/middlewares/validate-key.test.ts b/apps/server/src/libs/middlewares/validate-key.test.tsindex 58f5355a9..28527fb19 100644--- a/apps/server/src/libs/middlewares/validate-key.test.ts+++ b/apps/server/src/libs/middlewares/validate-key.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { validateKey } from "./auth";diff --git a/apps/server/src/libs/test/doubles/analytics.mock.ts b/apps/server/src/libs/test/doubles/analytics.mock.tsdeleted file mode 100644index dfe713439..000000000--- a/apps/server/src/libs/test/doubles/analytics.mock.ts+++ /dev/null@@ -1,26 +0,0 @@-// Test double for @openstatus/analytics, swapped in via --import-map. Keeps the-// real Events/parseInputToProps but replaces setupAnalytics with a spy (exposed-// on globalThis.__analyticsSpies) so tests assert tracking without OpenPanel.-export {- type EventProps,- Events,- parseInputToProps,-} from "@openstatus/analytics-real";--import { mock } from "@openstatus/test-utils";--const g = globalThis as Record<string, unknown>;-if (!g.__analyticsSpies) {- const track = mock(() => Promise.resolve());- g.__analyticsSpies = {- track,- setupAnalytics: mock((_props: unknown) => Promise.resolve({ track })),- };-}--const spies = g.__analyticsSpies as {- track: ReturnType<typeof mock>;- setupAnalytics: ReturnType<typeof mock>;-};--export const setupAnalytics = (props: unknown) => spies.setupAnalytics(props);diff --git a/apps/server/src/libs/test/doubles/page-urls.mock.ts b/apps/server/src/libs/test/doubles/page-urls.mock.tsdeleted file mode 100644index b4e181325..000000000--- a/apps/server/src/libs/test/doubles/page-urls.mock.ts+++ /dev/null@@ -1,10 +0,0 @@-// Test double for src/routes/slack/page-urls.ts (which hits the db), swapped in-// via --import-map so slack presenter tests get deterministic URLs.-export const getPageUrl = (_pageId: number): Promise<string | null> =>- Promise.resolve("https://example.openstatus.dev");--export const getReportUrl = (- _pageId: number,- reportId: number,-): Promise<string | null> =>- Promise.resolve(`https://example.openstatus.dev/events/report/${reportId}`);diff --git a/apps/server/src/libs/test/doubles/slack-agent.mock.ts b/apps/server/src/libs/test/doubles/slack-agent.mock.tsdeleted file mode 100644index ef4990b40..000000000--- a/apps/server/src/libs/test/doubles/slack-agent.mock.ts+++ /dev/null@@ -1,8 +0,0 @@-// Test double for slack/agent.ts (pulls in the AI SDK), swapped in via-// --import-map so handler tests don't run the real agent.-import { slackTestState } from "./slack-test-state.ts";--export const runAgent = () => {- if (slackTestState.runAgentOverride) return slackTestState.runAgentOverride();- return Promise.resolve({ text: "Here is my response", toolResults: [] });-};diff --git a/apps/server/src/libs/test/doubles/slack-test-state.ts b/apps/server/src/libs/test/doubles/slack-test-state.tsdeleted file mode 100644index 9d19743e6..000000000--- a/apps/server/src/libs/test/doubles/slack-test-state.ts+++ /dev/null@@ -1,33 +0,0 @@-// Mutable per-test config shared by the slack module doubles below. Replaces-// the per-file bun `mock.module` closures (handler.test / interactions.test):-// each test sets the fields it needs in beforeEach and reads `calls`.-type SlackCall = { method: string; args: Record<string, unknown> };-type Override = ((args: Record<string, unknown>) => Promise<unknown>) | null;--export interface SlackTestState {- resolveWorkspace: (teamId: string) => Promise<unknown>;- calls: SlackCall[];- postMessageOverride: Override;- updateOverride: Override;- postEphemeralOverride: Override;- runAgentOverride: (() => Promise<unknown>) | null;- repliesImpl: () => Promise<unknown>;-}--const g = globalThis as Record<string, unknown>;-if (!g.__slackTestState) {- g.__slackTestState = {- resolveWorkspace: () => Promise.resolve(null),- calls: [],- postMessageOverride: null,- updateOverride: null,- postEphemeralOverride: null,- runAgentOverride: null,- repliesImpl: () =>- Promise.resolve({- messages: [{ user: "U1", text: "test message", ts: "1.1" }],- }),- } satisfies SlackTestState;-}--export const slackTestState = g.__slackTestState as SlackTestState;diff --git a/apps/server/src/libs/test/doubles/slack-web-api.mock.ts b/apps/server/src/libs/test/doubles/slack-web-api.mock.tsdeleted file mode 100644index fd8d3c935..000000000--- a/apps/server/src/libs/test/doubles/slack-web-api.mock.ts+++ /dev/null@@ -1,26 +0,0 @@-// Test double for @slack/web-api (only WebClient is used), swapped in via-// --import-map. Captures chat calls into the shared slack test state.-import { slackTestState as s } from "./slack-test-state.ts";--export class WebClient {- chat = {- postMessage: (args: Record<string, unknown>) => {- if (s.postMessageOverride) return s.postMessageOverride(args);- s.calls.push({ method: "postMessage", args });- return Promise.resolve({ ts: "msg.ts" });- },- update: (args: Record<string, unknown>) => {- if (s.updateOverride) return s.updateOverride(args);- s.calls.push({ method: "update", args });- return Promise.resolve({ ts: "msg.ts" });- },- postEphemeral: (args: Record<string, unknown>) => {- if (s.postEphemeralOverride) return s.postEphemeralOverride(args);- s.calls.push({ method: "postEphemeral", args });- return Promise.resolve();- },- };- conversations = {- replies: () => s.repliesImpl(),- };-}diff --git a/apps/server/src/libs/test/doubles/state.ts b/apps/server/src/libs/test/doubles/state.tsdeleted file mode 100644index ec2239076..000000000--- a/apps/server/src/libs/test/doubles/state.ts+++ /dev/null@@ -1,49 +0,0 @@-// Shared test-double state, set on globalThis so tests can assert on spies and-// configure mock data β same interface the old bun `mock.module` preload-// exposed. Imported (for side effect) by every double module below.-import { mock } from "@openstatus/test-utils";--type Mut = Record<string, unknown>;-const g = globalThis as Mut;--if (!g.__subscriptionSpies) {- const sendVerification = mock(() => Promise.resolve());- g.__subscriptionSpies = {- dispatchStatusReportUpdate: mock(() => Promise.resolve()),- dispatchMaintenanceUpdate: mock(() => Promise.resolve()),- sendVerification,- getChannel: {- id: "email",- sendVerification,- sendNotifications: mock(() => Promise.resolve()),- validateConfig: mock(() => Promise.resolve({ valid: true })),- },- };-}--if (!g.__testRedisStore) {- g.__testRedisStore = new Map<string, string>();-}--if (!g.__tinybirdMockData) {- g.__tinybirdMockData = { httpListBiweekly: [], httpGetBiweekly: [] };-}-if (!g.__tinybirdMockCalls) {- g.__tinybirdMockCalls = { httpListBiweekly: [], httpGetBiweekly: [] };-}--export const subscriptionSpies = g.__subscriptionSpies as {- dispatchStatusReportUpdate: ReturnType<typeof mock>;- dispatchMaintenanceUpdate: ReturnType<typeof mock>;- sendVerification: ReturnType<typeof mock>;- getChannel: Record<string, unknown>;-};-export const testRedisStore = g.__testRedisStore as Map<string, string>;-export const tinybirdMockData = g.__tinybirdMockData as {- httpListBiweekly: unknown[];- httpGetBiweekly: unknown[];-};-export const tinybirdMockCalls = g.__tinybirdMockCalls as {- httpListBiweekly: unknown[];- httpGetBiweekly: unknown[];-};diff --git a/apps/server/src/libs/test/doubles/subscriptions.mock.ts b/apps/server/src/libs/test/doubles/subscriptions.mock.tsdeleted file mode 100644index aaf5f2977..000000000--- a/apps/server/src/libs/test/doubles/subscriptions.mock.ts+++ /dev/null@@ -1,11 +0,0 @@-// Test double for @openstatus/subscriptions, swapped in via --import-map.-// Re-exports the real module, overriding only the dispatch fns and getChannel-// with spies (exposed on globalThis via state.ts) so route tests can assert-// notification side effects without sending anything.-export * from "@openstatus/subscriptions-real";--import { subscriptionSpies as spies } from "./state.ts";--export const dispatchStatusReportUpdate = spies.dispatchStatusReportUpdate;-export const dispatchMaintenanceUpdate = spies.dispatchMaintenanceUpdate;-export const getChannel = () => spies.getChannel;diff --git a/apps/server/src/libs/test/doubles/tinybird.mock.ts b/apps/server/src/libs/test/doubles/tinybird.mock.tsdeleted file mode 100644index 2cf71dab6..000000000--- a/apps/server/src/libs/test/doubles/tinybird.mock.ts+++ /dev/null@@ -1,59 +0,0 @@-// Test double for @openstatus/tinybird, swapped in via --import-map. Overrides-// OSTinybird with a no-network stub backed by `__tinybirdMockData/Calls`, while-// re-exporting the real Tinybird/AuditLog/etc. for code that imports them.-export * from "@openstatus/tinybird-real";--import {- tinybirdMockCalls as calls,- tinybirdMockData as data,-} from "./state.ts";--const empty = () => Promise.resolve({ data: [] });--export class OSTinybird {- get legacy_httpStatus45d() {- return empty;- }- get legacy_tcpStatus45d() {- return empty;- }- get httpListBiweekly() {- return (params: unknown) => {- calls.httpListBiweekly.push(params);- return Promise.resolve({ data: data.httpListBiweekly });- };- }- get httpGetBiweekly() {- return (params: unknown) => {- calls.httpGetBiweekly.push(params);- return Promise.resolve({ data: data.httpGetBiweekly });- };- }- get httpMetricsDaily() {- return empty;- }- get httpMetricsWeekly() {- return empty;- }- get httpMetricsBiweekly() {- return empty;- }- get tcpMetricsDaily() {- return empty;- }- get tcpMetricsWeekly() {- return empty;- }- get tcpMetricsBiweekly() {- return empty;- }- get dnsMetricsDaily() {- return empty;- }- get dnsMetricsWeekly() {- return empty;- }- get dnsMetricsBiweekly() {- return empty;- }-}diff --git a/apps/server/src/libs/test/doubles/upstash.mock.ts b/apps/server/src/libs/test/doubles/upstash.mock.tsdeleted file mode 100644index b4dc5fb24..000000000--- a/apps/server/src/libs/test/doubles/upstash.mock.ts+++ /dev/null@@ -1,36 +0,0 @@-// Test double for @openstatus/upstash, swapped in via --import-map. Backs the-// Redis client with the in-memory `__testRedisStore` Map so tests can assert-// on stored state without a real Upstash instance.-import { testRedisStore as store } from "./state.ts";--const client = {- get: (key: string) => Promise.resolve(store.get(key) ?? null),- set: (key: string, value: string) => {- store.set(key, value);- return Promise.resolve("OK");- },- del: (key: string) => {- const existed = store.has(key) ? 1 : 0;- store.delete(key);- return Promise.resolve(existed);- },- getdel: (key: string) => {- const value = store.get(key) ?? null;- store.delete(key);- return Promise.resolve(value);- },- incr: (key: string) => {- const next = Number(store.get(key) ?? 0) + 1;- store.set(key, String(next));- return Promise.resolve(next);- },- expire: () => Promise.resolve(1),-};--export const redis = client;--export const Redis = {- fromEnv() {- return client;- },-};diff --git a/apps/server/src/libs/test/doubles/workspace-resolver.mock.ts b/apps/server/src/libs/test/doubles/workspace-resolver.mock.tsdeleted file mode 100644index 8766b79e7..000000000--- a/apps/server/src/libs/test/doubles/workspace-resolver.mock.ts+++ /dev/null@@ -1,6 +0,0 @@-// Test double for slack/workspace-resolver.ts (hits the db), swapped in via-// --import-map. Delegates to the per-test resolver in the shared slack state.-import { slackTestState } from "./slack-test-state.ts";--export const resolveWorkspace = (teamId: string) =>- slackTestState.resolveWorkspace(teamId);diff --git a/apps/server/src/libs/test/preload.ts b/apps/server/src/libs/test/preload.tsindex 232bf7f9f..a2efeadb6 100644--- a/apps/server/src/libs/test/preload.ts+++ b/apps/server/src/libs/test/preload.ts@@ -1,8 +1,9 @@+import { mock } from "bun:test";+// Import the real module BEFORE mock.module runs so we can spread real// service functions (createSubscription, updateChannel, etc.) into the// replacement while still stubbing the dispatch-side spies.import * as realSubscriptions from "@openstatus/subscriptions";-import { mock } from "@openstatus/test-utils";// Subscription dispatch spies β accessible in tests via globalThis.__subscriptionSpiesconst dispatchStatusReportUpdateSpy = mock((_id: number) => Promise.resolve());diff --git a/apps/server/src/routes/mcp/adapter.test.ts b/apps/server/src/routes/mcp/adapter.test.tsindex b1a00d1a1..b59441890 100644--- a/apps/server/src/routes/mcp/adapter.test.ts+++ b/apps/server/src/routes/mcp/adapter.test.ts@@ -1,7 +1,7 @@+import { describe, expect, test } from "bun:test";+import type { Workspace } from "@openstatus/db/src/schema";import { ForbiddenError, NotFoundError } from "@openstatus/services";-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";import { mapError, toServiceCtx } from "./adapter";diff --git a/apps/server/src/routes/mcp/adapter.ts b/apps/server/src/routes/mcp/adapter.tsindex 2f3d2a7d9..b19ede159 100644--- a/apps/server/src/routes/mcp/adapter.ts+++ b/apps/server/src/routes/mcp/adapter.ts@@ -1,5 +1,5 @@-import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";import { ErrorCode, McpError } from "@modelcontextprotocol/sdk/types.js";+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";import type { Scope, Workspace } from "@openstatus/db/src/schema";import { type ServiceContext, ServiceError } from "@openstatus/services";import { ZodError } from "zod";diff --git a/apps/server/src/routes/mcp/handler.test.ts b/apps/server/src/routes/mcp/handler.test.tsindex 46ba666c2..baa6efc00 100644--- a/apps/server/src/routes/mcp/handler.test.ts+++ b/apps/server/src/routes/mcp/handler.test.ts@@ -1,13 +1,14 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { sentry } from "@hono/sentry";import { db, desc, eq } from "@openstatus/db";import { auditLog, page, statusReport } from "@openstatus/db/src/schema";import { SEEDED_WORKSPACE_TEAM_ID } from "@openstatus/services/test/fixtures";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";import { Hono } from "hono";import { requestId } from "hono/request-id";-import { handleError } from "../../libs/errors";+import { handleError } from "@/libs/errors";+import { mcpRoute } from "./index";/**diff --git a/apps/server/src/routes/mcp/index.ts b/apps/server/src/routes/mcp/index.tsindex 822c47f43..419f324c6 100644--- a/apps/server/src/routes/mcp/index.ts+++ b/apps/server/src/routes/mcp/index.ts@@ -1,9 +1,10 @@import { StreamableHTTPTransport } from "@hono/mcp";import { Hono } from "hono";-import { handleError } from "../../libs/errors";-import { authMiddleware } from "../../libs/middlewares/auth";-import type { Variables } from "../../types";+import { handleError } from "@/libs/errors";+import { authMiddleware } from "@/libs/middlewares/auth";+import type { Variables } from "@/types";+import { toServiceCtx } from "./adapter";import { createMcpServer } from "./server";diff --git a/apps/server/src/routes/mcp/tools/register-scoped.test.ts b/apps/server/src/routes/mcp/tools/register-scoped.test.tsindex 3b5eae6f7..f853a8f7a 100644--- a/apps/server/src/routes/mcp/tools/register-scoped.test.ts+++ b/apps/server/src/routes/mcp/tools/register-scoped.test.ts@@ -1,8 +1,8 @@+import { describe, expect, test } from "bun:test";+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";import type { Workspace } from "@openstatus/db/src/schema";import type { ServiceContext } from "@openstatus/services";-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";import { registerScopedTool } from "./register-scoped";diff --git a/apps/server/src/routes/mcp/tools/tools.test.ts b/apps/server/src/routes/mcp/tools/tools.test.tsindex 3e4e82b3a..0d64855af 100644--- a/apps/server/src/routes/mcp/tools/tools.test.ts+++ b/apps/server/src/routes/mcp/tools/tools.test.ts@@ -1,3 +1,5 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";import { db, eq } from "@openstatus/db";import {@@ -19,8 +21,6 @@ import {readAuditLog,withTestTransaction,} from "@openstatus/services/test/helpers";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";import { toServiceCtx } from "../adapter";import { registerMaintenanceTools } from "./maintenance";diff --git a/apps/server/src/routes/public/status.test.ts b/apps/server/src/routes/public/status.test.tsindex 679c461e9..49c71237c 100644--- a/apps/server/src/routes/public/status.test.ts+++ b/apps/server/src/routes/public/status.test.ts@@ -1,14 +1,15 @@-import { db, eq } from "@openstatus/db";-import { expect } from "@std/expect";import {afterAll,beforeAll,beforeEach,describe,+ expect,test,-} from "@std/testing/bdd";+} from "bun:test";++import { db, eq } from "@openstatus/db";-import { app } from "../../index";+import { app } from "@/index";const testRedisStore = (globalThis as Record<string, unknown>).__testRedisStore as Map<string, string> | undefined;diff --git a/apps/server/src/routes/public/status.ts b/apps/server/src/routes/public/status.tsindex dc1152668..049416034 100644--- a/apps/server/src/routes/public/status.ts+++ b/apps/server/src/routes/public/status.ts@@ -7,7 +7,7 @@ import { endTime, setMetric, startTime } from "hono/timing";const logger = getLogger("api-server");import { Status, Tracker } from "@openstatus/tracker";-import { redis } from "../../libs/clients";+import { redis } from "@/libs/clients";// TODO: include ratelimitingdiff --git a/apps/server/src/routes/rpc/adapter.test.ts b/apps/server/src/routes/rpc/adapter.test.tsindex 381bfa331..d5f02493c 100644--- a/apps/server/src/routes/rpc/adapter.test.ts+++ b/apps/server/src/routes/rpc/adapter.test.ts@@ -1,3 +1,5 @@+import { beforeAll, describe, expect, test } from "bun:test";+import { Code, ConnectError } from "@connectrpc/connect";import type { Workspace } from "@openstatus/db/src/schema";import {@@ -12,8 +14,6 @@ import {loadSeededWorkspace,withTestTransaction,} from "@openstatus/services/test/helpers";-import { expect } from "@std/expect";-import { beforeAll, describe, test } from "@std/testing/bdd";import { toConnectError, toServiceCtx } from "./adapter";diff --git a/apps/server/src/routes/rpc/handlers/maintenance/__tests__/maintenance.test.ts b/apps/server/src/routes/rpc/handlers/maintenance/__tests__/maintenance.test.tsindex bfedbb0de..874d96f6c 100644--- a/apps/server/src/routes/rpc/handlers/maintenance/__tests__/maintenance.test.ts+++ b/apps/server/src/routes/rpc/handlers/maintenance/__tests__/maintenance.test.ts@@ -1,3 +1,5 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import {maintenance,@@ -5,19 +7,14 @@ import {page,pageComponent,pageSubscriber,- workspace,} from "@openstatus/db/src/schema";-import { mock } from "@openstatus/test-utils";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";-import { nanoid } from "nanoid";-import { app } from "../../../../../index";+import { app } from "@/index";const subscriptionSpies = (globalThis as Record<string, unknown>).__subscriptionSpies as {- dispatchStatusReportUpdate: ReturnType<typeof mock>;- dispatchMaintenanceUpdate: ReturnType<typeof mock>;+ dispatchStatusReportUpdate: ReturnType<typeof import("bun:test").mock>;+ dispatchMaintenanceUpdate: ReturnType<typeof import("bun:test").mock>;};/**@@ -43,14 +40,6 @@ async function connectRequest(}const TEST_PREFIX = "rpc-maintenance-test";-// Scoped to a dedicated workspace+page so parallel suites mutating the-// shared seed workspace 1 / page 1 can't delete our fixtures mid-run.-// dev/test `validateKey` maps `x-openstatus-key` to the workspace id.-const WORKSPACE_LIMITS =- '{"monitors":50,"synthetic-checks":150000,"periodicity":["30s","1m","5m","10m","30m","1h"],"multi-region":true,"max-regions":35,"data-retention":"24 months","status-pages":20,"maintenance":true,"status-subscribers":true,"custom-domain":true,"password-protection":true,"email-domain-protection":true,"white-label":true,"notifications":true,"sms":true,"pagerduty":true,"notification-channels":50,"members":"Unlimited","audit-log":true}';-let testWorkspaceId: number;-let authKey: string;-let testPageId: number;let testPageComponentId: number;let testMaintenanceId: number;let testMaintenanceToDeleteId: number;@@ -62,39 +51,26 @@ let testPage2Id: number;let testPage2ComponentId: number;beforeAll(async () => {- const ws = await db- .insert(workspace)- .values({- slug: `${TEST_PREFIX}-ws-${nanoid(8)}`,- name: `${TEST_PREFIX}-workspace`,- plan: "team",- limits: WORKSPACE_LIMITS,- })- .returning()- .get();- testWorkspaceId = ws.id;- authKey = String(testWorkspaceId);-- // Primary page for the suite (replaces shared seed page 1).- const mainPage = await db- .insert(page)- .values({- workspaceId: testWorkspaceId,- title: `${TEST_PREFIX}-page`,- slug: `${TEST_PREFIX}-page-slug-${nanoid(8)}`,- description: "Primary test page for maintenance tests",- customDomain: "",- })- .returning()- .get();- testPageId = mainPage.id;+ // Clean up any existing test data+ await db+ .delete(maintenance)+ .where(eq(maintenance.title, `${TEST_PREFIX}-main`));+ await db+ .delete(maintenance)+ .where(eq(maintenance.title, `${TEST_PREFIX}-to-delete`));+ await db+ .delete(maintenance)+ .where(eq(maintenance.title, `${TEST_PREFIX}-to-update`));+ await db+ .delete(pageComponent)+ .where(eq(pageComponent.name, `${TEST_PREFIX}-component`));- // Create a test page component on the suite's page+ // Create a test page component (using existing page 1 from seed)const component = await db.insert(pageComponent).values({- workspaceId: testWorkspaceId,- pageId: testPageId,+ workspaceId: 1,+ pageId: 1,type: "static",name: `${TEST_PREFIX}-component`,description: "Test component for maintenance tests",@@ -108,9 +84,9 @@ beforeAll(async () => {const page2 = await db.insert(page).values({- workspaceId: testWorkspaceId,+ workspaceId: 1,title: `${TEST_PREFIX}-page-2`,- slug: `${TEST_PREFIX}-page-2-slug-${nanoid(8)}`,+ slug: `${TEST_PREFIX}-page-2-slug`,description: "Second test page for mixed-page tests",customDomain: "",})@@ -121,7 +97,7 @@ beforeAll(async () => {const component2 = await db.insert(pageComponent).values({- workspaceId: testWorkspaceId,+ workspaceId: 1,pageId: testPage2Id,type: "static",name: `${TEST_PREFIX}-component-2`,@@ -136,8 +112,8 @@ beforeAll(async () => {const maintenanceRecord = await db.insert(maintenance).values({- workspaceId: testWorkspaceId,- pageId: testPageId,+ workspaceId: 1,+ pageId: 1,title: `${TEST_PREFIX}-main`,message: "Test maintenance message",from: new Date(Date.now() + 24 * 60 * 60 * 1000), // 1 day from now@@ -157,8 +133,8 @@ beforeAll(async () => {const deleteRecord = await db.insert(maintenance).values({- workspaceId: testWorkspaceId,- pageId: testPageId,+ workspaceId: 1,+ pageId: 1,title: `${TEST_PREFIX}-to-delete`,message: "Maintenance to delete",from: new Date(Date.now() + 48 * 60 * 60 * 1000),@@ -172,8 +148,8 @@ beforeAll(async () => {const updateRecord = await db.insert(maintenance).values({- workspaceId: testWorkspaceId,- pageId: testPageId,+ workspaceId: 1,+ pageId: 1,title: `${TEST_PREFIX}-to-update`,message: "Maintenance to update",from: new Date(Date.now() + 72 * 60 * 60 * 1000),@@ -192,8 +168,8 @@ beforeAll(async () => {const notifyRecord = await db.insert(maintenance).values({- workspaceId: testWorkspaceId,- pageId: testPageId,+ workspaceId: 1,+ pageId: 1,title: `${TEST_PREFIX}-for-notify`,message: "Maintenance for notify tests",from: new Date(Date.now() + 96 * 60 * 60 * 1000),@@ -212,7 +188,7 @@ beforeAll(async () => {const subscriber = await db.insert(pageSubscriber).values({- pageId: testPageId,+ pageId: 1,email: `${TEST_PREFIX}@example.com`,token: `${TEST_PREFIX}-token`,acceptedAt: new Date(),@@ -272,14 +248,6 @@ afterAll(async () => {.delete(pageComponent).where(eq(pageComponent.name, `${TEST_PREFIX}-component-2`));await db.delete(page).where(eq(page.title, `${TEST_PREFIX}-page-2`));-- // Tear down the dedicated page + workspace last (FK order).- if (testPageId) {- await db.delete(page).where(eq(page.id, testPageId));- }- if (testWorkspaceId) {- await db.delete(workspace).where(eq(workspace.id, testWorkspaceId));- }});describe("MaintenanceService.CreateMaintenance", () => {@@ -294,10 +262,10 @@ describe("MaintenanceService.CreateMaintenance", () => {message: "Scheduled maintenance for system upgrade.",from: fromDate.toISOString(),to: toDate.toISOString(),- pageId: String(testPageId),+ pageId: "1",pageComponentIds: [String(testPageComponentId)],},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);@@ -335,8 +303,8 @@ describe("MaintenanceService.CreateMaintenance", () => {message: "Test message",from: fromDate.toISOString(),to: toDate.toISOString(),- pageId: String(testPageId),- pageComponentIds: [String(testPageComponentId)],+ pageId: "1",+ pageComponentIds: ["1"],});expect(res.status).toBe(401);@@ -353,10 +321,10 @@ describe("MaintenanceService.CreateMaintenance", () => {message: "Test message",from: fromDate.toISOString(),to: toDate.toISOString(),- pageId: String(testPageId),+ pageId: "1",pageComponentIds: ["99999"],},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(404);@@ -373,13 +341,13 @@ describe("MaintenanceService.CreateMaintenance", () => {message: "Test message",from: fromDate.toISOString(),to: toDate.toISOString(),- pageId: String(testPageId),+ pageId: "1",pageComponentIds: [String(testPageComponentId),String(testPage2ComponentId),],},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(400);@@ -400,10 +368,10 @@ describe("MaintenanceService.CreateMaintenance", () => {message: "Test pageId mismatch with components.",from: fromDate.toISOString(),to: toDate.toISOString(),- pageId: String(testPageId), // This doesn't match testPage2ComponentId's page+ pageId: "1", // This doesn't match testPage2ComponentId's pagepageComponentIds: [String(testPage2ComponentId)],},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(400);@@ -429,7 +397,7 @@ describe("MaintenanceService.CreateMaintenance", () => {pageId: String(testPage2Id), // Matching the component's pagepageComponentIds: [String(testPage2ComponentId)],},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);@@ -473,10 +441,10 @@ describe("MaintenanceService.CreateMaintenance", () => {message: "Maintenance without components.",from: fromDate.toISOString(),to: toDate.toISOString(),- pageId: String(testPageId),+ pageId: "1",pageComponentIds: [],},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);@@ -506,11 +474,11 @@ describe("MaintenanceService.CreateMaintenance", () => {message: "Notifying subscribers about this maintenance.",from: fromDate.toISOString(),to: toDate.toISOString(),- pageId: String(testPageId),+ pageId: "1",pageComponentIds: [String(testPageComponentId)],notify: true,},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);@@ -551,11 +519,11 @@ describe("MaintenanceService.CreateMaintenance", () => {message: "No notification for this one.",from: fromDate.toISOString(),to: toDate.toISOString(),- pageId: String(testPageId),+ pageId: "1",pageComponentIds: [],notify: false,},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);@@ -583,10 +551,10 @@ describe("MaintenanceService.CreateMaintenance", () => {to: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000 + 3600000,).toISOString(),- pageId: String(testPageId),+ pageId: "1",pageComponentIds: [],},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(400);@@ -605,10 +573,10 @@ describe("MaintenanceService.CreateMaintenance", () => {message: "Test with invalid date range.",from: fromDate.toISOString(),to: toDate.toISOString(),- pageId: String(testPageId),+ pageId: "1",pageComponentIds: [],},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(400);@@ -630,7 +598,7 @@ describe("MaintenanceService.CreateMaintenance", () => {pageId: "99999",pageComponentIds: [],},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(404);@@ -648,7 +616,7 @@ describe("MaintenanceService.GetMaintenance", () => {const res = await connectRequest("GetMaintenance",{ id: String(testMaintenanceId) },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);@@ -678,7 +646,7 @@ describe("MaintenanceService.GetMaintenance", () => {const res = await connectRequest("GetMaintenance",{ id: "99999" },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(404);@@ -702,7 +670,7 @@ describe("MaintenanceService.GetMaintenance", () => {const res = await connectRequest("GetMaintenance",{ id: String(otherRecord.id) },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(404);@@ -715,7 +683,7 @@ describe("MaintenanceService.GetMaintenance", () => {const res = await connectRequest("GetMaintenance",{ id: "" },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(400);@@ -725,7 +693,7 @@ describe("MaintenanceService.GetMaintenance", () => {const res = await connectRequest("GetMaintenance",{ id: " " },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(400);@@ -737,7 +705,7 @@ describe("MaintenanceService.ListMaintenances", () => {const res = await connectRequest("ListMaintenances",{},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);@@ -752,7 +720,7 @@ describe("MaintenanceService.ListMaintenances", () => {const res = await connectRequest("ListMaintenances",{ limit: 100 },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);@@ -781,7 +749,7 @@ describe("MaintenanceService.ListMaintenances", () => {const res = await connectRequest("ListMaintenances",{ limit: 1 },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);@@ -795,7 +763,7 @@ describe("MaintenanceService.ListMaintenances", () => {const res1 = await connectRequest("ListMaintenances",{},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);const data1 = await res1.json();const totalSize = data1.totalSize;@@ -805,7 +773,7 @@ describe("MaintenanceService.ListMaintenances", () => {const res2 = await connectRequest("ListMaintenances",{ limit: 1, offset: 0 },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);const data2 = await res2.json();@@ -813,7 +781,7 @@ describe("MaintenanceService.ListMaintenances", () => {const res3 = await connectRequest("ListMaintenances",{ limit: 1, offset: 1 },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);const data3 = await res3.json();@@ -827,16 +795,16 @@ describe("MaintenanceService.ListMaintenances", () => {test("filters by page_id", async () => {const res = await connectRequest("ListMaintenances",- { pageId: String(testPageId) },- { "x-openstatus-key": authKey },+ { pageId: "1" },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);const data = await res.json();- // All returned maintenances should belong to the filtered page+ // All returned maintenances should have pageId 1for (const record of data.maintenances || []) {- expect(record.pageId).toBe(String(testPageId));+ expect(record.pageId).toBe("1");}});@@ -858,7 +826,7 @@ describe("MaintenanceService.ListMaintenances", () => {const res = await connectRequest("ListMaintenances",{ limit: 100 },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);@@ -883,7 +851,7 @@ describe("MaintenanceService.UpdateMaintenance", () => {id: String(testMaintenanceToUpdateId),title: `${TEST_PREFIX}-updated-title`,},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);@@ -906,7 +874,7 @@ describe("MaintenanceService.UpdateMaintenance", () => {id: String(testMaintenanceToUpdateId),message: "Updated maintenance message",},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);@@ -922,22 +890,21 @@ describe("MaintenanceService.UpdateMaintenance", () => {});test("updates page component associations", async () => {+ // Use existing seeded page component 1const res = await connectRequest("UpdateMaintenance",{id: String(testMaintenanceToUpdateId),- pageComponentIds: [String(testPageComponentId)],+ pageComponentIds: ["1"],updatePageComponentIds: true,},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);const data = await res.json();- expect(data.maintenance.pageComponentIds).toContain(- String(testPageComponentId),- );+ expect(data.maintenance.pageComponentIds).toContain("1");});test("returns 401 when no auth key provided", async () => {@@ -953,7 +920,7 @@ describe("MaintenanceService.UpdateMaintenance", () => {const res = await connectRequest("UpdateMaintenance",{ id: "99999", title: "Non-existent update" },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(404);@@ -963,7 +930,7 @@ describe("MaintenanceService.UpdateMaintenance", () => {const res = await connectRequest("UpdateMaintenance",{ id: "", title: "Empty ID update" },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(400);@@ -973,7 +940,7 @@ describe("MaintenanceService.UpdateMaintenance", () => {const res = await connectRequest("UpdateMaintenance",{ id: " ", title: "Whitespace ID update" },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(400);@@ -997,7 +964,7 @@ describe("MaintenanceService.UpdateMaintenance", () => {const res = await connectRequest("UpdateMaintenance",{ id: String(otherRecord.id), title: "Should not update" },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(404);@@ -1014,7 +981,7 @@ describe("MaintenanceService.UpdateMaintenance", () => {pageComponentIds: ["99999"],updatePageComponentIds: true,},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(404);@@ -1031,7 +998,7 @@ describe("MaintenanceService.UpdateMaintenance", () => {],updatePageComponentIds: true,},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(400);@@ -1057,7 +1024,7 @@ describe("MaintenanceService.UpdateMaintenance", () => {id: String(testMaintenanceToUpdateId),from: newFrom.toISOString(),},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(400);@@ -1088,7 +1055,7 @@ describe("MaintenanceService.UpdateMaintenance", () => {id: String(testMaintenanceToUpdateId),title: `${TEST_PREFIX}-title-only`,},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);@@ -1137,7 +1104,7 @@ describe("MaintenanceService.UpdateMaintenance", () => {id: String(testMaintenanceToUpdateId),pageComponentIds: ["99999"],},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);@@ -1169,7 +1136,7 @@ describe("MaintenanceService.UpdateMaintenance", () => {id: String(testMaintenanceToUpdateId),pageId: "999",},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);@@ -1187,8 +1154,8 @@ describe("MaintenanceService.UpdateMaintenance", () => {const tempRecord = await db.insert(maintenance).values({- workspaceId: testWorkspaceId,- pageId: testPageId,+ workspaceId: 1,+ pageId: 1,title: `${TEST_PREFIX}-clear-pageid`,message: "Temp maintenance for clear test",from: new Date(Date.now() + 24 * 60 * 60 * 1000),@@ -1210,7 +1177,7 @@ describe("MaintenanceService.UpdateMaintenance", () => {pageComponentIds: [],updatePageComponentIds: true,},- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);@@ -1242,7 +1209,7 @@ describe("MaintenanceService.DeleteMaintenance", () => {const res = await connectRequest("DeleteMaintenance",{ id: String(testMaintenanceToDeleteId) },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(200);@@ -1269,7 +1236,7 @@ describe("MaintenanceService.DeleteMaintenance", () => {const res = await connectRequest("DeleteMaintenance",{ id: "99999" },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(404);@@ -1279,7 +1246,7 @@ describe("MaintenanceService.DeleteMaintenance", () => {const res = await connectRequest("DeleteMaintenance",{ id: "" },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(400);@@ -1289,7 +1256,7 @@ describe("MaintenanceService.DeleteMaintenance", () => {const res = await connectRequest("DeleteMaintenance",{ id: " " },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(400);@@ -1313,7 +1280,7 @@ describe("MaintenanceService.DeleteMaintenance", () => {const res = await connectRequest("DeleteMaintenance",{ id: String(otherRecord.id) },- { "x-openstatus-key": authKey },+ { "x-openstatus-key": "1" },);expect(res.status).toBe(404);diff --git a/apps/server/src/routes/rpc/handlers/monitor/__tests__/monitor.test.ts b/apps/server/src/routes/rpc/handlers/monitor/__tests__/monitor.test.tsindex 2a6c33c71..7b9e19d92 100644--- a/apps/server/src/routes/rpc/handlers/monitor/__tests__/monitor.test.ts+++ b/apps/server/src/routes/rpc/handlers/monitor/__tests__/monitor.test.ts@@ -1,3 +1,12 @@+import {+ afterAll,+ beforeAll,+ beforeEach,+ describe,+ expect,+ test,+} from "bun:test";+import { and, db, eq } from "@openstatus/db";import {auditLog,@@ -5,23 +14,10 @@ import {pageComponent,privateLocation,privateLocationToMonitors,- workspace,} from "@openstatus/db/src/schema";import { monitorStatusTable } from "@openstatus/db/src/schema/monitor_status/monitor_status";-import {- createMonitor,- createWorkspace,-} from "@openstatus/db/src/test/factories";-import { expect } from "@std/expect";-import {- afterAll,- beforeAll,- beforeEach,- describe,- test,-} from "@std/testing/bdd";-import { app } from "../../../../../index";+import { app } from "@/index";/*** Helper to make ConnectRPC requests using the Connect protocol (JSON).@@ -503,17 +499,20 @@ describe("MonitorService.DeleteMonitor", () => {});test("cannot delete monitor from another workspace", async () => {- // Isolated workspace (fresh, unique id) so this never collides with seed- // data or another suite mutating workspace 2 in parallel.- const otherWorkspace = await createWorkspace();- const otherWorkspaceMon = await createMonitor(otherWorkspace.id, {- name: `${TEST_PREFIX}-delete-other-ws`,- url: "https://other-ws-delete.example.com",- periodicity: "1m",- active: true,- regions: "ams",- jobType: "http",- });+ // Create a monitor for workspace 2+ const otherWorkspaceMon = await db+ .insert(monitor)+ .values({+ workspaceId: 2,+ name: `${TEST_PREFIX}-delete-other-ws`,+ url: "https://other-ws-delete.example.com",+ periodicity: "1m",+ active: true,+ regions: "ams",+ jobType: "http",+ })+ .returning()+ .get();try {// Try to delete with workspace 1's key@@ -537,7 +536,6 @@ describe("MonitorService.DeleteMonitor", () => {expect(stillExists?.deletedAt).toBeNull();} finally {await db.delete(monitor).where(eq(monitor.id, otherWorkspaceMon.id));- await db.delete(workspace).where(eq(workspace.id, otherWorkspace.id));}});diff --git a/apps/server/src/routes/rpc/handlers/monitor/converters/regions.test.ts b/apps/server/src/routes/rpc/handlers/monitor/converters/regions.test.tsindex c617b766b..bce0efdcb 100644--- a/apps/server/src/routes/rpc/handlers/monitor/converters/regions.test.ts+++ b/apps/server/src/routes/rpc/handlers/monitor/converters/regions.test.ts@@ -1,7 +1,7 @@+import { describe, expect, test } from "bun:test";+import { Region } from "@openstatus/proto/monitor/v1";import { AVAILABLE_REGIONS, RAILWAY_REGIONS } from "@openstatus/regions";-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";import {regionToString,@@ -20,17 +20,13 @@ describe("region converter", () => {["railway_asia-southeast1-eqsg3a", Region.RAILWAY_ASIA_SOUTHEAST1],];- for (const [db, proto] of cases) {- test(`stringToRegion(${db}) β enum`, () => {- expect(stringToRegion(db)).toBe(proto);- });- }+ test.each(cases)("stringToRegion(%s) β enum", (db, proto) => {+ expect(stringToRegion(db)).toBe(proto);+ });- for (const [db, proto] of cases) {- test(`regionToString(enum) β ${db}`, () => {- expect(regionToString(proto)).toBe(db);- });- }+ test.each(cases)("regionToString(enum) β %s", (db, proto) => {+ expect(regionToString(proto)).toBe(db);+ });test("validateRegions accepts all Railway DB codes", () => {expect(validateRegions([...RAILWAY_REGIONS])).toEqual([]);diff --git a/apps/server/src/routes/rpc/handlers/monitor/index.ts b/apps/server/src/routes/rpc/handlers/monitor/index.tsindex e6a4522b7..3e7fda8aa 100644--- a/apps/server/src/routes/rpc/handlers/monitor/index.ts+++ b/apps/server/src/routes/rpc/handlers/monitor/index.ts@@ -30,8 +30,9 @@ import {listResponseLogs,} from "@openstatus/services/monitor";-import { env } from "../../../../env";-import { getCheckerPayload, getCheckerUrl } from "../../../../libs/checker";+import { env } from "@/env";+import { getCheckerPayload, getCheckerUrl } from "@/libs/checker";+import { toConnectError, toServiceCtx } from "../../adapter";import { getRpcContext } from "../../interceptors";import {diff --git a/apps/server/src/routes/rpc/handlers/monitor/response-logs.test.ts b/apps/server/src/routes/rpc/handlers/monitor/response-logs.test.tsindex 315eb4dfc..575dc685c 100644--- a/apps/server/src/routes/rpc/handlers/monitor/response-logs.test.ts+++ b/apps/server/src/routes/rpc/handlers/monitor/response-logs.test.ts@@ -1,6 +1,6 @@+import { expect, test } from "bun:test";+import { redactSensitiveHeaders } from "@openstatus/services/monitor";-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";test("redactSensitiveHeaders returns an empty object when headers are missing", () => {expect(redactSensitiveHeaders(null)).toEqual({});diff --git a/apps/server/src/routes/rpc/handlers/notification/__tests__/notification.test.ts b/apps/server/src/routes/rpc/handlers/notification/__tests__/notification.test.tsindex bf640a35a..87c9dde4e 100644--- a/apps/server/src/routes/rpc/handlers/notification/__tests__/notification.test.ts+++ b/apps/server/src/routes/rpc/handlers/notification/__tests__/notification.test.ts@@ -1,12 +1,12 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import {notification,notificationsToMonitors,} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";-import { app } from "../../../../../index";+import { app } from "@/index";/*** Helper to make ConnectRPC requests using the Connect protocol (JSON).diff --git a/apps/server/src/routes/rpc/handlers/status-page/__tests__/status-page.test.ts b/apps/server/src/routes/rpc/handlers/status-page/__tests__/status-page.test.tsindex d153fd311..6daf779fe 100644--- a/apps/server/src/routes/rpc/handlers/status-page/__tests__/status-page.test.ts+++ b/apps/server/src/routes/rpc/handlers/status-page/__tests__/status-page.test.ts@@ -1,3 +1,5 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { and, db, eq, isNull, sql } from "@openstatus/db";import {auditLog,@@ -9,11 +11,8 @@ import {statusReport,statusReportsToPageComponents,} from "@openstatus/db/src/schema";-import { mock } from "@openstatus/test-utils";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";-import { app } from "../../../../../index";+import { app } from "@/index";/*** Helper to make ConnectRPC requests using the Connect protocol (JSON).@@ -1721,7 +1720,7 @@ describe("StatusPageService.UpdateComponentGroup", () => {const subscriptionSpies = (globalThis as Record<string, unknown>).__subscriptionSpies as {- sendVerification: ReturnType<typeof mock>;+ sendVerification: ReturnType<typeof import("bun:test").mock>;};describe("StatusPageService.SubscribeToPage", () => {diff --git a/apps/server/src/routes/rpc/handlers/status-report/__tests__/status-report.test.ts b/apps/server/src/routes/rpc/handlers/status-report/__tests__/status-report.test.tsindex 03f4c58a3..57e03d4c1 100644--- a/apps/server/src/routes/rpc/handlers/status-report/__tests__/status-report.test.ts+++ b/apps/server/src/routes/rpc/handlers/status-report/__tests__/status-report.test.ts@@ -1,3 +1,5 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import {page,@@ -7,18 +9,14 @@ import {statusReportUpdate,statusReportUpdateToPageComponents,statusReportsToPageComponents,- workspace,} from "@openstatus/db/src/schema";-import { createWorkspace } from "@openstatus/db/src/test/factories";import {PageComponentImpact,StatusReportStatus,} from "@openstatus/proto/status_report/v1";-import { mock } from "@openstatus/test-utils";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";-import { app } from "../../../../../index";+import { app } from "@/index";+import {dbImpactToProto,protoImpactToDb,@@ -27,8 +25,8 @@ import {const subscriptionSpies = (globalThis as Record<string, unknown>).__subscriptionSpies as {- dispatchStatusReportUpdate: ReturnType<typeof mock>;- dispatchMaintenanceUpdate: ReturnType<typeof mock>;+ dispatchStatusReportUpdate: ReturnType<typeof import("bun:test").mock>;+ dispatchMaintenanceUpdate: ReturnType<typeof import("bun:test").mock>;};/**@@ -783,64 +781,36 @@ describe("StatusReportService.ListStatusReports", () => {});test("respects offset parameter", async () => {- // Isolate in a dedicated workspace so concurrent inserts from other suites- // can't shift the pagination window mid-test. In dev/test the- // `x-openstatus-key` header is the workspace id. Distinct createdAt values- // give the `desc(createdAt)` order a deterministic sequence.- const ws = await createWorkspace();- const key = String(ws.id);- const now = Date.now();- const inserted = await db- .insert(statusReport)- .values([- {- workspaceId: ws.id,- title: `${TEST_PREFIX}-offset-1`,- status: "investigating",- createdAt: new Date(now - 2000),- },- {- workspaceId: ws.id,- title: `${TEST_PREFIX}-offset-2`,- status: "investigating",- createdAt: new Date(now - 1000),- },- {- workspaceId: ws.id,- title: `${TEST_PREFIX}-offset-3`,- status: "investigating",- createdAt: new Date(now),- },- ])- .returning();-- try {- const total = await connectRequest(- "ListStatusReports",- {},- { "x-openstatus-key": key },- );- expect((await total.json()).totalSize).toBe(inserted.length);+ // Get total count first+ const res1 = await connectRequest(+ "ListStatusReports",+ {},+ { "x-openstatus-key": "1" },+ );+ const data1 = await res1.json();+ const totalSize = data1.totalSize;- const page1 = await connectRequest(+ if (totalSize > 1) {+ // Get first page+ const res2 = await connectRequest("ListStatusReports",{ limit: 1, offset: 0 },- { "x-openstatus-key": key },+ { "x-openstatus-key": "1" },);- const page2 = await connectRequest(+ const data2 = await res2.json();++ // Get second page+ const res3 = await connectRequest("ListStatusReports",{ limit: 1, offset: 1 },- { "x-openstatus-key": key },+ { "x-openstatus-key": "1" },);- const data1 = await page1.json();- const data2 = await page2.json();+ const data3 = await res3.json();- expect(data1.statusReports).toHaveLength(1);- expect(data2.statusReports).toHaveLength(1);- expect(data1.statusReports[0].id).not.toBe(data2.statusReports[0].id);- } finally {- await db.delete(statusReport).where(eq(statusReport.workspaceId, ws.id));- await db.delete(workspace).where(eq(workspace.id, ws.id));+ // Should have different reports+ if (data2.statusReports?.length > 0 && data3.statusReports?.length > 0) {+ expect(data2.statusReports[0].id).not.toBe(data3.statusReports[0].id);+ }}});diff --git a/apps/server/src/routes/rpc/interceptors/__tests__/tracking.test.ts b/apps/server/src/routes/rpc/interceptors/__tests__/tracking.test.tsindex 234213c13..d79ebb00b 100644--- a/apps/server/src/routes/rpc/interceptors/__tests__/tracking.test.ts+++ b/apps/server/src/routes/rpc/interceptors/__tests__/tracking.test.ts@@ -1,26 +1,35 @@-import type { Interceptor } from "@connectrpc/connect";-import { Events } from "@openstatus/analytics";// @ts-nocheck β ConnectRPC's deep generic types (AnyFn, UnaryResponse, etc.)// are incompatible with bun:test mocks. All runtime behavior is correct.-import {- beforeEach,- describe,- expect,- mock,- test,-} from "@openstatus/test-utils";+import { beforeEach, describe, expect, mock, test } from "bun:test";++import type { Interceptor } from "@connectrpc/connect";+import { Events } from "@openstatus/analytics";import { RPC_CONTEXT_KEY } from "../auth";import { RPC_EVENT_MAP, trackingInterceptor } from "../tracking";-// @openstatus/analytics is swapped for a double (test.importmap.json) whose-// setupAnalytics/track spies are exposed here on globalThis.-const { track: mockTrack, setupAnalytics: mockSetupAnalytics } = (- globalThis as Record<string, unknown>-).__analyticsSpies as {- track: ReturnType<typeof mock>;- setupAnalytics: ReturnType<typeof mock>;-};+// Mock analytics+const mockTrack = mock(() => Promise.resolve());+const mockSetupAnalytics = mock((_props: unknown) =>+ Promise.resolve({ track: mockTrack }),+);++mock.module("@openstatus/analytics", () => ({+ Events,+ parseInputToProps: (json: unknown, props?: string[]) => {+ if (typeof json !== "object" || json === null || !props) return {};+ return props.reduce(+ (acc, prop) => {+ if (prop in json) {+ acc[prop] = (json as Record<string, unknown>)[prop];+ }+ return acc;+ },+ {} as Record<string, unknown>,+ );+ },+ setupAnalytics: (props: unknown) => mockSetupAnalytics(props),+}));type NextFn = Parameters<ReturnType<Interceptor>>[0];diff --git a/apps/server/src/routes/rpc/interceptors/auth.ts b/apps/server/src/routes/rpc/interceptors/auth.tsindex 72171178e..ef72d8a62 100644--- a/apps/server/src/routes/rpc/interceptors/auth.ts+++ b/apps/server/src/routes/rpc/interceptors/auth.ts@@ -7,7 +7,7 @@ import {import type { Scope, Workspace } from "@openstatus/db/src/schema";import { nanoid } from "nanoid";-import { lookupWorkspace, validateKey } from "../../../libs/middlewares/auth";+import { lookupWorkspace, validateKey } from "@/libs/middlewares/auth";/*** RPC context containing workspace and request information.diff --git a/apps/server/src/routes/slack/blocks.test.ts b/apps/server/src/routes/slack/blocks.test.tsindex ceac36c3f..65cd22bef 100644--- a/apps/server/src/routes/slack/blocks.test.ts+++ b/apps/server/src/routes/slack/blocks.test.ts@@ -1,6 +1,6 @@+import { describe, expect, test } from "bun:test";+import { agentTools } from "@openstatus/services/agent-tools";-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";import {buildConfirmationBlocks,diff --git a/apps/server/src/routes/slack/confirmation-store.test.ts b/apps/server/src/routes/slack/confirmation-store.test.tsindex 93e7a211e..4964d3931 100644--- a/apps/server/src/routes/slack/confirmation-store.test.ts+++ b/apps/server/src/routes/slack/confirmation-store.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { beforeEach, describe, test } from "@std/testing/bdd";+import { beforeEach, describe, expect, test } from "bun:test";import {consume,diff --git a/apps/server/src/routes/slack/handler.test.ts b/apps/server/src/routes/slack/handler.test.tsindex 0bfcfbadb..86e01f694 100644--- a/apps/server/src/routes/slack/handler.test.ts+++ b/apps/server/src/routes/slack/handler.test.ts@@ -1,20 +1,84 @@+import { beforeEach, describe, expect, mock, test } from "bun:test";import crypto from "node:crypto";-import { beforeEach, describe, expect, test } from "@openstatus/test-utils";import { Hono } from "hono";-// workspace-resolver / @slack/web-api / agent are swapped for doubles via the-// test import map; behavior is driven through this shared mutable state.-import { slackTestState } from "@/libs/test/doubles/slack-test-state";--import { handleSlackEvent } from "./handler";-import { verifySlackSignature } from "./verify";+import * as agentModule from "./agent";const SIGNING_SECRET = "test-signing-secret";process.env.SLACK_SIGNING_SECRET = SIGNING_SECRET;process.env.AI_GATEWAY_API_KEY = "test-key";+mock.module("./workspace-resolver", () => ({+ resolveWorkspace: (teamId: string) => {+ if (teamId === "T_KNOWN") {+ return Promise.resolve({+ workspace: {+ id: 1,+ name: "Test Workspace",+ slug: "test",+ plan: "free",+ limits: {},+ },+ botToken: "xoxb-test",+ botUserId: "UBOT",+ });+ }+ return Promise.resolve(null);+ },+}));++let slackMessages: Array<{ method: string; args: Record<string, unknown> }> =+ [];+let postMessageOverride:+ | ((args: Record<string, unknown>) => Promise<{ ts: string }>)+ | null = null;+let updateOverride:+ | ((args: Record<string, unknown>) => Promise<{ ts: string }>)+ | null = null;++mock.module("@slack/web-api", () => ({+ WebClient: class {+ chat = {+ postMessage: (args: Record<string, unknown>) => {+ if (postMessageOverride) return postMessageOverride(args);+ slackMessages.push({ method: "postMessage", args });+ return Promise.resolve({ ts: "msg.ts" });+ },+ update: (args: Record<string, unknown>) => {+ if (updateOverride) return updateOverride(args);+ slackMessages.push({ method: "update", args });+ return Promise.resolve({ ts: "msg.ts" });+ },+ };+ conversations = {+ replies: () =>+ Promise.resolve({+ messages: [{ user: "U1", text: "test message", ts: "1.1" }],+ }),+ };+ },+}));++let runAgentOverride:+ | (() => Promise<{ text: string; toolResults: never[] }>)+ | null = null;++mock.module("./agent", () => ({+ ...agentModule,+ runAgent: () => {+ if (runAgentOverride) return runAgentOverride();+ return Promise.resolve({+ text: "Here is my response",+ toolResults: [],+ });+ },+}));++const { handleSlackEvent } = await import("./handler");+const { verifySlackSignature } = await import("./verify");+function createTestApp() {const app = new Hono<{ Variables: { slackBody: unknown } }>();app.post("/slack/events", verifySlackSignature, handleSlackEvent);@@ -48,26 +112,10 @@ describe("handleSlackEvent", () => {const app = createTestApp();beforeEach(() => {- slackTestState.calls = [];- slackTestState.postMessageOverride = null;- slackTestState.updateOverride = null;- slackTestState.runAgentOverride = null;- slackTestState.resolveWorkspace = (teamId: string) => {- if (teamId === "T_KNOWN") {- return Promise.resolve({- workspace: {- id: 1,- name: "Test Workspace",- slug: "test",- plan: "free",- limits: {},- },- botToken: "xoxb-test",- botUserId: "UBOT",- });- }- return Promise.resolve(null);- };+ slackMessages = [];+ postMessageOverride = null;+ updateOverride = null;+ runAgentOverride = null;});test("responds to url_verification challenge", async () => {@@ -154,11 +202,11 @@ describe("handleSlackEvent", () => {await signAndPost(app, body);await new Promise((r) => setTimeout(r, 50));- slackTestState.calls = [];+ slackMessages = [];await signAndPost(app, body);await new Promise((r) => setTimeout(r, 50));- expect(slackTestState.calls.length).toBe(0);+ expect(slackMessages.length).toBe(0);});test("ignores events from unknown teams", async () => {@@ -177,7 +225,7 @@ describe("handleSlackEvent", () => {expect(res.status).toBe(200);await new Promise((r) => setTimeout(r, 50));- expect(slackTestState.calls.length).toBe(0);+ expect(slackMessages.length).toBe(0);});test("ignores message events from bots", async () => {@@ -196,7 +244,7 @@ describe("handleSlackEvent", () => {expect(res.status).toBe(200);await new Promise((r) => setTimeout(r, 50));- expect(slackTestState.calls.length).toBe(0);+ expect(slackMessages.length).toBe(0);});test("ignores channel message without bot mention", async () => {@@ -216,7 +264,7 @@ describe("handleSlackEvent", () => {expect(res.status).toBe(200);await new Promise((r) => setTimeout(r, 50));- expect(slackTestState.calls.length).toBe(0);+ expect(slackMessages.length).toBe(0);});test("processes DM messages without bot mention", async () => {@@ -237,7 +285,7 @@ describe("handleSlackEvent", () => {expect(res.status).toBe(200);await new Promise((r) => setTimeout(r, 50));// DM should trigger a response (postMessage for "Thinking...")- expect(slackTestState.calls.length).toBeGreaterThan(0);+ expect(slackMessages.length).toBeGreaterThan(0);});test("ignores events without channel", async () => {@@ -255,7 +303,7 @@ describe("handleSlackEvent", () => {expect(res.status).toBe(200);await new Promise((r) => setTimeout(r, 50));- expect(slackTestState.calls.length).toBe(0);+ expect(slackMessages.length).toBe(0);});test("ignores events without timestamp", async () => {@@ -273,7 +321,7 @@ describe("handleSlackEvent", () => {expect(res.status).toBe(200);await new Promise((r) => setTimeout(r, 50));- expect(slackTestState.calls.length).toBe(0);+ expect(slackMessages.length).toBe(0);});test("ignores events without team_id", async () => {@@ -291,7 +339,7 @@ describe("handleSlackEvent", () => {expect(res.status).toBe(200);await new Promise((r) => setTimeout(r, 50));- expect(slackTestState.calls.length).toBe(0);+ expect(slackMessages.length).toBe(0);});test("ignores unsupported event types", async () => {@@ -306,7 +354,7 @@ describe("handleSlackEvent", () => {expect(res.status).toBe(200);await new Promise((r) => setTimeout(r, 50));- expect(slackTestState.calls.length).toBe(0);+ expect(slackMessages.length).toBe(0);});test("ignores channel_join system messages", async () => {@@ -326,7 +374,7 @@ describe("handleSlackEvent", () => {expect(res.status).toBe(200);await new Promise((r) => setTimeout(r, 50));- expect(slackTestState.calls.length).toBe(0);+ expect(slackMessages.length).toBe(0);});test("ignores channel_leave system messages", async () => {@@ -346,7 +394,7 @@ describe("handleSlackEvent", () => {expect(res.status).toBe(200);await new Promise((r) => setTimeout(r, 50));- expect(slackTestState.calls.length).toBe(0);+ expect(slackMessages.length).toBe(0);});test("ignores events with no event payload", async () => {@@ -358,12 +406,12 @@ describe("handleSlackEvent", () => {expect(res.status).toBe(200);await new Promise((r) => setTimeout(r, 50));- expect(slackTestState.calls.length).toBe(0);+ expect(slackMessages.length).toBe(0);});test("falls back to top-level message on cannot_reply_to_message", async () => {let callCount = 0;- slackTestState.postMessageOverride = (args: Record<string, unknown>) => {+ postMessageOverride = (args: Record<string, unknown>) => {callCount++;if (callCount === 1) {const err = new Error("An API error occurred: cannot_reply_to_message");@@ -373,7 +421,7 @@ describe("handleSlackEvent", () => {});return Promise.reject(err);}- slackTestState.calls.push({ method: "postMessage", args });+ slackMessages.push({ method: "postMessage", args });return Promise.resolve({ ts: "fallback.ts" });};@@ -393,14 +441,14 @@ describe("handleSlackEvent", () => {expect(res.status).toBe(200);await new Promise((r) => setTimeout(r, 100));- const fallbackPost = slackTestState.calls.find(+ const fallbackPost = slackMessages.find((m) => m.method === "postMessage" && !m.args.thread_ts,);expect(fallbackPost).toBeDefined();});test("returns early on non-recoverable postMessage error", async () => {- slackTestState.postMessageOverride = () => {+ postMessageOverride = () => {const err = new Error("An API error occurred: channel_not_found");Object.assign(err, {code: "slack_webapi_platform_error",@@ -425,15 +473,12 @@ describe("handleSlackEvent", () => {expect(res.status).toBe(200);await new Promise((r) => setTimeout(r, 100));- const updateMessages = slackTestState.calls.filter(- (m) => m.method === "update",- );+ const updateMessages = slackMessages.filter((m) => m.method === "update");expect(updateMessages.length).toBe(0);});test("shows error message when runAgent throws", async () => {- slackTestState.runAgentOverride = () =>- Promise.reject(new Error("agent exploded"));+ runAgentOverride = () => Promise.reject(new Error("agent exploded"));const res = await signAndPost(app, {type: "event_callback",@@ -451,7 +496,7 @@ describe("handleSlackEvent", () => {expect(res.status).toBe(200);await new Promise((r) => setTimeout(r, 100));- const errorUpdate = slackTestState.calls.find(+ const errorUpdate = slackMessages.find((m) =>m.method === "update" &&typeof m.args.text === "string" &&@@ -461,9 +506,8 @@ describe("handleSlackEvent", () => {});test("does not throw when both runAgent and error update fail", async () => {- slackTestState.runAgentOverride = () =>- Promise.reject(new Error("agent exploded"));- slackTestState.updateOverride = () => {+ runAgentOverride = () => Promise.reject(new Error("agent exploded"));+ updateOverride = () => {const err = new Error("An API error occurred: channel_not_found");Object.assign(err, {code: "slack_webapi_platform_error",diff --git a/apps/server/src/routes/slack/index.test.ts b/apps/server/src/routes/slack/index.test.tsindex 89c34b80b..54983660b 100644--- a/apps/server/src/routes/slack/index.test.ts+++ b/apps/server/src/routes/slack/index.test.ts@@ -1,7 +1,6 @@+import { beforeEach, describe, expect, test } from "bun:test";import crypto from "node:crypto";-import { expect } from "@std/expect";-import { beforeEach, describe, test } from "@std/testing/bdd";import { Hono } from "hono";const SIGNING_SECRET = "test-signing-secret";diff --git a/apps/server/src/routes/slack/interactions.test.ts b/apps/server/src/routes/slack/interactions.test.tsindex 98be8198a..a056ce6d3 100644--- a/apps/server/src/routes/slack/interactions.test.ts+++ b/apps/server/src/routes/slack/interactions.test.ts@@ -1,15 +1,8 @@+import { beforeEach, describe, expect, mock, test } from "bun:test";import crypto from "node:crypto";-import { beforeEach, describe, expect, test } from "@openstatus/test-utils";import { Hono } from "hono";-// workspace-resolver / @slack/web-api are swapped for doubles via the test-// import map; behavior is driven through this shared mutable state.-import { slackTestState } from "@/libs/test/doubles/slack-test-state";--import { handleSlackInteraction } from "./interactions";-import { verifySlackSignature } from "./verify";-const SIGNING_SECRET = "test-signing-secret";process.env.SLACK_SIGNING_SECRET = SIGNING_SECRET;@@ -29,13 +22,34 @@ const basePending = {createdAt: Date.now(),};-function configureSlackDoubles() {- slackTestState.calls = [];- slackTestState.resolveWorkspace = (teamId: string) =>- teamId === "T_KNOWN"- ? Promise.resolve({ botToken: "xoxb-fallback" })- : Promise.resolve(null);-}+mock.module("./workspace-resolver", () => ({+ resolveWorkspace: (teamId: string) => {+ if (teamId === "T_KNOWN") {+ return Promise.resolve({ botToken: "xoxb-fallback" });+ }+ return Promise.resolve(null);+ },+}));++let slackCalls: Array<{ method: string; args: Record<string, unknown> }> = [];++mock.module("@slack/web-api", () => ({+ WebClient: class {+ chat = {+ update: (args: Record<string, unknown>) => {+ slackCalls.push({ method: "update", args });+ return Promise.resolve();+ },+ postEphemeral: (args: Record<string, unknown>) => {+ slackCalls.push({ method: "postEphemeral", args });+ return Promise.resolve();+ },+ };+ },+}));++const { handleSlackInteraction } = await import("./interactions");+const { verifySlackSignature } = await import("./verify");function createTestApp() {const app = new Hono<{ Variables: { slackBody: unknown } }>();@@ -119,14 +133,14 @@ describe("handleSlackInteraction (dispatch)", () => {const app = createTestApp();beforeEach(() => {- configureSlackDoubles();+ slackCalls = [];redisStore.clear();});test("returns ok for non-block_actions", async () => {const res = await signAndPost(app, { type: "message_action", actions: [] });expect(res.status).toBe(200);- expect(slackTestState.calls).toHaveLength(0);+ expect(slackCalls).toHaveLength(0);});test("returns ok for unknown action_id prefix", async () => {@@ -139,7 +153,7 @@ describe("handleSlackInteraction (dispatch)", () => {actions: [{ action_id: "unknown_action" }],});expect(res.status).toBe(200);- expect(slackTestState.calls).toHaveLength(0);+ expect(slackCalls).toHaveLength(0);});test("cancel updates message to cancelled", async () => {@@ -153,7 +167,7 @@ describe("handleSlackInteraction (dispatch)", () => {actions: [{ action_id: "cancel_pending-123" }],});expect(res.status).toBe(200);- const cancelCall = slackTestState.calls.find(+ const cancelCall = slackCalls.find((c) =>c.method === "update" && (c.args.text as string).includes("Cancelled"),);@@ -171,9 +185,7 @@ describe("handleSlackInteraction (dispatch)", () => {actions: [{ action_id: "approve_pending-123" }],});expect(res.status).toBe(200);- const ephemeral = slackTestState.calls.find(- (c) => c.method === "postEphemeral",- );+ const ephemeral = slackCalls.find((c) => c.method === "postEphemeral");expect(ephemeral).toBeDefined();expect(ephemeral?.args.text as string).toContain("Only the person");expect(redisStore.has("slack:action:pending-123")).toBe(true);@@ -189,7 +201,7 @@ describe("handleSlackInteraction (dispatch)", () => {actions: [{ action_id: "approve_unknown-id" }],});expect(res.status).toBe(200);- const expiredCall = slackTestState.calls.find(+ const expiredCall = slackCalls.find((c) =>c.method === "update" && (c.args.text as string).includes("expired"),);@@ -206,7 +218,7 @@ describe("handleSlackInteraction (dispatch)", () => {actions: [{ action_id: "approve_some-id" }],});expect(res.status).toBe(200);- expect(slackTestState.calls).toHaveLength(0);+ expect(slackCalls).toHaveLength(0);});test("approve_flag parses flag=true; approve parses flag=false", async () => {@@ -242,7 +254,7 @@ describe("registry-runner execution paths", () => {const app = createTestApp();beforeEach(() => {- configureSlackDoubles();+ slackCalls = [];redisStore.clear();});@@ -257,7 +269,7 @@ describe("registry-runner execution paths", () => {actions: [{ action_id: "approve_maint-001" }],});expect(res.status).toBe(200);- const successCall = slackTestState.calls.find(+ const successCall = slackCalls.find((c) =>c.method === "update" &&(c.args.text as string).includes(@@ -281,7 +293,7 @@ describe("registry-runner execution paths", () => {actions: [{ action_id: "approve_flag_maint-001" }],});expect(res.status).toBe(200);- const successCall = slackTestState.calls.find(+ const successCall = slackCalls.find((c) =>c.method === "update" &&(c.args.text as string).includes("subscribers notified"),@@ -300,7 +312,7 @@ describe("registry-runner execution paths", () => {actions: [{ action_id: "cancel_maint-001" }],});expect(res.status).toBe(200);- const cancelCall = slackTestState.calls.find(+ const cancelCall = slackCalls.find((c) =>c.method === "update" && (c.args.text as string).includes("Cancelled"),);@@ -318,7 +330,7 @@ describe("registry-runner execution paths", () => {actions: [{ action_id: "approve_maint-bad" }],});expect(res.status).toBe(200);- const errCall = slackTestState.calls.find(+ const errCall = slackCalls.find((c) =>c.method === "update" &&(c.args.text as string).startsWith(":x:") &&@@ -342,7 +354,7 @@ describe("registry-runner execution paths", () => {actions: [{ action_id: "approve_maint-bad-time" }],});expect(res.status).toBe(200);- const errCall = slackTestState.calls.find(+ const errCall = slackCalls.find((c) => c.method === "update" && (c.args.text as string).startsWith(":x:"),);expect(errCall).toBeDefined();diff --git a/apps/server/src/routes/slack/oauth.test.ts b/apps/server/src/routes/slack/oauth.test.tsindex 19624dd0d..8d6bc8477 100644--- a/apps/server/src/routes/slack/oauth.test.ts+++ b/apps/server/src/routes/slack/oauth.test.ts@@ -1,7 +1,6 @@+import { describe, expect, test } from "bun:test";import crypto from "node:crypto";-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";import { Hono } from "hono";import { handleSlackInstall, handleSlackOAuthCallback } from "./oauth";diff --git a/apps/server/src/routes/slack/presenters/presenters.test.ts b/apps/server/src/routes/slack/presenters/presenters.test.tsindex 1878a6987..4161a12ea 100644--- a/apps/server/src/routes/slack/presenters/presenters.test.ts+++ b/apps/server/src/routes/slack/presenters/presenters.test.ts@@ -1,13 +1,20 @@+import { describe, expect, mock, test } from "bun:test";+import type { ServiceContext } from "@openstatus/services";import { agentTools } from "@openstatus/services/agent-tools";import type { AnyAgentTool } from "@openstatus/services/agent-tools";-import { describe, expect, test } from "@openstatus/test-utils";import { z } from "zod";-// page-urls.ts hits the db; it's swapped for a deterministic double via the-// test import map (see test.importmap.json).-import { defaultPresenter } from "./default";-import { renderToolResult } from "./index";+// page-urls.ts hits the db; stub before the presenters module loads.+mock.module("../page-urls", () => ({+ getPageUrl: (_pageId: number) =>+ Promise.resolve("https://example.openstatus.dev"),+ getReportUrl: (_pageId: number, reportId: number) =>+ Promise.resolve(`https://example.openstatus.dev/events/report/${reportId}`),+}));++const { defaultPresenter } = await import("./default");+const { renderToolResult } = await import("./index");const fakeCtx = {workspace: { id: 1 },diff --git a/apps/server/src/routes/slack/registry-runner.test.ts b/apps/server/src/routes/slack/registry-runner.test.tsindex a5dad44e3..dd1e74949 100644--- a/apps/server/src/routes/slack/registry-runner.test.ts+++ b/apps/server/src/routes/slack/registry-runner.test.ts@@ -1,8 +1,8 @@+import { describe, expect, test } from "bun:test";+import type { ServiceContext } from "@openstatus/services";import { agentTools } from "@openstatus/services/agent-tools";import type { AnyAgentTool } from "@openstatus/services/agent-tools";-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";import { z } from "zod";import {diff --git a/apps/server/src/routes/slack/system-prompt.test.ts b/apps/server/src/routes/slack/system-prompt.test.tsindex 42835ee74..0b23f7987 100644--- a/apps/server/src/routes/slack/system-prompt.test.ts+++ b/apps/server/src/routes/slack/system-prompt.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { buildSystemPrompt } from "./system-prompt";diff --git a/apps/server/src/routes/slack/verify.test.ts b/apps/server/src/routes/slack/verify.test.tsindex 4640216ee..83b0650cd 100644--- a/apps/server/src/routes/slack/verify.test.ts+++ b/apps/server/src/routes/slack/verify.test.ts@@ -1,7 +1,6 @@+import { describe, expect, test } from "bun:test";import crypto from "node:crypto";-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";import { Hono } from "hono";import { verifySlackSignature } from "./verify";diff --git a/apps/server/src/routes/v1/check/http/post.test.ts b/apps/server/src/routes/v1/check/http/post.test.tsindex ab47edfa1..586b84543 100644--- a/apps/server/src/routes/v1/check/http/post.test.ts+++ b/apps/server/src/routes/v1/check/http/post.test.ts@@ -1,10 +1,12 @@-import { afterEach, expect, mock, test } from "@openstatus/test-utils";+import { expect, test } from "bun:test";+import { afterEach, mock } from "bun:test";import { app } from "@/index";const mockFetch = mock();global.fetch = mockFetch as unknown as typeof fetch;+mock.module("node-fetch", () => mockFetch);afterEach(() => {mockFetch.mockReset();diff --git a/apps/server/src/routes/v1/incidents/get.test.ts b/apps/server/src/routes/v1/incidents/get.test.tsindex 9de6b293d..c7f23e001 100644--- a/apps/server/src/routes/v1/incidents/get.test.ts+++ b/apps/server/src/routes/v1/incidents/get.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/incidents/get_all.test.ts b/apps/server/src/routes/v1/incidents/get_all.test.tsindex 19cb2dc13..618ff95b1 100644--- a/apps/server/src/routes/v1/incidents/get_all.test.ts+++ b/apps/server/src/routes/v1/incidents/get_all.test.ts@@ -1,7 +1,7 @@+import { afterAll, beforeAll, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import { incidentTable, monitor } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, test } from "@std/testing/bdd";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/incidents/put.test.ts b/apps/server/src/routes/v1/incidents/put.test.tsindex 8bf5f059e..309e41d58 100644--- a/apps/server/src/routes/v1/incidents/put.test.ts+++ b/apps/server/src/routes/v1/incidents/put.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/maintenances/get.test.ts b/apps/server/src/routes/v1/maintenances/get.test.tsindex 69a4a2483..c7927a237 100644--- a/apps/server/src/routes/v1/maintenances/get.test.ts+++ b/apps/server/src/routes/v1/maintenances/get.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/maintenances/get_all.test.ts b/apps/server/src/routes/v1/maintenances/get_all.test.tsindex 2eb761920..b5682afdc 100644--- a/apps/server/src/routes/v1/maintenances/get_all.test.ts+++ b/apps/server/src/routes/v1/maintenances/get_all.test.ts@@ -1,3 +1,5 @@+import { afterAll, beforeAll, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import {maintenance,@@ -5,8 +7,6 @@ import {monitor,pageComponent,} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, test } from "@std/testing/bdd";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/maintenances/post.test.ts b/apps/server/src/routes/v1/maintenances/post.test.tsindex d4fd15fe8..dbb51799b 100644--- a/apps/server/src/routes/v1/maintenances/post.test.ts+++ b/apps/server/src/routes/v1/maintenances/post.test.ts@@ -1,7 +1,7 @@+import { beforeEach, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import { maintenance } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { beforeEach, test } from "@std/testing/bdd";import { app } from "@/index";@@ -245,9 +245,7 @@ test("create a maintenance calls dispatchMaintenanceUpdate", async () => {const result = MaintenanceSchema.safeParse(await res.json());expect(result.success).toBe(true);expect(spies.dispatchMaintenanceUpdate.mock.calls.length).toBe(1);- expect(typeof spies.dispatchMaintenanceUpdate.mock.calls[0][0]).toBe(- "number",- );+ expect(spies.dispatchMaintenanceUpdate.mock.calls[0][0]).toBeNumber();if (result.success) {await db.delete(maintenance).where(eq(maintenance.id, result.data.id));diff --git a/apps/server/src/routes/v1/maintenances/put.test.ts b/apps/server/src/routes/v1/maintenances/put.test.tsindex 1400f196a..bf4624247 100644--- a/apps/server/src/routes/v1/maintenances/put.test.ts+++ b/apps/server/src/routes/v1/maintenances/put.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";@@ -97,7 +96,7 @@ test("update only the message", async () => {expect(result.data?.message).toBe("Only Message Updated");});-test.ignore("update only the dates", async () => {+test.todo("update only the dates", async () => {const from = new Date();const to = new Date(from.getTime() + 7200000); // 2 hours later@@ -121,27 +120,24 @@ test.ignore("update only the dates", async () => {expect(result.data?.to).toEqual(to);});-test.ignore(- "update maintenance with `from` date after `to` date should return 400",- async () => {- const to = new Date();- const from = new Date(to.getTime() + 3600000); // from is 1 hour after to-- const res = await app.request("/v1/maintenance/1", {- method: "PUT",- headers: {- "x-openstatus-key": "1",- "Content-Type": "application/json",- },- body: JSON.stringify({- from: from.toISOString(),- to: to.toISOString(),- }),- });-- expect(res.status).toBe(400);- },-);+test.todo("update maintenance with `from` date after `to` date should return 400", async () => {+ const to = new Date();+ const from = new Date(to.getTime() + 3600000); // from is 1 hour after to++ const res = await app.request("/v1/maintenance/1", {+ method: "PUT",+ headers: {+ "x-openstatus-key": "1",+ "Content-Type": "application/json",+ },+ body: JSON.stringify({+ from: from.toISOString(),+ to: to.toISOString(),+ }),+ });++ expect(res.status).toBe(400);+});test("remove all maintenance monitors", async () => {const res = await app.request("/v1/maintenance/1", {@@ -162,7 +158,7 @@ test("remove all maintenance monitors", async () => {expect(result.data?.monitorIds?.length).toBe(0);});-test.ignore("empty body should return 400", async () => {+test.todo("empty body should return 400", async () => {const res = await app.request("/v1/maintenance/1", {method: "PUT",headers: {diff --git a/apps/server/src/routes/v1/monitors/delete.test.ts b/apps/server/src/routes/v1/monitors/delete.test.tsindex 9e9adec89..503883c0c 100644--- a/apps/server/src/routes/v1/monitors/delete.test.ts+++ b/apps/server/src/routes/v1/monitors/delete.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/monitors/get.test.ts b/apps/server/src/routes/v1/monitors/get.test.tsindex 15209292c..9a26b26ae 100644--- a/apps/server/src/routes/v1/monitors/get.test.ts+++ b/apps/server/src/routes/v1/monitors/get.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/monitors/get_all.test.ts b/apps/server/src/routes/v1/monitors/get_all.test.tsindex 97c7dbedc..f7b286dc8 100644--- a/apps/server/src/routes/v1/monitors/get_all.test.ts+++ b/apps/server/src/routes/v1/monitors/get_all.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/monitors/post.test.ts b/apps/server/src/routes/v1/monitors/post.test.tsindex 84ba06e50..235329cf5 100644--- a/apps/server/src/routes/v1/monitors/post.test.ts+++ b/apps/server/src/routes/v1/monitors/post.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";import { createErrorSchema } from "@/libs/errors";@@ -124,7 +123,7 @@ test("create a monitor with deprecated regions should return 400", async () => {expect(res.status).toBe(400);expect(errorSchema.success).toBe(true);- expect(errorSchema.data?.message).toContain(+ expect(errorSchema.data?.message).toMatch("Deprecated regions are not allowed: hkg, waw",);});diff --git a/apps/server/src/routes/v1/monitors/post_dns.test.ts b/apps/server/src/routes/v1/monitors/post_dns.test.tsindex 5a5b3d81f..70223677f 100644--- a/apps/server/src/routes/v1/monitors/post_dns.test.ts+++ b/apps/server/src/routes/v1/monitors/post_dns.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/monitors/post_http.test.ts b/apps/server/src/routes/v1/monitors/post_http.test.tsindex 7ac84591a..9caa0befd 100644--- a/apps/server/src/routes/v1/monitors/post_http.test.ts+++ b/apps/server/src/routes/v1/monitors/post_http.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/monitors/post_tcp.test.ts b/apps/server/src/routes/v1/monitors/post_tcp.test.tsindex 650a79dca..7958913b5 100644--- a/apps/server/src/routes/v1/monitors/post_tcp.test.ts+++ b/apps/server/src/routes/v1/monitors/post_tcp.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/monitors/put.test.ts b/apps/server/src/routes/v1/monitors/put.test.tsindex 3fa45af3e..5b0357ded 100644--- a/apps/server/src/routes/v1/monitors/put.test.ts+++ b/apps/server/src/routes/v1/monitors/put.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/monitors/put_dns.test.ts b/apps/server/src/routes/v1/monitors/put_dns.test.tsindex 3561dc062..e985b8afd 100644--- a/apps/server/src/routes/v1/monitors/put_dns.test.ts+++ b/apps/server/src/routes/v1/monitors/put_dns.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/monitors/put_http.test.ts b/apps/server/src/routes/v1/monitors/put_http.test.tsindex 4ae822a20..f042b7d2d 100644--- a/apps/server/src/routes/v1/monitors/put_http.test.ts+++ b/apps/server/src/routes/v1/monitors/put_http.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/monitors/put_tcp.test.ts b/apps/server/src/routes/v1/monitors/put_tcp.test.tsindex 80ff90299..fa1c2f351 100644--- a/apps/server/src/routes/v1/monitors/put_tcp.test.ts+++ b/apps/server/src/routes/v1/monitors/put_tcp.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/monitors/results/get.test.ts b/apps/server/src/routes/v1/monitors/results/get.test.tsindex 511ec1bff..67ea10dc9 100644--- a/apps/server/src/routes/v1/monitors/results/get.test.ts+++ b/apps/server/src/routes/v1/monitors/results/get.test.ts@@ -1,11 +1,10 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";import { ResultRun } from "../schema";-test.ignore("get monitor result with valid id should return 200", async () => {+test.todo("get monitor result with valid id should return 200", async () => {const res = await app.request("/v1/monitor/1/result/1", {method: "GET",headers: {@@ -61,23 +60,20 @@ test("get monitor result from different workspace should return 404", async () =expect(res.status).toBe(404);});-test.ignore(- "get monitor result with valid TCP monitor should return 200",- async () => {- const res = await app.request("/v1/monitor/4/result/2", {- method: "GET",- headers: {- "x-openstatus-key": "1",- },- });-- expect(res.status).toBe(200);-- const json = await res.json();- const result = ResultRun.array().safeParse(json);- expect(result.success).toBe(true);- },-);+test.todo("get monitor result with valid TCP monitor should return 200", async () => {+ const res = await app.request("/v1/monitor/4/result/2", {+ method: "GET",+ headers: {+ "x-openstatus-key": "1",+ },+ });++ expect(res.status).toBe(200);++ const json = await res.json();+ const result = ResultRun.array().safeParse(json);+ expect(result.success).toBe(true);+});test("get monitor result with non-matching result id should return 404", async () => {const res = await app.request("/v1/monitor/1/result/999998", {diff --git a/apps/server/src/routes/v1/monitors/run/post.test.ts b/apps/server/src/routes/v1/monitors/run/post.test.tsindex b0a1f7565..26547105b 100644--- a/apps/server/src/routes/v1/monitors/run/post.test.ts+++ b/apps/server/src/routes/v1/monitors/run/post.test.ts@@ -1,4 +1,5 @@-import { afterEach, expect, mock, test } from "@openstatus/test-utils";+import { expect, test } from "bun:test";+import { afterEach, mock } from "bun:test";import { app } from "@/index";@@ -7,6 +8,7 @@ import { TriggerResult } from "../schema";const mockFetch = mock();global.fetch = mockFetch as unknown as typeof fetch;+mock.module("node-fetch", () => mockFetch);afterEach(() => {mockFetch.mockReset();@@ -142,47 +144,44 @@ test("run TCP monitor with valid id should return 200", async () => {}});-test.ignore(- "run monitor with multiple regions should return array of results",- async () => {- mockFetch.mockReturnValue(- Promise.resolve(- new Response(- JSON.stringify({- jobType: "http",- status: 200,- latency: 100,- region: "ams",- timestamp: 1234567890,- timing: {- dnsStart: 1,- dnsDone: 2,- connectStart: 3,- connectDone: 4,- tlsHandshakeStart: 5,- tlsHandshakeDone: 6,- firstByteStart: 7,- firstByteDone: 8,- transferStart: 9,- transferDone: 10,- },- }),- { status: 200, headers: { "content-type": "application/json" } },- ),+test.todo("run monitor with multiple regions should return array of results", async () => {+ mockFetch.mockReturnValue(+ Promise.resolve(+ new Response(+ JSON.stringify({+ jobType: "http",+ status: 200,+ latency: 100,+ region: "ams",+ timestamp: 1234567890,+ timing: {+ dnsStart: 1,+ dnsDone: 2,+ connectStart: 3,+ connectDone: 4,+ tlsHandshakeStart: 5,+ tlsHandshakeDone: 6,+ firstByteStart: 7,+ firstByteDone: 8,+ transferStart: 9,+ transferDone: 10,+ },+ }),+ { status: 200, headers: { "content-type": "application/json" } },),- );-- const res = await app.request("/v1/monitor/5/run", {- method: "POST",- headers: {- "x-openstatus-key": "1",- "content-type": "application/json",- },- });-- expect(res.status).toBe(200);-- const json = await res.json();- expect(Array.isArray(json)).toBe(true);- },-);+ ),+ );++ const res = await app.request("/v1/monitor/5/run", {+ method: "POST",+ headers: {+ "x-openstatus-key": "1",+ "content-type": "application/json",+ },+ });++ expect(res.status).toBe(200);++ const json = await res.json();+ expect(Array.isArray(json)).toBe(true);+});diff --git a/apps/server/src/routes/v1/monitors/summary/get.test.ts b/apps/server/src/routes/v1/monitors/summary/get.test.tsindex 300271c17..4bf601d2b 100644--- a/apps/server/src/routes/v1/monitors/summary/get.test.ts+++ b/apps/server/src/routes/v1/monitors/summary/get.test.ts@@ -1,12 +1,12 @@+import { expect, test } from "bun:test";+import { z } from "@hono/zod-openapi";-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";import { app } from "@/index";import { SummarySchema } from "./schema";-test.ignore("return the summary of the monitor", async () => {+test.todo("return the summary of the monitor", async () => {const res = await app.request("/v1/monitor/1/summary", {headers: {"x-openstatus-key": "1",diff --git a/apps/server/src/routes/v1/monitors/summary/get.ts b/apps/server/src/routes/v1/monitors/summary/get.tsindex 22320e12a..6ae9cba33 100644--- a/apps/server/src/routes/v1/monitors/summary/get.ts+++ b/apps/server/src/routes/v1/monitors/summary/get.ts@@ -8,6 +8,11 @@ import { OpenStatusApiError, openApiErrorResponses } from "@/libs/errors";import type { monitorsApi } from "../index";import { ParamsSchema, SummarySchema } from "./schema";+// TODO: is there another better way to mock Redis/Tinybird?+if (process.env.NODE_ENV === "test") {+ require("@/libs/test/preload");+}+const getMonitorStats = createRoute({method: "get",tags: ["monitor"],diff --git a/apps/server/src/routes/v1/monitors/trigger/post.test.ts b/apps/server/src/routes/v1/monitors/trigger/post.test.tsindex 028a0a713..7442da5b4 100644--- a/apps/server/src/routes/v1/monitors/trigger/post.test.ts+++ b/apps/server/src/routes/v1/monitors/trigger/post.test.ts@@ -1,4 +1,5 @@-import { afterEach, expect, mock, test } from "@openstatus/test-utils";+import { expect, test } from "bun:test";+import { afterEach, mock } from "bun:test";import { app } from "@/index";@@ -7,6 +8,7 @@ import { TriggerSchema } from "./schema";const mockFetch = mock();global.fetch = mockFetch as unknown as typeof fetch;+mock.module("node-fetch", () => mockFetch);afterEach(() => {mockFetch.mockReset();diff --git a/apps/server/src/routes/v1/notifications/get.test.ts b/apps/server/src/routes/v1/notifications/get.test.tsindex 8759de392..3e967ba55 100644--- a/apps/server/src/routes/v1/notifications/get.test.ts+++ b/apps/server/src/routes/v1/notifications/get.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/notifications/get_all.test.ts b/apps/server/src/routes/v1/notifications/get_all.test.tsindex 5f2f580eb..0c92e23f0 100644--- a/apps/server/src/routes/v1/notifications/get_all.test.ts+++ b/apps/server/src/routes/v1/notifications/get_all.test.ts@@ -1,7 +1,7 @@+import { afterAll, beforeAll, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import { notification } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, test } from "@std/testing/bdd";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/notifications/post.test.ts b/apps/server/src/routes/v1/notifications/post.test.tsindex b90369afa..5208aec5a 100644--- a/apps/server/src/routes/v1/notifications/post.test.ts+++ b/apps/server/src/routes/v1/notifications/post.test.ts@@ -1,7 +1,7 @@+import { expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import { notification } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/pageSubscribers/post.test.ts b/apps/server/src/routes/v1/pageSubscribers/post.test.tsindex 80de79fa9..7d1bc085c 100644--- a/apps/server/src/routes/v1/pageSubscribers/post.test.ts+++ b/apps/server/src/routes/v1/pageSubscribers/post.test.ts@@ -1,7 +1,7 @@+import { expect, test } from "bun:test";+import { and, db, eq, isNull } from "@openstatus/db";import { pageSubscriber } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/pages/get.test.ts b/apps/server/src/routes/v1/pages/get.test.tsindex 4335e569d..2c197d624 100644--- a/apps/server/src/routes/v1/pages/get.test.ts+++ b/apps/server/src/routes/v1/pages/get.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/pages/get_all.test.ts b/apps/server/src/routes/v1/pages/get_all.test.tsindex 6c9485527..155ed2cbb 100644--- a/apps/server/src/routes/v1/pages/get_all.test.ts+++ b/apps/server/src/routes/v1/pages/get_all.test.ts@@ -1,7 +1,7 @@+import { afterAll, beforeAll, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import { monitor, page, pageComponent } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, test } from "@std/testing/bdd";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/pages/post.test.ts b/apps/server/src/routes/v1/pages/post.test.tsindex e57a260c0..ec8999c6a 100644--- a/apps/server/src/routes/v1/pages/post.test.ts+++ b/apps/server/src/routes/v1/pages/post.test.ts@@ -1,7 +1,7 @@+import { expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import { monitor, page, pageComponent } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/pages/put.test.ts b/apps/server/src/routes/v1/pages/put.test.tsindex 0c76046de..3d327ca1b 100644--- a/apps/server/src/routes/v1/pages/put.test.ts+++ b/apps/server/src/routes/v1/pages/put.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/statusReportUpdates/get.test.ts b/apps/server/src/routes/v1/statusReportUpdates/get.test.tsindex 510c03b86..2a90e6bfe 100644--- a/apps/server/src/routes/v1/statusReportUpdates/get.test.ts+++ b/apps/server/src/routes/v1/statusReportUpdates/get.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/statusReportUpdates/post.test.ts b/apps/server/src/routes/v1/statusReportUpdates/post.test.tsindex d07c2f315..575b169e3 100644--- a/apps/server/src/routes/v1/statusReportUpdates/post.test.ts+++ b/apps/server/src/routes/v1/statusReportUpdates/post.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { beforeEach, test } from "@std/testing/bdd";+import { beforeEach, expect, test } from "bun:test";import { app } from "@/index";@@ -316,7 +315,5 @@ test("create a status report update calls dispatchStatusReportUpdate", async ()const result = StatusReportUpdateSchema.safeParse(await res.json());expect(result.success).toBe(true);expect(spies.dispatchStatusReportUpdate.mock.calls.length).toBe(1);- expect(typeof spies.dispatchStatusReportUpdate.mock.calls[0][0]).toBe(- "number",- );+ expect(spies.dispatchStatusReportUpdate.mock.calls[0][0]).toBeNumber();});diff --git a/apps/server/src/routes/v1/statusReports/delete.test.ts b/apps/server/src/routes/v1/statusReports/delete.test.tsindex b0760725b..2532be018 100644--- a/apps/server/src/routes/v1/statusReports/delete.test.ts+++ b/apps/server/src/routes/v1/statusReports/delete.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/statusReports/get.test.ts b/apps/server/src/routes/v1/statusReports/get.test.tsindex 61980dfde..a833c20ae 100644--- a/apps/server/src/routes/v1/statusReports/get.test.ts+++ b/apps/server/src/routes/v1/statusReports/get.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/statusReports/get_all.test.ts b/apps/server/src/routes/v1/statusReports/get_all.test.tsindex 93e057df5..221354713 100644--- a/apps/server/src/routes/v1/statusReports/get_all.test.ts+++ b/apps/server/src/routes/v1/statusReports/get_all.test.ts@@ -1,3 +1,5 @@+import { afterAll, beforeAll, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import {monitor,@@ -6,8 +8,6 @@ import {statusReportUpdate,statusReportsToPageComponents,} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, test } from "@std/testing/bdd";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/statusReports/post.test.ts b/apps/server/src/routes/v1/statusReports/post.test.tsindex 94c8d9058..77154186a 100644--- a/apps/server/src/routes/v1/statusReports/post.test.ts+++ b/apps/server/src/routes/v1/statusReports/post.test.ts@@ -1,11 +1,11 @@+import { beforeEach, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import {pageComponent,statusReport,statusReportsToPageComponents,} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { beforeEach, test } from "@std/testing/bdd";import { app } from "@/index";@@ -202,9 +202,7 @@ test("create a status report calls dispatchStatusReportUpdate", async () => {const result = StatusReportSchema.safeParse(await res.json());expect(result.success).toBe(true);expect(spies.dispatchStatusReportUpdate.mock.calls.length).toBe(1);- expect(typeof spies.dispatchStatusReportUpdate.mock.calls[0][0]).toBe(- "number",- );+ expect(spies.dispatchStatusReportUpdate.mock.calls[0][0]).toBeNumber();if (result.success) {await dbdiff --git a/apps/server/src/routes/v1/statusReports/subscriber-filtering.integration.test.ts b/apps/server/src/routes/v1/statusReports/subscriber-filtering.integration.test.tsindex 95d14722d..743cfd1c1 100644--- a/apps/server/src/routes/v1/statusReports/subscriber-filtering.integration.test.ts+++ b/apps/server/src/routes/v1/statusReports/subscriber-filtering.integration.test.ts@@ -1,7 +1,7 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { and, db, eq, isNotNull, isNull } from "@openstatus/db";import { page, pageSubscriber } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";/*** Integration tests for subscriber filtering in status report email queries.diff --git a/apps/server/src/routes/v1/statusReports/update/post.test.ts b/apps/server/src/routes/v1/statusReports/update/post.test.tsindex cf13fc176..2ec28acad 100644--- a/apps/server/src/routes/v1/statusReports/update/post.test.ts+++ b/apps/server/src/routes/v1/statusReports/update/post.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/routes/v1/statusReports/update/post.ts b/apps/server/src/routes/v1/statusReports/update/post.tsindex 6f899172e..5c19a0aad 100644--- a/apps/server/src/routes/v1/statusReports/update/post.ts+++ b/apps/server/src/routes/v1/statusReports/update/post.ts@@ -114,9 +114,8 @@ export function registerStatusReportUpdateRoutes(api: typeof statusReportsApi) {.all();const validSubscribers = subscribers.filter(- (s): s is typeof s & { token: string; email: string } =>+ (s): s is typeof s & { token: string } =>s.token !== null &&- s.email !== null &&s.acceptedAt !== null &&s.unsubscribedAt === null,);diff --git a/apps/server/src/routes/v1/whoami/get.test.ts b/apps/server/src/routes/v1/whoami/get.test.tsindex a0a7aa1b2..91f49c789 100644--- a/apps/server/src/routes/v1/whoami/get.test.ts+++ b/apps/server/src/routes/v1/whoami/get.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { app } from "@/index";diff --git a/apps/server/src/serve.ts b/apps/server/src/serve.tsdeleted file mode 100644index b280c1cf5..000000000--- a/apps/server/src/serve.ts+++ /dev/null@@ -1,13 +0,0 @@-import { getLogger } from "@logtape/logtape";--import { env } from "./env";-import { app } from "./index";--const port = 3000;--getLogger("api-server").info("Starting server", {- port,- environment: env.NODE_ENV,-});--Deno.serve({ port }, app.fetch);diff --git a/apps/server/src/utils/audit-log.ts b/apps/server/src/utils/audit-log.tsindex 6c6596984..1c2f37830 100644--- a/apps/server/src/utils/audit-log.ts+++ b/apps/server/src/utils/audit-log.ts@@ -1,6 +1,6 @@import { AuditLog, Tinybird } from "@openstatus/tinybird";-import { env } from "@/env";+import { env } from "../env";const tb = new Tinybird({ token: env.TINY_BIRD_API_KEY });diff --git a/apps/server/test.importmap.json b/apps/server/test.importmap.jsondeleted file mode 100644index e2cdceab4..000000000--- a/apps/server/test.importmap.json+++ /dev/null@@ -1,16 +0,0 @@-{- "imports": {- "@/": "./src/",- "@openstatus/upstash": "./src/libs/test/doubles/upstash.mock.ts",- "@openstatus/tinybird": "./src/libs/test/doubles/tinybird.mock.ts",- "@openstatus/tinybird-real": "../../packages/tinybird/src/index.ts",- "@openstatus/subscriptions": "./src/libs/test/doubles/subscriptions.mock.ts",- "@openstatus/subscriptions-real": "../../packages/subscriptions/src/index.ts",- "@openstatus/analytics": "./src/libs/test/doubles/analytics.mock.ts",- "@openstatus/analytics-real": "../../packages/analytics/src/index.ts",- "./src/routes/slack/page-urls": "./src/libs/test/doubles/page-urls.mock.ts",- "./src/routes/slack/workspace-resolver": "./src/libs/test/doubles/workspace-resolver.mock.ts",- "./src/routes/slack/agent": "./src/libs/test/doubles/slack-agent.mock.ts",- "@slack/web-api": "./src/libs/test/doubles/slack-web-api.mock.ts"- }-}diff --git a/apps/server/tsconfig.json b/apps/server/tsconfig.jsonindex e0efb05dc..d2c9d74a7 100644--- a/apps/server/tsconfig.json+++ b/apps/server/tsconfig.json@@ -8,15 +8,9 @@"moduleResolution": "bundler","jsxImportSource": "react","allowJs": true,- "types": [],+ "types": ["bun-types"],"paths": {- "@/*": ["./src/*"],- "@modelcontextprotocol/sdk/server/mcp.js": [- "./node_modules/@modelcontextprotocol/sdk/dist/esm/server/mcp.d.ts"- ],- "@modelcontextprotocol/sdk/types.js": [- "./node_modules/@modelcontextprotocol/sdk/dist/esm/types.d.ts"- ]+ "@/*": ["./src/*"]}}}diff --git a/apps/status-page/env.ts b/apps/status-page/env.tsindex dab63f5f4..dbb28b166 100644--- a/apps/status-page/env.ts+++ b/apps/status-page/env.ts@@ -1 +1,2 @@-await Deno.copyFile("./.env.example", "./.env");+const file = Bun.file("./.env.example");+await Bun.write("./.env", file);diff --git a/apps/status-page/package.json b/apps/status-page/package.jsonindex 58a35fa7e..cd3368276 100644--- a/apps/status-page/package.json+++ b/apps/status-page/package.json@@ -3,12 +3,12 @@"version": "1.0.0","private": true,"scripts": {- "env": "deno run -A env.ts",+ "env": "bun env.ts","dev": "next dev --turbopack","build": "next build","start": "next start","lint": "next lint",- "test": "deno test --parallel -A --no-check --sloppy-imports",+ "test": "bun test","tsc": "tsc --noEmit"},"dependencies": {@@ -77,14 +77,13 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@tailwindcss/postcss": "catalog:","@tailwindcss/typography": "catalog:","@types/dom-speech-recognition": "catalog:","@types/node": "catalog:","@types/react": "catalog:","@types/react-dom": "catalog:",+ "bun-types": "catalog:","shadcn": "catalog:","tailwindcss": "catalog:","tw-animate-css": "catalog:",diff --git a/apps/status-page/src/app/(public)/client.tsx b/apps/status-page/src/app/(public)/client.tsxindex 9d8568e98..38d02ffd0 100644--- a/apps/status-page/src/app/(public)/client.tsx+++ b/apps/status-page/src/app/(public)/client.tsx@@ -26,7 +26,7 @@ import { useTheme } from "next-themes";import { useQueryStates } from "nuqs";import { useEffect, useState } from "react";-import { Link } from "../../components/common/link";+import { Link } from "@/components/common/link";import {Section,SectionDescription,@@ -34,13 +34,14 @@ import {SectionGroupHeader,SectionHeader,SectionTitle,-} from "../../components/content/section";-import { recomputeStyles } from "../../components/status-page/floating-button";-import { StatusComponentStatic } from "../../components/status-page/static/status-component-static";-import { ThemePalettePicker } from "../../components/themes/theme-palette-picker";-import { ThemeSelect } from "../../components/themes/theme-select";-import { monitors } from "../../data/monitors";-import { useTRPC } from "../../lib/trpc/client";+} from "@/components/content/section";+import { recomputeStyles } from "@/components/status-page/floating-button";+import { StatusComponentStatic } from "@/components/status-page/static/status-component-static";+import { ThemePalettePicker } from "@/components/themes/theme-palette-picker";+import { ThemeSelect } from "@/components/themes/theme-select";+import { monitors } from "@/data/monitors";+import { useTRPC } from "@/lib/trpc/client";+import { searchParamsParsers } from "./search-params";const MAIN_COLORS = [diff --git a/apps/status-page/src/app/(public)/layout.tsx b/apps/status-page/src/app/(public)/layout.tsxindex 68c079858..9297bb8a5 100644--- a/apps/status-page/src/app/(public)/layout.tsx+++ b/apps/status-page/src/app/(public)/layout.tsx@@ -8,12 +8,12 @@ import { NextIntlClientProvider } from "next-intl";import PlausibleProvider from "next-plausible";import { Suspense } from "react";-import { Link } from "../../components/common/link";-import { ThemeProvider } from "../../components/themes/theme-provider";+import { Link } from "@/components/common/link";+import { ThemeProvider } from "@/components/themes/theme-provider";import {SidebarTrigger,ThemeSidebar,-} from "../../components/themes/theme-sidebar";+} from "@/components/themes/theme-sidebar";const SIDEBAR_WIDTH = "20rem";const SIDEBAR_WIDTH_MOBILE = "18rem";diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/layout.tsxindex 4dce7e677..62448552d 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/layout.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/layout.tsx@@ -1,9 +1,9 @@import { cn } from "@openstatus/ui/lib/utils";import { Suspense } from "react";-import { EmbedShell } from "../../../../../components/layout/embed-shell";-import { Footer } from "../../../../../components/nav/footer";-import { getQueryClient, trpc } from "../../../../../lib/trpc/server";+import { EmbedShell } from "@/components/layout/embed-shell";+import { Footer } from "@/components/nav/footer";+import { getQueryClient, trpc } from "@/lib/trpc/server";export default async function Layout({children,diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/login/_components/section-magic-link.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/login/_components/section-magic-link.tsxindex 0030f8675..6da92191a 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/login/_components/section-magic-link.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/login/_components/section-magic-link.tsx@@ -11,18 +11,16 @@ import {EmptyStateContainer,EmptyStateDescription,EmptyStateTitle,-} from "../../../../../../../components/content/empty-state";+} from "@/components/content/empty-state";import {Section,SectionDescription,SectionHeader,SectionTitle,-} from "../../../../../../../components/content/section";-import {- FormEmail,- type FormValues,-} from "../../../../../../../components/forms/form-email";-import { generateServerActionPromise } from "../../../../../../../lib/server-actions";+} from "@/components/content/section";+import { FormEmail, type FormValues } from "@/components/forms/form-email";+import { generateServerActionPromise } from "@/lib/server-actions";+import { signInWithResendAction } from "../actions";export function SectionMagicLink() {diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/login/_components/section-password.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/login/_components/section-password.tsxindex af1bbba9f..32b13e977 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/login/_components/section-password.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/login/_components/section-password.tsx@@ -11,10 +11,10 @@ import {SectionDescription,SectionHeader,SectionTitle,-} from "../../../../../../../components/content/section";-import { FormPassword } from "../../../../../../../components/forms/form-password";-import { createProtectedCookieKey } from "../../../../../../../lib/protected";-import { useTRPC } from "../../../../../../../lib/trpc/client";+} from "@/components/content/section";+import { FormPassword } from "@/components/forms/form-password";+import { createProtectedCookieKey } from "@/lib/protected";+import { useTRPC } from "@/lib/trpc/client";export function SectionPassword() {const t = useExtracted();diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/login/actions.ts b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/login/actions.tsindex bef7b0a38..46056921e 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/login/actions.ts+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/login/actions.ts@@ -5,8 +5,8 @@ import { AuthError } from "next-auth";import { getExtracted } from "next-intl/server";import { isRedirectError } from "next/dist/client/components/redirect-error";-import { signIn } from "../../../../../../lib/auth";-import { getQueryClient, trpc } from "../../../../../../lib/trpc/server";+import { signIn } from "@/lib/auth";+import { getQueryClient, trpc } from "@/lib/trpc/server";export async function signInWithResendAction(formData: FormData) {const t = await getExtracted();diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/login/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/login/page.tsxindex 0368b670d..554c8146b 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/login/page.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/login/page.tsx@@ -3,7 +3,8 @@import { useQuery } from "@tanstack/react-query";import { notFound, useParams } from "next/navigation";-import { useTRPC } from "../../../../../../lib/trpc/client";+import { useTRPC } from "@/lib/trpc/client";+import { SectionMagicLink } from "./_components/section-magic-link";import { SectionPassword } from "./_components/section-password";diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/restricted/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/restricted/page.tsxindex cbdecf1d2..2e6e8b909 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/restricted/page.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(auth)/restricted/page.tsx@@ -5,7 +5,7 @@ import { ShieldAlert } from "lucide-react";import { useExtracted } from "next-intl";import { notFound, useParams } from "next/navigation";-import { useTRPC } from "../../../../../../lib/trpc/client";+import { useTRPC } from "@/lib/trpc/client";export default function RestrictedPage() {const { domain } = useParams<{ domain: string }>();diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/client.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/client.tsxindex 0dc501745..f650dcf94 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/client.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/client.tsx@@ -27,8 +27,8 @@ import { skipToken, useQuery } from "@tanstack/react-query";import { notFound, useParams } from "next/navigation";import { useMemo } from "react";-import { Link } from "../../../../../components/common/link";-import { useStatusPage } from "../../../../../components/status-page/floating-button";+import { Link } from "@/components/common/link";+import { useStatusPage } from "@/components/status-page/floating-button";import {StatusBanner,StatusBannerContainer,@@ -37,23 +37,23 @@ import {StatusBannerTabsContent,StatusBannerTabsList,StatusBannerTabsTrigger,-} from "../../../../../components/status-page/status-banner";+} from "@/components/status-page/status-banner";import {StatusBar,StatusBarSkeleton,-} from "../../../../../components/status-page/status-bar";-import { StatusComponentGroup } from "../../../../../components/status-page/status-component-group";+} from "@/components/status-page/status-bar";+import { StatusComponentGroup } from "@/components/status-page/status-component-group";import {StatusEventAffected,StatusEventAffectedBadge,StatusEventTimelineMaintenance,StatusEventTimelineReportUpdate,-} from "../../../../../components/status-page/status-events";-import { StatusFeed } from "../../../../../components/status-page/status-feed";-import { useEmbed } from "../../../../../hooks/use-embed";-import { usePathnamePrefix } from "../../../../../hooks/use-pathname-prefix";-import { updatesWithImpactChanges } from "../../../../../lib/report-impacts";-import { useTRPC } from "../../../../../lib/trpc/client";+} from "@/components/status-page/status-events";+import { StatusFeed } from "@/components/status-page/status-feed";+import { useEmbed } from "@/hooks/use-embed";+import { usePathnamePrefix } from "@/hooks/use-pathname-prefix";+import { updatesWithImpactChanges } from "@/lib/report-impacts";+import { useTRPC } from "@/lib/trpc/client";export function Client() {const prefix = usePathnamePrefix();diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(list)/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(list)/layout.tsxindex 6a5704cb9..32ea5a797 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(list)/layout.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(list)/layout.tsx@@ -1,6 +1,6 @@import type { Metadata } from "next";-import { statusPageAlternatesMetadata } from "../../../../../../../lib/alternates-metadata";+import { statusPageAlternatesMetadata } from "@/lib/alternates-metadata";export async function generateMetadata({params,diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(list)/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(list)/page.tsxindex 7e7134de4..0d64d5c67 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(list)/page.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(list)/page.tsx@@ -12,7 +12,7 @@ import Link from "next/link";import { useParams } from "next/navigation";import { useQueryStates } from "nuqs";-import { StatusBlankEvents } from "../../../../../../../components/status-page/status-blank";+import { StatusBlankEvents } from "@/components/status-page/status-blank";import {StatusEvent,StatusEventAffected,@@ -25,9 +25,10 @@ import {StatusEventTimelineReport,StatusEventTitle,StatusEventTitleCheck,-} from "../../../../../../../components/status-page/status-events";-import { updatesWithImpactChanges } from "../../../../../../../lib/report-impacts";-import { useTRPC } from "../../../../../../../lib/trpc/client";+} from "@/components/status-page/status-events";+import { updatesWithImpactChanges } from "@/lib/report-impacts";+import { useTRPC } from "@/lib/trpc/client";+import { searchParamsParsers } from "./search-params";export default function Page() {diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/maintenance/[id]/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/maintenance/[id]/layout.tsxindex 4caf455ce..140e18c53 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/maintenance/[id]/layout.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/maintenance/[id]/layout.tsx@@ -1,12 +1,8 @@import type { Metadata } from "next";import { notFound } from "next/navigation";-import { statusPageAlternatesMetadata } from "../../../../../../../../../lib/alternates-metadata";-import {- HydrateClient,- getQueryClient,- trpc,-} from "../../../../../../../../../lib/trpc/server";+import { statusPageAlternatesMetadata } from "@/lib/alternates-metadata";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";export async function generateMetadata({params,diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/maintenance/[id]/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/maintenance/[id]/page.tsxindex 58a9ce959..a4eafcd52 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/maintenance/[id]/page.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/maintenance/[id]/page.tsx@@ -4,9 +4,9 @@ import { useQuery } from "@tanstack/react-query";import { useExtracted } from "next-intl";import { useParams } from "next/navigation";-import { ButtonBack } from "../../../../../../../../../components/button/button-back";-import { ButtonCopyLink } from "../../../../../../../../../components/button/button-copy-link";-import { StatusBlankEvents } from "../../../../../../../../../components/status-page/status-blank";+import { ButtonBack } from "@/components/button/button-back";+import { ButtonCopyLink } from "@/components/button/button-copy-link";+import { StatusBlankEvents } from "@/components/status-page/status-blank";import {StatusEvent,StatusEventAffected,@@ -16,8 +16,8 @@ import {StatusEventDate,StatusEventTimelineMaintenance,StatusEventTitle,-} from "../../../../../../../../../components/status-page/status-events";-import { useTRPC } from "../../../../../../../../../lib/trpc/client";+} from "@/components/status-page/status-events";+import { useTRPC } from "@/lib/trpc/client";export default function MaintenancePage() {const t = useExtracted();diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/report/[id]/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/report/[id]/layout.tsxindex 0977d1bfa..124f989ec 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/report/[id]/layout.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/report/[id]/layout.tsx@@ -1,12 +1,8 @@import type { Metadata } from "next";import { notFound } from "next/navigation";-import { statusPageAlternatesMetadata } from "../../../../../../../../../lib/alternates-metadata";-import {- HydrateClient,- getQueryClient,- trpc,-} from "../../../../../../../../../lib/trpc/server";+import { statusPageAlternatesMetadata } from "@/lib/alternates-metadata";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";export async function generateMetadata({params,diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/report/[id]/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/report/[id]/page.tsxindex 6f3000552..1387487c9 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/report/[id]/page.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/(view)/report/[id]/page.tsx@@ -4,9 +4,9 @@ import { useQuery } from "@tanstack/react-query";import { useExtracted } from "next-intl";import { useParams } from "next/navigation";-import { ButtonBack } from "../../../../../../../../../components/button/button-back";-import { ButtonCopyLink } from "../../../../../../../../../components/button/button-copy-link";-import { StatusBlankEvents } from "../../../../../../../../../components/status-page/status-blank";+import { ButtonBack } from "@/components/button/button-back";+import { ButtonCopyLink } from "@/components/button/button-copy-link";+import { StatusBlankEvents } from "@/components/status-page/status-blank";import {StatusEvent,StatusEventAffected,@@ -17,9 +17,9 @@ import {StatusEventTimelineReport,StatusEventTitle,StatusEventTitleCheck,-} from "../../../../../../../../../components/status-page/status-events";-import { updatesWithImpactChanges } from "../../../../../../../../../lib/report-impacts";-import { useTRPC } from "../../../../../../../../../lib/trpc/client";+} from "@/components/status-page/status-events";+import { updatesWithImpactChanges } from "@/lib/report-impacts";+import { useTRPC } from "@/lib/trpc/client";export default function ReportPage() {const t = useExtracted();diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/layout.tsxindex 1d913d442..faa8e4e07 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/layout.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/events/layout.tsx@@ -10,7 +10,7 @@ import {import { useQuery } from "@tanstack/react-query";import { useParams } from "next/navigation";-import { useTRPC } from "../../../../../../lib/trpc/client";+import { useTRPC } from "@/lib/trpc/client";export default function EventLayout({children,diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/feed/[type]/route.ts b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/feed/[type]/route.tsindex f8ea2279c..a3fbb4637 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/feed/[type]/route.ts+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/feed/[type]/route.ts@@ -1,9 +1,9 @@import { Feed } from "feed";import { notFound, unauthorized } from "next/navigation";-import { auth } from "../../../../../../../lib/auth";-import { getBaseUrl } from "../../../../../../../lib/base-url";-import { getQueryClient, trpc } from "../../../../../../../lib/trpc/server";+import { auth } from "@/lib/auth";+import { getBaseUrl } from "@/lib/base-url";+import { getQueryClient, trpc } from "@/lib/trpc/server";const STATUS_LABELS = {investigating: "Investigating",diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/feed/json/route.ts b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/feed/json/route.tsindex 600d02f7c..885246ea0 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/feed/json/route.ts+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/feed/json/route.ts@@ -1,7 +1,7 @@import { notFound, unauthorized } from "next/navigation";-import { auth } from "../../../../../../../lib/auth";-import { getQueryClient, trpc } from "../../../../../../../lib/trpc/server";+import { auth } from "@/lib/auth";+import { getQueryClient, trpc } from "@/lib/trpc/server";export const revalidate = 60;diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/layout.tsxindex 3e5c45e3a..582ebac01 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/layout.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/layout.tsx@@ -4,9 +4,9 @@ import {} from "@openstatus/ui/components/blocks/status-page-shell";import { Suspense } from "react";-import { EmbedShell } from "../../../../../components/layout/embed-shell";-import { Footer } from "../../../../../components/nav/footer";-import { Header } from "../../../../../components/nav/header";+import { EmbedShell } from "@/components/layout/embed-shell";+import { Footer } from "@/components/nav/footer";+import { Header } from "@/components/nav/header";export default function Layout({ children }: { children: React.ReactNode }) {return (diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/llms.txt/route.ts b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/llms.txt/route.tsindex 32ff79983..060d94fc2 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/llms.txt/route.ts+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/llms.txt/route.ts@@ -2,12 +2,9 @@ import { db, sql } from "@openstatus/db";import { page } from "@openstatus/db/src/schema";import { NextResponse } from "next/server";-import {- escapeLinkLabel,- type OverviewPage,-} from "../../../../../../content/markdown";-import { getBaseUrl } from "../../../../../../lib/base-url";-import { getQueryClient, trpc } from "../../../../../../lib/trpc/server";+import { escapeLinkLabel, type OverviewPage } from "@/content/markdown";+import { getBaseUrl } from "@/lib/base-url";+import { getQueryClient, trpc } from "@/lib/trpc/server";export const runtime = "nodejs";export const dynamic = "force-dynamic";diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/manage/[token]/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/manage/[token]/layout.tsxindex d7759e1ac..f90f987a7 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/manage/[token]/layout.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/manage/[token]/layout.tsx@@ -1,8 +1,4 @@-import {- HydrateClient,- getQueryClient,- trpc,-} from "../../../../../../../lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";export default async function Layout({children,diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/manage/[token]/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/manage/[token]/page.tsxindex fefbeaaf3..9bc7aef7b 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/manage/[token]/page.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/manage/[token]/page.tsx@@ -18,7 +18,7 @@ import { useExtracted, useLocale } from "next-intl";import { useParams } from "next/navigation";import { toast } from "sonner";-import { ButtonBack } from "../../../../../../../components/button/button-back";+import { ButtonBack } from "@/components/button/button-back";import {FormCard,FormCardContent,@@ -27,16 +27,16 @@ import {FormCardFooterInfo,FormCardHeader,FormCardTitle,-} from "../../../../../../../components/forms/form-card";-import { FormManageSubscription } from "../../../../../../../components/forms/form-manage-subscription";+} from "@/components/forms/form-card";+import { FormManageSubscription } from "@/components/forms/form-manage-subscription";import {StatusBlankContainer,StatusBlankContent,StatusBlankDescription,StatusBlankLink,StatusBlankTitle,-} from "../../../../../../../components/status-page/status-blank";-import { useTRPC } from "../../../../../../../lib/trpc/client";+} from "@/components/status-page/status-blank";+import { useTRPC } from "@/lib/trpc/client";export default function VerifyPage() {const t = useExtracted();diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/manage/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/manage/layout.tsxindex 1d913d442..faa8e4e07 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/manage/layout.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/manage/layout.tsx@@ -10,7 +10,7 @@ import {import { useQuery } from "@tanstack/react-query";import { useParams } from "next/navigation";-import { useTRPC } from "../../../../../../lib/trpc/client";+import { useTRPC } from "@/lib/trpc/client";export default function EventLayout({children,diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/[id]/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/[id]/layout.tsxindex 36dafd6db..5a45b9601 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/[id]/layout.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/[id]/layout.tsx@@ -1,7 +1,7 @@import type { Metadata } from "next";import { notFound } from "next/navigation";-import { statusPageAlternatesMetadata } from "../../../../../../../lib/alternates-metadata";+import { statusPageAlternatesMetadata } from "@/lib/alternates-metadata";export async function generateMetadata({params,diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/[id]/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/[id]/page.tsxindex 964d2a630..5efcc37e6 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/[id]/page.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/[id]/page.tsx@@ -15,27 +15,27 @@ import { useParams } from "next/navigation";import { useQueryStates } from "nuqs";import { useMemo } from "react";-import { ButtonBack } from "../../../../../../../components/button/button-back";-import { ButtonCopyLink } from "../../../../../../../components/button/button-copy-link";+import { ButtonBack } from "@/components/button/button-back";+import { ButtonCopyLink } from "@/components/button/button-copy-link";import {ChartAreaPercentiles,ChartAreaPercentilesSkeleton,-} from "../../../../../../../components/chart/chart-area-percentiles";+} from "@/components/chart/chart-area-percentiles";import {ChartBarUptime,ChartBarUptimeSkeleton,-} from "../../../../../../../components/chart/chart-bar-uptime";+} from "@/components/chart/chart-bar-uptime";import {ChartLineRegions,ChartLineRegionsSkeleton,-} from "../../../../../../../components/chart/chart-line-regions";-import { StatusBlankMonitors } from "../../../../../../../components/status-page/status-blank";+} from "@/components/chart/chart-line-regions";+import { StatusBlankMonitors } from "@/components/status-page/status-blank";import {StatusChartContent,StatusChartDescription,StatusChartHeader,StatusChartTitle,-} from "../../../../../../../components/status-page/status-charts";+} from "@/components/status-page/status-charts";import {StatusMonitorTabs,StatusMonitorTabsContent,@@ -44,13 +44,14 @@ import {StatusMonitorTabsTriggerLabel,StatusMonitorTabsTriggerValue,StatusMonitorTabsTriggerValueSkeleton,-} from "../../../../../../../components/status-page/status-monitor-tabs";+} from "@/components/status-page/status-monitor-tabs";import {formatMillisecondsRange,formatNumber,formatPercentage,-} from "../../../../../../../lib/formatter";-import { useTRPC } from "../../../../../../../lib/trpc/client";+} from "@/lib/formatter";+import { useTRPC } from "@/lib/trpc/client";+import { searchParamsParsers } from "./search-params";export default function Page() {diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/layout.tsxindex b793c90ae..61d968111 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/layout.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/layout.tsx@@ -1,6 +1,6 @@import type { Metadata } from "next";-import { statusPageAlternatesMetadata } from "../../../../../../lib/alternates-metadata";+import { statusPageAlternatesMetadata } from "@/lib/alternates-metadata";export async function generateMetadata({params,diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/page.tsxindex 6bc56d9cb..48aef75d6 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/page.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/monitors/page.tsx@@ -18,9 +18,9 @@ import { useParams } from "next/navigation";import {ChartAreaPercentiles,ChartAreaPercentilesSkeleton,-} from "../../../../../../components/chart/chart-area-percentiles";-import { StatusBlankMonitors } from "../../../../../../components/status-page/status-blank";-import { useTRPC } from "../../../../../../lib/trpc/client";+} from "@/components/chart/chart-area-percentiles";+import { StatusBlankMonitors } from "@/components/status-page/status-blank";+import { useTRPC } from "@/lib/trpc/client";export default function Page() {const { domain } = useParams<{ domain: string }>();diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/search-params.ts b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/search-params.tsindex fb02a69ac..2edef64c1 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/search-params.ts+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/search-params.ts@@ -1,6 +1,6 @@import { createSearchParamsCache } from "nuqs/server";-import { embedParser } from "../../../../../lib/embed-params";+import { embedParser } from "@/lib/embed-params";export const embedSearchParamsCache = createSearchParamsCache({embed: embedParser,diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/unsubscribe/[token]/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/unsubscribe/[token]/layout.tsxindex 41485a1ee..c77dbc686 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/unsubscribe/[token]/layout.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/unsubscribe/[token]/layout.tsx@@ -10,7 +10,7 @@ import {import { useQuery } from "@tanstack/react-query";import { useParams } from "next/navigation";-import { useTRPC } from "../../../../../../../lib/trpc/client";+import { useTRPC } from "@/lib/trpc/client";export default function UnsubscribeLayout({children,diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/unsubscribe/[token]/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/unsubscribe/[token]/page.tsxindex d4f0aded3..53bea9545 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/unsubscribe/[token]/page.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/unsubscribe/[token]/page.tsx@@ -11,8 +11,8 @@ import {StatusBlankDescription,StatusBlankLink,StatusBlankTitle,-} from "../../../../../../../components/status-page/status-blank";-import { useTRPC } from "../../../../../../../lib/trpc/client";+} from "@/components/status-page/status-blank";+import { useTRPC } from "@/lib/trpc/client";export default function UnsubscribePage() {const t = useExtracted();diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/verify/[token]/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/verify/[token]/layout.tsxindex 3c0616362..faa8e4e07 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/verify/[token]/layout.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/verify/[token]/layout.tsx@@ -10,7 +10,7 @@ import {import { useQuery } from "@tanstack/react-query";import { useParams } from "next/navigation";-import { useTRPC } from "../../../../../../../lib/trpc/client";+import { useTRPC } from "@/lib/trpc/client";export default function EventLayout({children,diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/verify/[token]/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/verify/[token]/page.tsxindex cf71d1f2a..c27dd0978 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/verify/[token]/page.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/(public)/verify/[token]/page.tsx@@ -11,8 +11,8 @@ import {StatusBlankContent,StatusBlankLink,StatusBlankTitle,-} from "../../../../../../../components/status-page/status-blank";-import { useTRPC } from "../../../../../../../lib/trpc/client";+} from "@/components/status-page/status-blank";+import { useTRPC } from "@/lib/trpc/client";export default function VerifyPage() {const t = useExtracted();diff --git a/apps/status-page/src/app/(status-page)/[domain]/[locale]/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/[locale]/layout.tsxindex 1bab2f44a..79d21b240 100644--- a/apps/status-page/src/app/(status-page)/[domain]/[locale]/layout.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/[locale]/layout.tsx@@ -2,9 +2,9 @@ import { NextIntlClientProvider, hasLocale } from "next-intl";import { setRequestLocale } from "next-intl/server";import { notFound } from "next/navigation";-import { DateFnsProvider } from "../../../../components/date-fns-provider";-import { StatusBlocksProvider } from "../../../../components/i18n/status-blocks-provider";-import { routing } from "../../../../i18n/routing";+import { DateFnsProvider } from "@/components/date-fns-provider";+import { StatusBlocksProvider } from "@/components/i18n/status-blocks-provider";+import { routing } from "@/i18n/routing";export default async function LocaleLayout({children,diff --git a/apps/status-page/src/app/(status-page)/[domain]/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/layout.tsxindex 5dbcf2932..3b6b86fff 100644--- a/apps/status-page/src/app/(status-page)/[domain]/layout.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/layout.tsx@@ -4,16 +4,16 @@ import { Toaster } from "@openstatus/ui/components/ui/sonner";import type { Metadata } from "next";import { notFound } from "next/navigation";-import { PasswordWrapper } from "../../../components/password-wrapper";+import { defaultMetadata, ogMetadata, twitterMetadata } from "@/app/metadata";+import { PasswordWrapper } from "@/components/password-wrapper";import {FloatingButton,StatusPageProvider,-} from "../../../components/status-page/floating-button";-import { FloatingTheme } from "../../../components/status-page/floating-theme";-import { ThemeProvider } from "../../../components/themes/theme-provider";-import { statusPageAlternates } from "../../../lib/alternates";-import { getQueryClient, HydrateClient, trpc } from "../../../lib/trpc/server";-import { defaultMetadata, ogMetadata, twitterMetadata } from "../../metadata";+} from "@/components/status-page/floating-button";+import { FloatingTheme } from "@/components/status-page/floating-theme";+import { ThemeProvider } from "@/components/themes/theme-provider";+import { statusPageAlternates } from "@/lib/alternates";+import { getQueryClient, HydrateClient, trpc } from "@/lib/trpc/server";// Canonical schema β guarantees concrete enum output (never null/undefined).diff --git a/apps/status-page/src/app/api/auth/[...nextauth]/route.ts b/apps/status-page/src/app/api/auth/[...nextauth]/route.tsindex 9f1bce8e8..c55a45ed7 100644--- a/apps/status-page/src/app/api/auth/[...nextauth]/route.ts+++ b/apps/status-page/src/app/api/auth/[...nextauth]/route.ts@@ -1,3 +1,3 @@-import { handlers } from "../../../../lib/auth";+import { handlers } from "@/lib/auth";export const { GET, POST } = handlers;diff --git a/apps/status-page/src/app/api/markdown/[[...path]]/route.ts b/apps/status-page/src/app/api/markdown/[[...path]]/route.tsindex 5f8868af8..43a151d45 100644--- a/apps/status-page/src/app/api/markdown/[[...path]]/route.ts+++ b/apps/status-page/src/app/api/markdown/[[...path]]/route.ts@@ -10,12 +10,12 @@ import {generateReport,matchMarkdownRoute,parseMarkdownPath,-} from "../../../../content/markdown";-import { getBaseUrl } from "../../../../lib/base-url";-import { resolveClientIp } from "../../../../lib/http/client-ip";-import { resolveMarkdownResponse } from "../../../../lib/http/markdown-response";-import { type GatePage, resolveGate } from "../../../../lib/proxy/resolve-gate";-import { getQueryClient, trpc } from "../../../../lib/trpc/server";+} from "@/content/markdown";+import { getBaseUrl } from "@/lib/base-url";+import { resolveClientIp } from "@/lib/http/client-ip";+import { resolveMarkdownResponse } from "@/lib/http/markdown-response";+import { type GatePage, resolveGate } from "@/lib/proxy/resolve-gate";+import { getQueryClient, trpc } from "@/lib/trpc/server";// Match the feed route: getQueryClient/httpBatchLink needs Node, not Edge.export const runtime = "nodejs";diff --git a/apps/status-page/src/app/api/status/[[...path]]/route.ts b/apps/status-page/src/app/api/status/[[...path]]/route.tsindex 6ee8bb273..37255f800 100644--- a/apps/status-page/src/app/api/status/[[...path]]/route.ts+++ b/apps/status-page/src/app/api/status/[[...path]]/route.ts@@ -8,14 +8,14 @@ import {toStatus,toSummary,toUnresolvedIncidents,-} from "../../../../content/status-json";-import { getBaseUrl } from "../../../../lib/base-url";-import { stripHostPort } from "../../../../lib/domain";-import { resolveClientIp } from "../../../../lib/http/client-ip";-import { computeETag, isNotModified } from "../../../../lib/http/etag";-import { resolveGate } from "../../../../lib/proxy/resolve-gate";-import { resolveRoute } from "../../../../lib/resolve-route";-import { getQueryClient, trpc } from "../../../../lib/trpc/server";+} from "@/content/status-json";+import { getBaseUrl } from "@/lib/base-url";+import { stripHostPort } from "@/lib/domain";+import { resolveClientIp } from "@/lib/http/client-ip";+import { computeETag, isNotModified } from "@/lib/http/etag";+import { resolveGate } from "@/lib/proxy/resolve-gate";+import { resolveRoute } from "@/lib/resolve-route";+import { getQueryClient, trpc } from "@/lib/trpc/server";// trpc httpBatchLink needs Node, matching the markdown route.export const runtime = "nodejs";diff --git a/apps/status-page/src/app/api/trpc/edge/[trpc]/route.ts b/apps/status-page/src/app/api/trpc/edge/[trpc]/route.tsindex c05e3b01e..9dd8225ba 100644--- a/apps/status-page/src/app/api/trpc/edge/[trpc]/route.ts+++ b/apps/status-page/src/app/api/trpc/edge/[trpc]/route.ts@@ -3,8 +3,8 @@ import { edgeRouter } from "@openstatus/api/src/edge";import { fetchRequestHandler } from "@trpc/server/adapters/fetch";import type { NextRequest } from "next/server";-import { auth } from "../../../../../lib/auth";-import { createOnError, guardTRPCSource } from "../../../../../lib/trpc/shared";+import { auth } from "@/lib/auth";+import { createOnError, guardTRPCSource } from "@/lib/trpc/shared";export const runtime = "edge";diff --git a/apps/status-page/src/app/api/trpc/lambda/[trpc]/route.ts b/apps/status-page/src/app/api/trpc/lambda/[trpc]/route.tsindex f17aa8177..944ea4af4 100644--- a/apps/status-page/src/app/api/trpc/lambda/[trpc]/route.ts+++ b/apps/status-page/src/app/api/trpc/lambda/[trpc]/route.ts@@ -3,8 +3,8 @@ import { lambdaRouter } from "@openstatus/api/src/lambda";import { fetchRequestHandler } from "@trpc/server/adapters/fetch";import type { NextRequest } from "next/server";-import { auth } from "../../../../../lib/auth";-import { createOnError, guardTRPCSource } from "../../../../../lib/trpc/shared";+import { auth } from "@/lib/auth";+import { createOnError, guardTRPCSource } from "@/lib/trpc/shared";// Stripe is incompatible with Edge runtimes due to using Node.js events// export const runtime = "edge";diff --git a/apps/status-page/src/app/global-error.tsx b/apps/status-page/src/app/global-error.tsxindex 758c18093..6d4ad424f 100644--- a/apps/status-page/src/app/global-error.tsx+++ b/apps/status-page/src/app/global-error.tsx@@ -4,7 +4,7 @@ import { Button } from "@openstatus/ui/components/ui/button";import * as Sentry from "@sentry/nextjs";import { useEffect } from "react";-import { Link } from "../components/common/link";+import { Link } from "@/components/common/link";export default function GlobalError({error,diff --git a/apps/status-page/src/app/layout.tsx b/apps/status-page/src/app/layout.tsxindex bc1a2aec1..600b276d0 100644--- a/apps/status-page/src/app/layout.tsx+++ b/apps/status-page/src/app/layout.tsx@@ -6,8 +6,9 @@ import { Geist, Geist_Mono } from "next/font/google";import LocalFont from "next/font/local";import { NuqsAdapter } from "nuqs/adapters/next/app";-import { TailwindIndicator } from "../components/tailwind-indicator";-import { TRPCReactProvider } from "../lib/trpc/client";+import { TailwindIndicator } from "@/components/tailwind-indicator";+import { TRPCReactProvider } from "@/lib/trpc/client";+import { ogMetadata, twitterMetadata } from "./metadata";import { defaultMetadata } from "./metadata";diff --git a/apps/status-page/src/app/not-found.tsx b/apps/status-page/src/app/not-found.tsxindex a1042a9a4..47cd00e22 100644--- a/apps/status-page/src/app/not-found.tsx+++ b/apps/status-page/src/app/not-found.tsx@@ -5,8 +5,8 @@ import { useRouter } from "next/navigation";import { NuqsAdapter } from "nuqs/adapters/next/app";import { Suspense } from "react";-import { Link } from "../components/common/link";-import { ThemeProvider } from "../components/themes/theme-provider";+import { Link } from "@/components/common/link";+import { ThemeProvider } from "@/components/themes/theme-provider";export default function NotFound() {return (diff --git a/apps/status-page/src/app/robots.ts b/apps/status-page/src/app/robots.tsindex dc3db8bab..4df99d6d6 100644--- a/apps/status-page/src/app/robots.ts+++ b/apps/status-page/src/app/robots.ts@@ -3,9 +3,9 @@ import { page } from "@openstatus/db/src/schema";import type { MetadataRoute } from "next";import { headers } from "next/headers";-import { getBaseUrl } from "../lib/base-url";-import { stripHostPort } from "../lib/domain";-import { resolveRoute } from "../lib/resolve-route";+import { getBaseUrl } from "@/lib/base-url";+import { stripHostPort } from "@/lib/domain";+import { resolveRoute } from "@/lib/resolve-route";// trpc/db lookup needs Node, matching the sitemap and other content routes.export const runtime = "nodejs";diff --git a/apps/status-page/src/app/sitemap.ts b/apps/status-page/src/app/sitemap.tsindex 857cfbe79..b6e31bef2 100644--- a/apps/status-page/src/app/sitemap.ts+++ b/apps/status-page/src/app/sitemap.ts@@ -3,10 +3,10 @@ import { page } from "@openstatus/db/src/schema";import type { MetadataRoute } from "next";import { headers } from "next/headers";-import { getBaseUrl } from "../lib/base-url";-import { stripHostPort } from "../lib/domain";-import { resolveRoute } from "../lib/resolve-route";-import { getQueryClient, trpc } from "../lib/trpc/server";+import { getBaseUrl } from "@/lib/base-url";+import { stripHostPort } from "@/lib/domain";+import { resolveRoute } from "@/lib/resolve-route";+import { getQueryClient, trpc } from "@/lib/trpc/server";// One sitemap per host: a custom domain must never enumerate other tenants'// pages. trpc httpBatchLink needs Node, matching the other content routes.diff --git a/apps/status-page/src/components/chart/chart-area-percentiles.tsx b/apps/status-page/src/components/chart/chart-area-percentiles.tsxindex 0e4ac7b4a..78f62b7c5 100644--- a/apps/status-page/src/components/chart/chart-area-percentiles.tsx+++ b/apps/status-page/src/components/chart/chart-area-percentiles.tsx@@ -13,7 +13,8 @@ import { useState } from "react";import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from "recharts";import type { AxisDomain } from "recharts/types/util/types";-import { formatMilliseconds } from "../../lib/formatter";+import { formatMilliseconds } from "@/lib/formatter";+import { ChartLegendBadge } from "./chart-legend-badge";import { ChartTooltipNumber } from "./chart-tooltip-number";diff --git a/apps/status-page/src/components/chart/chart-bar-uptime.tsx b/apps/status-page/src/components/chart/chart-bar-uptime.tsxindex c4565542e..81df7d41a 100644--- a/apps/status-page/src/components/chart/chart-bar-uptime.tsx+++ b/apps/status-page/src/components/chart/chart-bar-uptime.tsx@@ -12,7 +12,8 @@ import { cn } from "@openstatus/ui/lib/utils";import { useState } from "react";import { Bar, BarChart, CartesianGrid, XAxis, YAxis } from "recharts";-import { formatNumber } from "../../lib/formatter";+import { formatNumber } from "@/lib/formatter";+import { ChartLegendBadge } from "./chart-legend-badge";const chartConfig = {diff --git a/apps/status-page/src/components/chart/chart-legend-badge.tsx b/apps/status-page/src/components/chart/chart-legend-badge.tsxindex ef0d13f3e..6d6d84c84 100644--- a/apps/status-page/src/components/chart/chart-legend-badge.tsx+++ b/apps/status-page/src/components/chart/chart-legend-badge.tsx@@ -12,7 +12,7 @@ import * as React from "react";import type * as RechartsPrimitive from "recharts";import type { Payload } from "recharts/types/component/DefaultLegendContent";-import { getPayloadConfigFromPayload } from "../../lib/chart";+import { getPayloadConfigFromPayload } from "@/lib/chart";export function ChartLegendBadge({className,diff --git a/apps/status-page/src/components/chart/chart-line-regions.tsx b/apps/status-page/src/components/chart/chart-line-regions.tsxindex f216e6b10..71c9de48f 100644--- a/apps/status-page/src/components/chart/chart-line-regions.tsx+++ b/apps/status-page/src/components/chart/chart-line-regions.tsx@@ -20,8 +20,9 @@ import {YAxis,} from "recharts";-import { regions } from "../../data/regions";-import { formatMilliseconds } from "../../lib/formatter";+import { regions } from "@/data/regions";+import { formatMilliseconds } from "@/lib/formatter";+import { ChartLegendBadge } from "./chart-legend-badge";import { ChartTooltipNumber } from "./chart-tooltip-number";diff --git a/apps/status-page/src/components/common/link.tsx b/apps/status-page/src/components/common/link.tsxindex 9a4d75c02..0d2c16cc5 100644--- a/apps/status-page/src/components/common/link.tsx+++ b/apps/status-page/src/components/common/link.tsx@@ -4,7 +4,7 @@ import { cn } from "@openstatus/ui/lib/utils";import { type VariantProps, cva } from "class-variance-authority";import NextLink from "next/link";-import { useEmbed } from "../../hooks/use-embed";+import { useEmbed } from "@/hooks/use-embed";export const linkVariants = cva("focus-visible:ring-ring/50 rounded-sm outline-none focus-visible:ring-[3px]",diff --git a/apps/status-page/src/components/date-fns-provider.tsx b/apps/status-page/src/components/date-fns-provider.tsxindex f6d1f35aa..046a51477 100644--- a/apps/status-page/src/components/date-fns-provider.tsx+++ b/apps/status-page/src/components/date-fns-provider.tsx@@ -3,7 +3,7 @@import { dateFnsLocales } from "@openstatus/locales";import { setDefaultOptions } from "date-fns";-import type { Locale } from "../i18n/config";+import type { Locale } from "@/i18n/config";export function DateFnsProvider({locale,diff --git a/apps/status-page/src/components/date-picker.tsx b/apps/status-page/src/components/date-picker.tsxindex 608fc8e88..751cc1632 100644--- a/apps/status-page/src/components/date-picker.tsx+++ b/apps/status-page/src/components/date-picker.tsx@@ -10,8 +10,8 @@ import { useExtracted } from "next-intl";import { useState } from "react";import type { DateRange } from "react-day-picker";-import { formatDateForInput } from "../lib/formatter";-import { Kbd } from "./common/kbd";+import { Kbd } from "@/components/common/kbd";+import { formatDateForInput } from "@/lib/formatter";type DatePickerProps = {range: DateRange;diff --git a/apps/status-page/src/components/forms/form-manage-subscription.tsx b/apps/status-page/src/components/forms/form-manage-subscription.tsxindex ac055e4c0..039398d51 100644--- a/apps/status-page/src/components/forms/form-manage-subscription.tsx+++ b/apps/status-page/src/components/forms/form-manage-subscription.tsx@@ -23,7 +23,7 @@ import {StatusBlankContainer,StatusBlankDescription,StatusBlankTitle,-} from "../status-page/status-blank";+} from "@/components/status-page/status-blank";type Page = NonNullable<RouterOutputs["statusPage"]["get"]>;diff --git a/apps/status-page/src/components/forms/form-subscribe-email.tsx b/apps/status-page/src/components/forms/form-subscribe-email.tsxindex 7e233c37e..5bc5549ee 100644--- a/apps/status-page/src/components/forms/form-subscribe-email.tsx+++ b/apps/status-page/src/components/forms/form-subscribe-email.tsx@@ -23,7 +23,7 @@ import {StatusBlankContainer,StatusBlankDescription,StatusBlankTitle,-} from "../status-page/status-blank";+} from "@/components/status-page/status-blank";type Page = NonNullable<RouterOutputs["statusPage"]["get"]>;diff --git a/apps/status-page/src/components/i18n/status-blocks-provider.tsx b/apps/status-page/src/components/i18n/status-blocks-provider.tsxindex afa5e7b85..b1678e225 100644--- a/apps/status-page/src/components/i18n/status-blocks-provider.tsx+++ b/apps/status-page/src/components/i18n/status-blocks-provider.tsx@@ -12,7 +12,7 @@ import {formatDateRange,formatDateRangeParts,formatDateTime,-} from "../../lib/formatter";+} from "@/lib/formatter";// Status-page timestamps render in UTC; the suffix tells viewers which zone.const withUTC = (value: string) => `${value} (UTC)`;diff --git a/apps/status-page/src/components/layout/embed-shell.tsx b/apps/status-page/src/components/layout/embed-shell.tsxindex c7a960eed..2de6e875c 100644--- a/apps/status-page/src/components/layout/embed-shell.tsx+++ b/apps/status-page/src/components/layout/embed-shell.tsx@@ -2,7 +2,7 @@import { cn } from "@openstatus/ui/lib/utils";-import { ALL_EMBED_SECTIONS, useEmbed } from "../../hooks/use-embed";+import { ALL_EMBED_SECTIONS, useEmbed } from "@/hooks/use-embed";export function EmbedShell({children,diff --git a/apps/status-page/src/components/locale-switcher.tsx b/apps/status-page/src/components/locale-switcher.tsxindex ba82b8a17..234cd0979 100644--- a/apps/status-page/src/components/locale-switcher.tsx+++ b/apps/status-page/src/components/locale-switcher.tsx@@ -13,7 +13,7 @@ import {defaultLocale as globalDefaultLocale,localeTranslations,locales,-} from "../i18n/config";+} from "@/i18n/config";export function LocaleSwitcher({className,diff --git a/apps/status-page/src/components/nav/footer.tsx b/apps/status-page/src/components/nav/footer.tsxindex 1a2be0812..a98cd31b3 100644--- a/apps/status-page/src/components/nav/footer.tsx+++ b/apps/status-page/src/components/nav/footer.tsx@@ -13,12 +13,12 @@ import { Clock } from "lucide-react";import { useParams } from "next/navigation";import { useEffect, useState } from "react";-import { useEmbed } from "../../hooks/use-embed";-import { useTRPC } from "../../lib/trpc/client";-import { Link } from "../common/link";-import { TimestampHoverCard } from "../content/timestamp-hover-card";-import { LocaleSwitcher } from "../locale-switcher";-import { ThemeSwitcher } from "../themes/theme-switcher";+import { Link } from "@/components/common/link";+import { TimestampHoverCard } from "@/components/content/timestamp-hover-card";+import { LocaleSwitcher } from "@/components/locale-switcher";+import { ThemeSwitcher } from "@/components/themes/theme-switcher";+import { useEmbed } from "@/hooks/use-embed";+import { useTRPC } from "@/lib/trpc/client";export function Footer({className,diff --git a/apps/status-page/src/components/nav/header.tsx b/apps/status-page/src/components/nav/header.tsxindex 6f5b1cd0a..034394569 100644--- a/apps/status-page/src/components/nav/header.tsx+++ b/apps/status-page/src/components/nav/header.tsx@@ -30,13 +30,13 @@ import { useParams, usePathname } from "next/navigation";import { useState } from "react";import { toast } from "sonner";-import { usePathnamePrefix } from "../../hooks/use-pathname-prefix";-import { useTRPC } from "../../lib/trpc/client";-import { Link } from "../common/link";+import { Link } from "@/components/common/link";import {type StatusUpdateType,StatusUpdates,-} from "../status-page/status-updates";+} from "@/components/status-page/status-updates";+import { usePathnamePrefix } from "@/hooks/use-pathname-prefix";+import { useTRPC } from "@/lib/trpc/client";type Page = RouterOutputs["statusPage"]["get"];diff --git a/apps/status-page/src/components/password-wrapper.tsx b/apps/status-page/src/components/password-wrapper.tsxindex cb364ada8..41e2eee33 100644--- a/apps/status-page/src/components/password-wrapper.tsx+++ b/apps/status-page/src/components/password-wrapper.tsx@@ -4,7 +4,7 @@ import { useParams } from "next/navigation";import { parseAsString, useQueryState } from "nuqs";import { useEffect } from "react";-import { createProtectedCookieKey } from "../lib/protected";+import { createProtectedCookieKey } from "@/lib/protected";export function PasswordWrapper({ children }: { children?: React.ReactNode }) {const [password, setPassword] = useQueryState("pw", parseAsString);diff --git a/apps/status-page/src/components/status-page/floating-button.tsx b/apps/status-page/src/components/status-page/floating-button.tsxindex c538dd269..c19e8a756 100644--- a/apps/status-page/src/components/status-page/floating-button.tsx+++ b/apps/status-page/src/components/status-page/floating-button.tsx@@ -35,7 +35,7 @@ import { parseAsString, useQueryState } from "nuqs";import type React from "react";import { createContext, useContext, useEffect, useState } from "react";-import { ThemeSelect } from "../themes/theme-select";+import { ThemeSelect } from "@/components/themes/theme-select";export const IS_DEV = process.env.NODE_ENV === "development";diff --git a/apps/status-page/src/components/status-page/floating-theme.tsx b/apps/status-page/src/components/status-page/floating-theme.tsxindex bbf8b90f9..4e68f1657 100644--- a/apps/status-page/src/components/status-page/floating-theme.tsx+++ b/apps/status-page/src/components/status-page/floating-theme.tsx@@ -21,7 +21,8 @@ import { Check, ChevronsUpDown, Palette } from "lucide-react";import { useEffect } from "react";import { useState } from "react";-import { ThemeSelect } from "../themes/theme-select";+import { ThemeSelect } from "@/components/themes/theme-select";+import { useStatusPage } from "./floating-button";export const COMMUNITY_THEME = THEME_KEYS;diff --git a/apps/status-page/src/components/status-page/status-bar.tsx b/apps/status-page/src/components/status-page/status-bar.tsxindex dcad7aa62..9b43257ab 100644--- a/apps/status-page/src/components/status-page/status-bar.tsx+++ b/apps/status-page/src/components/status-page/status-bar.tsx@@ -5,8 +5,8 @@ import {StatusBarEvent,} from "@openstatus/ui/components/blocks/status-bar";-import { usePathnamePrefix } from "../../hooks/use-pathname-prefix";-import { Link } from "../common/link";+import { Link } from "@/components/common/link";+import { usePathnamePrefix } from "@/hooks/use-pathname-prefix";export { StatusBarSkeleton } from "@openstatus/ui/components/blocks/status-bar";diff --git a/apps/status-page/src/components/status-page/status-blank.tsx b/apps/status-page/src/components/status-page/status-blank.tsxindex 5d5ec21e1..e4ea59772 100644--- a/apps/status-page/src/components/status-page/status-blank.tsx+++ b/apps/status-page/src/components/status-page/status-blank.tsx@@ -3,7 +3,7 @@import { Button } from "@openstatus/ui/components/ui/button";import { cn } from "@openstatus/ui/lib/utils";-import { Link } from "../common/link";+import { Link } from "@/components/common/link";export {StatusBlankContainer,diff --git a/apps/status-page/src/components/status-page/status-calendar.tsx b/apps/status-page/src/components/status-page/status-calendar.tsxindex 19992ddda..9b38d5220 100644--- a/apps/status-page/src/components/status-page/status-calendar.tsx+++ b/apps/status-page/src/components/status-page/status-calendar.tsx@@ -20,9 +20,9 @@ import {import { useLocale } from "next-intl";import { useCallback, useMemo } from "react";-import { usePathnamePrefix } from "../../hooks/use-pathname-prefix";-import type { Locale as AppLocale } from "../../i18n/config";-import { Link } from "../common/link";+import { Link } from "@/components/common/link";+import { usePathnamePrefix } from "@/hooks/use-pathname-prefix";+import type { Locale as AppLocale } from "@/i18n/config";type Page = NonNullable<RouterOutputs["statusPage"]["get"]>;type ReportInput = Page["statusReports"][number];diff --git a/apps/status-page/src/components/status-page/status-events.tsx b/apps/status-page/src/components/status-page/status-events.tsxindex 4a01ead1b..42ff846ce 100644--- a/apps/status-page/src/components/status-page/status-events.tsx+++ b/apps/status-page/src/components/status-page/status-events.tsx@@ -6,7 +6,7 @@ import {StatusEventTimelineReportUpdate as BlockStatusEventTimelineReportUpdate,} from "@openstatus/ui/components/blocks/status-events";-import { ProcessMessage } from "../content/process-message";+import { ProcessMessage } from "@/components/content/process-message";// Re-export pass-through primitives that don't need glue.export {diff --git a/apps/status-page/src/components/status-page/status-feed.tsx b/apps/status-page/src/components/status-page/status-feed.tsxindex bbd3f934e..5f21632ed 100644--- a/apps/status-page/src/components/status-page/status-feed.tsx+++ b/apps/status-page/src/components/status-page/status-feed.tsx@@ -4,9 +4,10 @@ import { StatusBlankAction } from "@openstatus/ui/components/blocks/status-blankimport { StatusFeed as BlockStatusFeed } from "@openstatus/ui/components/blocks/status-feed";import { useExtracted } from "next-intl";-import { usePathnamePrefix } from "../../hooks/use-pathname-prefix";-import { Link } from "../common/link";-import { ProcessMessage } from "../content/process-message";+import { Link } from "@/components/common/link";+import { ProcessMessage } from "@/components/content/process-message";+import { usePathnamePrefix } from "@/hooks/use-pathname-prefix";+import { StatusBlankLink } from "./status-blank";const renderMarkdownMessage = (message: string) => (diff --git a/apps/status-page/src/components/status-page/status-updates.tsx b/apps/status-page/src/components/status-page/status-updates.tsxindex 7ba925e44..f1a38198b 100644--- a/apps/status-page/src/components/status-page/status-updates.tsx+++ b/apps/status-page/src/components/status-page/status-updates.tsx@@ -26,12 +26,12 @@ import { useExtracted } from "next-intl";import { useParams } from "next/navigation";import { useState } from "react";-import { getBaseUrl } from "../../lib/base-url";-import { createProtectedCookieKey } from "../../lib/protected";import {FormSubscribeEmail,type FormValues,-} from "../forms/form-subscribe-email";+} from "@/components/forms/form-subscribe-email";+import { getBaseUrl } from "@/lib/base-url";+import { createProtectedCookieKey } from "@/lib/protected";export type StatusUpdateType = "email" | "rss" | "ssh" | "json" | "slack";diff --git a/apps/status-page/src/components/themes/theme-provider.tsx b/apps/status-page/src/components/themes/theme-provider.tsxindex cfd1d8a87..5c56dc145 100644--- a/apps/status-page/src/components/themes/theme-provider.tsx+++ b/apps/status-page/src/components/themes/theme-provider.tsx@@ -4,8 +4,8 @@ import { ThemeProvider as NextThemesProvider } from "next-themes";import { useQueryState } from "nuqs";import type * as React from "react";-import { useEmbed } from "../../hooks/use-embed";-import { embedThemeParser } from "../../lib/embed-params";+import { useEmbed } from "@/hooks/use-embed";+import { embedThemeParser } from "@/lib/embed-params";export function ThemeProvider({children,diff --git a/apps/status-page/src/components/themes/theme-sidebar.tsx b/apps/status-page/src/components/themes/theme-sidebar.tsxindex 3293962e1..2b43361a3 100644--- a/apps/status-page/src/components/themes/theme-sidebar.tsx+++ b/apps/status-page/src/components/themes/theme-sidebar.tsx@@ -58,8 +58,8 @@ import { useTheme } from "next-themes";import { useQueryStates } from "nuqs";import { useEffect, useState } from "react";-import { searchParamsParsers } from "../../app/(public)/search-params";-import { recomputeStyles } from "../status-page/floating-button";+import { searchParamsParsers } from "@/app/(public)/search-params";+import { recomputeStyles } from "@/components/status-page/floating-button";type ThemeBuilderColor = {label: string;diff --git a/apps/status-page/src/components/ui/data-table/data-table-toolbar.tsx b/apps/status-page/src/components/ui/data-table/data-table-toolbar.tsxindex e945965bf..bb18066f8 100644--- a/apps/status-page/src/components/ui/data-table/data-table-toolbar.tsx+++ b/apps/status-page/src/components/ui/data-table/data-table-toolbar.tsx@@ -5,8 +5,8 @@ import { Input } from "@openstatus/ui/components/ui/input";import type { Table } from "@tanstack/react-table";import { X } from "lucide-react";-import { DataTableFacetedFilter } from "./data-table-faceted-filter";-import { DataTableViewOptions } from "./data-table-view-options";+import { DataTableFacetedFilter } from "@/components/ui/data-table/data-table-faceted-filter";+import { DataTableViewOptions } from "@/components/ui/data-table/data-table-view-options";export interface DataTableToolbarProps<TData> {table: Table<TData>;diff --git a/apps/status-page/src/content/markdown/generators.test.ts b/apps/status-page/src/content/markdown/generators.test.tsindex 0bfd7274a..05c074d54 100644--- a/apps/status-page/src/content/markdown/generators.test.ts+++ b/apps/status-page/src/content/markdown/generators.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import {escapeCell,diff --git a/apps/status-page/src/content/markdown/match-route.test.ts b/apps/status-page/src/content/markdown/match-route.test.tsindex 4a4175fd9..7000f38d9 100644--- a/apps/status-page/src/content/markdown/match-route.test.ts+++ b/apps/status-page/src/content/markdown/match-route.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { matchMarkdownRoute, parseMarkdownPath } from "./match-route";diff --git a/apps/status-page/src/content/status-json.test.ts b/apps/status-page/src/content/status-json.test.tsindex d0fe2da19..70e450c20 100644--- a/apps/status-page/src/content/status-json.test.ts+++ b/apps/status-page/src/content/status-json.test.ts@@ -1,6 +1,6 @@+import { describe, expect, test } from "bun:test";+import type { RouterOutputs } from "@openstatus/api";-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";import {matchEndpoint,diff --git a/apps/status-page/src/content/status-vocab.test.ts b/apps/status-page/src/content/status-vocab.test.tsindex da2f5bb64..5769f458e 100644--- a/apps/status-page/src/content/status-vocab.test.ts+++ b/apps/status-page/src/content/status-vocab.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import {componentStatus,diff --git a/apps/status-page/src/data/metrics.client.ts b/apps/status-page/src/data/metrics.client.tsindex 9db66b9e0..790dc19ce 100644--- a/apps/status-page/src/data/metrics.client.ts+++ b/apps/status-page/src/data/metrics.client.ts@@ -3,8 +3,9 @@import type { RouterOutputs } from "@openstatus/api";import { monitorRegions } from "@openstatus/db/src/schema/constants";-import type { MetricCard } from "../components/content/metric-card";-import { formatDateTime, formatMilliseconds } from "../lib/formatter";+import type { MetricCard } from "@/components/content/metric-card";+import { formatDateTime, formatMilliseconds } from "@/lib/formatter";+import type { RegionMetric } from "./region-metrics";import type { Region } from "./regions";diff --git a/apps/status-page/src/hooks/use-embed.ts b/apps/status-page/src/hooks/use-embed.tsindex 1c202b4fb..2369e961f 100644--- a/apps/status-page/src/hooks/use-embed.ts+++ b/apps/status-page/src/hooks/use-embed.ts@@ -2,13 +2,13 @@import { useQueryState } from "nuqs";-import { embedParser } from "../lib/embed-params";+import { embedParser } from "@/lib/embed-params";export {ALL_EMBED_SECTIONS,type EmbedSection,type EmbedState,-} from "../lib/embed-params";+} from "@/lib/embed-params";export function useEmbed() {const [state] = useQueryState("embed", embedParser);diff --git a/apps/status-page/src/hooks/use-pathname-prefix.ts b/apps/status-page/src/hooks/use-pathname-prefix.tsindex fb0f6b0ad..46a898d38 100644--- a/apps/status-page/src/hooks/use-pathname-prefix.ts+++ b/apps/status-page/src/hooks/use-pathname-prefix.ts@@ -5,9 +5,9 @@ import { useLocale } from "next-intl";import { useParams } from "next/navigation";import { useEffect, useState } from "react";-import { defaultLocale as globalDefaultLocale } from "../i18n/config";-import { resolvePathnamePrefix } from "../lib/resolve-pathname-prefix";-import { useTRPC } from "../lib/trpc/client";+import { defaultLocale as globalDefaultLocale } from "@/i18n/config";+import { resolvePathnamePrefix } from "@/lib/resolve-pathname-prefix";+import { useTRPC } from "@/lib/trpc/client";export function usePathnamePrefix() {const trpc = useTRPC();diff --git a/apps/status-page/src/lib/alternates-metadata.ts b/apps/status-page/src/lib/alternates-metadata.tsindex 192b7e582..ae4d66550 100644--- a/apps/status-page/src/lib/alternates-metadata.ts+++ b/apps/status-page/src/lib/alternates-metadata.ts@@ -1,7 +1,7 @@import type { Metadata } from "next";-import { statusPageAlternates } from "./alternates";-import { getQueryClient, trpc } from "./trpc/server";+import { statusPageAlternates } from "@/lib/alternates";+import { getQueryClient, trpc } from "@/lib/trpc/server";export async function statusPageAlternatesMetadata({domain,diff --git a/apps/status-page/src/lib/alternates.test.ts b/apps/status-page/src/lib/alternates.test.tsindex 320be3b7d..900502ee4 100644--- a/apps/status-page/src/lib/alternates.test.ts+++ b/apps/status-page/src/lib/alternates.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { statusPageAlternates } from "./alternates";diff --git a/apps/status-page/src/lib/auth/index.ts b/apps/status-page/src/lib/auth/index.tsindex 80fad5f04..40d655e63 100644--- a/apps/status-page/src/lib/auth/index.ts+++ b/apps/status-page/src/lib/auth/index.ts@@ -4,8 +4,9 @@ import type { DefaultSession } from "next-auth";import NextAuth, { AuthError } from "next-auth";import { headers } from "next/headers";-import { getValidCustomDomain } from "../domain";-import { getQueryClient, trpc } from "../trpc/server";+import { getValidCustomDomain } from "@/lib/domain";+import { getQueryClient, trpc } from "@/lib/trpc/server";+import { adapter } from "./adapter";import { ResendProvider } from "./providers";diff --git a/apps/status-page/src/lib/auth/providers.ts b/apps/status-page/src/lib/auth/providers.tsindex 45967066c..8ff8d9303 100644--- a/apps/status-page/src/lib/auth/providers.ts+++ b/apps/status-page/src/lib/auth/providers.ts@@ -1,8 +1,9 @@import { EmailClient } from "@openstatus/emails";import Resend from "next-auth/providers/resend";+import { getQueryClient, trpc } from "@/lib/trpc/server";+import { getValidCustomDomain } from "../domain";-import { getQueryClient, trpc } from "../trpc/server";export const ResendProvider = Resend({apiKey: undefined,diff --git a/apps/status-page/src/lib/formatter.test.ts b/apps/status-page/src/lib/formatter.test.tsindex bcba4dde0..d9e59b032 100644--- a/apps/status-page/src/lib/formatter.test.ts+++ b/apps/status-page/src/lib/formatter.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import {formatDate,diff --git a/apps/status-page/src/lib/http/client-ip.test.ts b/apps/status-page/src/lib/http/client-ip.test.tsindex 45b2f7c42..684c07a58 100644--- a/apps/status-page/src/lib/http/client-ip.test.ts+++ b/apps/status-page/src/lib/http/client-ip.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { resolveClientIp } from "./client-ip";diff --git a/apps/status-page/src/lib/http/etag.test.ts b/apps/status-page/src/lib/http/etag.test.tsindex 66d584e39..66e86bd8b 100644--- a/apps/status-page/src/lib/http/etag.test.ts+++ b/apps/status-page/src/lib/http/etag.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { computeETag, isNotModified } from "./etag";diff --git a/apps/status-page/src/lib/http/markdown-response.test.ts b/apps/status-page/src/lib/http/markdown-response.test.tsindex 00976f941..c519398eb 100644--- a/apps/status-page/src/lib/http/markdown-response.test.ts+++ b/apps/status-page/src/lib/http/markdown-response.test.ts@@ -1,9 +1,8 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";-import { withPoweredBy } from "../../content/markdown";-import { computeETag } from "./etag";-import { resolveMarkdownResponse } from "./markdown-response";+import { withPoweredBy } from "@/content/markdown";+import { computeETag } from "@/lib/http/etag";+import { resolveMarkdownResponse } from "@/lib/http/markdown-response";const PUBLIC_CACHE ="public, max-age=60, s-maxage=60, stale-while-revalidate=300";diff --git a/apps/status-page/src/lib/http/markdown-response.ts b/apps/status-page/src/lib/http/markdown-response.tsindex 41cb8b1f0..ae27ed3ec 100644--- a/apps/status-page/src/lib/http/markdown-response.ts+++ b/apps/status-page/src/lib/http/markdown-response.ts@@ -1,6 +1,6 @@-import { withPoweredBy } from "../../content/markdown";-import { markdownCacheControl } from "../proxy/markdown-cache-control";-import { computeETag, isNotModified } from "./etag";+import { withPoweredBy } from "@/content/markdown";+import { computeETag, isNotModified } from "@/lib/http/etag";+import { markdownCacheControl } from "@/lib/proxy/markdown-cache-control";const MARKDOWN = "text/markdown; charset=utf-8";diff --git a/apps/status-page/src/lib/proxy/apply-page-locale-override.test.ts b/apps/status-page/src/lib/proxy/apply-page-locale-override.test.tsindex c04f0fe62..f6821af11 100644--- a/apps/status-page/src/lib/proxy/apply-page-locale-override.test.ts+++ b/apps/status-page/src/lib/proxy/apply-page-locale-override.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import type { ResolvedRoute } from "../resolve-route";import { applyPageLocaleOverride } from "./apply-page-locale-override";diff --git a/apps/status-page/src/lib/proxy/build-external-path.test.ts b/apps/status-page/src/lib/proxy/build-external-path.test.tsindex df5444bb4..e809f6da9 100644--- a/apps/status-page/src/lib/proxy/build-external-path.test.ts+++ b/apps/status-page/src/lib/proxy/build-external-path.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { buildExternalPath } from "./build-external-path";diff --git a/apps/status-page/src/lib/proxy/compose-page-action.test.ts b/apps/status-page/src/lib/proxy/compose-page-action.test.tsindex f3778b40f..92c33732b 100644--- a/apps/status-page/src/lib/proxy/compose-page-action.test.ts+++ b/apps/status-page/src/lib/proxy/compose-page-action.test.ts@@ -1,6 +1,6 @@+import { describe, expect, test } from "bun:test";+import type { Page } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";import type { ResolvedRoute } from "../resolve-route";import { type ComposeInput, composePageAction } from "./compose-page-action";diff --git a/apps/status-page/src/lib/proxy/detect-markdown.test.ts b/apps/status-page/src/lib/proxy/detect-markdown.test.tsindex 75d0c6135..10dbc1f91 100644--- a/apps/status-page/src/lib/proxy/detect-markdown.test.ts+++ b/apps/status-page/src/lib/proxy/detect-markdown.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { detectMarkdown } from "./detect-markdown";diff --git a/apps/status-page/src/lib/proxy/evaluate-markdown-gate.test.ts b/apps/status-page/src/lib/proxy/evaluate-markdown-gate.test.tsindex 2386573a4..02c7f46ba 100644--- a/apps/status-page/src/lib/proxy/evaluate-markdown-gate.test.ts+++ b/apps/status-page/src/lib/proxy/evaluate-markdown-gate.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { evaluateMarkdownGate } from "./evaluate-markdown-gate";diff --git a/apps/status-page/src/lib/proxy/is-ip-allowed.test.ts b/apps/status-page/src/lib/proxy/is-ip-allowed.test.tsindex c963ca317..d96101df9 100644--- a/apps/status-page/src/lib/proxy/is-ip-allowed.test.ts+++ b/apps/status-page/src/lib/proxy/is-ip-allowed.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { isIpAllowed } from "./is-ip-allowed";diff --git a/apps/status-page/src/lib/proxy/markdown-cache-control.test.ts b/apps/status-page/src/lib/proxy/markdown-cache-control.test.tsindex 0f8cd54f2..9b6f90532 100644--- a/apps/status-page/src/lib/proxy/markdown-cache-control.test.ts+++ b/apps/status-page/src/lib/proxy/markdown-cache-control.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { markdownCacheControl } from "./markdown-cache-control";diff --git a/apps/status-page/src/lib/proxy/resolve-custom-domain-rewrite.test.ts b/apps/status-page/src/lib/proxy/resolve-custom-domain-rewrite.test.tsindex 67a2c1f48..06eec6053 100644--- a/apps/status-page/src/lib/proxy/resolve-custom-domain-rewrite.test.ts+++ b/apps/status-page/src/lib/proxy/resolve-custom-domain-rewrite.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { resolveCustomDomainRewrite } from "./resolve-custom-domain-rewrite";diff --git a/apps/status-page/src/lib/proxy/resolve-default-rewrite.test.ts b/apps/status-page/src/lib/proxy/resolve-default-rewrite.test.tsindex 5aff1bca9..57f39dd23 100644--- a/apps/status-page/src/lib/proxy/resolve-default-rewrite.test.ts+++ b/apps/status-page/src/lib/proxy/resolve-default-rewrite.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import type { ResolvedRoute } from "../resolve-route";import { resolveDefaultRewrite } from "./resolve-default-rewrite";diff --git a/apps/status-page/src/lib/proxy/resolve-email-domain-action.test.ts b/apps/status-page/src/lib/proxy/resolve-email-domain-action.test.tsindex 0a47a7efe..b6f878520 100644--- a/apps/status-page/src/lib/proxy/resolve-email-domain-action.test.ts+++ b/apps/status-page/src/lib/proxy/resolve-email-domain-action.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import type { ResolvedRoute } from "../resolve-route";import { resolveEmailDomainAction } from "./resolve-email-domain-action";diff --git a/apps/status-page/src/lib/proxy/resolve-gate.ts b/apps/status-page/src/lib/proxy/resolve-gate.tsindex fb6ca343d..7e56564e5 100644--- a/apps/status-page/src/lib/proxy/resolve-gate.ts+++ b/apps/status-page/src/lib/proxy/resolve-gate.ts@@ -1,9 +1,10 @@import type { Page } from "@openstatus/db/src/schema";-import { auth } from "../auth";-import { createProtectedCookieKey } from "../protected";-import type { getQueryClient } from "../trpc/server";-import { trpc } from "../trpc/server";+import { auth } from "@/lib/auth";+import { createProtectedCookieKey } from "@/lib/protected";+import type { getQueryClient } from "@/lib/trpc/server";+import { trpc } from "@/lib/trpc/server";+import {evaluateMarkdownGate,type MarkdownGateResult,diff --git a/apps/status-page/src/lib/proxy/resolve-ip-restriction-action.test.ts b/apps/status-page/src/lib/proxy/resolve-ip-restriction-action.test.tsindex 58987fb9f..0405f8128 100644--- a/apps/status-page/src/lib/proxy/resolve-ip-restriction-action.test.ts+++ b/apps/status-page/src/lib/proxy/resolve-ip-restriction-action.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import type { ResolvedRoute } from "../resolve-route";import { resolveIpRestrictionAction } from "./resolve-ip-restriction-action";diff --git a/apps/status-page/src/lib/proxy/resolve-locale-action.test.ts b/apps/status-page/src/lib/proxy/resolve-locale-action.test.tsindex ef78a82cc..946ea0b69 100644--- a/apps/status-page/src/lib/proxy/resolve-locale-action.test.ts+++ b/apps/status-page/src/lib/proxy/resolve-locale-action.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import type { ResolvedRoute } from "../resolve-route";import { resolveLocaleAction } from "./resolve-locale-action";diff --git a/apps/status-page/src/lib/proxy/resolve-password-action.test.ts b/apps/status-page/src/lib/proxy/resolve-password-action.test.tsindex 382f8137b..5904bdf96 100644--- a/apps/status-page/src/lib/proxy/resolve-password-action.test.ts+++ b/apps/status-page/src/lib/proxy/resolve-password-action.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import type { ResolvedRoute } from "../resolve-route";import { resolvePasswordAction } from "./resolve-password-action";diff --git a/apps/status-page/src/lib/proxy/sanitize-redirect-param.test.ts b/apps/status-page/src/lib/proxy/sanitize-redirect-param.test.tsindex 5a3c69897..a50c54ebb 100644--- a/apps/status-page/src/lib/proxy/sanitize-redirect-param.test.ts+++ b/apps/status-page/src/lib/proxy/sanitize-redirect-param.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { sanitizeRedirectParam } from "./sanitize-redirect-param";diff --git a/apps/status-page/src/lib/proxy/strip-prefix-for-external.test.ts b/apps/status-page/src/lib/proxy/strip-prefix-for-external.test.tsindex 041ad0a4c..b44472309 100644--- a/apps/status-page/src/lib/proxy/strip-prefix-for-external.test.ts+++ b/apps/status-page/src/lib/proxy/strip-prefix-for-external.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { stripPrefixForExternal } from "./strip-prefix-for-external";diff --git a/apps/status-page/src/lib/resolve-pathname-prefix.test.ts b/apps/status-page/src/lib/resolve-pathname-prefix.test.tsindex 85e9d9b70..867c64cce 100644--- a/apps/status-page/src/lib/resolve-pathname-prefix.test.ts+++ b/apps/status-page/src/lib/resolve-pathname-prefix.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { resolvePathnamePrefix } from "./resolve-pathname-prefix";diff --git a/apps/status-page/src/lib/resolve-route.test.ts b/apps/status-page/src/lib/resolve-route.test.tsindex 39046b508..fa1f8e718 100644--- a/apps/status-page/src/lib/resolve-route.test.ts+++ b/apps/status-page/src/lib/resolve-route.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { resolveRoute } from "./resolve-route";diff --git a/apps/status-page/src/lib/resolve-route.ts b/apps/status-page/src/lib/resolve-route.tsindex 2e2804879..88f8760c7 100644--- a/apps/status-page/src/lib/resolve-route.ts+++ b/apps/status-page/src/lib/resolve-route.ts@@ -1,4 +1,5 @@-import { type Locale, defaultLocale, locales } from "../i18n/config";+import { type Locale, defaultLocale, locales } from "@/i18n/config";+import { getValidSubdomain } from "./domain";export type RouteType = "hostname" | "pathname";diff --git a/apps/status-page/src/lib/status-blocks-labels.test.ts b/apps/status-page/src/lib/status-blocks-labels.test.tsindex f6878d61d..e3d5c2238 100644--- a/apps/status-page/src/lib/status-blocks-labels.test.ts+++ b/apps/status-page/src/lib/status-blocks-labels.test.ts@@ -1,6 +1,6 @@+import { describe, expect, test } from "bun:test";+import { defaultStatusBlocksLabels as labels } from "@openstatus/ui/components/blocks/status.utils";-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";// Status-page timestamps render in UTC, so the user-facing labels carry a// trailing "(UTC)" to tell viewers which zone they are reading (see #2302).diff --git a/apps/status-page/src/lib/trpc/client.tsx b/apps/status-page/src/lib/trpc/client.tsxindex 51ecd68c5..296c0c426 100644--- a/apps/status-page/src/lib/trpc/client.tsx+++ b/apps/status-page/src/lib/trpc/client.tsx@@ -6,7 +6,7 @@ import { createTRPCClient, loggerLink } from "@trpc/client";import { createTRPCContext } from "@trpc/tanstack-react-query";import { useState } from "react";-import { endingLink } from "./shared";+import { endingLink } from "@/lib/trpc/shared";export const { TRPCProvider, useTRPC, useTRPCClient } =createTRPCContext<AppRouter>();diff --git a/apps/status-page/src/proxy.ts b/apps/status-page/src/proxy.tsindex b93550f9c..ab8511f2b 100644--- a/apps/status-page/src/proxy.ts+++ b/apps/status-page/src/proxy.ts@@ -2,8 +2,9 @@ import { db, sql } from "@openstatus/db";import { page, selectPageSchema } from "@openstatus/db/src/schema";import { NextResponse } from "next/server";-import { auth } from "./lib/auth";-import { resolveClientIp } from "./lib/http/client-ip";+import { auth } from "@/lib/auth";+import { resolveClientIp } from "@/lib/http/client-ip";+import { createProtectedCookieKey } from "./lib/protected";import { applyPageLocaleOverride } from "./lib/proxy/apply-page-locale-override";import { composePageAction } from "./lib/proxy/compose-page-action";diff --git a/apps/web/env.ts b/apps/web/env.tsindex dab63f5f4..dbb28b166 100644--- a/apps/web/env.ts+++ b/apps/web/env.ts@@ -1 +1,2 @@-await Deno.copyFile("./.env.example", "./.env");+const file = Bun.file("./.env.example");+await Bun.write("./.env", file);diff --git a/apps/web/package.json b/apps/web/package.jsonindex ebf0045d2..e7fb85bb7 100644--- a/apps/web/package.json+++ b/apps/web/package.json@@ -3,13 +3,13 @@"version": "1.0.0","private": true,"scripts": {- "env": "deno run -A env.ts",+ "env": "bun env.ts","dev": "next dev","build:registry": "turbo run registry:build --filter=@openstatus/ui","build": "pnpm build:registry && next build","start": "next start","lint": "next lint",- "test": "deno test --parallel -A --no-check --sloppy-imports",+ "test": "bun test","tsc": "tsc --noEmit"},"dependencies": {@@ -98,8 +98,6 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@tailwindcss/postcss": "catalog:","@types/node": "catalog:","@types/react": "catalog:",diff --git a/apps/web/src/app/(ai)/llms-full.txt/route.ts b/apps/web/src/app/(ai)/llms-full.txt/route.tsindex f47518611..75e067085 100644--- a/apps/web/src/app/(ai)/llms-full.txt/route.ts+++ b/apps/web/src/app/(ai)/llms-full.txt/route.ts@@ -1,15 +1,15 @@-import { convertMdxToMarkdown } from "../../../content/convert";+import { convertMdxToMarkdown } from "@/content/convert";import {PRODUCT_CONTEXT_MARKDOWN,PRODUCT_SUMMARY,-} from "../../../content/llms-context";+} from "@/content/llms-context";import {type MDXData,getHomePage,getProductPages,getToolingPages,getUnrelatedPages,-} from "../../../content/utils";+} from "@/content/utils";export const runtime = "nodejs";export const revalidate = 3600;diff --git a/apps/web/src/app/(ai)/llms.txt/route.ts b/apps/web/src/app/(ai)/llms.txt/route.tsindex 069076c1e..6bc1cf36f 100644--- a/apps/web/src/app/(ai)/llms.txt/route.ts+++ b/apps/web/src/app/(ai)/llms.txt/route.ts@@ -1,7 +1,7 @@import {PRODUCT_CONTEXT_MARKDOWN,PRODUCT_SUMMARY,-} from "../../../content/llms-context";+} from "@/content/llms-context";import {type MDXData,getBlogPosts,@@ -14,7 +14,7 @@ import {getToolsPages,getUnrelatedPages,getUseCasePages,-} from "../../../content/utils";+} from "@/content/utils";export const runtime = "nodejs";export const revalidate = 3600;diff --git a/apps/web/src/app/(ai)/mcp/route.ts b/apps/web/src/app/(ai)/mcp/route.tsindex 26cd28830..dc30e23c9 100644--- a/apps/web/src/app/(ai)/mcp/route.ts+++ b/apps/web/src/app/(ai)/mcp/route.ts@@ -1,6 +1,6 @@// Discovery endpoint for /mcp. JSON clients receive the server card inline// (no domain coupling); browsers get redirected to the human-readable page.-import { GET as serverCardGET } from "../../.well-known/mcp/server-card.json/route";+import { GET as serverCardGET } from "@/app/.well-known/mcp/server-card.json/route";export function GET(request: Request) {const accept = request.headers.get("accept") ?? "";diff --git a/apps/web/src/app/(docs)/docs/[[...slug]]/page.tsx b/apps/web/src/app/(docs)/docs/[[...slug]]/page.tsxindex e80ed59ad..fc9dc97ae 100644--- a/apps/web/src/app/(docs)/docs/[[...slug]]/page.tsx+++ b/apps/web/src/app/(docs)/docs/[[...slug]]/page.tsx@@ -5,34 +5,34 @@ import {ContentBoxDescription,ContentBoxLink,ContentBoxTitle,-} from "../../../(landing)/content-box";-import { ContentPagination } from "../../../(landing)/content-pagination";+} from "@/app/(landing)/content-box";+import { ContentPagination } from "@/app/(landing)/content-pagination";import {getDocs,getDocsPage,getDocsPagination,gitLastModified,validateDocsNav,-} from "../../../../content/docs";-import { DocsFeedback } from "../../../../content/docs-feedback";-import { DocsSubNav } from "../../../../content/docs-sub-nav";-import { TableOfContents } from "../../../../content/docs-toc";+} from "@/content/docs";+import { DocsFeedback } from "@/content/docs-feedback";+import { DocsSubNav } from "@/content/docs-sub-nav";+import { TableOfContents } from "@/content/docs-toc";import {type DocsNavNode,docsNavTree,findDocsNode,findDocsTrail,getDocsContainerSlugs,-} from "../../../../content/docs.config";-import { CustomMDX } from "../../../../content/mdx";-import { Grid } from "../../../../content/mdx-components/grid";-import { extractHeadings } from "../../../../content/toc";-import { JsonLd } from "../../../../lib/metadata/json-ld";+} from "@/content/docs.config";+import { CustomMDX } from "@/content/mdx";+import { Grid } from "@/content/mdx-components/grid";+import { extractHeadings } from "@/content/toc";+import { JsonLd } from "@/lib/metadata/json-ld";import {BASE_URL,getPageMetadata,getSocialMetadata,-} from "../../../../lib/metadata/shared-metadata";+} from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,@@ -41,7 +41,7 @@ import {getJsonLDItemList,getJsonLDOrganization,getJsonLDTechArticle,-} from "../../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";export const dynamicParams = false;diff --git a/apps/web/src/app/(docs)/layout.tsx b/apps/web/src/app/(docs)/layout.tsxindex 1664fe19f..153bdd8b1 100644--- a/apps/web/src/app/(docs)/layout.tsx+++ b/apps/web/src/app/(docs)/layout.tsx@@ -1,6 +1,6 @@-import { DocsFooter } from "../../content/docs-footer";-import { DocsHeader } from "../../content/docs-header";-import { DocsMobileNav, DocsSidebar } from "../../content/docs-sidebar";+import { DocsFooter } from "@/content/docs-footer";+import { DocsHeader } from "@/content/docs-header";+import { DocsMobileNav, DocsSidebar } from "@/content/docs-sidebar";export default function DocsLayout({children,diff --git a/apps/web/src/app/(landing)/[slug]/page.tsx b/apps/web/src/app/(landing)/[slug]/page.tsxindex 41c0ecb11..1713d307b 100644--- a/apps/web/src/app/(landing)/[slug]/page.tsx+++ b/apps/web/src/app/(landing)/[slug]/page.tsx@@ -1,10 +1,10 @@import type { Metadata } from "next";import { notFound } from "next/navigation";-import { CustomMDX } from "../../../content/mdx";-import { getMainPages } from "../../../content/utils";-import { JsonLd } from "../../../lib/metadata/json-ld";-import { getPageMetadata } from "../../../lib/metadata/shared-metadata";+import { CustomMDX } from "@/content/mdx";+import { getMainPages } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";+import { getPageMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDFAQPage,@@ -13,7 +13,7 @@ import {getJsonLDProduct,getJsonLDSoftwareApplication,getJsonLDWebPage,-} from "../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";export const dynamicParams = false;diff --git a/apps/web/src/app/(landing)/blog/[slug]/page.tsx b/apps/web/src/app/(landing)/blog/[slug]/page.tsxindex a230288f5..2d400a238 100644--- a/apps/web/src/app/(landing)/blog/[slug]/page.tsx+++ b/apps/web/src/app/(landing)/blog/[slug]/page.tsx@@ -2,13 +2,10 @@ import type { Metadata } from "next";import Image from "next/image";import { notFound } from "next/navigation";-import { CustomMDX } from "../../../../content/mdx";-import { getBlogPosts } from "../../../../content/utils";-import { JsonLd } from "../../../../lib/metadata/json-ld";-import {- BASE_URL,- getPageMetadata,-} from "../../../../lib/metadata/shared-metadata";+import { CustomMDX } from "@/content/mdx";+import { getBlogPosts } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";+import { BASE_URL, getPageMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBlogPosting,@@ -17,7 +14,8 @@ import {getJsonLDHowTo,getJsonLDOrganization,getJsonLDWebPage,-} from "../../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import { ContentMetadata } from "../../content-metadata";import { ContentPagination } from "../../content-pagination";diff --git a/apps/web/src/app/(landing)/blog/category/[slug]/page.tsx b/apps/web/src/app/(landing)/blog/category/[slug]/page.tsxindex 64e66988d..553c7cf1f 100644--- a/apps/web/src/app/(landing)/blog/category/[slug]/page.tsx+++ b/apps/web/src/app/(landing)/blog/category/[slug]/page.tsx@@ -1,21 +1,21 @@import type { Metadata } from "next";-import { getBlogPosts } from "../../../../../content/utils";-import { JsonLd } from "../../../../../lib/metadata/json-ld";+import { ContentCategory } from "@/app/(landing)/content-category";+import { ContentList } from "@/app/(landing)/content-list";+import { getBlogPosts } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";import {BASE_URL,defaultMetadata,ogMetadata,twitterMetadata,-} from "../../../../../lib/metadata/shared-metadata";+} from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDItemList,getJsonLDOrganization,-} from "../../../../../lib/metadata/structured-data";-import { ContentCategory } from "../../../content-category";-import { ContentList } from "../../../content-list";+} from "@/lib/metadata/structured-data";export async function generateMetadata({params,diff --git a/apps/web/src/app/(landing)/blog/category/page.tsx b/apps/web/src/app/(landing)/blog/category/page.tsxindex 6d9179995..266e29865 100644--- a/apps/web/src/app/(landing)/blog/category/page.tsx+++ b/apps/web/src/app/(landing)/blog/category/page.tsx@@ -1,12 +1,13 @@import type { Metadata } from "next";-import { components } from "../../../../content/mdx";-import { getBlogPosts } from "../../../../content/utils";+import { components } from "@/content/mdx";+import { getBlogPosts } from "@/content/utils";import {defaultMetadata,ogMetadata,twitterMetadata,-} from "../../../../lib/metadata/shared-metadata";+} from "@/lib/metadata/shared-metadata";+import { ContentBoxLink, ContentBoxTitle } from "../../content-box";const TITLE = "Blog Categories";diff --git a/apps/web/src/app/(landing)/blog/feed.xml/route.ts b/apps/web/src/app/(landing)/blog/feed.xml/route.tsindex 82a770830..e81229429 100644--- a/apps/web/src/app/(landing)/blog/feed.xml/route.ts+++ b/apps/web/src/app/(landing)/blog/feed.xml/route.ts@@ -1,7 +1,7 @@import { Feed } from "feed";import { getAuthor } from "src/data/author";-import { getBlogPosts } from "../../../../content/utils";+import { getBlogPosts } from "@/content/utils";export async function GET() {const feed = new Feed({diff --git a/apps/web/src/app/(landing)/blog/page.tsx b/apps/web/src/app/(landing)/blog/page.tsxindex 0da5f4073..18bd6d31a 100644--- a/apps/web/src/app/(landing)/blog/page.tsx+++ b/apps/web/src/app/(landing)/blog/page.tsx@@ -1,20 +1,21 @@import type { Metadata } from "next";import Link from "next/link";-import { getBlogPosts } from "../../../content/utils";-import { JsonLd } from "../../../lib/metadata/json-ld";+import { getBlogPosts } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";import {BASE_URL,defaultMetadata,ogMetadata,-} from "../../../lib/metadata/shared-metadata";-import { twitterMetadata } from "../../../lib/metadata/shared-metadata";+} from "@/lib/metadata/shared-metadata";+import { twitterMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDItemList,getJsonLDOrganization,-} from "../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import { ContentCategory } from "../content-category";import { ContentList } from "../content-list";diff --git a/apps/web/src/app/(landing)/changelog/[slug]/page.tsx b/apps/web/src/app/(landing)/changelog/[slug]/page.tsxindex a0071eb27..01a9ef56c 100644--- a/apps/web/src/app/(landing)/changelog/[slug]/page.tsx+++ b/apps/web/src/app/(landing)/changelog/[slug]/page.tsx@@ -2,13 +2,10 @@ import type { Metadata } from "next";import Image from "next/image";import { notFound } from "next/navigation";-import { CustomMDX } from "../../../../content/mdx";-import { getChangelogPosts } from "../../../../content/utils";-import { JsonLd } from "../../../../lib/metadata/json-ld";-import {- BASE_URL,- getPageMetadata,-} from "../../../../lib/metadata/shared-metadata";+import { CustomMDX } from "@/content/mdx";+import { getChangelogPosts } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";+import { BASE_URL, getPageMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBlogPosting,@@ -17,7 +14,8 @@ import {getJsonLDHowTo,getJsonLDOrganization,getJsonLDWebPage,-} from "../../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import { ContentMetadata } from "../../content-metadata";import { ContentPagination } from "../../content-pagination";diff --git a/apps/web/src/app/(landing)/changelog/category/[slug]/page.tsx b/apps/web/src/app/(landing)/changelog/category/[slug]/page.tsxindex 269532c20..d970a69d0 100644--- a/apps/web/src/app/(landing)/changelog/category/[slug]/page.tsx+++ b/apps/web/src/app/(landing)/changelog/category/[slug]/page.tsx@@ -1,21 +1,21 @@import type { Metadata } from "next";-import { getChangelogPosts } from "../../../../../content/utils";-import { JsonLd } from "../../../../../lib/metadata/json-ld";+import { ContentCategory } from "@/app/(landing)/content-category";+import { ContentList } from "@/app/(landing)/content-list";+import { getChangelogPosts } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";import {BASE_URL,defaultMetadata,ogMetadata,twitterMetadata,-} from "../../../../../lib/metadata/shared-metadata";+} from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDItemList,getJsonLDOrganization,-} from "../../../../../lib/metadata/structured-data";-import { ContentCategory } from "../../../content-category";-import { ContentList } from "../../../content-list";+} from "@/lib/metadata/structured-data";export async function generateMetadata({params,diff --git a/apps/web/src/app/(landing)/changelog/category/page.tsx b/apps/web/src/app/(landing)/changelog/category/page.tsxindex 65b4a27cc..d9472c13a 100644--- a/apps/web/src/app/(landing)/changelog/category/page.tsx+++ b/apps/web/src/app/(landing)/changelog/category/page.tsx@@ -1,12 +1,13 @@import type { Metadata } from "next";-import { components } from "../../../../content/mdx";-import { getChangelogPosts } from "../../../../content/utils";+import { components } from "@/content/mdx";+import { getChangelogPosts } from "@/content/utils";import {defaultMetadata,ogMetadata,twitterMetadata,-} from "../../../../lib/metadata/shared-metadata";+} from "@/lib/metadata/shared-metadata";+import { ContentBoxLink, ContentBoxTitle } from "../../content-box";const TITLE = "Changelog Categories";diff --git a/apps/web/src/app/(landing)/changelog/feed.xml/route.ts b/apps/web/src/app/(landing)/changelog/feed.xml/route.tsindex 78422c9ca..d48b54bcf 100644--- a/apps/web/src/app/(landing)/changelog/feed.xml/route.ts+++ b/apps/web/src/app/(landing)/changelog/feed.xml/route.ts@@ -1,7 +1,7 @@import { Feed } from "feed";import { getAuthor } from "src/data/author";-import { getChangelogPosts } from "../../../../content/utils";+import { getChangelogPosts } from "@/content/utils";export async function GET() {const feed = new Feed({diff --git a/apps/web/src/app/(landing)/changelog/page.tsx b/apps/web/src/app/(landing)/changelog/page.tsxindex c7d07e67f..ad57acd86 100644--- a/apps/web/src/app/(landing)/changelog/page.tsx+++ b/apps/web/src/app/(landing)/changelog/page.tsx@@ -1,20 +1,21 @@import type { Metadata } from "next";import Link from "next/link";-import { getChangelogPosts } from "../../../content/utils";-import { JsonLd } from "../../../lib/metadata/json-ld";+import { getChangelogPosts } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";import {BASE_URL,defaultMetadata,ogMetadata,-} from "../../../lib/metadata/shared-metadata";-import { twitterMetadata } from "../../../lib/metadata/shared-metadata";+} from "@/lib/metadata/shared-metadata";+import { twitterMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDItemList,getJsonLDOrganization,-} from "../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import { ContentCategory } from "../content-category";import { ContentList } from "../content-list";diff --git a/apps/web/src/app/(landing)/compare/[slug]/page.tsx b/apps/web/src/app/(landing)/compare/[slug]/page.tsxindex 95bcf03f2..f3002f408 100644--- a/apps/web/src/app/(landing)/compare/[slug]/page.tsx+++ b/apps/web/src/app/(landing)/compare/[slug]/page.tsx@@ -1,13 +1,11 @@import type { Metadata } from "next";import { notFound } from "next/navigation";-import { CustomMDX } from "../../../../content/mdx";-import { getComparePages } from "../../../../content/utils";-import { JsonLd } from "../../../../lib/metadata/json-ld";-import {- BASE_URL,- getPageMetadata,-} from "../../../../lib/metadata/shared-metadata";+import { ContentPagination } from "@/app/(landing)/content-pagination";+import { CustomMDX } from "@/content/mdx";+import { getComparePages } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";+import { BASE_URL, getPageMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBlogPosting,@@ -16,8 +14,7 @@ import {getJsonLDHowTo,getJsonLDOrganization,getJsonLDWebPage,-} from "../../../../lib/metadata/structured-data";-import { ContentPagination } from "../../content-pagination";+} from "@/lib/metadata/structured-data";export const dynamicParams = false;diff --git a/apps/web/src/app/(landing)/compare/page.tsx b/apps/web/src/app/(landing)/compare/page.tsxindex f4f01e1e4..7bc2f2b1e 100644--- a/apps/web/src/app/(landing)/compare/page.tsx+++ b/apps/web/src/app/(landing)/compare/page.tsx@@ -1,20 +1,21 @@import type { Metadata } from "next";-import { components } from "../../../content/mdx";-import { getComparePages } from "../../../content/utils";-import { JsonLd } from "../../../lib/metadata/json-ld";+import { components } from "@/content/mdx";+import { getComparePages } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";import {BASE_URL,defaultMetadata,ogMetadata,twitterMetadata,-} from "../../../lib/metadata/shared-metadata";+} from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDItemList,getJsonLDOrganization,-} from "../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import {ContentBoxDescription,ContentBoxLink,diff --git a/apps/web/src/app/(landing)/content-box-image.tsx b/apps/web/src/app/(landing)/content-box-image.tsxindex 2e32b42e7..4d1ff74a6 100644--- a/apps/web/src/app/(landing)/content-box-image.tsx+++ b/apps/web/src/app/(landing)/content-box-image.tsx@@ -1,7 +1,7 @@import type React from "react";-import { CustomImage } from "../../content/mdx-components/custom-image";-import { cn } from "../../lib/utils";+import { CustomImage } from "@/content/mdx-components/custom-image";+import { cn } from "@/lib/utils";export function ContentBoxImage({className,diff --git a/apps/web/src/app/(landing)/content-box.tsx b/apps/web/src/app/(landing)/content-box.tsxindex a66a914a4..6cfbdea26 100644--- a/apps/web/src/app/(landing)/content-box.tsx+++ b/apps/web/src/app/(landing)/content-box.tsx@@ -1,7 +1,7 @@import Link from "next/link";import type React from "react";-import { cn } from "../../lib/utils";+import { cn } from "@/lib/utils";export function ContentBoxLink({href,diff --git a/apps/web/src/app/(landing)/content-category.tsx b/apps/web/src/app/(landing)/content-category.tsxindex 91ca45daf..826a7c5dc 100644--- a/apps/web/src/app/(landing)/content-category.tsx+++ b/apps/web/src/app/(landing)/content-category.tsx@@ -1,7 +1,7 @@import Link from "next/link";import { Fragment } from "react";-import type { MDXData } from "../../content/utils";+import type { MDXData } from "@/content/utils";export function ContentCategory({data,diff --git a/apps/web/src/app/(landing)/content-list.tsx b/apps/web/src/app/(landing)/content-list.tsxindex 1f6c40ab9..1a3e08fb1 100644--- a/apps/web/src/app/(landing)/content-list.tsx+++ b/apps/web/src/app/(landing)/content-list.tsx@@ -1,7 +1,7 @@import Link from "next/link";-import { type MDXData, formatDate } from "../../content/utils";-import { cn } from "../../lib/utils";+import { type MDXData, formatDate } from "@/content/utils";+import { cn } from "@/lib/utils";export function ContentList({data,diff --git a/apps/web/src/app/(landing)/content-metadata.tsx b/apps/web/src/app/(landing)/content-metadata.tsxindex aa9ebb237..02fd8bea7 100644--- a/apps/web/src/app/(landing)/content-metadata.tsx+++ b/apps/web/src/app/(landing)/content-metadata.tsx@@ -1,5 +1,5 @@-import { type MDXData, formatDate } from "../../content/utils";-import { getAuthor } from "../../data/author";+import { type MDXData, formatDate } from "@/content/utils";+import { getAuthor } from "@/data/author";export function ContentMetadata({ data }: { data: MDXData }) {return (diff --git a/apps/web/src/app/(landing)/content-pagination.tsx b/apps/web/src/app/(landing)/content-pagination.tsxindex 91f98721e..710feed5c 100644--- a/apps/web/src/app/(landing)/content-pagination.tsx+++ b/apps/web/src/app/(landing)/content-pagination.tsx@@ -1,6 +1,6 @@import Link from "next/link";-import type { MDXData } from "../../content/utils";+import type { MDXData } from "@/content/utils";export function ContentPagination({prev,diff --git a/apps/web/src/app/(landing)/customers/[slug]/page.tsx b/apps/web/src/app/(landing)/customers/[slug]/page.tsxindex b4d0b7149..ee02d5012 100644--- a/apps/web/src/app/(landing)/customers/[slug]/page.tsx+++ b/apps/web/src/app/(landing)/customers/[slug]/page.tsx@@ -1,21 +1,18 @@import type { Metadata } from "next";import { notFound } from "next/navigation";-import { CustomMDX } from "../../../../content/mdx";-import { CustomImage } from "../../../../content/mdx-components/custom-image";-import { getCustomerPages } from "../../../../content/utils";-import { JsonLd } from "../../../../lib/metadata/json-ld";-import {- BASE_URL,- getPageMetadata,-} from "../../../../lib/metadata/shared-metadata";+import { CustomMDX } from "@/content/mdx";+import { CustomImage } from "@/content/mdx-components/custom-image";+import { getCustomerPages } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";+import { BASE_URL, getPageMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDFAQPage,getJsonLDOrganization,getJsonLDWebPage,-} from "../../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";export const dynamicParams = false;diff --git a/apps/web/src/app/(landing)/customers/page.tsx b/apps/web/src/app/(landing)/customers/page.tsxindex 707baddb0..b810b8aa4 100644--- a/apps/web/src/app/(landing)/customers/page.tsx+++ b/apps/web/src/app/(landing)/customers/page.tsx@@ -1,20 +1,21 @@import type { Metadata } from "next";-import { components } from "../../../content/mdx";-import { getCustomerPages } from "../../../content/utils";-import { JsonLd } from "../../../lib/metadata/json-ld";+import { components } from "@/content/mdx";+import { getCustomerPages } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";import {BASE_URL,defaultMetadata,ogMetadata,twitterMetadata,-} from "../../../lib/metadata/shared-metadata";+} from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDItemList,getJsonLDOrganization,-} from "../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import {ContentBoxDescription,ContentBoxLink,diff --git a/apps/web/src/app/(landing)/guides/[slug]/page.tsx b/apps/web/src/app/(landing)/guides/[slug]/page.tsxindex 2db3fd5b7..225835771 100644--- a/apps/web/src/app/(landing)/guides/[slug]/page.tsx+++ b/apps/web/src/app/(landing)/guides/[slug]/page.tsx@@ -2,13 +2,10 @@ import type { Metadata } from "next";import Image from "next/image";import { notFound } from "next/navigation";-import { CustomMDX } from "../../../../content/mdx";-import { getGuides } from "../../../../content/utils";-import { JsonLd } from "../../../../lib/metadata/json-ld";-import {- BASE_URL,- getPageMetadata,-} from "../../../../lib/metadata/shared-metadata";+import { CustomMDX } from "@/content/mdx";+import { getGuides } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";+import { BASE_URL, getPageMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBlogPosting,@@ -17,7 +14,8 @@ import {getJsonLDHowTo,getJsonLDOrganization,getJsonLDWebPage,-} from "../../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import { ContentMetadata } from "../../content-metadata";import { ContentPagination } from "../../content-pagination";diff --git a/apps/web/src/app/(landing)/guides/category/[slug]/page.tsx b/apps/web/src/app/(landing)/guides/category/[slug]/page.tsxindex 1041fb8d7..10f795915 100644--- a/apps/web/src/app/(landing)/guides/category/[slug]/page.tsx+++ b/apps/web/src/app/(landing)/guides/category/[slug]/page.tsx@@ -1,21 +1,21 @@import type { Metadata } from "next";-import { getGuides } from "../../../../../content/utils";-import { JsonLd } from "../../../../../lib/metadata/json-ld";+import { ContentCategory } from "@/app/(landing)/content-category";+import { ContentList } from "@/app/(landing)/content-list";+import { getGuides } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";import {BASE_URL,defaultMetadata,ogMetadata,twitterMetadata,-} from "../../../../../lib/metadata/shared-metadata";+} from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDItemList,getJsonLDOrganization,-} from "../../../../../lib/metadata/structured-data";-import { ContentCategory } from "../../../content-category";-import { ContentList } from "../../../content-list";+} from "@/lib/metadata/structured-data";export async function generateMetadata({params,diff --git a/apps/web/src/app/(landing)/guides/category/page.tsx b/apps/web/src/app/(landing)/guides/category/page.tsxindex cd19b69e0..9660aa4c9 100644--- a/apps/web/src/app/(landing)/guides/category/page.tsx+++ b/apps/web/src/app/(landing)/guides/category/page.tsx@@ -1,12 +1,13 @@import type { Metadata } from "next";-import { components } from "../../../../content/mdx";-import { getGuides } from "../../../../content/utils";+import { components } from "@/content/mdx";+import { getGuides } from "@/content/utils";import {defaultMetadata,ogMetadata,twitterMetadata,-} from "../../../../lib/metadata/shared-metadata";+} from "@/lib/metadata/shared-metadata";+import { ContentBoxLink, ContentBoxTitle } from "../../content-box";const TITLE = "Guides Categories";diff --git a/apps/web/src/app/(landing)/guides/page.tsx b/apps/web/src/app/(landing)/guides/page.tsxindex b47709862..a66d5158b 100644--- a/apps/web/src/app/(landing)/guides/page.tsx+++ b/apps/web/src/app/(landing)/guides/page.tsx@@ -1,19 +1,20 @@import type { Metadata } from "next";-import { getGuides } from "../../../content/utils";-import { JsonLd } from "../../../lib/metadata/json-ld";+import { getGuides } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";import {BASE_URL,defaultMetadata,ogMetadata,-} from "../../../lib/metadata/shared-metadata";-import { twitterMetadata } from "../../../lib/metadata/shared-metadata";+} from "@/lib/metadata/shared-metadata";+import { twitterMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDItemList,getJsonLDOrganization,-} from "../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import { ContentCategory } from "../content-category";import { ContentList } from "../content-list";diff --git a/apps/web/src/app/(landing)/layout.tsx b/apps/web/src/app/(landing)/layout.tsxindex e8b074eb7..2933a24a2 100644--- a/apps/web/src/app/(landing)/layout.tsx+++ b/apps/web/src/app/(landing)/layout.tsx@@ -1,6 +1,6 @@-import { Footer } from "../../content/footer";-import { Header } from "../../content/header";-import { SubNav } from "../../content/sub-nav";+import { Footer } from "@/content/footer";+import { Header } from "@/content/header";+import { SubNav } from "@/content/sub-nav";export default function Layout({ children }: { children: React.ReactNode }) {return (diff --git a/apps/web/src/app/(landing)/oss-friends/page.tsx b/apps/web/src/app/(landing)/oss-friends/page.tsxindex 9e58bc7ae..ed2928820 100644--- a/apps/web/src/app/(landing)/oss-friends/page.tsx+++ b/apps/web/src/app/(landing)/oss-friends/page.tsx@@ -1,12 +1,13 @@import type { Metadata } from "next";import { z } from "zod";-import { components } from "../../../content/mdx";+import { components } from "@/content/mdx";import {defaultMetadata,ogMetadata,twitterMetadata,-} from "../../../lib/metadata/shared-metadata";+} from "@/lib/metadata/shared-metadata";+import {ContentBoxDescription,ContentBoxLink,diff --git a/apps/web/src/app/(landing)/page.tsx b/apps/web/src/app/(landing)/page.tsxindex 6576990f5..b9cab94fc 100644--- a/apps/web/src/app/(landing)/page.tsx+++ b/apps/web/src/app/(landing)/page.tsx@@ -1,9 +1,9 @@import type { Metadata } from "next";-import { CustomMDX } from "../../content/mdx";-import { getHomePage } from "../../content/utils";-import { JsonLd } from "../../lib/metadata/json-ld";-import { defaultMetadata } from "../../lib/metadata/shared-metadata";+import { CustomMDX } from "@/content/mdx";+import { getHomePage } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";+import { defaultMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDFAQPage,@@ -12,7 +12,7 @@ import {getJsonLDProduct,getJsonLDSoftwareApplication,getJsonLDWebPage,-} from "../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";export const metadata: Metadata = defaultMetadata;diff --git a/apps/web/src/app/(landing)/play/checker/[slug]/client.tsx b/apps/web/src/app/(landing)/play/checker/[slug]/client.tsxindex 6b979138b..1f23b6849 100644--- a/apps/web/src/app/(landing)/play/checker/[slug]/client.tsx+++ b/apps/web/src/app/(landing)/play/checker/[slug]/client.tsx@@ -19,14 +19,15 @@ import {} from "@openstatus/ui/components/ui/tabs";import { useState } from "react";-import { IconCloudProvider } from "../../../../../components/icon-cloud-provider";+import { IconCloudProvider } from "@/components/icon-cloud-provider";import {type CachedRegionChecker,getTimingPhases,regionFormatter,timestampFormatter,-} from "../../../../../lib/checker/utils";-import { cn } from "../../../../../lib/utils";+} from "@/lib/checker/utils";+import { cn } from "@/lib/utils";+import { handleExportCSV } from "../utils";const STATUS_CODES = {diff --git a/apps/web/src/app/(landing)/play/checker/[slug]/page.tsx b/apps/web/src/app/(landing)/play/checker/[slug]/page.tsxindex f07f70f0c..8cc463d0c 100644--- a/apps/web/src/app/(landing)/play/checker/[slug]/page.tsx+++ b/apps/web/src/app/(landing)/play/checker/[slug]/page.tsx@@ -1,24 +1,22 @@import type { Metadata } from "next";import { redirect } from "next/navigation";-import { CustomMDX } from "../../../../../content/mdx";-import { getToolsPage } from "../../../../../content/utils";-import { mockCheckAllRegions } from "../../../../../lib/checker/mock";+import { CustomMDX } from "@/content/mdx";+import { getToolsPage } from "@/content/utils";+import { mockCheckAllRegions } from "@/lib/checker/mock";import {getCheckerDataById,latencyFormatter,regionFormatter,-} from "../../../../../lib/checker/utils";-import { JsonLd } from "../../../../../lib/metadata/json-ld";-import {- BASE_URL,- getPageMetadata,-} from "../../../../../lib/metadata/shared-metadata";+} from "@/lib/checker/utils";+import { JsonLd } from "@/lib/metadata/json-ld";+import { BASE_URL, getPageMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDWebPage,-} from "../../../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import { Table } from "./client";function formatDate(date: Date) {diff --git a/apps/web/src/app/(landing)/play/checker/api/route.ts b/apps/web/src/app/(landing)/play/checker/api/route.tsindex 14230857e..a9ce8c99e 100644--- a/apps/web/src/app/(landing)/play/checker/api/route.ts+++ b/apps/web/src/app/(landing)/play/checker/api/route.ts@@ -3,17 +3,17 @@ import { AVAILABLE_REGIONS } from "@openstatus/regions";import { after } from "next/server";import { z } from "zod";-import { mockCheckRegion } from "../../../../../lib/checker/mock";+import { mockCheckRegion } from "@/lib/checker/mock";import {type Method,checkRegion,getTimingPhases,storeBaseCheckerData,storeCheckerData,-} from "../../../../../lib/checker/utils";-import { getClientIP, ratelimit } from "../../../../../lib/ratelimit";-import { iteratorToStream, yieldMany } from "../../../../../lib/stream";-import { wait } from "../../../../../lib/utils";+} from "@/lib/checker/utils";+import { getClientIP, ratelimit } from "@/lib/ratelimit";+import { iteratorToStream, yieldMany } from "@/lib/stream";+import { wait } from "@/lib/utils";export const runtime = "edge";diff --git a/apps/web/src/app/(landing)/play/checker/client.tsx b/apps/web/src/app/(landing)/play/checker/client.tsxindex 1db7ed7cc..471ad5795 100644--- a/apps/web/src/app/(landing)/play/checker/client.tsx+++ b/apps/web/src/app/(landing)/play/checker/client.tsx@@ -25,16 +25,17 @@ import {useTransition,} from "react";-import { IconCloudProvider } from "../../../../components/icon-cloud-provider";+import { IconCloudProvider } from "@/components/icon-cloud-provider";import {type Timing,is32CharHex,latencyFormatter,regionCheckerSchema,regionFormatter,-} from "../../../../lib/checker/utils";-import { toast } from "../../../../lib/toast";-import { cn, notEmpty } from "../../../../lib/utils";+} from "@/lib/checker/utils";+import { toast } from "@/lib/toast";+import { cn, notEmpty } from "@/lib/utils";+import { searchParamsParsers } from "./search-params";import { handleExportCSV } from "./utils";diff --git a/apps/web/src/app/(landing)/play/checker/page.tsx b/apps/web/src/app/(landing)/play/checker/page.tsxindex f8a6dbd12..7e53f3ee7 100644--- a/apps/web/src/app/(landing)/play/checker/page.tsx+++ b/apps/web/src/app/(landing)/play/checker/page.tsx@@ -1,20 +1,18 @@import type { Metadata } from "next";-import { CustomMDX } from "../../../../content/mdx";-import { getToolsPage } from "../../../../content/utils";-import { mockCheckAllRegions } from "../../../../lib/checker/mock";-import { getCheckerDataById } from "../../../../lib/checker/utils";-import { JsonLd } from "../../../../lib/metadata/json-ld";-import {- BASE_URL,- getPageMetadata,-} from "../../../../lib/metadata/shared-metadata";+import { CustomMDX } from "@/content/mdx";+import { getToolsPage } from "@/content/utils";+import { mockCheckAllRegions } from "@/lib/checker/mock";+import { getCheckerDataById } from "@/lib/checker/utils";+import { JsonLd } from "@/lib/metadata/json-ld";+import { BASE_URL, getPageMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDFAQPage,getJsonLDWebPage,-} from "../../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import {CheckerProvider,DetailsButtonLink,diff --git a/apps/web/src/app/(landing)/play/checker/utils.ts b/apps/web/src/app/(landing)/play/checker/utils.tsindex 410cf7a2c..057b61343 100644--- a/apps/web/src/app/(landing)/play/checker/utils.ts+++ b/apps/web/src/app/(landing)/play/checker/utils.ts@@ -1,7 +1,7 @@import { type Region, regionDict } from "@openstatus/regions";-import { type Timing, getTimingPhases } from "../../../../lib/checker/utils";-import { toast } from "../../../../lib/toast";+import { type Timing, getTimingPhases } from "@/lib/checker/utils";+import { toast } from "@/lib/toast";export type CheckerRow = {region: string;diff --git a/apps/web/src/app/(landing)/play/curl/page.tsx b/apps/web/src/app/(landing)/play/curl/page.tsxindex c7cc3fff4..ed05a6f8e 100644--- a/apps/web/src/app/(landing)/play/curl/page.tsx+++ b/apps/web/src/app/(landing)/play/curl/page.tsx@@ -1,18 +1,16 @@import type { Metadata } from "next";-import { CustomMDX } from "../../../../content/mdx";-import { getToolsPage } from "../../../../content/utils";-import { JsonLd } from "../../../../lib/metadata/json-ld";-import {- BASE_URL,- getPageMetadata,-} from "../../../../lib/metadata/shared-metadata";+import { CustomMDX } from "@/content/mdx";+import { getToolsPage } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";+import { BASE_URL, getPageMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDFAQPage,getJsonLDWebPage,-} from "../../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import { Form } from "./client";export function generateMetadata(): Metadata {diff --git a/apps/web/src/app/(landing)/play/mcp-health/[id]/client.tsx b/apps/web/src/app/(landing)/play/mcp-health/[id]/client.tsxindex 1fba7fa69..5df37359c 100644--- a/apps/web/src/app/(landing)/play/mcp-health/[id]/client.tsx+++ b/apps/web/src/app/(landing)/play/mcp-health/[id]/client.tsx@@ -1,6 +1,7 @@"use client";-import type { HealthCheckReport } from "../../../../../lib/mcp/health-check";+import type { HealthCheckReport } from "@/lib/mcp/health-check";+import { ResultTableStatic, ToolsTableView, VerdictBarStatic } from "../client";export function Table({ data }: { data: HealthCheckReport }) {diff --git a/apps/web/src/app/(landing)/play/mcp-health/[id]/page.tsx b/apps/web/src/app/(landing)/play/mcp-health/[id]/page.tsxindex 33daf4aff..d1d9678e1 100644--- a/apps/web/src/app/(landing)/play/mcp-health/[id]/page.tsx+++ b/apps/web/src/app/(landing)/play/mcp-health/[id]/page.tsx@@ -1,19 +1,17 @@import type { Metadata } from "next";import { redirect } from "next/navigation";-import { CustomMDX } from "../../../../../content/mdx";-import { getToolsPage } from "../../../../../content/utils";-import { getHealthReportById } from "../../../../../lib/mcp/health-check";-import { JsonLd } from "../../../../../lib/metadata/json-ld";-import {- BASE_URL,- getPageMetadata,-} from "../../../../../lib/metadata/shared-metadata";+import { CustomMDX } from "@/content/mdx";+import { getToolsPage } from "@/content/utils";+import { getHealthReportById } from "@/lib/mcp/health-check";+import { JsonLd } from "@/lib/metadata/json-ld";+import { BASE_URL, getPageMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDWebPage,-} from "../../../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import { VERDICT_LABEL, formatTimestamp } from "../utils";import { Table } from "./client";diff --git a/apps/web/src/app/(landing)/play/mcp-health/api/route.ts b/apps/web/src/app/(landing)/play/mcp-health/api/route.tsindex 71ced0d50..fb81a631f 100644--- a/apps/web/src/app/(landing)/play/mcp-health/api/route.ts+++ b/apps/web/src/app/(landing)/play/mcp-health/api/route.ts@@ -9,8 +9,8 @@ import {runMcpHealthCheck,storeHealthReport,toPersistedReport,-} from "../../../../../lib/mcp/health-check";-import { getClientIP, ratelimit } from "../../../../../lib/ratelimit";+} from "@/lib/mcp/health-check";+import { getClientIP, ratelimit } from "@/lib/ratelimit";export const runtime = "edge";// Worst-case 16s of step time + metadata fetch + analytics; give some slack.diff --git a/apps/web/src/app/(landing)/play/mcp-health/client.tsx b/apps/web/src/app/(landing)/play/mcp-health/client.tsxindex b42d585f7..70efd99d2 100644--- a/apps/web/src/app/(landing)/play/mcp-health/client.tsx+++ b/apps/web/src/app/(landing)/play/mcp-health/client.tsx@@ -32,9 +32,10 @@ import type {HealthCheckReport,StepResult,ToolInfo,-} from "../../../../lib/mcp/health-check";-import { toast } from "../../../../lib/toast";-import { cn } from "../../../../lib/utils";+} from "@/lib/mcp/health-check";+import { toast } from "@/lib/toast";+import { cn } from "@/lib/utils";+import { searchParamsParsers } from "./search-params";import {STEP_REQUEST_BODIES,diff --git a/apps/web/src/app/(landing)/play/mcp-health/page.tsx b/apps/web/src/app/(landing)/play/mcp-health/page.tsxindex 69da93cb8..c6fff2e65 100644--- a/apps/web/src/app/(landing)/play/mcp-health/page.tsx+++ b/apps/web/src/app/(landing)/play/mcp-health/page.tsx@@ -1,20 +1,18 @@import type { Metadata } from "next";-import { CustomMDX } from "../../../../content/mdx";-import { getToolsPage } from "../../../../content/utils";-import { getHealthReportById } from "../../../../lib/mcp/health-check";-import { JsonLd } from "../../../../lib/metadata/json-ld";-import {- BASE_URL,- getPageMetadata,-} from "../../../../lib/metadata/shared-metadata";+import { CustomMDX } from "@/content/mdx";+import { getToolsPage } from "@/content/utils";+import { getHealthReportById } from "@/lib/mcp/health-check";+import { JsonLd } from "@/lib/metadata/json-ld";+import { BASE_URL, getPageMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDFAQPage,getJsonLDHowTo,getJsonLDWebPage,-} from "../../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import {AuthChallengeCallout,DetailsButtonLink,diff --git a/apps/web/src/app/(landing)/play/mcp-health/utils.test.ts b/apps/web/src/app/(landing)/play/mcp-health/utils.test.tsindex ba080c634..228c78b56 100644--- a/apps/web/src/app/(landing)/play/mcp-health/utils.test.ts+++ b/apps/web/src/app/(landing)/play/mcp-health/utils.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import {formatResponseBody,diff --git a/apps/web/src/app/(landing)/play/mcp-health/utils.ts b/apps/web/src/app/(landing)/play/mcp-health/utils.tsindex 73c088b63..2080daa34 100644--- a/apps/web/src/app/(landing)/play/mcp-health/utils.ts+++ b/apps/web/src/app/(landing)/play/mcp-health/utils.ts@@ -1,12 +1,6 @@-import type {- HealthCheckReport,- StepResult,-} from "../../../../lib/mcp/health-check";+import type { HealthCheckReport, StepResult } from "@/lib/mcp/health-check";-export {- STEP_REQUEST_BODIES,- type StepKey,-} from "../../../../lib/mcp/protocol";+export { STEP_REQUEST_BODIES, type StepKey } from "@/lib/mcp/protocol";export const VERDICT_LABEL: Record<HealthCheckReport["verdict"], string> = {healthy: "GOOD",diff --git a/apps/web/src/app/(landing)/play/page.tsx b/apps/web/src/app/(landing)/play/page.tsxindex a7d54da9b..7f27849d6 100644--- a/apps/web/src/app/(landing)/play/page.tsx+++ b/apps/web/src/app/(landing)/play/page.tsx@@ -1,11 +1,12 @@import type { Metadata } from "next";-import { components } from "../../../content/mdx";+import { components } from "@/content/mdx";import {defaultMetadata,ogMetadata,twitterMetadata,-} from "../../../lib/metadata/shared-metadata";+} from "@/lib/metadata/shared-metadata";+import {ContentBoxDescription,ContentBoxLink,diff --git a/apps/web/src/app/(landing)/play/severity-matrix/client.tsx b/apps/web/src/app/(landing)/play/severity-matrix/client.tsxindex bf8e8b856..0a794ce8a 100644--- a/apps/web/src/app/(landing)/play/severity-matrix/client.tsx+++ b/apps/web/src/app/(landing)/play/severity-matrix/client.tsx@@ -7,7 +7,7 @@ import { Label } from "@openstatus/ui/components/ui/label";import { Slider } from "@openstatus/ui/components/ui/slider";import { useState } from "react";-import { Details } from "../../../../content/mdx-components/details";+import { Details } from "@/content/mdx-components/details";type SeverityLevel = "SEV0" | "SEV1" | "SEV2" | "SEV3";diff --git a/apps/web/src/app/(landing)/play/severity-matrix/page.tsx b/apps/web/src/app/(landing)/play/severity-matrix/page.tsxindex b4af063af..e3d57b2d5 100644--- a/apps/web/src/app/(landing)/play/severity-matrix/page.tsx+++ b/apps/web/src/app/(landing)/play/severity-matrix/page.tsx@@ -1,18 +1,16 @@import type { Metadata } from "next";-import { CustomMDX } from "../../../../content/mdx";-import { getToolsPage } from "../../../../content/utils";-import { JsonLd } from "../../../../lib/metadata/json-ld";-import {- BASE_URL,- getPageMetadata,-} from "../../../../lib/metadata/shared-metadata";+import { CustomMDX } from "@/content/mdx";+import { getToolsPage } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";+import { BASE_URL, getPageMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDFAQPage,getJsonLDWebPage,-} from "../../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import { SeverityMatrixBuilder } from "./client";export function generateMetadata(): Metadata {diff --git a/apps/web/src/app/(landing)/play/uptime-sla/page.tsx b/apps/web/src/app/(landing)/play/uptime-sla/page.tsxindex 2214ce250..aa88a7c7a 100644--- a/apps/web/src/app/(landing)/play/uptime-sla/page.tsx+++ b/apps/web/src/app/(landing)/play/uptime-sla/page.tsx@@ -1,18 +1,16 @@import type { Metadata } from "next";-import { CustomMDX } from "../../../../content/mdx";-import { getToolsPage } from "../../../../content/utils";-import { JsonLd } from "../../../../lib/metadata/json-ld";-import {- BASE_URL,- getPageMetadata,-} from "../../../../lib/metadata/shared-metadata";+import { CustomMDX } from "@/content/mdx";+import { getToolsPage } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";+import { BASE_URL, getPageMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDFAQPage,getJsonLDWebPage,-} from "../../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import { Calculation } from "./client";export function generateMetadata(): Metadata {diff --git a/apps/web/src/app/(landing)/status/[id]/[component]/component-detail.tsx b/apps/web/src/app/(landing)/status/[id]/[component]/component-detail.tsxindex 9e47b6bda..6e6d88db9 100644--- a/apps/web/src/app/(landing)/status/[id]/[component]/component-detail.tsx+++ b/apps/web/src/app/(landing)/status/[id]/[component]/component-detail.tsx@@ -2,21 +2,22 @@import { REPORT_WINDOW_MINUTES } from "@openstatus/api/src/router/effective-status";-import { Grid } from "../../../../../content/mdx-components/grid";-import { JsonLd } from "../../../../../lib/metadata/json-ld";-import { BASE_URL } from "../../../../../lib/metadata/shared-metadata";+import {+ ContentBoxDescription,+ ContentBoxLink,+ ContentBoxTitle,+} from "@/app/(landing)/content-box";+import { Grid } from "@/content/mdx-components/grid";+import { JsonLd } from "@/lib/metadata/json-ld";+import { BASE_URL } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDFAQPage,getJsonLDWebPage,-} from "../../../../../lib/metadata/structured-data";-import { api } from "../../../../../trpc/rq-client";-import {- ContentBoxDescription,- ContentBoxLink,- ContentBoxTitle,-} from "../../../content-box";+} from "@/lib/metadata/structured-data";+import { api } from "@/trpc/rq-client";+import { ExternalServicePill } from "../../external-service-pill";import { formatRelative } from "../../utils";import { HistoryBars } from "../history-bars";diff --git a/apps/web/src/app/(landing)/status/[id]/[component]/page.tsx b/apps/web/src/app/(landing)/status/[id]/[component]/page.tsxindex c5f7e78d1..6906aeb73 100644--- a/apps/web/src/app/(landing)/status/[id]/[component]/page.tsx+++ b/apps/web/src/app/(landing)/status/[id]/[component]/page.tsx@@ -2,17 +2,18 @@ import type { Metadata } from "next";import { notFound, permanentRedirect } from "next/navigation";import { Suspense } from "react";-import { ButtonLink } from "../../../../../content/mdx-components/button-link";-import { CustomLink } from "../../../../../content/mdx-components/custom-link";-import { cachedGetExternalComponentBySlug } from "../../../../../lib/external-service-cache";+import { ButtonLink } from "@/content/mdx-components/button-link";+import { CustomLink } from "@/content/mdx-components/custom-link";+import { cachedGetExternalComponentBySlug } from "@/lib/external-service-cache";import {APP_URL,BASE_URL,defaultMetadata,ogMetadata,twitterMetadata,-} from "../../../../../lib/metadata/shared-metadata";-import { HydrateClient, api } from "../../../../../trpc/rq-server";+} from "@/lib/metadata/shared-metadata";+import { HydrateClient, api } from "@/trpc/rq-server";+import {ContentBoxContainer,ContentBoxDescription,diff --git a/apps/web/src/app/(landing)/status/[id]/incidents.tsx b/apps/web/src/app/(landing)/status/[id]/incidents.tsxindex 2a4c6d606..4ee5276c8 100644--- a/apps/web/src/app/(landing)/status/[id]/incidents.tsx+++ b/apps/web/src/app/(landing)/status/[id]/incidents.tsx@@ -1,12 +1,12 @@"use client";-import { Grid } from "../../../../content/mdx-components/grid";-import { api } from "../../../../trpc/rq-client";import {ContentBoxDescription,ContentBoxLink,ContentBoxTitle,-} from "../../content-box";+} from "@/app/(landing)/content-box";+import { Grid } from "@/content/mdx-components/grid";+import { api } from "@/trpc/rq-client";function impactClass(impact: string | undefined): string {switch (impact) {diff --git a/apps/web/src/app/(landing)/status/[id]/page.tsx b/apps/web/src/app/(landing)/status/[id]/page.tsxindex 20594bf5b..ea21922ef 100644--- a/apps/web/src/app/(landing)/status/[id]/page.tsx+++ b/apps/web/src/app/(landing)/status/[id]/page.tsx@@ -3,18 +3,19 @@ import type { Metadata } from "next";import { notFound, permanentRedirect } from "next/navigation";import { Suspense } from "react";-import { ButtonLink } from "../../../../content/mdx-components/button-link";-import { CustomLink } from "../../../../content/mdx-components/custom-link";-import { getServiceEscalation } from "../../../../lib/external-report-escalation";-import { cachedGetExternalServiceBySlug } from "../../../../lib/external-service-cache";+import { ButtonLink } from "@/content/mdx-components/button-link";+import { CustomLink } from "@/content/mdx-components/custom-link";+import { getServiceEscalation } from "@/lib/external-report-escalation";+import { cachedGetExternalServiceBySlug } from "@/lib/external-service-cache";import {APP_URL,BASE_URL,defaultMetadata,ogMetadata,twitterMetadata,-} from "../../../../lib/metadata/shared-metadata";-import { HydrateClient, api } from "../../../../trpc/rq-server";+} from "@/lib/metadata/shared-metadata";+import { HydrateClient, api } from "@/trpc/rq-server";+import {ContentBoxContainer,ContentBoxDescription,diff --git a/apps/web/src/app/(landing)/status/[id]/report-issue.tsx b/apps/web/src/app/(landing)/status/[id]/report-issue.tsxindex 705129f0e..d3ed1de27 100644--- a/apps/web/src/app/(landing)/status/[id]/report-issue.tsx+++ b/apps/web/src/app/(landing)/status/[id]/report-issue.tsx@@ -12,7 +12,8 @@ import {} from "@openstatus/ui/components/ui/select";import { useState } from "react";-import { api } from "../../../../trpc/rq-client";+import { api } from "@/trpc/rq-client";+import { buildSections } from "../external-service-components";const WHOLE_SERVICE = "all";diff --git a/apps/web/src/app/(landing)/status/[id]/service-components.tsx b/apps/web/src/app/(landing)/status/[id]/service-components.tsxindex ff0fe13d1..bbaf6a574 100644--- a/apps/web/src/app/(landing)/status/[id]/service-components.tsx+++ b/apps/web/src/app/(landing)/status/[id]/service-components.tsx@@ -1,6 +1,7 @@"use client";-import { api } from "../../../../trpc/rq-client";+import { api } from "@/trpc/rq-client";+import { ExternalServiceComponents } from "../external-service-components";export function ServiceComponents({diff --git a/apps/web/src/app/(landing)/status/[id]/service-detail.tsx b/apps/web/src/app/(landing)/status/[id]/service-detail.tsxindex 4ca6c4771..7a92deb7d 100644--- a/apps/web/src/app/(landing)/status/[id]/service-detail.tsx+++ b/apps/web/src/app/(landing)/status/[id]/service-detail.tsx@@ -2,16 +2,17 @@import { Suspense } from "react";-import { JsonLd } from "../../../../lib/metadata/json-ld";-import { BASE_URL } from "../../../../lib/metadata/shared-metadata";+import { JsonLd } from "@/lib/metadata/json-ld";+import { BASE_URL } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDFAQPage,getJsonLDService,getJsonLDWebPage,-} from "../../../../lib/metadata/structured-data";-import { api } from "../../../../trpc/rq-client";+} from "@/lib/metadata/structured-data";+import { api } from "@/trpc/rq-client";+import { ExternalServicePill } from "../external-service-pill";import { formatRelative, getStatusAnswer, isStale } from "../utils";import { HistoryBars } from "./history-bars";diff --git a/apps/web/src/app/(landing)/status/[id]/user-reports.tsx b/apps/web/src/app/(landing)/status/[id]/user-reports.tsxindex b22c81501..96b5ea5d3 100644--- a/apps/web/src/app/(landing)/status/[id]/user-reports.tsx+++ b/apps/web/src/app/(landing)/status/[id]/user-reports.tsx@@ -9,7 +9,7 @@ import {} from "@openstatus/ui/components/ui/chart";import { Bar, BarChart, XAxis } from "recharts";-import { api } from "../../../../trpc/rq-client";+import { api } from "@/trpc/rq-client";const chartConfig = {total: { label: "Reports", color: "var(--color-warning)" },diff --git a/apps/web/src/app/(landing)/status/external-status-grid.tsx b/apps/web/src/app/(landing)/status/external-status-grid.tsxindex 0a4a74c03..070b4dcb3 100644--- a/apps/web/src/app/(landing)/status/external-status-grid.tsx+++ b/apps/web/src/app/(landing)/status/external-status-grid.tsx@@ -3,8 +3,9 @@import { useQueryState } from "nuqs";import { useMemo } from "react";-import { Grid } from "../../../content/mdx-components/grid";-import { api } from "../../../trpc/rq-client";+import { Grid } from "@/content/mdx-components/grid";+import { api } from "@/trpc/rq-client";+import { ContentBoxLink } from "../content-box";import { ExternalServicePill } from "./external-service-pill";import { filterServices } from "./filter-services";diff --git a/apps/web/src/app/(landing)/status/page.tsx b/apps/web/src/app/(landing)/status/page.tsxindex ef16c8e05..616563516 100644--- a/apps/web/src/app/(landing)/status/page.tsx+++ b/apps/web/src/app/(landing)/status/page.tsx@@ -1,16 +1,17 @@import type { Metadata } from "next";import { Suspense } from "react";-import { ButtonLink } from "../../../content/mdx-components/button-link";-import { CustomLink } from "../../../content/mdx-components/custom-link";+import { ButtonLink } from "@/content/mdx-components/button-link";+import { CustomLink } from "@/content/mdx-components/custom-link";import {APP_URL,BASE_URL,defaultMetadata,ogMetadata,twitterMetadata,-} from "../../../lib/metadata/shared-metadata";-import { HydrateClient, api } from "../../../trpc/rq-server";+} from "@/lib/metadata/shared-metadata";+import { HydrateClient, api } from "@/trpc/rq-server";+import {ContentBoxContainer,ContentBoxDescription,diff --git a/apps/web/src/app/(landing)/tooling/[slug]/page.tsx b/apps/web/src/app/(landing)/tooling/[slug]/page.tsxindex 3a677a21e..55e79dc44 100644--- a/apps/web/src/app/(landing)/tooling/[slug]/page.tsx+++ b/apps/web/src/app/(landing)/tooling/[slug]/page.tsx@@ -1,13 +1,10 @@import type { Metadata } from "next";import { notFound } from "next/navigation";-import { CustomMDX } from "../../../../content/mdx";-import { getToolingPages } from "../../../../content/utils";-import { JsonLd } from "../../../../lib/metadata/json-ld";-import {- BASE_URL,- getPageMetadata,-} from "../../../../lib/metadata/shared-metadata";+import { CustomMDX } from "@/content/mdx";+import { getToolingPages } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";+import { BASE_URL, getPageMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,@@ -15,7 +12,7 @@ import {getJsonLDHowTo,getJsonLDOrganization,getJsonLDWebPage,-} from "../../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";export const dynamicParams = false;diff --git a/apps/web/src/app/(landing)/tooling/page.tsx b/apps/web/src/app/(landing)/tooling/page.tsxindex bd6430234..837eae5fa 100644--- a/apps/web/src/app/(landing)/tooling/page.tsx+++ b/apps/web/src/app/(landing)/tooling/page.tsx@@ -1,20 +1,21 @@import type { Metadata } from "next";-import { components } from "../../../content/mdx";-import { getToolingPages } from "../../../content/utils";-import { JsonLd } from "../../../lib/metadata/json-ld";+import { components } from "@/content/mdx";+import { getToolingPages } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";import {BASE_URL,defaultMetadata,ogMetadata,twitterMetadata,-} from "../../../lib/metadata/shared-metadata";+} from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDItemList,getJsonLDOrganization,-} from "../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import {ContentBoxDescription,ContentBoxLink,diff --git a/apps/web/src/app/(landing)/use-case/[slug]/page.tsx b/apps/web/src/app/(landing)/use-case/[slug]/page.tsxindex 6d4cdcd68..a7855b950 100644--- a/apps/web/src/app/(landing)/use-case/[slug]/page.tsx+++ b/apps/web/src/app/(landing)/use-case/[slug]/page.tsx@@ -2,13 +2,10 @@ import type { Metadata } from "next";import Image from "next/image";import { notFound } from "next/navigation";-import { CustomMDX } from "../../../../content/mdx";-import { getUseCasePages } from "../../../../content/utils";-import { JsonLd } from "../../../../lib/metadata/json-ld";-import {- BASE_URL,- getPageMetadata,-} from "../../../../lib/metadata/shared-metadata";+import { CustomMDX } from "@/content/mdx";+import { getUseCasePages } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";+import { BASE_URL, getPageMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBlogPosting,@@ -17,7 +14,8 @@ import {getJsonLDHowTo,getJsonLDOrganization,getJsonLDWebPage,-} from "../../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import { ContentMetadata } from "../../content-metadata";import { ContentPagination } from "../../content-pagination";diff --git a/apps/web/src/app/(landing)/use-case/page.tsx b/apps/web/src/app/(landing)/use-case/page.tsxindex d1e5b3bac..f298ea2ca 100644--- a/apps/web/src/app/(landing)/use-case/page.tsx+++ b/apps/web/src/app/(landing)/use-case/page.tsx@@ -1,19 +1,20 @@import type { Metadata } from "next";-import { getUseCasePages } from "../../../content/utils";-import { JsonLd } from "../../../lib/metadata/json-ld";+import { getUseCasePages } from "@/content/utils";+import { JsonLd } from "@/lib/metadata/json-ld";import {BASE_URL,defaultMetadata,ogMetadata,-} from "../../../lib/metadata/shared-metadata";-import { twitterMetadata } from "../../../lib/metadata/shared-metadata";+} from "@/lib/metadata/shared-metadata";+import { twitterMetadata } from "@/lib/metadata/shared-metadata";import {createJsonLDGraph,getJsonLDBreadcrumbList,getJsonLDItemList,getJsonLDOrganization,-} from "../../../lib/metadata/structured-data";+} from "@/lib/metadata/structured-data";+import { ContentList } from "../content-list";const TITLE = "Use Cases";diff --git a/apps/web/src/app/api/checker/cron/_cron.ts b/apps/web/src/app/api/checker/cron/_cron.tsindex 370077d69..d0385fa7c 100644--- a/apps/web/src/app/api/checker/cron/_cron.ts+++ b/apps/web/src/app/api/checker/cron/_cron.ts@@ -22,7 +22,7 @@ import {import type { NextRequest } from "next/server";import { z } from "zod";-import { env } from "../../../../env";+import { env } from "@/env";const periodicityAvailable = selectMonitorSchema.pick({ periodicity: true });diff --git a/apps/web/src/app/api/checker/test/http/route.ts b/apps/web/src/app/api/checker/test/http/route.tsindex 653c0c84f..5bf9f9618 100644--- a/apps/web/src/app/api/checker/test/http/route.ts+++ b/apps/web/src/app/api/checker/test/http/route.ts@@ -3,7 +3,8 @@ import { httpPayloadSchema } from "@openstatus/utils";import { NextResponse } from "next/server";import { z } from "zod";-import { checkRegion } from "../../../../../lib/checker/utils";+import { checkRegion } from "@/lib/checker/utils";+import { isAnInvalidTestUrl } from "../../utils";export const runtime = "edge";diff --git a/apps/web/src/app/api/feedback/docs/route.ts b/apps/web/src/app/api/feedback/docs/route.tsindex d99408b92..1c0b313ab 100644--- a/apps/web/src/app/api/feedback/docs/route.ts+++ b/apps/web/src/app/api/feedback/docs/route.ts@@ -1,8 +1,8 @@import { redis } from "@openstatus/upstash";import { z } from "zod";-import { getClientIP, ratelimit } from "../../../../lib/ratelimit";-import { hashIP } from "../../../../lib/utils";+import { getClientIP, ratelimit } from "@/lib/ratelimit";+import { hashIP } from "@/lib/utils";export const runtime = "edge";diff --git a/apps/web/src/app/api/markdown/[[...path]]/route.ts b/apps/web/src/app/api/markdown/[[...path]]/route.tsindex b7c456a3a..9a1f41ffd 100644--- a/apps/web/src/app/api/markdown/[[...path]]/route.ts+++ b/apps/web/src/app/api/markdown/[[...path]]/route.ts@@ -1,11 +1,11 @@import { type NextRequest, NextResponse } from "next/server";-import { convertMdxToMarkdown } from "../../../../content/convert";+import { convertMdxToMarkdown } from "@/content/convert";import {generateStatusDetailMarkdown,generateStatusIndexMarkdown,-} from "../../../../content/status-markdown";-import { resolveContent } from "../../../../content/utils/resolve";+} from "@/content/status-markdown";+import { resolveContent } from "@/content/utils/resolve";export const runtime = "nodejs"; // Need fs access for content loadingdiff --git a/apps/web/src/app/api/og/_components/background.tsx b/apps/web/src/app/api/og/_components/background.tsxindex 1db707239..0405b09cb 100644--- a/apps/web/src/app/api/og/_components/background.tsx+++ b/apps/web/src/app/api/og/_components/background.tsx@@ -1,4 +1,4 @@-import { cn } from "../../../../lib/utils";+import { cn } from "@/lib/utils";export function Background({children,diff --git a/apps/web/src/app/api/og/_components/basic-layout.tsx b/apps/web/src/app/api/og/_components/basic-layout.tsxindex f8f59adf2..9ac367933 100644--- a/apps/web/src/app/api/og/_components/basic-layout.tsx+++ b/apps/web/src/app/api/og/_components/basic-layout.tsx@@ -1,4 +1,5 @@-import { cn } from "../../../../lib/utils";+import { cn } from "@/lib/utils";+import { Background } from "./background";export function BasicLayout({diff --git a/apps/web/src/app/api/og/_components/status-check.tsx b/apps/web/src/app/api/og/_components/status-check.tsxindex 19bf209cb..db63031ec 100644--- a/apps/web/src/app/api/og/_components/status-check.tsx+++ b/apps/web/src/app/api/og/_components/status-check.tsx@@ -1,6 +1,6 @@import type { Tracker } from "@openstatus/tracker";-import { cn } from "../../../../lib/utils";+import { cn } from "@/lib/utils";export function StatusCheck({ tracker }: { tracker: Tracker }) {const details = tracker.currentDetails;diff --git a/apps/web/src/app/api/og/_components/tracker.tsx b/apps/web/src/app/api/og/_components/tracker.tsxindex 860119678..d02580eb3 100644--- a/apps/web/src/app/api/og/_components/tracker.tsx+++ b/apps/web/src/app/api/og/_components/tracker.tsx@@ -1,7 +1,7 @@import { Tracker as OSTracker, classNames } from "@openstatus/tracker";-import type { ResponseStatusTracker } from "../../../../lib/tb";-import { cn, formatDate } from "../../../../lib/utils";+import type { ResponseStatusTracker } from "@/lib/tb";+import { cn, formatDate } from "@/lib/utils";interface TrackerProps {data: ResponseStatusTracker[];diff --git a/apps/web/src/app/api/og/checker/route.tsx b/apps/web/src/app/api/og/checker/route.tsxindex be80038a1..baeaf2a38 100644--- a/apps/web/src/app/api/og/checker/route.tsx+++ b/apps/web/src/app/api/og/checker/route.tsx@@ -4,8 +4,9 @@ import {getCheckerDataById,regionFormatter,timestampFormatter,-} from "../../../../lib/checker/utils";-import { cn } from "../../../../lib/utils";+} from "@/lib/checker/utils";+import { cn } from "@/lib/utils";+import { BasicLayout } from "../_components/basic-layout";import {SIZE,diff --git a/apps/web/src/app/api/og/external-service/route.tsx b/apps/web/src/app/api/og/external-service/route.tsxindex 6552526c0..a2c1333e3 100644--- a/apps/web/src/app/api/og/external-service/route.tsx+++ b/apps/web/src/app/api/og/external-service/route.tsx@@ -1,17 +1,18 @@import { OSTinybird, safePipeData } from "@openstatus/tinybird";import { ImageResponse } from "next/og";-import { isStale } from "../../../(landing)/status/utils";+import { isStale } from "@/app/(landing)/status/utils";import {getComponentEscalation,getServiceEscalation,-} from "../../../../lib/external-report-escalation";+} from "@/lib/external-report-escalation";import {cachedGetExternalComponentBySlug,cachedGetExternalServiceBySlug,cachedListExternalServices,-} from "../../../../lib/external-service-cache";-import { cn } from "../../../../lib/utils";+} from "@/lib/external-service-cache";+import { cn } from "@/lib/utils";+import { SIZE } from "../utils";// nodejs (not edge): this route pulls in the service reads + Effect retry, whichdiff --git a/apps/web/src/app/api/og/monitor/route.tsx b/apps/web/src/app/api/og/monitor/route.tsxindex 788ab2008..1fa453ed1 100644--- a/apps/web/src/app/api/og/monitor/route.tsx+++ b/apps/web/src/app/api/og/monitor/route.tsx@@ -1,8 +1,9 @@import { OSTinybird } from "@openstatus/tinybird";import { ImageResponse } from "next/og";-import { env } from "../../../../env";-import { DESCRIPTION, TITLE } from "../../../../lib/metadata/shared-metadata";+import { env } from "@/env";+import { DESCRIPTION, TITLE } from "@/lib/metadata/shared-metadata";+import { BasicLayout } from "../_components/basic-layout";import { Tracker } from "../_components/tracker";import { SIZE, calSemiBold, interLight, interRegular } from "../utils";diff --git a/apps/web/src/app/api/og/page/route.tsx b/apps/web/src/app/api/og/page/route.tsxindex 72e8f733c..1ea61b35f 100644--- a/apps/web/src/app/api/og/page/route.tsx+++ b/apps/web/src/app/api/og/page/route.tsx@@ -1,8 +1,9 @@import { Tracker } from "@openstatus/tracker";import { ImageResponse } from "next/og";-import { DESCRIPTION, TITLE } from "../../../../lib/metadata/shared-metadata";-import { api } from "../../../../trpc/server";+import { DESCRIPTION, TITLE } from "@/lib/metadata/shared-metadata";+import { api } from "@/trpc/server";+import { BasicLayout } from "../_components/basic-layout";import { StatusCheck } from "../_components/status-check";import { SIZE, calSemiBold, interLight, interRegular } from "../utils";diff --git a/apps/web/src/app/api/og/post/route.tsx b/apps/web/src/app/api/og/post/route.tsxindex 1f00b7b28..0413f82fd 100644--- a/apps/web/src/app/api/og/post/route.tsx+++ b/apps/web/src/app/api/og/post/route.tsx@@ -1,7 +1,8 @@/* eslint-disable @next/next/no-img-element */import { ImageResponse } from "next/og";-import { TITLE } from "../../../../lib/metadata/shared-metadata";+import { TITLE } from "@/lib/metadata/shared-metadata";+import { BasicLayout } from "../_components/basic-layout";import {DEFAULT_URL,diff --git a/apps/web/src/app/api/og/route.tsx b/apps/web/src/app/api/og/route.tsxindex a84516f03..73e773328 100644--- a/apps/web/src/app/api/og/route.tsx+++ b/apps/web/src/app/api/og/route.tsx@@ -1,7 +1,8 @@/* eslint-disable @next/next/no-img-element */import { ImageResponse } from "next/og";-import { OG_DESCRIPTION, TITLE } from "../../../lib/metadata/shared-metadata";+import { OG_DESCRIPTION, TITLE } from "@/lib/metadata/shared-metadata";+import { SIZE } from "./utils";export const runtime = "edge";diff --git a/apps/web/src/app/api/og/status/route.tsx b/apps/web/src/app/api/og/status/route.tsxindex c7f2cfb31..988b2154a 100644--- a/apps/web/src/app/api/og/status/route.tsx+++ b/apps/web/src/app/api/og/status/route.tsx@@ -2,9 +2,10 @@ import type { RouterOutputs } from "@openstatus/api";import { format } from "date-fns";import { ImageResponse } from "next/og";-import { DESCRIPTION, TITLE } from "../../../../lib/metadata/shared-metadata";-import { cn } from "../../../../lib/utils";-import { api } from "../../../../trpc/server";+import { DESCRIPTION, TITLE } from "@/lib/metadata/shared-metadata";+import { cn } from "@/lib/utils";+import { api } from "@/trpc/server";+import { SIZE } from "../utils";export const runtime = "edge";diff --git a/apps/web/src/app/api/search/route.ts b/apps/web/src/app/api/search/route.tsindex e9810d5d9..c35f79bd4 100644--- a/apps/web/src/app/api/search/route.ts+++ b/apps/web/src/app/api/search/route.ts@@ -1,7 +1,7 @@import { z } from "zod";-import { PAGE_TYPES } from "../../../content/utils";-import { searchCorpus } from "../../../content/utils/search-index";+import { PAGE_TYPES } from "@/content/utils";+import { searchCorpus } from "@/content/utils/search-index";const SearchSchema = z.object({p: z.enum(PAGE_TYPES).nullish(),diff --git a/apps/web/src/app/api/test/timeout/route.ts b/apps/web/src/app/api/test/timeout/route.tsindex 3e454a7e2..6513b15cb 100644--- a/apps/web/src/app/api/test/timeout/route.ts+++ b/apps/web/src/app/api/test/timeout/route.ts@@ -1,6 +1,6 @@import { NextResponse } from "next/server";-import { wait } from "../../../../lib/utils";+import { wait } from "@/lib/utils";export async function POST() {await wait(10_000);diff --git a/apps/web/src/app/api/trpc/edge/[trpc]/route.ts b/apps/web/src/app/api/trpc/edge/[trpc]/route.tsindex 5a339780e..8ad8edf0b 100644--- a/apps/web/src/app/api/trpc/edge/[trpc]/route.ts+++ b/apps/web/src/app/api/trpc/edge/[trpc]/route.ts@@ -3,7 +3,7 @@ import { edgeRouter } from "@openstatus/api/src/edge";import { fetchRequestHandler } from "@trpc/server/adapters/fetch";import type { NextRequest } from "next/server";-import { createOnError, guardTRPCSource } from "../../../../../trpc/shared";+import { createOnError, guardTRPCSource } from "@/trpc/shared";export const runtime = "edge";diff --git a/apps/web/src/app/api/trpc/lambda/[trpc]/route.ts b/apps/web/src/app/api/trpc/lambda/[trpc]/route.tsindex ddbd1dbbd..175c51af8 100644--- a/apps/web/src/app/api/trpc/lambda/[trpc]/route.ts+++ b/apps/web/src/app/api/trpc/lambda/[trpc]/route.ts@@ -3,7 +3,7 @@ import { lambdaRouter } from "@openstatus/api/src/lambda";import { fetchRequestHandler } from "@trpc/server/adapters/fetch";import type { NextRequest } from "next/server";-import { createOnError, guardTRPCSource } from "../../../../../trpc/shared";+import { createOnError, guardTRPCSource } from "@/trpc/shared";// Stripe is incompatible with Edge runtimes due to using Node.js events// export const runtime = "edge";diff --git a/apps/web/src/app/api/webhook/stripe/route.ts b/apps/web/src/app/api/webhook/stripe/route.tsindex 992eae4d8..630ba2469 100644--- a/apps/web/src/app/api/webhook/stripe/route.ts+++ b/apps/web/src/app/api/webhook/stripe/route.ts@@ -4,7 +4,7 @@ import { TRPCError } from "@trpc/server";import { getHTTPStatusCodeFromError } from "@trpc/server/http";import type { NextRequest } from "next/server";-import { env } from "../../../../env";+import { env } from "@/env";export async function POST(req: NextRequest) {const payload = await req.text();diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsxindex cdd6ea156..bab21c8c4 100644--- a/apps/web/src/app/layout.tsx+++ b/apps/web/src/app/layout.tsx@@ -1,4 +1,4 @@-import "../styles/globals.css";+import "@/styles/globals.css";import { OpenPanelComponent } from "@openpanel/nextjs";import { Toaster } from "@openstatus/ui/components/ui/sonner";import type { Metadata } from "next";@@ -8,15 +8,15 @@ import LocalFont from "next/font/local";import Script from "next/script";import { NuqsAdapter } from "nuqs/adapters/next/app";-import { ThemeProvider } from "../components/theme-provider";-import { WebMcpProvider } from "../components/webmcp-provider";-import { env } from "../env";+import { ThemeProvider } from "@/components/theme-provider";+import { WebMcpProvider } from "@/components/webmcp-provider";+import { env } from "@/env";import {defaultMetadata,ogMetadata,twitterMetadata,-} from "../lib/metadata/shared-metadata";-import { TRPCReactQueryProvider } from "../trpc/rq-client";+} from "@/lib/metadata/shared-metadata";+import { TRPCReactQueryProvider } from "@/trpc/rq-client";const inter = Inter({ subsets: ["latin"], variable: "--font-sans" });diff --git a/apps/web/src/app/not-found.tsx b/apps/web/src/app/not-found.tsxindex 3f52999e0..6902b4b58 100644--- a/apps/web/src/app/not-found.tsx+++ b/apps/web/src/app/not-found.tsx@@ -1,5 +1,5 @@-import { CustomMDX } from "../content/mdx";-import { getUnrelatedPage } from "../content/utils";+import { CustomMDX } from "@/content/mdx";+import { getUnrelatedPage } from "@/content/utils";export default function NotFound() {const page = getUnrelatedPage("not-found");diff --git a/apps/web/src/app/sitemap.ts b/apps/web/src/app/sitemap.tsindex 53efa8ac4..9d43f572d 100644--- a/apps/web/src/app/sitemap.ts+++ b/apps/web/src/app/sitemap.ts@@ -13,11 +13,11 @@ import {getToolsPages,getUnrelatedPages,getUseCasePages,-} from "../content/utils";+} from "@/content/utils";import {cachedListExternalComponentsBySlug,cachedListExternalServices,-} from "../lib/external-service-cache";+} from "@/lib/external-service-cache";export const revalidate = 3600;diff --git a/apps/web/src/components/dev-mode-container.tsx b/apps/web/src/components/dev-mode-container.tsxindex 410427671..76eb3a55a 100644--- a/apps/web/src/components/dev-mode-container.tsx+++ b/apps/web/src/components/dev-mode-container.tsx@@ -1,4 +1,4 @@-import { cn } from "../lib/utils";+import { cn } from "@/lib/utils";export default function DevModeContainer({children,diff --git a/apps/web/src/components/icon-cloud-provider.tsx b/apps/web/src/components/icon-cloud-provider.tsxindex c1e9d7a24..14db64a17 100644--- a/apps/web/src/components/icon-cloud-provider.tsx+++ b/apps/web/src/components/icon-cloud-provider.tsx@@ -7,7 +7,7 @@ import {} from "@openstatus/ui/components/ui/tooltip";import { Globe } from "lucide-react";-import { cn } from "../lib/utils";+import { cn } from "@/lib/utils";export function IconCloudProvider({provider,diff --git a/apps/web/src/components/loading-animation.tsx b/apps/web/src/components/loading-animation.tsxindex f3fdc9e63..3142bfd3e 100644--- a/apps/web/src/components/loading-animation.tsx+++ b/apps/web/src/components/loading-animation.tsx@@ -1,7 +1,7 @@import { cva } from "class-variance-authority";import type { VariantProps } from "class-variance-authority";-import { cn } from "../lib/utils";+import { cn } from "@/lib/utils";const loadingVariants = cva("direction-alternate animate-pulse rounded-full duration-700",diff --git a/apps/web/src/config/socials.ts b/apps/web/src/config/socials.tsindex 0287bde64..e97d24877 100644--- a/apps/web/src/config/socials.ts+++ b/apps/web/src/config/socials.ts@@ -1,4 +1,4 @@-import type { ValidIcon } from "../components/icons";+import type { ValidIcon } from "@/components/icons";export type Social = {title: string;diff --git a/apps/web/src/content/cmdk.tsx b/apps/web/src/content/cmdk.tsxindex dcd2579ac..da40c8f8e 100644--- a/apps/web/src/content/cmdk.tsx+++ b/apps/web/src/content/cmdk.tsx@@ -24,8 +24,12 @@ import { useTheme } from "next-themes";import { useRouter } from "next/navigation";import * as React from "react";-import { CORPUS_LABELS, type Corpus, type SearchResult } from "./search-meta";-import { buildHighlightRegex } from "./utils/search-match";+import {+ CORPUS_LABELS,+ type Corpus,+ type SearchResult,+} from "@/content/search-meta";+import { buildHighlightRegex } from "@/content/utils/search-match";type ConfigItem = {type: "item";diff --git a/apps/web/src/content/docs-feedback.tsx b/apps/web/src/content/docs-feedback.tsxindex b9cefb174..c57310f87 100644--- a/apps/web/src/content/docs-feedback.tsx+++ b/apps/web/src/content/docs-feedback.tsx@@ -21,7 +21,7 @@ import { useEffect, useState } from "react";import { useForm } from "react-hook-form";import { z } from "zod";-import { toastAction } from "../lib/toast";+import { toastAction } from "@/lib/toast";type Rating = "up" | "down";diff --git a/apps/web/src/content/docs-footer.tsx b/apps/web/src/content/docs-footer.tsxindex 617c8a21a..6c3c564e1 100644--- a/apps/web/src/content/docs-footer.tsx+++ b/apps/web/src/content/docs-footer.tsx@@ -1,6 +1,7 @@+import { Link } from "@/content/link";+import { ThemeToggle } from "@/content/theme-toggle";+import { FooterStatus } from "./footer-status";-import { Link } from "./link";-import { ThemeToggle } from "./theme-toggle";export function DocsFooter() {return (diff --git a/apps/web/src/content/docs-sidebar.tsx b/apps/web/src/content/docs-sidebar.tsxindex 8b7546c23..a1c8381ac 100644--- a/apps/web/src/content/docs-sidebar.tsx+++ b/apps/web/src/content/docs-sidebar.tsx@@ -12,7 +12,8 @@ import Link from "next/link";import { usePathname } from "next/navigation";import { useEffect, useState } from "react";-import { cn } from "../lib/utils";+import { cn } from "@/lib/utils";+import {type DocsNavGroup,type DocsNavItem,diff --git a/apps/web/src/content/docs-sub-nav.tsx b/apps/web/src/content/docs-sub-nav.tsxindex 7a9394092..7d50c8acc 100644--- a/apps/web/src/content/docs-sub-nav.tsx+++ b/apps/web/src/content/docs-sub-nav.tsx@@ -4,7 +4,8 @@ import Link from "next/link";import { usePathname } from "next/navigation";import { Fragment } from "react";-import { cn } from "../lib/utils";+import { cn } from "@/lib/utils";+import { CopyDropdownButton } from "./copy-button";export function DocsSubNav({diff --git a/apps/web/src/content/docs-toc.tsx b/apps/web/src/content/docs-toc.tsxindex f9a4642f6..d83a02acd 100644--- a/apps/web/src/content/docs-toc.tsx+++ b/apps/web/src/content/docs-toc.tsx@@ -2,7 +2,8 @@import { useEffect, useState } from "react";-import { cn } from "../lib/utils";+import { cn } from "@/lib/utils";+import type { TocItem } from "./toc";function useActiveHeading(items: TocItem[]) {diff --git a/apps/web/src/content/footer-status.tsx b/apps/web/src/content/footer-status.tsxindex ea8e43fd5..95e024da2 100644--- a/apps/web/src/content/footer-status.tsx+++ b/apps/web/src/content/footer-status.tsx@@ -4,7 +4,7 @@ import type { StatusResponse } from "@openstatus/react";import { useQuery } from "@tanstack/react-query";import Link from "next/link";-import { cn } from "../lib/utils";+import { cn } from "@/lib/utils";export function FooterStatus() {const { data } = useQuery({diff --git a/apps/web/src/content/footer.tsx b/apps/web/src/content/footer.tsxindex 406d16941..1045e551a 100644--- a/apps/web/src/content/footer.tsx+++ b/apps/web/src/content/footer.tsx@@ -1,7 +1,8 @@-import { footerLinks } from "../data/content";+import { Link } from "@/content/link";+import { ThemeToggle } from "@/content/theme-toggle";+import { footerLinks } from "@/data/content";+import { FooterStatus } from "./footer-status";-import { Link } from "./link";-import { ThemeToggle } from "./theme-toggle";export function Footer() {return (diff --git a/apps/web/src/content/header.tsx b/apps/web/src/content/header.tsxindex 00389e7a0..38c6a890f 100644--- a/apps/web/src/content/header.tsx+++ b/apps/web/src/content/header.tsx@@ -6,7 +6,8 @@ import {} from "@openstatus/ui/components/ui/dropdown-menu";import Link from "next/link";-import { headerLinks } from "../data/content";+import { headerLinks } from "@/data/content";+import { CmdK } from "./cmdk";import { LogoWithContextMenu } from "./logo-with-context-menu";diff --git a/apps/web/src/content/highlight-text.tsx b/apps/web/src/content/highlight-text.tsxindex 0a22adf1f..d3a5e5a6a 100644--- a/apps/web/src/content/highlight-text.tsx+++ b/apps/web/src/content/highlight-text.tsx@@ -3,7 +3,7 @@import { useSearchParams } from "next/navigation";import { useEffect, useRef } from "react";-import { buildHighlightRegex } from "./utils/search-match";+import { buildHighlightRegex } from "@/content/utils/search-match";function escapeHtml(input: string) {return input.replace(/[&<>]/g, (c) =>diff --git a/apps/web/src/content/image-zoom.tsx b/apps/web/src/content/image-zoom.tsxindex 93dc42880..fa59e93b8 100644--- a/apps/web/src/content/image-zoom.tsx+++ b/apps/web/src/content/image-zoom.tsx@@ -9,7 +9,7 @@ import Zoom, {type UncontrolledProps,} from "react-medium-image-zoom";-import { cn } from "../lib/utils";+import { cn } from "@/lib/utils";export type ImageZoomProps = UncontrolledProps & {isZoomed?: ControlledProps["isZoomed"];diff --git a/apps/web/src/content/latency-chart-table.tsx b/apps/web/src/content/latency-chart-table.tsxindex 3a7e5cc8e..bce59b84d 100644--- a/apps/web/src/content/latency-chart-table.tsx+++ b/apps/web/src/content/latency-chart-table.tsx@@ -2,7 +2,8 @@ import fs from "node:fs";import { type Region, regionDict } from "@openstatus/regions";-import type { RegionMetricsChartTable } from "../data/content";+import type { RegionMetricsChartTable } from "@/data/content";+import { SimpleChart } from "./simple-chart";export interface LatencyChartTableProps {diff --git a/apps/web/src/content/link.tsx b/apps/web/src/content/link.tsxindex 9b928a9d1..9043ae77b 100644--- a/apps/web/src/content/link.tsx+++ b/apps/web/src/content/link.tsx@@ -1,6 +1,6 @@import NextLink from "next/link";-import { cn } from "../lib/utils";+import { cn } from "@/lib/utils";// TODO: we could add cva variants for the linkdiff --git a/apps/web/src/content/mdx-components/aside.tsx b/apps/web/src/content/mdx-components/aside.tsxindex 863c9829e..c23385c28 100644--- a/apps/web/src/content/mdx-components/aside.tsx+++ b/apps/web/src/content/mdx-components/aside.tsx@@ -1,7 +1,7 @@import { cva } from "class-variance-authority";import type React from "react";-import { cn } from "../../lib/utils";+import { cn } from "@/lib/utils";type AsideType = "note" | "tip" | "caution" | "danger";diff --git a/apps/web/src/content/mdx-components/card.tsx b/apps/web/src/content/mdx-components/card.tsxindex 336c1ea6a..8a692833a 100644--- a/apps/web/src/content/mdx-components/card.tsx+++ b/apps/web/src/content/mdx-components/card.tsx@@ -1,7 +1,7 @@import Link from "next/link";import type React from "react";-import { cn } from "../../lib/utils";+import { cn } from "@/lib/utils";export function CardGrid({ children }: { children: React.ReactNode }) {return <div className="my-4 grid gap-4 sm:grid-cols-2">{children}</div>;diff --git a/apps/web/src/content/mdx-components/custom-image.tsx b/apps/web/src/content/mdx-components/custom-image.tsxindex a7087a2c7..e7b12e809 100644--- a/apps/web/src/content/mdx-components/custom-image.tsx+++ b/apps/web/src/content/mdx-components/custom-image.tsx@@ -3,8 +3,9 @@ import { join } from "node:path";import Image from "next/image";-import { getImageDimensions } from "../../lib/image-dimensions";-import { cn } from "../../lib/utils";+import { getImageDimensions } from "@/lib/image-dimensions";+import { cn } from "@/lib/utils";+import { ImageZoom, ZoomableImage } from "../image-zoom";type CustomImageProps = React.ComponentProps<typeof Image> & {diff --git a/apps/web/src/content/mdx-components/grid.tsx b/apps/web/src/content/mdx-components/grid.tsxindex 82afd5ab0..d637228c4 100644--- a/apps/web/src/content/mdx-components/grid.tsx+++ b/apps/web/src/content/mdx-components/grid.tsx@@ -1,6 +1,6 @@import type React from "react";-import { cn } from "../../lib/utils";+import { cn } from "@/lib/utils";export function Grid({cols = 2,diff --git a/apps/web/src/content/mdx-components/subtle.tsx b/apps/web/src/content/mdx-components/subtle.tsxindex 4b1adeea2..423f2e9e1 100644--- a/apps/web/src/content/mdx-components/subtle.tsx+++ b/apps/web/src/content/mdx-components/subtle.tsx@@ -1,6 +1,6 @@import type React from "react";-import { cn } from "../../lib/utils";+import { cn } from "@/lib/utils";export function Subtle({ className, ...props }: React.ComponentProps<"span">) {return <span className={cn("text-muted-foreground", className)} {...props} />;diff --git a/apps/web/src/content/simple-chart.tsx b/apps/web/src/content/simple-chart.tsxindex e7869a77f..87be846d5 100644--- a/apps/web/src/content/simple-chart.tsx+++ b/apps/web/src/content/simple-chart.tsx@@ -8,7 +8,7 @@ import {} from "@openstatus/ui/components/ui/chart";import { Line, LineChart, XAxis } from "recharts";-import { cn } from "../lib/utils";+import { cn } from "@/lib/utils";const chartConfig = {latency: {diff --git a/apps/web/src/content/status-markdown.ts b/apps/web/src/content/status-markdown.tsindex fa79587e3..caf43d5d4 100644--- a/apps/web/src/content/status-markdown.ts+++ b/apps/web/src/content/status-markdown.ts@@ -10,11 +10,11 @@ import {} from "@openstatus/services/external-service-report";import { OSTinybird, safePipeData } from "@openstatus/tinybird";-import { env } from "../env";+import { env } from "@/env";import {cachedGetExternalServiceBySlug,cachedListExternalServices,-} from "../lib/external-service-cache";+} from "@/lib/external-service-cache";type LatestRow = {id: string;diff --git a/apps/web/src/content/sub-nav.tsx b/apps/web/src/content/sub-nav.tsxindex 81e4e1c1c..50ea6fe14 100644--- a/apps/web/src/content/sub-nav.tsx+++ b/apps/web/src/content/sub-nav.tsx@@ -4,7 +4,8 @@ import Link from "next/link";import { usePathname } from "next/navigation";import { Fragment } from "react";-import { cn } from "../lib/utils";+import { cn } from "@/lib/utils";+import { CopyDropdownButton } from "./copy-button";export function SubNav({ className, ...props }: React.ComponentProps<"div">) {diff --git a/apps/web/src/content/theme-toggle.tsx b/apps/web/src/content/theme-toggle.tsxindex a39e10289..45064ca72 100644--- a/apps/web/src/content/theme-toggle.tsx+++ b/apps/web/src/content/theme-toggle.tsx@@ -5,7 +5,7 @@ import { useTheme } from "next-themes";import type * as React from "react";import { useEffect, useState } from "react";-import { cn } from "../lib/utils";+import { cn } from "@/lib/utils";export function ThemeToggle({className,diff --git a/apps/web/src/content/utils/search-index.ts b/apps/web/src/content/utils/search-index.tsindex 1f3fe2514..357bc83ee 100644--- a/apps/web/src/content/utils/search-index.ts+++ b/apps/web/src/content/utils/search-index.ts@@ -1,6 +1,7 @@import "server-only";+import { slugify } from "@/content/mdx";+import { type MDXData, PAGE_TYPES, getHomePage, getPages } from ".";-import { slugify } from "../mdx";import type { Corpus, SearchResult } from "../search-meta";import {closestHeadingSlug,diff --git a/apps/web/src/content/utils/search-match.test.ts b/apps/web/src/content/utils/search-match.test.tsindex 827ca8e9a..15e92226c 100644--- a/apps/web/src/content/utils/search-match.test.ts+++ b/apps/web/src/content/utils/search-match.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import {WEIGHTS,diff --git a/apps/web/src/data/content.ts b/apps/web/src/data/content.tsindex 7cf726ad2..a80c48be2 100644--- a/apps/web/src/data/content.ts+++ b/apps/web/src/data/content.ts@@ -7,7 +7,7 @@ import {getToolingPages,getToolsPages,getUseCasePages,-} from "../content/utils";+} from "@/content/utils";const products = getProductPages();diff --git a/apps/web/src/data/trigger-dictionary.ts b/apps/web/src/data/trigger-dictionary.tsindex 06cbc4f50..2b4703b24 100644--- a/apps/web/src/data/trigger-dictionary.ts+++ b/apps/web/src/data/trigger-dictionary.ts@@ -1,5 +1,5 @@-import type { ValidIcon } from "../components/icons";-import type { Trigger } from "../lib/monitor/utils";+import type { ValidIcon } from "@/components/icons";+import type { Trigger } from "@/lib/monitor/utils";export const triggerDict = {cron: {diff --git a/apps/web/src/lib/checker/mock.ts b/apps/web/src/lib/checker/mock.tsindex cdc60e499..ce20f05d0 100644--- a/apps/web/src/lib/checker/mock.ts+++ b/apps/web/src/lib/checker/mock.ts@@ -1,7 +1,7 @@import type { Region } from "@openstatus/db/src/schema/constants";-import { wait } from "../utils";-import { type RegionChecker, cachedCheckerSchema } from "./utils";+import { type RegionChecker, cachedCheckerSchema } from "@/lib/checker/utils";+import { wait } from "@/lib/utils";export async function mockCheckRegion(region: Region) {const response = data.checksdiff --git a/apps/web/src/lib/external-report-escalation.ts b/apps/web/src/lib/external-report-escalation.tsindex c91450026..be7f9de6b 100644--- a/apps/web/src/lib/external-report-escalation.ts+++ b/apps/web/src/lib/external-report-escalation.ts@@ -10,7 +10,7 @@ import {import { OSTinybird, safePipeData } from "@openstatus/tinybird";import { unstable_cache } from "next/cache";-import { env } from "../env";+import { env } from "@/env";const tb = new OSTinybird(env.TINY_BIRD_API_KEY);diff --git a/apps/web/src/lib/mcp/health-check.test.ts b/apps/web/src/lib/mcp/health-check.test.tsindex 760265b64..1eac8d994 100644--- a/apps/web/src/lib/mcp/health-check.test.ts+++ b/apps/web/src/lib/mcp/health-check.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { afterEach, describe, test } from "@std/testing/bdd";+import { afterEach, describe, expect, test } from "bun:test";import {normalizeUrlForStorage,diff --git a/apps/web/src/lib/metadata/shared-metadata.ts b/apps/web/src/lib/metadata/shared-metadata.tsindex 68e9a67b3..db9d7981f 100644--- a/apps/web/src/lib/metadata/shared-metadata.ts+++ b/apps/web/src/lib/metadata/shared-metadata.ts@@ -1,6 +1,6 @@import type { Metadata } from "next";-import type { MDXData } from "../../content/utils";+import type { MDXData } from "@/content/utils";export const TITLE = "openstatus";export const HOMEPAGE_TITLE = "The Compliance-First Status Page";diff --git a/apps/web/src/lib/metadata/structured-data.ts b/apps/web/src/lib/metadata/structured-data.tsindex d7f7fb381..36a29602e 100644--- a/apps/web/src/lib/metadata/structured-data.ts+++ b/apps/web/src/lib/metadata/structured-data.ts@@ -19,7 +19,8 @@ import type {WithContext,} from "schema-dts";-import type { MDXData } from "../../content/utils";+import type { MDXData } from "@/content/utils";+import { BASE_URL } from "./shared-metadata";export const getJsonLDWebPage = (diff --git a/apps/web/src/lib/stripe/client.ts b/apps/web/src/lib/stripe/client.tsindex 8e64d21e5..50e713747 100644--- a/apps/web/src/lib/stripe/client.ts+++ b/apps/web/src/lib/stripe/client.ts@@ -1,7 +1,7 @@import type { Stripe as StripeProps } from "@stripe/stripe-js";import { loadStripe } from "@stripe/stripe-js";-import { env } from "../../env";+import { env } from "@/env";let stripePromise: Promise<StripeProps | null>;diff --git a/apps/web/src/lib/tb.ts b/apps/web/src/lib/tb.tsindex fc16ba37c..371c5e022 100644--- a/apps/web/src/lib/tb.ts+++ b/apps/web/src/lib/tb.ts@@ -1,6 +1,6 @@import { OSTinybird } from "@openstatus/tinybird";-import { env } from "../env";+import { env } from "@/env";const tb = new OSTinybird(env.TINY_BIRD_API_KEY);diff --git a/apps/workflows/.gitignore b/apps/workflows/.gitignoreindex e4037038c..506e4c37e 100644--- a/apps/workflows/.gitignore+++ b/apps/workflows/.gitignore@@ -1,6 +1,2 @@# depsnode_modules/--# build artifacts / local dev db-app-dev.db*diff --git a/apps/workflows/Dockerfile b/apps/workflows/Dockerfileindex 348eacb70..42ee8271f 100644--- a/apps/workflows/Dockerfile+++ b/apps/workflows/Dockerfile@@ -2,121 +2,68 @@# This file is generated by Dofigen v2.8.0# See https://github.com/lenra-io/dofigen+# docker+FROM oven/bun@sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7 AS docker+LABEL \+ org.opencontainers.image.base.digest="sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7" \+ org.opencontainers.image.base.name="docker.io/oven/bun:1.3.11"+WORKDIR /app/apps/workflows+COPY \+ --link \+ "." "/app/"+RUN bun run src/build-docker.ts+# install-FROM node@sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc AS install+FROM node@sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf AS installLABEL \- org.opencontainers.image.base.digest="sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc" \+ org.opencontainers.image.base.digest="sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf" \org.opencontainers.image.base.name="docker.io/node:24-slim" \org.opencontainers.image.stage="install"WORKDIR /app/-COPY \- --link \- "pnpm-workspace.yaml" "/app/pnpm-workspace.yaml"-COPY \- --link \- "pnpm-lock.yaml" "/app/pnpm-lock.yaml"-COPY \- --link \- "package.json" "/app/package.json"-COPY \- --link \- "apps/workflows/package.json" "/app/apps/workflows/package.json"-COPY \- --link \- "packages/assertions/package.json" "/app/packages/assertions/package.json"-COPY \- --link \- "packages/db/package.json" "/app/packages/db/package.json"-COPY \- --link \- "packages/emails/package.json" "/app/packages/emails/package.json"-COPY \- --link \- "packages/notifications/base/package.json" "/app/packages/notifications/base/package.json"-COPY \- --link \- "packages/notifications/discord/package.json" "/app/packages/notifications/discord/package.json"-COPY \- --link \- "packages/notifications/email/package.json" "/app/packages/notifications/email/package.json"-COPY \- --link \- "packages/notifications/grafana-oncall/package.json" "/app/packages/notifications/grafana-oncall/package.json"-COPY \- --link \- "packages/notifications/google-chat/package.json" "/app/packages/notifications/google-chat/package.json"-COPY \- --link \- "packages/notifications/ms-teams/package.json" "/app/packages/notifications/ms-teams/package.json"-COPY \- --link \- "packages/notifications/ntfy/package.json" "/app/packages/notifications/ntfy/package.json"-COPY \- --link \- "packages/notifications/opsgenie/package.json" "/app/packages/notifications/opsgenie/package.json"-COPY \- --link \- "packages/notifications/pagerduty/package.json" "/app/packages/notifications/pagerduty/package.json"-COPY \- --link \- "packages/notifications/slack/package.json" "/app/packages/notifications/slack/package.json"-COPY \- --link \- "packages/notifications/telegram/package.json" "/app/packages/notifications/telegram/package.json"-COPY \- --link \- "packages/notifications/bird-whatsapp/package.json" "/app/packages/notifications/bird-whatsapp/package.json"-COPY \- --link \- "packages/notifications/twillio-sms/package.json" "/app/packages/notifications/twillio-sms/package.json"-COPY \- --link \- "packages/notifications/webhook/package.json" "/app/packages/notifications/webhook/package.json"-COPY \- --link \- "packages/importers/package.json" "/app/packages/importers/package.json"-COPY \- --link \- "packages/regions/package.json" "/app/packages/regions/package.json"-COPY \- --link \- "packages/services/package.json" "/app/packages/services/package.json"-COPY \- --link \- "packages/subscriptions/package.json" "/app/packages/subscriptions/package.json"-COPY \- --link \- "packages/utils/package.json" "/app/packages/utils/package.json"-COPY \- --link \- "packages/tsconfig/package.json" "/app/packages/tsconfig/package.json"-COPY \- --link \- "packages/tinybird/package.json" "/app/packages/tinybird/package.json"-COPY \- --link \- "packages/upstash/package.json" "/app/packages/upstash/package.json"-COPY \- --link \- "packages/theme-store/package.json" "/app/packages/theme-store/package.json"-COPY \- --link \- "packages/locales/package.json" "/app/packages/locales/package.json"-COPY \- --link \- "packages/status-fetcher/package.json" "/app/packages/status-fetcher/package.json"RUN \- --mount=type=cache,target=/root/.local/share/pnpm/store,id=s/995d9762-a732-446d-808a-498c7c33a8d5-/root/.local/share/pnpm/store,sharing=locked \+ --mount=type=bind,target=pnpm-workspace.yaml,source=pnpm-workspace.yaml \+ --mount=type=bind,target=pnpm-lock.yaml,source=pnpm-lock.yaml \+ --mount=type=bind,target=package.json,source=package.json \+ --mount=type=bind,target=apps/workflows/package.json,source=apps/workflows/package.json \+ --mount=type=bind,target=packages/assertions/package.json,source=packages/assertions/package.json \+ --mount=type=bind,target=packages/db/package.json,source=packages/db/package.json \+ --mount=type=bind,target=packages/emails/package.json,source=packages/emails/package.json \+ --mount=type=bind,target=packages/notifications/base/package.json,source=packages/notifications/base/package.json \+ --mount=type=bind,target=packages/notifications/discord/package.json,source=packages/notifications/discord/package.json \+ --mount=type=bind,target=packages/notifications/email/package.json,source=packages/notifications/email/package.json \+ --mount=type=bind,target=packages/notifications/grafana-oncall/package.json,source=packages/notifications/grafana-oncall/package.json \+ --mount=type=bind,target=packages/notifications/google-chat/package.json,source=packages/notifications/google-chat/package.json \+ --mount=type=bind,target=packages/notifications/ms-teams/package.json,source=packages/notifications/ms-teams/package.json \+ --mount=type=bind,target=packages/notifications/ntfy/package.json,source=packages/notifications/ntfy/package.json \+ --mount=type=bind,target=packages/notifications/opsgenie/package.json,source=packages/notifications/opsgenie/package.json \+ --mount=type=bind,target=packages/notifications/pagerduty/package.json,source=packages/notifications/pagerduty/package.json \+ --mount=type=bind,target=packages/notifications/slack/package.json,source=packages/notifications/slack/package.json \+ --mount=type=bind,target=packages/notifications/telegram/package.json,source=packages/notifications/telegram/package.json \+ --mount=type=bind,target=packages/notifications/bird-whatsapp/package.json,source=packages/notifications/bird-whatsapp/package.json \+ --mount=type=bind,target=packages/notifications/twillio-sms/package.json,source=packages/notifications/twillio-sms/package.json \+ --mount=type=bind,target=packages/notifications/webhook/package.json,source=packages/notifications/webhook/package.json \+ --mount=type=bind,target=packages/importers/package.json,source=packages/importers/package.json \+ --mount=type=bind,target=packages/regions/package.json,source=packages/regions/package.json \+ --mount=type=bind,target=packages/services/package.json,source=packages/services/package.json \+ --mount=type=bind,target=packages/subscriptions/package.json,source=packages/subscriptions/package.json \+ --mount=type=bind,target=packages/utils/package.json,source=packages/utils/package.json \+ --mount=type=bind,target=packages/tsconfig/package.json,source=packages/tsconfig/package.json \+ --mount=type=bind,target=packages/tinybird/package.json,source=packages/tinybird/package.json \+ --mount=type=bind,target=packages/upstash/package.json,source=packages/upstash/package.json \+ --mount=type=bind,target=packages/theme-store/package.json,source=packages/theme-store/package.json \+ --mount=type=bind,target=packages/locales/package.json,source=packages/locales/package.json \+ --mount=type=bind,target=packages/status-fetcher/package.json,source=packages/status-fetcher/package.json \+ --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \<<EOFcorepack enable pnpm-pnpm install --prod --frozen-lockfile --filter=@openstatus/workflows... --verbose+pnpm install --prod --frozen-lockfile --verboseEOF# build-FROM denoland/deno@sha256:8d24854de78a79c56e74b49aa4c5996c60e1fe3730efba8fbdd2692c582e6e29 AS build+FROM oven/bun@sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7 AS buildLABEL \- org.opencontainers.image.base.digest="sha256:8d24854de78a79c56e74b49aa4c5996c60e1fe3730efba8fbdd2692c582e6e29" \- org.opencontainers.image.base.name="docker.io/denoland/deno:2.9.0" \+ org.opencontainers.image.base.digest="sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7" \+ org.opencontainers.image.base.name="docker.io/oven/bun:1.3.11" \org.opencontainers.image.stage="build"ENV NODE_ENV="production"WORKDIR /app/apps/workflows@@ -135,21 +82,27 @@ COPY \--from=install \--link \"/app/packages" "/app/packages"-RUN <<EOF-mkdir -p /tmp/sc-deno eval 'const p="/app/node_modules/.pnpm";const v=(x)=>{for(const e of Deno.readDirSync(p))if(e.name.startsWith(x+"@"))return e.name.slice(x.length+1).split("_")[0]};Deno.writeTextFileSync("/tmp/sc/package.json",JSON.stringify({dependencies:{"@libsql/client":v("@libsql+client"),libsql:v("libsql"),"@google-cloud/tasks":v("@google-cloud+tasks")}}))'-cd /tmp/sc && deno install --node-modules-dir=auto --allow-scripts-cd /app/apps/workflows && deno bundle --platform=deno --minify --sloppy-imports --node-modules-dir=manual --external '@libsql/client' --external 'libsql' --external '@google-cloud/tasks' --output /tmp/sc/_serve.bundle.mjs src/serve.ts-cd /tmp/sc && deno compile --no-check -A --node-modules-dir=manual --output /app/apps/workflows/app /tmp/sc/_serve.bundle.mjs-mkdir -p /app/data-EOF+RUN bun build --compile --target bun --sourcemap src/index.ts --outfile=app++# libsql+FROM oven/bun@sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7 AS libsql+LABEL \+ org.opencontainers.image.base.digest="sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7" \+ org.opencontainers.image.base.name="docker.io/oven/bun:1.3.11"+WORKDIR /app/+COPY \+ --from=docker \+ --link \+ "/app/apps/build-docker/package.json" "/app/package.json"+RUN bun install --production# runtime-FROM registry.access.redhat.com/hi/curl@sha256:848b81ab5d5e55371d7193fd4f1ea7b605d14dbb039344ffad34a4c1f0d880f4 AS runtime+FROM debian@sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604 AS runtimeLABEL \io.dofigen.version="2.8.0" \org.opencontainers.image.authors="OpenStatus Team" \- org.opencontainers.image.base.digest="sha256:848b81ab5d5e55371d7193fd4f1ea7b605d14dbb039344ffad34a4c1f0d880f4" \+ org.opencontainers.image.base.digest="sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604" \+ org.opencontainers.image.base.name="docker.io/debian:bullseye-slim" \org.opencontainers.image.description="Background job processing and probe scheduling for OpenStatus" \org.opencontainers.image.source="https://github.com/openstatusHQ/openstatus" \org.opencontainers.image.title="OpenStatus Workflows" \@@ -162,16 +115,17 @@ COPY \--link \"/app/apps/workflows/app" "/app/apps/workflows/"COPY \- --from=build \+ --from=libsql \--chown=1000:1000 \--link \- "/app/data" "/app/data"+ "/app/node_modules" "/app/packages/db/node_modules"+COPY \+ --from=libsql \+ --chown=1000:1000 \+ --link \+ "/app/node_modules" "/app/node_modules"+USER 0:0+RUN apt-get update -q && apt-get install -y -q --no-install-recommends ca-certificates curl && update-ca-certificates && rm -rf /var/lib/apt/lists/* && mkdir -p /app/data && chown -R 1000:1000 /app/dataUSER 1000:1000EXPOSE 3000-HEALTHCHECK \- --interval=1m \- --timeout=10s \- --start-period=30s \- --retries=3 \- CMD ["curl", "-f", "http://localhost:3000/ping"]ENTRYPOINT ["/app/apps/workflows/app"]diff --git a/apps/workflows/deno-migration-plan.md b/apps/workflows/deno-migration-plan.mddeleted file mode 100644index 2b7b2f0f9..000000000--- a/apps/workflows/deno-migration-plan.md+++ /dev/null@@ -1,437 +0,0 @@-# Plan: migrate `apps/server` + `apps/workflows` from bun to Deno 2.9--Goal: remove **bun** from the project. Three pillars, shipped as **one big-bang PR**:--1. **Build** β `bun build --compile` β `deno compile` (server + workflows).-2. **Install** β the Docker `pnpm install` stage β `deno install` (server + workflows).-3. **Tests** β `bun:test` β **`node:test` runner + `@std/expect`**, run via **`deno test`**,- across **all ~270 test files** (12 packages + apps server, workflows, web, status-page).--The other apps (`web`, `dashboard`, `status-page`, `docs`, `screenshot-service`) keep-**pnpm** for install + their existing builds; their only bun usage was `bun test`, removed by-pillar 3. `pnpm` remains the local-dev + non-migrated-app package manager.-------## Agreed decisions (the design)--| # | Area | Decision |-|---|------|----------|-| 1 | Test scope | All ~270 `bun:test` files (12 packages + server/workflows/web/status-page) |-| 2 | Rollout | One big-bang PR, guarded by a baseline test-count parity gate (#16) |-| 3 | Entrypoint | **Split**: `index.ts` exports `app`; new `serve.ts` calls `Deno.serve`, is the compile target |-| 4 | Assertions | Keep Jest-style `expect` via **`@std/expect`** |-| 5 | Mocks | **`@std/testing/mock`** (`spy`/`stub`, `using`) + **`@std/testing/time`** (`FakeTime`) |-| 6 | `mock.module` | **Hybrid**: `stub` the reachable seams; **default-param DI** for the rest; delete dead ones |-| 7 | Test infra | New **`@openstatus/test-utils`** package: matchers (`expect.extend`), setup, shared fakes |-| 8 | DI style | **Default-parameter injection** for `dispatch*` / `getChannel` |-| 9 | Snapshots / type tests | `@std/testing/snapshot` / `expect-type` |-| 10 | Typecheck | Replace `tsc` with **`deno check`**, scoped to `apps/server` + `apps/workflows` (src + tests) |-| 11 | Permissions | `-A` for `deno test` and `deno compile` now; tighten the binary in a follow-up |-| 12 | Docker install | `deno install --prod --frozen --allow-scripts`, hoisted node_modules; `pnpm-workspace.yaml` stays authoritative; commit `deno.lock` only |-| 13 | CI install | CI test/migrate jobs **keep `pnpm install`**; `deno install` is exercised by the docker-publish build |-| 14 | CI test orchestration | Keep **turbo**; each package `"test": "deno test -A"`; swap `setup-bun` β `setup-deno` |-| 15 | Integration tests | Stay in the same `deno test -A` run, against the CI libsql service (as today) |-| 16 | Safety net | Record base-commit `bun test` pass count; assert `deno test` count β₯ it (fail CI on drop) |-| 17 | Other apps | Stay on pnpm install + existing build |-| 18 | Codemod | `ts-morph`/`jscodeshift` for the mechanical rewrite; hand-fix the ~60-file residue |-------## Resolved by codebase exploration (facts, not assumptions)--- **Entrypoint must split** β tests do `import { app } from "@/index"`; a top-level- `Deno.serve` in `index.ts` would boot a server on every test import.-- **Server needs no libsql side-car** β `packages/db` uses `drizzle-orm/libsql/http` (pure- HTTP). Only `apps/workflows/src/lib/db.ts` uses the native `@libsql/client` embedded replica- β native-addon compile risk is **workflows-only**.-- **Tests are integration tests against a real libSQL DB** β CI runs a `libsql-server`- service + migrate + seed. The preload mocks only Tinybird/Redis/subscriptions; DB is real.-- **Step D seams are mixed**: `@/libs/clients` (`tb`/`redis` singletons) + `Redis.fromEnv`- are stub-able; `@openstatus/subscriptions` `dispatch*` + `getChannel` are destructured live- bindings called directly β need DI.-- **`node-fetch` mock is dead** β the SUT uses **global `fetch`**; tests set- `global.fetch = mockFetch` (the effective line) plus a redundant `mock.module("node-fetch")`- (not a dependency). β `stub(globalThis, "fetch", β¦)` and delete the `mock.module` line.-- **`start.sh` is unused by Fly** (entrypoint is the binary; compose `command` commented) β- prod migrations run via CI `migrate.yml`. We keep `start.sh` anyway and port its command.-- **migrate/seed have no `Bun.*`** β `packages/db/src/migrate.mts` + `seed.mts` use only- `@libsql/client`/drizzle/`process` β run under `deno run -A` unchanged.-- **`Bun.*` lives only in dev/build scripts** β `packages/db/env.ts`, `apps/server/env.ts`,- `apps/workflows/src/build-docker.ts` (`Bun.file`/`Bun.write`).-- **web/status-page tests are pure logic/util** β no DOM/`@testing-library`/React rendering;- run under `deno test` with no jsdom.-- **Only `apps/server` runs `tsc`** today (`tsc --noEmit`, `types: ["bun-types"]`).-------## Phase 0 β Spikes (gate the big-bang) β β DONE (1,2) / deferred (3,4)--Toolchain confirmed: **deno 2.9.0**, bun 1.3.11, pnpm 11.2.1, node 24, dofigen 2.8.0.--1. β **`Deno.serve` + Hono compile/serve.** Compiled, served, `/ping`β200, embedded asset- read via `Deno.readTextFile(new URL(...))`. **Correction: the flag is `--include`, not- `--include-as-is`** (the latter does not exist in 2.9).-2. β **libSQL native addon under `deno compile` β make-or-break, PASSED with a bonus.**- `deno compile` **embeds the native addon into the binary** (10.7MB) and the binary runs from- a clean dir with **no node_modules**. **Consequence: the workflows `docker` + `libsql`- side-car stages are no longer needed** (they existed only because `bun build --compile`- could not embed native addons). One caveat for the real monorepo build: `--node-modules-dir=manual`- against the giant shared `node_modules` hangs (tries to embed everything) β use deno's- managed npm resolution / `--exclude-unused-npm` so only reachable packages embed. Final flag- combo to be settled in Phase 5 against the real Docker build.-3. β³ **Test stack interop** β validated at the start of Phase 2 by migrating one real route- test (faster than a synthetic spike): `@std/expect` matchers, `toHaveBeenCalled*` vs- `@std/testing/mock` spies (else `assertSpyCalls`), `expect.extend`, `stub` on `tb` getters +- `globalThis.fetch`, `FakeTime`.-4. β³ **`deno install` on the repo** β done carefully in Phase 3 (it may rewrite manifests and- re-layout `node_modules`, which would disrupt the in-progress pnpm-based work), in an- isolated copy first.-------## β RESOLVED β deep workspace imports: exports maps + sloppy (no deno.json)--**Solution (verified under `deno run` + `deno compile` + bun):** add an `exports` map to the-4 deep-imported packages (`@openstatus/db`, `@openstatus/api`, `@openstatus/emails`,-`@openstatus/tracker`) and pass `--unstable-sloppy-imports` on every deno command. The exports-map crosses the package boundary (sloppy can't); sloppy resolves the relative extensionless-imports inside packages. **No deno.json. 4 package.json touched, not 512 imports.**--Exports map shape (per package), covering the 36 distinct targets (29 files, 7 dirs all in db):--```jsonc-"exports": {- ".": "./src/index.ts",- "./env.mjs": "./env.mjs", // db only (non-src deep import)- "./src/schema": "./src/schema/index.ts", // + the 6 other directory targets- "./src/client": "./src/client.tsx", // .tsx files need explicit entries- "./src/*": "./src/*.ts" // wildcard handles the .ts files-}-```--Every deno invocation (`test`/`compile`/`check`/`run`) must include `--unstable-sloppy-imports`.--### Original investigation (kept for context)--The codebase has **512 bare deep-subpath imports across 400 files** of the form-`@openstatus/db/src/schema/constants` (also `@openstatus/api/src/*`, `@openstatus/emails/src/*`,-`@openstatus/tracker/src/*`). Targets are a **mix of `.ts` files, `.tsx` files, and directories**-(`@openstatus/db/src/schema` is a dir with `index.ts`). Verified facts (Deno 2.9.0 experiments):--- **`--unstable-sloppy-imports` resolves *relative* extensionless imports** (incl. dir-index and- `.tsx`) for `deno run`/`compile`/`test`. β-- It does **NOT** resolve **bare cross-package** deep subpaths β those go through node_modules- package resolution where sloppy does not apply. Fails for run/compile/test (works only for the- lenient `deno check` TS resolver). β β true even in Deno workspace mode (`deno install`).-- **Explicit extension** (`@openstatus/db/src/schema/constants.ts`) resolves under both Deno and- bun β but directory imports still need `/index.ts`, and it risks the Next.js apps (turbopack/tsc).-- **`exports` map** with a `./src/*` wildcard handles `.ts` files but **not** the mixed- dir/`.tsx` cases reliably (Deno does not fall through exports fallback arrays on a missing file).-- **deno.json import map** prefix (`"@openstatus/db/src/": "./packages/db/src/"`) + sloppy- **resolves ALL cases** (file `.ts`/`.tsx` + dir-index) for run **and** compile. β β but it is a- `deno.json`, which the user asked to avoid.--**This is a hard fork:** the only clean, complete fix is a 4-entry `deno.json` import map, which-collides with the "no deno.json" preference ([[feedback-no-deno-json]]). Awaiting a decision (see-chat) before proceeding with Phase 2+. Everything below assumes that decision is made.--## Implementation findings (verified during execution)--- **`@/*` tsconfig path alias** β Deno doesn't read tsconfig `paths`. 153 `@/β¦` imports across- 113 files in `apps/server` rewritten to **relative paths** (codemod). workflows uses none. β-- **`deno install` foundation** β works, with one workaround: it **crashes seeding `deno.lock`- from `pnpm-lock.yaml`** on a pnpm alias (`string-width-cjs@[email protected]`). Fix: move- `pnpm-lock.yaml` aside during `deno install` so Deno resolves fresh, then restore it. Deno- migrates the **catalog into root `package.json`** (not deno.json) and writes `deno.lock`.- After install, the full server graph resolves (deep imports + `zod` + `hono`). β-- **`@std/expect` `toHaveBeenCalled*` does NOT accept `@std/testing/mock` spies** (verified:- "Received function must be a mock or spy function"). β the ~187 `toHaveBeenCalled*` sites must- use **`assertSpyCalls`/`assertSpyCall`** instead. Basic `expect`, `expect.extend` custom- matchers, and `FakeTime` all work. β (more test rework than planned)-- **β `deno compile` of `apps/server` WORKS in a clean Docker container** β the local 12-min- hang was the **polluted local node_modules** (Deno-managed mix + broken `.next` symlinks +- every app's deps). In Docker with a **scoped `pnpm install --filter @openstatus/server...`**- (20.8s) then `deno compile --node-modules-dir=manual`, the binary builds fast and **runs**:- `/ping`β200, `/openapi.yaml`βembedded asset, full app graph boots ("Listening on :3000").- - **Winning build recipe** (`apps/server/Dockerfile.deno-test`): node:24-slim β `pnpm install- --prod --frozen-lockfile --filter @openstatus/server...` β denoland/deno:2.9.0 β `deno- compile -A --no-check --unstable-sloppy-imports --node-modules-dir=manual --include- static/openapi.yaml --include static/openapi-v1.json --output app src/serve.ts` β debian- runtime with just the binary.- - **No `deno install`** in the build β pnpm install (scoped) is what produces node_modules;- Deno reads the catalog from root `package.json` (migrated once) + consumes pnpm's layout.- This sidesteps `deno install`'s whole-monorepo install + the pnpm-alias lockfile crash.- - Catalog must be present in root `package.json` for Deno to resolve `catalog:` specifiers.- - Sandbox note: needed `docker build --network=host` here (flaky build-network); normal CI ok.- - Image 495MB (debian + binary). Could slim further later.-- **β `apps/workflows` also builds in Docker** (same recipe, `--filter @openstatus/workflows...`,- 465MB) and **embeds the libSQL native addon** (no side-car). Verified the binary executes (it- reaches the embedded-replica `createClient` and opens the sync connection). Full boot needs a- real Turso `DATABASE_URL` β in the sandbox it blocks in SYN_SENT to an unreachable sync URL at- module load (the `createClient` runs before logging, so no logs appear). Not a build defect.-- **β `@sentry/bun` β `@sentry/deno`** β workflows used `@sentry/bun` (bun-only; hangs under- Deno) in `index.ts`, `lib/sentry.ts`, `cron/index.ts`. Swapped all three to `@sentry/deno`- (`10.61.0`, API-compatible: `init`/`captureException`/`captureMessage`/`captureCheckIn`/`flush`),- updated `package.json` + `pnpm-lock.yaml`. The server uses `@hono/sentry` (unaffected).-- **β embedded-replica `createClient` blocks at module load** until the sync URL connects β so- the workflows process won't serve `/ping` until the DB is reachable. Pre-existing behavior- (bun did the same); flagged for prod startup robustness.--## Phase 2 β Test migration β πΆ IN PROGRESS--- β `@openstatus/test-utils` package built + validated: re-exports `node:test` runner with a- Bun-compat **`.each`** shim, `@std/expect` `expect` extended with the ~12 **bun-only matchers**- (`toBeNumber`, `toContainValue`, β¦), and `@std/testing/mock` (`spy`/`stub`/`assertSpyCalls`) +- `@std/testing/time` (`FakeTime`). Uses `jsr:@std/*` so only Deno needs them.-- β Codemod swapped `bun:test` β `@openstatus/test-utils` in **194 files**; updated 21+- `package.json` (`deno test` script, test-utils devDep, dropped `@types/bun`/`bun-types`);- removed `bunfig.toml`.-- β **`@/*` alias β relative** rewrite: server (153), status-page (211), web (332). Deno- ignores tsconfig paths.-- β **Import-only suites PASS under `deno test`**: header-analysis (7), status-page (51), web- (23). Mock pattern validated: discord + 5 more notifications PASS.-- πΆ **Remaining mock work (~47 files)**: `@std/expect` `toHaveBeenCalled*` does NOT accept std- spies β use `assertSpyCalls`. Per-file quirks remain: 6 notifications (webhook double-stub,- bird-whatsapp `jest`, slack/grafana call-count-after-restub), importers clients, status-fetcher,- tracker (`FakeTime`), subscriptions/api/server (**`mock.module` β stub + default-param DI**,- and these are **DB-integration tests needing a running libSQL to verify**).-- β³ snapshots (`toMatchSnapshot` β `@std/testing/snapshot`) + type tests (`expectTypeOf` β- `expect-type`) not started.--## Phase 1 β Source changes β β DONE--- β split `index.ts`/`serve.ts` (both apps); server static asset β `Deno.readTextFile`.-- β `Bun.*` β `Deno.copyFile` in `apps/server/env.ts`, `packages/db/env.ts`.-- β `migrate`/`seed`/`env` scripts + `start.sh` β `deno run -A`; app `dev`/`start`/`test` β deno.--(Detail of the changes below.)--### Entrypoint split (both apps)--`index.ts`: keep `export const app = new Hono(...)`, **remove** `const server = {...}` +-`export default server`. New `serve.ts`:--```ts-import { app } from "./index";-import { env } from "./env";-Deno.serve({ port: env.PORT ?? 3000 }, app.fetch);-```--`serve.ts` is the `deno compile` target. Tests still import `app` with no server side-effect.--### Server static asset (`apps/server/src/index.ts:22`)--Drop `import openapiYaml β¦ with { type: "text" }`. Embed via `--include-as-is` (Phase 4) and-read at startup:--```ts-const openapiYaml = await Deno.readTextFile(new URL("../static/openapi.yaml", import.meta.url));-```--JSON imports (`with { type: "json" }`) stay β Deno supports them.--### `Bun.*` β Deno APIs (dev/build scripts)--`packages/db/env.ts`, `apps/server/env.ts`: `Bun.file(p).text()/.json()` β-`Deno.readTextFile(p)` (+ `JSON.parse`); `Bun.write(p, s)` β `Deno.writeTextFile(p, s)`.-(`apps/workflows/src/build-docker.ts` is deleted in Phase 5 β no port needed.)--### migrate / `start.sh`--`packages/db/package.json`: `"migrate": "deno run -A src/migrate.mts"`,-`"seed": "deno run -A src/seed.mts"`, `"env": "deno run -A env.ts"`. Keep `start.sh`; change-`bun src/migrate.mts` β `deno run -A src/migrate.mts`.-------## Phase 2 β Test migration (`bun:test` β `node:test` + `@std/expect`, `deno test`)--Surface: **~270 files**, ~2920 `expect` assertions, ~150 bun-only matchers, 47 `mock` /-21 `spyOn` / 10 `setSystemTime` / 6 `jest.*`, 4 `mock.module` seams (+ dead `node-fetch`),-12 snapshot files, 10 type-test files.--### Step 0 β `@openstatus/test-utils` package (Decision 7)--```-packages/test-utils/- src/setup.ts # registers expect.extend matchers; installs the global fetch stub helper- src/matchers.ts # the ~150 bun-only matchers (toBeNumber, toContainValue, toBeString, β¦)- src/fakes/ # tinybird.ts, redis.ts, subscriptions.ts β shared test doubles-```--Each tester adds `@openstatus/test-utils` as a devDependency; every test file imports-`@openstatus/test-utils/setup` **first** (codemod injects).--### Step A β codemod (`ts-morph`/`jscodeshift`, ~270 files)--Per file: replace the `bun:test` import with `node:test` + `@std/expect`, alias-`beforeAllβbefore`/`afterAllβafter`, and inject `import "@openstatus/test-utils/setup";` as-the first import. `expect(...)` bodies untouched.--### Step B β bun-only matchers--Implemented once in `@openstatus/test-utils` via `expect.extend` (verified in Phase 0 spike 3).-`pass()`/`fail()` helpers β explicit `expect(...)` assertions in the few sites that use them.--### Step C β mocks (`@std/testing/mock` + `@std/testing/time`)--`mock(fn)`β`spy(fn)`; `spyOn(o,"m")`β`using s = spy(o,"m")` / `stub(o,"m",impl)`; sequential-returnsβ`returnsNext`; `setSystemTime`β`using t = new FakeTime(date)` + `t.tick`. Prefer-`using` (auto-restore) β deletes most `afterEach` teardown. Keep `toHaveBeenCalled*` if Phase-0-interop holds, else `assertSpyCalls`/`assertSpyCall`.--### Step D β module mocks (hybrid; Decisions 6 + 8)--- **stub-able** β `@std/testing/mock` `stub`, fakes from `@openstatus/test-utils/fakes`:- `tb`/`redis` (`@/libs/clients` singletons), `Redis.fromEnv` (`@openstatus/upstash`).-- **global fetch** β `stub(globalThis, "fetch", β¦)`; **delete** every `mock.module("node-fetch")`.-- **DI (default-param)** β `dispatchMaintenanceUpdate`, `dispatchStatusReportUpdate`- (`maintenances/post.ts`, `statusReports/post.ts`), `getChannel`- (`rpc/handlers/status-page/index.ts`): add `deps = { β¦ }` last param; tests pass fakes.-- The old global `preload.ts` is deleted; its four mocks move to the above mechanisms.--### Step E β preload replacement--`bunfig.toml` preload is gone; the `@openstatus/test-utils/setup` import (Step A) replaces it.-Import ordering: setup first, then the SUT.--### Step F β snapshots + type tests--Snapshots β `@std/testing/snapshot` `assertSnapshot(t, value)` (regenerate + diff the 12-files). Type tests β `expect-type` (`expectTypeOf<T>().toEqualTypeOf<U>()`), validated by-`deno check` where in scope (the two apps).--### Step G β invocation--Each package/app `"test": "deno test -A"`. Pull `@std/expect`, `@std/testing`, `expect-type`-via `jsr add`/devDeps so pnpm install resolves them. Remove `bunfig.toml`, `bun-types`,-`@types/bun`.-------## Phase 3 β Install via `deno install` (Docker, server + workflows)--Deno 2.9 reads `pnpm-workspace.yaml` catalogs (482 `catalog:` refs) + workspace globs-(244 `workspace:*`) and seeds `deno.lock` from `pnpm-lock.yaml`. dofigen `install` stage:--```yaml- install:- fromImage: denoland/deno:2.9.0- workdir: /app/- env:- DENO_NODE_MODULES_DIR: auto # hoisted layout for compile + libsql side-car- bind:- - pnpm-workspace.yaml # catalog + workspace source of truth- - pnpm-lock.yaml- - deno.lock- - package.json- - β¦all workspace package.json (same bind list as today)β¦- run: deno install --prod --frozen --allow-scripts- cache:- - /deno-dir-```--`pnpm-workspace.yaml` stays authoritative (Decision 12); commit `deno.lock`; do **not** commit-any catalog/`deno.json` that 2.9 may emit. Verify (Phase 0 spike 4) the migration write stays-additive so pnpm keeps working for the other apps.-------## Phase 4 β `apps/server/dofigen.yml` (build)--`build` stage β Deno + `deno compile` (target `serve.ts`). No libsql side-car (HTTP driver).--```yaml- build:- fromImage: denoland/deno:2.9.0- workdir: /app/apps/server- env: { NODE_ENV: production }- copy:- - . /app/- - { fromBuilder: install, source: /app/node_modules, target: /app/node_modules }- - { fromBuilder: install, source: /app/apps/server/node_modules, target: /app/apps/server/node_modules }- - { fromBuilder: install, source: /app/packages, target: /app/packages }- run: >-- deno compile -A --no-check --node-modules-dir- --include static/openapi.yaml --include static/openapi-v1.json- --output app serve.ts-```--`--no-check` keeps compile fast (`deno check` is the typecheck gate, Decision 10). Optionally-benchmark experimental `--bundle` for a smaller binary. Runtime copy `/app/apps/server/app` β-`/bin/app` unchanged.-------## Phase 5 β `apps/workflows/dofigen.yml` (build) β side-car DROPPED--Spike 2 proved `deno compile` **embeds** the libSQL native addon into the binary, so the whole-side-car apparatus goes away:--1. **`build`** β `deno compile -A --no-check --output app serve.ts`. Settle the npm-embed flags- here (`--exclude-unused-npm` / managed npm) so it embeds reachable packages, not the whole- `node_modules` (spike 2 caveat).-2. **DELETE the `docker` stage** (`build-docker.ts` existed only to generate the side-car- `package.json`) and **DELETE the `libsql` stage**.-3. **`build-docker.ts`** itself becomes dead code β remove (its sole purpose was the side-car).-4. **runtime copy** β just the self-contained `app` binary. No `node_modules` copied at all.--This makes the workflows runtime image dramatically simpler (binary only, like server).-------## Phase 6 β CI--- `test.yml` + `migrate.yml`: replace `oven-sh/setup-bun` with `denoland/setup-deno@v2`- (Deno 2.9). **Keep `pnpm install`** (Decision 13), the libsql service, migrate, seed.- `pnpm test` β turbo β per-package `deno test -A` (Decision 14).-- Add a **`deno check`** step for `apps/server` + `apps/workflows` (src + tests) replacing the- server `tsc` step (Decision 10).-- **Parity gate** (Decision 16): a CI step records the base-commit `bun test` total pass count- (artifact / committed baseline number), then asserts `deno test`'s pass count β₯ baseline.-- docker-publish workflows exercise `deno install` + `deno compile` via the Dockerfiles.-------## Phase 7 β Verify & ship--Per app: `dofigen generate`; `docker buildx build -f apps/<app>/Dockerfile .` from repo root;-run, `GET /ping` β 200; server `GET /openapi.yaml` β body; workflows embedded replica syncs +-a cron endpoint responds. Locally: `pnpm install && pnpm migrate && pnpm seed && pnpm test`-green; parity count β₯ baseline; `deno check` clean for the two apps. Watch Fly RSS/OOM on-workflows after deploy (Deno V8 heap defaults differ from bun β see `research.md`).-------## Risks--| Risk | Mitigation |-|------|-----------|-| ~~libSQL native addon won't `deno compile`~~ | β RESOLVED (spike 2): deno embeds the addon; side-car dropped |-| Big-bang PR hides a regression / silent skip | Parity gate (16); split into logical commits within the one PR for bisect |-| `@std/expect` `toHaveBeenCalled*` β interop with `@std/testing/mock` spies | Phase-0 spike 3; fallback `assertSpyCalls`/`assertSpyCall` |-| `deno install` rewrites manifests / breaks pnpm for other apps | Phase-0 spike 4; keep `pnpm-workspace.yaml` authoritative, don't commit deno catalog |-| `deno check` surfaces new diagnostics vs `tsc` | Scoped to two apps (10); fix as part of the PR |-| ~270-file codemod churn | AST codemod (18) + parity gate; hand-fix the ~60-file residue |-| `stub` can't reach `tb` getter methods | Phase-0 spike 3; fallback = make `tb`/`redis` injectable like the dispatch seams |-------## TODO--- [ ] **Phase 0** spikes: serve+compile Β· libsql-compile (workflows) Β· test-stack interop Β· `deno install`-- [ ] Phase 1: split `index.ts`/`serve.ts` (both) Β· server static asset Β· `Bun.*`βDeno Β· migrate/seed/`start.sh`βdeno-- [ ] Phase 2.0: create `@openstatus/test-utils` (matchers, setup, fakes)-- [ ] Phase 2.A: codemod imports + lifecycle + setup-inject (~270 files)-- [ ] Phase 2.BβC: matchers via `expect.extend`; mocks β `@std/testing/mock`/`time`-- [ ] Phase 2.D: hybrid module mocks β stub `tb`/`redis`/`Redis.fromEnv` + `globalThis.fetch`; DI `dispatch*`/`getChannel`; delete `node-fetch` mocks + `preload.ts`-- [ ] Phase 2.F: snapshots β `@std/testing/snapshot`; type tests β `expect-type`-- [ ] Phase 2.G: `"test": "deno test -A"` everywhere; add JSR devDeps; remove `bunfig.toml`/`bun-types`-- [ ] Phase 3: `deno install` stage (both dofigen); commit `deno.lock`-- [ ] Phase 4: `apps/server` build β `deno compile` (serve.ts, `--include-as-is`)-- [ ] Phase 5: `apps/workflows` build β `deno compile`; `build-docker.ts`βdeno; `libsql` stageβnpm-- [ ] Phase 6: CI `setup-deno`, keep `pnpm install`, `deno check` (2 apps), parity gate-- [ ] Phase 7: `dofigen generate` + docker build + verify each app; ship; watch Fly RSS-- [ ] Update CLAUDE.md memory note "use bun test directly" β `deno test`-</content>diff --git a/apps/workflows/docker-compose.yaml b/apps/workflows/docker-compose.yamlindex 101f38ef1..6eff45224 100644--- a/apps/workflows/docker-compose.yaml+++ b/apps/workflows/docker-compose.yaml@@ -4,9 +4,14 @@ services:build:context: ../..dockerfile: apps/workflows/Dockerfile- env_file:- - ../../.env.docker-+ environment:+ - DATABASE_URL=http://host.docker.internal:8081+ - DATABASE_AUTH_TOKEN=test+ - RESEND_API_KEY=test+ - UPSTASH_REDIS_REST_URL=test+ - UPSTASH_REDIS_REST_TOKEN=test+ - NODE_ENV=production+ - GCP_PROJECT_ID=testextra_hosts:- "host.docker.internal:host-gateway"diff --git a/apps/workflows/dofigen.lock b/apps/workflows/dofigen.lockindex c143f6761..cb7e8ab90 100644--- a/apps/workflows/dofigen.lock+++ b/apps/workflows/dofigen.lock@@ -12,127 +12,122 @@ effective: |- /packages/error- /packages/trackerbuilders:+ docker:+ fromImage:+ path: oven/bun+ digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7+ label:+ org.opencontainers.image.base.digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7+ org.opencontainers.image.base.name: docker.io/oven/bun:1.3.11+ workdir: /app/apps/workflows+ copy:+ - paths:+ - .+ target: /app/+ run:+ - bun run src/build-docker.tsinstall:fromImage:path: node- digest: sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc+ digest: sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecflabel:- org.opencontainers.image.base.digest: sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fcorg.opencontainers.image.stage: installorg.opencontainers.image.base.name: docker.io/node:24-slim+ org.opencontainers.image.base.digest: sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecfworkdir: /app/- copy:- - paths:- - pnpm-workspace.yaml- target: /app/pnpm-workspace.yaml- - paths:- - pnpm-lock.yaml- target: /app/pnpm-lock.yaml- - paths:- - package.json- target: /app/package.json- - paths:- - apps/workflows/package.json- target: /app/apps/workflows/package.json- - paths:- - packages/assertions/package.json- target: /app/packages/assertions/package.json- - paths:- - packages/db/package.json- target: /app/packages/db/package.json- - paths:- - packages/emails/package.json- target: /app/packages/emails/package.json- - paths:- - packages/notifications/base/package.json- target: /app/packages/notifications/base/package.json- - paths:- - packages/notifications/discord/package.json- target: /app/packages/notifications/discord/package.json- - paths:- - packages/notifications/email/package.json- target: /app/packages/notifications/email/package.json- - paths:- - packages/notifications/grafana-oncall/package.json- target: /app/packages/notifications/grafana-oncall/package.json- - paths:- - packages/notifications/google-chat/package.json- target: /app/packages/notifications/google-chat/package.json- - paths:- - packages/notifications/ms-teams/package.json- target: /app/packages/notifications/ms-teams/package.json- - paths:- - packages/notifications/ntfy/package.json- target: /app/packages/notifications/ntfy/package.json- - paths:- - packages/notifications/opsgenie/package.json- target: /app/packages/notifications/opsgenie/package.json- - paths:- - packages/notifications/pagerduty/package.json- target: /app/packages/notifications/pagerduty/package.json- - paths:- - packages/notifications/slack/package.json- target: /app/packages/notifications/slack/package.json- - paths:- - packages/notifications/telegram/package.json- target: /app/packages/notifications/telegram/package.json- - paths:- - packages/notifications/bird-whatsapp/package.json- target: /app/packages/notifications/bird-whatsapp/package.json- - paths:- - packages/notifications/twillio-sms/package.json- target: /app/packages/notifications/twillio-sms/package.json- - paths:- - packages/notifications/webhook/package.json- target: /app/packages/notifications/webhook/package.json- - paths:- - packages/importers/package.json- target: /app/packages/importers/package.json- - paths:- - packages/regions/package.json- target: /app/packages/regions/package.json- - paths:- - packages/services/package.json- target: /app/packages/services/package.json- - paths:- - packages/subscriptions/package.json- target: /app/packages/subscriptions/package.json- - paths:- - packages/utils/package.json- target: /app/packages/utils/package.json- - paths:- - packages/tsconfig/package.json- target: /app/packages/tsconfig/package.json- - paths:- - packages/tinybird/package.json- target: /app/packages/tinybird/package.json- - paths:- - packages/upstash/package.json- target: /app/packages/upstash/package.json- - paths:- - packages/theme-store/package.json- target: /app/packages/theme-store/package.json- - paths:- - packages/locales/package.json- target: /app/packages/locales/package.json- - paths:- - packages/status-fetcher/package.json- target: /app/packages/status-fetcher/package.jsonrun:- corepack enable pnpm- - pnpm install --prod --frozen-lockfile --filter=@openstatus/workflows... --verbose+ - pnpm install --prod --frozen-lockfile --verbosecache:- - id: s/995d9762-a732-446d-808a-498c7c33a8d5-/root/.local/share/pnpm/store- target: /root/.local/share/pnpm/store- sharing: locked+ - target: /root/.local/share/pnpm/store+ bind:+ - target: pnpm-workspace.yaml+ source: pnpm-workspace.yaml+ - target: pnpm-lock.yaml+ source: pnpm-lock.yaml+ - target: package.json+ source: package.json+ - target: apps/workflows/package.json+ source: apps/workflows/package.json+ - target: packages/assertions/package.json+ source: packages/assertions/package.json+ - target: packages/db/package.json+ source: packages/db/package.json+ - target: packages/emails/package.json+ source: packages/emails/package.json+ - target: packages/notifications/base/package.json+ source: packages/notifications/base/package.json+ - target: packages/notifications/discord/package.json+ source: packages/notifications/discord/package.json+ - target: packages/notifications/email/package.json+ source: packages/notifications/email/package.json+ - target: packages/notifications/grafana-oncall/package.json+ source: packages/notifications/grafana-oncall/package.json+ - target: packages/notifications/google-chat/package.json+ source: packages/notifications/google-chat/package.json+ - target: packages/notifications/ms-teams/package.json+ source: packages/notifications/ms-teams/package.json+ - target: packages/notifications/ntfy/package.json+ source: packages/notifications/ntfy/package.json+ - target: packages/notifications/opsgenie/package.json+ source: packages/notifications/opsgenie/package.json+ - target: packages/notifications/pagerduty/package.json+ source: packages/notifications/pagerduty/package.json+ - target: packages/notifications/slack/package.json+ source: packages/notifications/slack/package.json+ - target: packages/notifications/telegram/package.json+ source: packages/notifications/telegram/package.json+ - target: packages/notifications/bird-whatsapp/package.json+ source: packages/notifications/bird-whatsapp/package.json+ - target: packages/notifications/twillio-sms/package.json+ source: packages/notifications/twillio-sms/package.json+ - target: packages/notifications/webhook/package.json+ source: packages/notifications/webhook/package.json+ - target: packages/importers/package.json+ source: packages/importers/package.json+ - target: packages/regions/package.json+ source: packages/regions/package.json+ - target: packages/services/package.json+ source: packages/services/package.json+ - target: packages/subscriptions/package.json+ source: packages/subscriptions/package.json+ - target: packages/utils/package.json+ source: packages/utils/package.json+ - target: packages/tsconfig/package.json+ source: packages/tsconfig/package.json+ - target: packages/tinybird/package.json+ source: packages/tinybird/package.json+ - target: packages/upstash/package.json+ source: packages/upstash/package.json+ - target: packages/theme-store/package.json+ source: packages/theme-store/package.json+ - target: packages/locales/package.json+ source: packages/locales/package.json+ - target: packages/status-fetcher/package.json+ source: packages/status-fetcher/package.json+ libsql:+ fromImage:+ path: oven/bun+ digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7+ label:+ org.opencontainers.image.base.name: docker.io/oven/bun:1.3.11+ org.opencontainers.image.base.digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7+ workdir: /app/+ copy:+ - fromBuilder: docker+ paths:+ - /app/apps/build-docker/package.json+ target: /app/package.json+ run:+ - bun install --productionbuild:fromImage:- path: denoland/deno- digest: sha256:8d24854de78a79c56e74b49aa4c5996c60e1fe3730efba8fbdd2692c582e6e29+ path: oven/bun+ digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7label:- org.opencontainers.image.base.name: docker.io/denoland/deno:2.9.0+ org.opencontainers.image.base.name: docker.io/oven/bun:1.3.11org.opencontainers.image.stage: build- org.opencontainers.image.base.digest: sha256:8d24854de78a79c56e74b49aa4c5996c60e1fe3730efba8fbdd2692c582e6e29+ org.opencontainers.image.base.digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7workdir: /app/apps/workflowsenv:NODE_ENV: production@@ -153,28 +148,19 @@ effective: |- /app/packagestarget: /app/packagesrun:- - mkdir -p /tmp/sc- - deno eval 'const p="/app/node_modules/.pnpm";const v=(x)=>{for(const e of Deno.readDirSync(p))if(e.name.startsWith(x+"@"))return e.name.slice(x.length+1).split("_")[0]};Deno.writeTextFileSync("/tmp/sc/package.json",JSON.stringify({dependencies:{"@libsql/client":v("@libsql+client"),libsql:v("libsql"),"@google-cloud/tasks":v("@google-cloud+tasks")}}))'- - cd /tmp/sc && deno install --node-modules-dir=auto --allow-scripts- - cd /app/apps/workflows && deno bundle --platform=deno --minify --sloppy-imports --node-modules-dir=manual --external '@libsql/client' --external 'libsql' --external '@google-cloud/tasks' --output /tmp/sc/_serve.bundle.mjs src/serve.ts- - cd /tmp/sc && deno compile --no-check -A --node-modules-dir=manual --output /app/apps/workflows/app /tmp/sc/_serve.bundle.mjs- - mkdir -p /app/data+ - bun build --compile --target bun --sourcemap src/index.ts --outfile=appfromImage:- host: registry.access.redhat.com- port: 443- path: hi/curl- digest: sha256:848b81ab5d5e55371d7193fd4f1ea7b605d14dbb039344ffad34a4c1f0d880f4+ path: debian+ digest: sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604label:- io.dofigen.version: 2.8.0- org.opencontainers.image.vendor: OpenStatusorg.opencontainers.image.description: Background job processing and probe scheduling for OpenStatusorg.opencontainers.image.authors: OpenStatus Team- org.opencontainers.image.source: https://github.com/openstatusHQ/openstatus- org.opencontainers.image.base.digest: sha256:848b81ab5d5e55371d7193fd4f1ea7b605d14dbb039344ffad34a4c1f0d880f4+ org.opencontainers.image.base.digest: sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604org.opencontainers.image.title: OpenStatus Workflows- user:- user: '1000'- group: '1000'+ org.opencontainers.image.source: https://github.com/openstatusHQ/openstatus+ org.opencontainers.image.base.name: docker.io/debian:bullseye-slim+ io.dofigen.version: 2.8.0+ org.opencontainers.image.vendor: OpenStatusworkdir: /app/copy:- fromBuilder: build@@ -182,33 +168,37 @@ effective: |- /app/apps/workflows/apptarget: /app/apps/workflows/chmod: '555'- - fromBuilder: build+ - fromBuilder: libsqlpaths:- - /app/data- target: /app/data+ - /app/node_modules+ target: /app/packages/db/node_modules+ - fromBuilder: libsql+ paths:+ - /app/node_modules+ target: /app/node_modules+ root:+ run:+ - apt-get update -q && apt-get install -y -q --no-install-recommends ca-certificates curl && update-ca-certificates && rm -rf /var/lib/apt/lists/* && mkdir -p /app/data && chown -R 1000:1000 /app/dataentrypoint:- /app/apps/workflows/appexpose:- port: 3000- healthcheck:- cmd: '["curl", "-f", "http://localhost:3000/ping"]'- interval: 1m- timeout: 10s- start: 30s- retries: 3images:docker.io:- denoland:- deno:- 2.9.0:- digest: sha256:8d24854de78a79c56e74b49aa4c5996c60e1fe3730efba8fbdd2692c582e6e29library:node:24-slim:- digest: sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc+ digest: sha256:242549cd46785b480c832479a730f4f2a20865d61ea2e404fdb2a5c3d3b73ecf+ debian:+ bullseye-slim:+ digest: sha256:cd1bc32f233a49f1b82149c9edb8ef34fb1e6c45f37211445c51a97603468604+ oven:+ bun:+ 1.3.11:+ digest: sha256:0733e50325078969732ebe3b15ce4c4be5082f18c4ac1a0f0ca4839c2e4e42a7resources:dofigen.yml:- hash: c478b25a43ff0cfbc6114251b800a544357c64a503b8ac64805e1077f559c3de+ hash: 9ad08ee36ff20abe093e58fc36235d056b6ed3e22b8ae2f3fb30399e34cdaebecontent: |ignore:- node_modules@@ -228,57 +218,50 @@ resources:workdir: /app/labels:org.opencontainers.image.stage: install- # Railway's builder rejects --mount=type=bind (only type=cache is supported), so copy the- # manifests into the layer instead of bind-mounting them. Per-file targets preserve the- # workspace directory structure (multi-source COPY into a dir would flatten the paths).- copy:- - pnpm-workspace.yaml /app/pnpm-workspace.yaml- - pnpm-lock.yaml /app/pnpm-lock.yaml- - package.json /app/package.json- - apps/workflows/package.json /app/apps/workflows/package.json- - packages/assertions/package.json /app/packages/assertions/package.json- - packages/db/package.json /app/packages/db/package.json- - packages/emails/package.json /app/packages/emails/package.json- - packages/notifications/base/package.json /app/packages/notifications/base/package.json- - packages/notifications/discord/package.json /app/packages/notifications/discord/package.json- - packages/notifications/email/package.json /app/packages/notifications/email/package.json- - packages/notifications/grafana-oncall/package.json /app/packages/notifications/grafana-oncall/package.json- - packages/notifications/google-chat/package.json /app/packages/notifications/google-chat/package.json- - packages/notifications/ms-teams/package.json /app/packages/notifications/ms-teams/package.json- - packages/notifications/ntfy/package.json /app/packages/notifications/ntfy/package.json- - packages/notifications/opsgenie/package.json /app/packages/notifications/opsgenie/package.json- - packages/notifications/pagerduty/package.json /app/packages/notifications/pagerduty/package.json- - packages/notifications/slack/package.json /app/packages/notifications/slack/package.json- - packages/notifications/telegram/package.json /app/packages/notifications/telegram/package.json- - packages/notifications/bird-whatsapp/package.json /app/packages/notifications/bird-whatsapp/package.json- - packages/notifications/twillio-sms/package.json /app/packages/notifications/twillio-sms/package.json- - packages/notifications/webhook/package.json /app/packages/notifications/webhook/package.json- - packages/importers/package.json /app/packages/importers/package.json- - packages/regions/package.json /app/packages/regions/package.json- - packages/services/package.json /app/packages/services/package.json- - packages/subscriptions/package.json /app/packages/subscriptions/package.json- - packages/utils/package.json /app/packages/utils/package.json- - packages/tsconfig/package.json /app/packages/tsconfig/package.json- - packages/tinybird/package.json /app/packages/tinybird/package.json- - packages/upstash/package.json /app/packages/upstash/package.json- - packages/theme-store/package.json /app/packages/theme-store/package.json- - packages/locales/package.json /app/packages/locales/package.json- - packages/status-fetcher/package.json /app/packages/status-fetcher/package.json+ bind:+ - pnpm-workspace.yaml+ - pnpm-lock.yaml+ - package.json+ - apps/workflows/package.json+ - packages/assertions/package.json+ - packages/db/package.json+ - packages/emails/package.json+ - packages/notifications/base/package.json+ - packages/notifications/discord/package.json+ - packages/notifications/email/package.json+ - packages/notifications/grafana-oncall/package.json+ - packages/notifications/google-chat/package.json+ - packages/notifications/ms-teams/package.json+ - packages/notifications/ntfy/package.json+ - packages/notifications/opsgenie/package.json+ - packages/notifications/pagerduty/package.json+ - packages/notifications/slack/package.json+ - packages/notifications/telegram/package.json+ - packages/notifications/bird-whatsapp/package.json+ - packages/notifications/twillio-sms/package.json+ - packages/notifications/webhook/package.json+ - packages/importers/package.json+ - packages/regions/package.json+ - packages/services/package.json+ - packages/subscriptions/package.json+ - packages/utils/package.json+ - packages/tsconfig/package.json+ - packages/tinybird/package.json+ - packages/upstash/package.json+ - packages/theme-store/package.json+ - packages/locales/package.json+ - packages/status-fetcher/package.json- # Install dependencies (scoped to the workflows subgraph so node_modules β and the binary that embeds it β stays small)+ # Install dependenciesrun:- corepack enable pnpm- - pnpm install --prod --frozen-lockfile --filter=@openstatus/workflows... --verbose+ - pnpm install --prod --frozen-lockfile --verbosecache:- # Railway scopes cache mounts per service: the id must be literally- # s/<service-id>-<target> (env vars aren't allowed in the id).- - id: s/995d9762-a732-446d-808a-498c7c33a8d5-/root/.local/share/pnpm/store- target: /root/.local/share/pnpm/store- sharing: locked+ - /root/.local/share/pnpm/store- # Stage 4: Build application (compile to binary with Deno)+ # Stage 4: Build application (compile to binary)build:- fromImage: denoland/deno:2.9.0+ fromImage: oven/bun:1.3.11workdir: /app/apps/workflowslabels:org.opencontainers.image.stage: build@@ -293,24 +276,35 @@ resources:- fromBuilder: installsource: /app/packagestarget: /app/packages+ # Should set env to production here+ # Compile the TypeScript applicationenv:NODE_ENV: production- # Bundle the app to self-contained JS, EXTERNALISING the 3 packages that can't be inlined:- # @libsql/client + libsql (native .node loader) and @google-cloud/tasks (google-proto-files reads- # files via CJS __dirname). They ship as a minimal side-car node_modules (deno install, ~46MB,- # platform-aware so Fly amd64 works) instead of embedding all node_modules. Binary ~146MB vs ~360MB.- run:- - mkdir -p /tmp/sc- - deno eval 'const p="/app/node_modules/.pnpm";const v=(x)=>{for(const e of Deno.readDirSync(p))if(e.name.startsWith(x+"@"))return e.name.slice(x.length+1).split("_")[0]};Deno.writeTextFileSync("/tmp/sc/package.json",JSON.stringify({dependencies:{"@libsql/client":v("@libsql+client"),libsql:v("libsql"),"@google-cloud/tasks":v("@google-cloud+tasks")}}))'- - cd /tmp/sc && deno install --node-modules-dir=auto --allow-scripts- - cd /app/apps/workflows && deno bundle --platform=deno --minify --sloppy-imports --node-modules-dir=manual --external '@libsql/client' --external 'libsql' --external '@google-cloud/tasks' --output /tmp/sc/_serve.bundle.mjs src/serve.ts- - cd /tmp/sc && deno compile --no-check -A --node-modules-dir=manual --output /app/apps/workflows/app /tmp/sc/_serve.bundle.mjs- - mkdir -p /app/data+ run: bun build --compile --target bun --sourcemap src/index.ts --outfile=app- # Runtime: distroless glibc base that already ships curl + CA certs (Deno's HTTPS works on it; no apt needed).- # Pinned to the multi-arch index digest of hi/curl:latest β dofigen mis-resolves this registry's tag to an unpullable digest.- fromImage: registry.access.redhat.com/hi/curl@sha256:848b81ab5d5e55371d7193fd4f1ea7b605d14dbb039344ffad34a4c1f0d880f4+ docker:+ fromImage: oven/bun:1.3.11+ workdir: /app/apps/workflows+ copy:+ - . /app/+ run: bun run src/build-docker.ts++ libsql:+ fromImage: oven/bun:1.3.11+ workdir: /app/+ copy:+ - fromBuilder: docker+ source: /app/apps/build-docker/package.json+ target: /app/package.json+ # bun install is hoisted by default -> flat node_modules so the compiled bun binary can+ # resolve the libsql native addon (@libsql/<platform>) from disk at runtime. No lockfile+ # is needed (the generated package.json pins one exact version), so a single install does it.+ run: bun install --production++ fromImage: debian:bullseye-slimworkdir: /app/+ root:+ run: apt-get update -q && apt-get install -y -q --no-install-recommends ca-certificates curl && update-ca-certificates && rm -rf /var/lib/apt/lists/* && mkdir -p /app/data && chown -R 1000:1000 /app/data# Metadata labelslabels:@@ -320,25 +314,18 @@ resources:org.opencontainers.image.vendor: OpenStatusorg.opencontainers.image.authors: OpenStatus Team- # Copy the self-contained compiled binary (native addon embedded by deno compile)+ # Copy artifacts from build stagescopy:- fromBuilder: buildsource: /app/apps/workflows/apptarget: /app/apps/workflows/chmod: "555"- - fromBuilder: build- source: /app/data- target: /app/data-- user: "1000:1000"+ - fromBuilder: libsql+ source: /app/node_modules+ target: /app/packages/db/node_modules+ - fromBuilder: libsql+ source: /app/node_modules+ target: /app/node_modulesexpose: "3000"- # Health check β exec form (JSON array) because the base has no shell for CMD-SHELL- healthcheck:- interval: 1m- timeout: 10s- start: 30s- retries: 3- cmd: '["curl", "-f", "http://localhost:3000/ping"]'-entrypoint: /app/apps/workflows/appdiff --git a/apps/workflows/dofigen.yml b/apps/workflows/dofigen.ymlindex bfe48b331..89c086ddd 100644--- a/apps/workflows/dofigen.yml+++ b/apps/workflows/dofigen.yml@@ -16,57 +16,50 @@ builders:workdir: /app/labels:org.opencontainers.image.stage: install- # Railway's builder rejects --mount=type=bind (only type=cache is supported), so copy the- # manifests into the layer instead of bind-mounting them. Per-file targets preserve the- # workspace directory structure (multi-source COPY into a dir would flatten the paths).- copy:- - pnpm-workspace.yaml /app/pnpm-workspace.yaml- - pnpm-lock.yaml /app/pnpm-lock.yaml- - package.json /app/package.json- - apps/workflows/package.json /app/apps/workflows/package.json- - packages/assertions/package.json /app/packages/assertions/package.json- - packages/db/package.json /app/packages/db/package.json- - packages/emails/package.json /app/packages/emails/package.json- - packages/notifications/base/package.json /app/packages/notifications/base/package.json- - packages/notifications/discord/package.json /app/packages/notifications/discord/package.json- - packages/notifications/email/package.json /app/packages/notifications/email/package.json- - packages/notifications/grafana-oncall/package.json /app/packages/notifications/grafana-oncall/package.json- - packages/notifications/google-chat/package.json /app/packages/notifications/google-chat/package.json- - packages/notifications/ms-teams/package.json /app/packages/notifications/ms-teams/package.json- - packages/notifications/ntfy/package.json /app/packages/notifications/ntfy/package.json- - packages/notifications/opsgenie/package.json /app/packages/notifications/opsgenie/package.json- - packages/notifications/pagerduty/package.json /app/packages/notifications/pagerduty/package.json- - packages/notifications/slack/package.json /app/packages/notifications/slack/package.json- - packages/notifications/telegram/package.json /app/packages/notifications/telegram/package.json- - packages/notifications/bird-whatsapp/package.json /app/packages/notifications/bird-whatsapp/package.json- - packages/notifications/twillio-sms/package.json /app/packages/notifications/twillio-sms/package.json- - packages/notifications/webhook/package.json /app/packages/notifications/webhook/package.json- - packages/importers/package.json /app/packages/importers/package.json- - packages/regions/package.json /app/packages/regions/package.json- - packages/services/package.json /app/packages/services/package.json- - packages/subscriptions/package.json /app/packages/subscriptions/package.json- - packages/utils/package.json /app/packages/utils/package.json- - packages/tsconfig/package.json /app/packages/tsconfig/package.json- - packages/tinybird/package.json /app/packages/tinybird/package.json- - packages/upstash/package.json /app/packages/upstash/package.json- - packages/theme-store/package.json /app/packages/theme-store/package.json- - packages/locales/package.json /app/packages/locales/package.json- - packages/status-fetcher/package.json /app/packages/status-fetcher/package.json+ bind:+ - pnpm-workspace.yaml+ - pnpm-lock.yaml+ - package.json+ - apps/workflows/package.json+ - packages/assertions/package.json+ - packages/db/package.json+ - packages/emails/package.json+ - packages/notifications/base/package.json+ - packages/notifications/discord/package.json+ - packages/notifications/email/package.json+ - packages/notifications/grafana-oncall/package.json+ - packages/notifications/google-chat/package.json+ - packages/notifications/ms-teams/package.json+ - packages/notifications/ntfy/package.json+ - packages/notifications/opsgenie/package.json+ - packages/notifications/pagerduty/package.json+ - packages/notifications/slack/package.json+ - packages/notifications/telegram/package.json+ - packages/notifications/bird-whatsapp/package.json+ - packages/notifications/twillio-sms/package.json+ - packages/notifications/webhook/package.json+ - packages/importers/package.json+ - packages/regions/package.json+ - packages/services/package.json+ - packages/subscriptions/package.json+ - packages/utils/package.json+ - packages/tsconfig/package.json+ - packages/tinybird/package.json+ - packages/upstash/package.json+ - packages/theme-store/package.json+ - packages/locales/package.json+ - packages/status-fetcher/package.json- # Install dependencies (scoped to the workflows subgraph so node_modules β and the binary that embeds it β stays small)+ # Install dependenciesrun:- corepack enable pnpm- - pnpm install --prod --frozen-lockfile --filter=@openstatus/workflows... --verbose+ - pnpm install --prod --frozen-lockfile --verbosecache:- # Railway scopes cache mounts per service: the id must be literally- # s/<service-id>-<target> (env vars aren't allowed in the id).- - id: s/995d9762-a732-446d-808a-498c7c33a8d5-/root/.local/share/pnpm/store- target: /root/.local/share/pnpm/store- sharing: locked+ - /root/.local/share/pnpm/store- # Stage 4: Build application (compile to binary with Deno)+ # Stage 4: Build application (compile to binary)build:- fromImage: denoland/deno:2.9.0+ fromImage: oven/bun:1.3.11workdir: /app/apps/workflowslabels:org.opencontainers.image.stage: build@@ -81,24 +74,35 @@ builders:- fromBuilder: installsource: /app/packagestarget: /app/packages+ # Should set env to production here+ # Compile the TypeScript applicationenv:NODE_ENV: production- # Bundle the app to self-contained JS, EXTERNALISING the 3 packages that can't be inlined:- # @libsql/client + libsql (native .node loader) and @google-cloud/tasks (google-proto-files reads- # files via CJS __dirname). They ship as a minimal side-car node_modules (deno install, ~46MB,- # platform-aware so Fly amd64 works) instead of embedding all node_modules. Binary ~146MB vs ~360MB.- run:- - mkdir -p /tmp/sc- - deno eval 'const p="/app/node_modules/.pnpm";const v=(x)=>{for(const e of Deno.readDirSync(p))if(e.name.startsWith(x+"@"))return e.name.slice(x.length+1).split("_")[0]};Deno.writeTextFileSync("/tmp/sc/package.json",JSON.stringify({dependencies:{"@libsql/client":v("@libsql+client"),libsql:v("libsql"),"@google-cloud/tasks":v("@google-cloud+tasks")}}))'- - cd /tmp/sc && deno install --node-modules-dir=auto --allow-scripts- - cd /app/apps/workflows && deno bundle --platform=deno --minify --sloppy-imports --node-modules-dir=manual --external '@libsql/client' --external 'libsql' --external '@google-cloud/tasks' --output /tmp/sc/_serve.bundle.mjs src/serve.ts- - cd /tmp/sc && deno compile --no-check -A --node-modules-dir=manual --output /app/apps/workflows/app /tmp/sc/_serve.bundle.mjs- - mkdir -p /app/data+ run: bun build --compile --target bun --sourcemap src/index.ts --outfile=app++ docker:+ fromImage: oven/bun:1.3.11+ workdir: /app/apps/workflows+ copy:+ - . /app/+ run: bun run src/build-docker.ts-# Runtime: distroless glibc base that already ships curl + CA certs (Deno's HTTPS works on it; no apt needed).-# Pinned to the multi-arch index digest of hi/curl:latest β dofigen mis-resolves this registry's tag to an unpullable digest.-fromImage: registry.access.redhat.com/hi/curl@sha256:848b81ab5d5e55371d7193fd4f1ea7b605d14dbb039344ffad34a4c1f0d880f4+ libsql:+ fromImage: oven/bun:1.3.11+ workdir: /app/+ copy:+ - fromBuilder: docker+ source: /app/apps/build-docker/package.json+ target: /app/package.json+ # bun install is hoisted by default -> flat node_modules so the compiled bun binary can+ # resolve the libsql native addon (@libsql/<platform>) from disk at runtime. No lockfile+ # is needed (the generated package.json pins one exact version), so a single install does it.+ run: bun install --production++fromImage: debian:bullseye-slimworkdir: /app/+root:+ run: apt-get update -q && apt-get install -y -q --no-install-recommends ca-certificates curl && update-ca-certificates && rm -rf /var/lib/apt/lists/* && mkdir -p /app/data && chown -R 1000:1000 /app/data# Metadata labelslabels:@@ -108,25 +112,18 @@ labels:org.opencontainers.image.vendor: OpenStatusorg.opencontainers.image.authors: OpenStatus Team-# Copy the self-contained compiled binary (native addon embedded by deno compile)+# Copy artifacts from build stagescopy:- fromBuilder: buildsource: /app/apps/workflows/apptarget: /app/apps/workflows/chmod: "555"- - fromBuilder: build- source: /app/data- target: /app/data--user: "1000:1000"+ - fromBuilder: libsql+ source: /app/node_modules+ target: /app/packages/db/node_modules+ - fromBuilder: libsql+ source: /app/node_modules+ target: /app/node_modulesexpose: "3000"-# Health check β exec form (JSON array) because the base has no shell for CMD-SHELL-healthcheck:- interval: 1m- timeout: 10s- start: 30s- retries: 3- cmd: '["curl", "-f", "http://localhost:3000/ping"]'-entrypoint: /app/apps/workflows/appdiff --git a/apps/workflows/package.json b/apps/workflows/package.jsonindex 522f838f4..e92ffa725 100644--- a/apps/workflows/package.json+++ b/apps/workflows/package.json@@ -1,10 +1,9 @@{"name": "@openstatus/workflows","scripts": {- "check": "deno check --sloppy-imports src/serve.ts",- "dev": "NODE_ENV=development deno run -A --watch src/serve.ts",- "start": "NODE_ENV=production deno run -A src/serve.ts",- "test": "NODE_ENV=test RESEND_API_KEY=test-key deno test -A --no-check --sloppy-imports"+ "dev": "NODE_ENV=development bun run --hot src/index.ts",+ "start": "NODE_ENV=production bun run src/index.ts",+ "test": "bun test"},"dependencies": {"@google-cloud/tasks": "catalog:",@@ -34,11 +33,9 @@"@openstatus/tinybird": "workspace:*","@openstatus/upstash": "workspace:*","@openstatus/utils": "workspace:*",- "@opentelemetry/exporter-logs-otlp-http": "catalog:","@opentelemetry/resources": "catalog:",- "@opentelemetry/sdk-logs": "catalog:","@opentelemetry/semantic-conventions": "catalog:",- "@sentry/deno": "catalog:",+ "@sentry/bun": "catalog:","@upstash/qstash": "catalog:","drizzle-orm": "catalog:","effect": "catalog:",@@ -47,8 +44,8 @@"zod": "catalog:"},"devDependencies": {- "@openstatus/test-utils": "workspace:*","@openstatus/tsconfig": "workspace:*",+ "@types/bun": "latest","typescript": "catalog:"}}diff --git a/apps/workflows/src/build-docker.ts b/apps/workflows/src/build-docker.tsnew file mode 100644index 000000000..1db9537cb--- /dev/null+++ b/apps/workflows/src/build-docker.ts@@ -0,0 +1,81 @@+import path from "node:path";++// Create package.json that contains @libsql/client as dependency. It will be used to create node_modules and copy them alongside compiled server https://github.com/oven-sh/bun/issues/18909+type PackageJson = Record<"name" | "description" | "version", string> &+ Record<"dependencies", Record<string, string>>;+const packageJson: PackageJson = await Bun.file(+ path.join(__dirname, "../../../packages/db", "package.json"),+).json();++const extractDependenciesNames = ["@libsql/client"];+const workspaceConfig = await Bun.file(+ path.join(__dirname, "../../../pnpm-workspace.yaml"),+).text();++const catalog = (() => {+ const lines = workspaceConfig.split(/\r?\n/);+ let inCatalog = false;+ const entries: Record<string, string> = {};++ for (const line of lines) {+ if (!inCatalog) {+ if (line.trim() === "catalog:") {+ inCatalog = true;+ }+ continue;+ }++ if (!line.startsWith(" ")) {+ break;+ }++ const match = line.match(/^\s{2}("[^"]+"|[^:]+):\s*(.+)$/);+ if (!match) {+ continue;+ }++ const key = match[1].replace(/^"|"$/g, "").trim();+ const value = match[2].replace(/^"|"$/g, "").trim();+ entries[key] = value;+ }++ return entries;+})();++const resolveVersion = (name: string, spec: string) => {+ if (!spec.startsWith("catalog:")) {+ return spec;+ }++ const resolved = catalog[name];+ if (!resolved) {+ throw new Error(`Missing catalog entry for ${name}`);+ }++ return resolved;+};++const extractedDependencies = extractDependenciesNames.reduce(+ (acc, cur) => {+ const spec = packageJson.dependencies[cur];+ if (spec) {+ acc[cur] = resolveVersion(cur, spec);+ }++ return acc;+ },+ {} as Record<string, string>,+);++const packageJsonBuild = {+ name: packageJson.name,+ description: packageJson.description,+ version: packageJson.version,+ // type: "module",+ dependencies: extractedDependencies,+};++await Bun.write(+ "../build-docker/package.json",+ JSON.stringify(packageJsonBuild, null, 2),+);diff --git a/apps/workflows/src/checker/alerting.test.ts b/apps/workflows/src/checker/alerting.test.tsindex e69ab6c94..0f8bb1eee 100644--- a/apps/workflows/src/checker/alerting.test.ts+++ b/apps/workflows/src/checker/alerting.test.ts@@ -1,77 +1,95 @@+import { afterAll, afterEach, describe, expect, mock, test } from "bun:test";+import { db, eq, inArray } from "@openstatus/db";import {notification,notificationTrigger,notificationsToMonitors,} from "@openstatus/db/src/schema";-import {- afterAll,- afterEach,- assertSpyCalls,- beforeEach,- describe,- expect,- type Stub,- stub,- test,-} from "@openstatus/test-utils";--import { checkerAudit } from "../utils/audit-log";-import { triggerNotifications } from "./alerting";-import { providerToFunction } from "./utils";--// Deno has no module mocking, so we stub the methods on the real singletons-// that alerting.ts reads at call time. Stubbing per-test resolves them to no-op-// to avoid real HTTP / Tinybird calls and gives a fresh call count each test.-// biome-ignore lint/suspicious/noExplicitAny: heterogeneous provider stubs-type AnyStub = Stub<any>;-let stubs: AnyStub[] = [];--const stubSend = (- provider: "email" | "slack" | "discord",- verb: "sendAlert" | "sendRecovery" | "sendDegraded",-): AnyStub => {- const s = stub(providerToFunction[provider], verb, () => Promise.resolve());- stubs.push(s);- return s;-};--let mockEmailSendAlert: AnyStub;-let mockEmailSendRecovery: AnyStub;-let mockEmailSendDegraded: AnyStub;-let mockSlackSendAlert: AnyStub;-let mockSlackSendRecovery: AnyStub;-let mockSlackSendDegraded: AnyStub;-let mockDiscordSendAlert: AnyStub;-let mockDiscordSendRecovery: AnyStub;-let mockDiscordSendDegraded: AnyStub;++// Mock audit log to avoid calling Tinybird+mock.module("../utils/audit-log", () => ({+ checkerAudit: {+ publishAuditLog: mock(() => Promise.resolve()),+ },+}));++// Mock notification providers to avoid real HTTP calls+const mockEmailSendAlert = mock(() => Promise.resolve());+const mockEmailSendRecovery = mock(() => Promise.resolve());+const mockEmailSendDegraded = mock(() => Promise.resolve());+const mockSlackSendAlert = mock(() => Promise.resolve());+const mockSlackSendRecovery = mock(() => Promise.resolve());+const mockSlackSendDegraded = mock(() => Promise.resolve());+const mockDiscordSendAlert = mock(() => Promise.resolve());+const mockDiscordSendRecovery = mock(() => Promise.resolve());+const mockDiscordSendDegraded = mock(() => Promise.resolve());++mock.module("./utils", () => ({+ providerToFunction: {+ email: {+ sendAlert: mockEmailSendAlert,+ sendRecovery: mockEmailSendRecovery,+ sendDegraded: mockEmailSendDegraded,+ },+ discord: {+ sendAlert: mockDiscordSendAlert,+ sendRecovery: mockDiscordSendRecovery,+ sendDegraded: mockDiscordSendDegraded,+ },+ slack: {+ sendAlert: mockSlackSendAlert,+ sendRecovery: mockSlackSendRecovery,+ sendDegraded: mockSlackSendDegraded,+ },+ sms: { sendAlert: mock(), sendRecovery: mock(), sendDegraded: mock() },+ webhook: { sendAlert: mock(), sendRecovery: mock(), sendDegraded: mock() },+ telegram: { sendAlert: mock(), sendRecovery: mock(), sendDegraded: mock() },+ pagerduty: {+ sendAlert: mock(),+ sendRecovery: mock(),+ sendDegraded: mock(),+ },+ opsgenie: { sendAlert: mock(), sendRecovery: mock(), sendDegraded: mock() },+ ntfy: { sendAlert: mock(), sendRecovery: mock(), sendDegraded: mock() },+ "google-chat": {+ sendAlert: mock(),+ sendRecovery: mock(),+ sendDegraded: mock(),+ },+ "grafana-oncall": {+ sendAlert: mock(),+ sendRecovery: mock(),+ sendDegraded: mock(),+ },+ "ms-teams": {+ sendAlert: mock(),+ sendRecovery: mock(),+ sendDegraded: mock(),+ },+ whatsapp: { sendAlert: mock(), sendRecovery: mock(), sendDegraded: mock() },+ },+}));++// Import after mocks are set up+const { triggerNotifications } = await import("./alerting");// Seed data has: monitor 1 (workspace 1) linked to notification 1 (email provider)// We use unique cronTimestamp per test to avoid unique constraint conflicts-beforeEach(() => {- stubs = [];- // biome-ignore lint/suspicious/noExplicitAny: avoid Tinybird call- stubs.push(- stub(checkerAudit, "publishAuditLog", () => Promise.resolve()) as AnyStub,- );- mockEmailSendAlert = stubSend("email", "sendAlert");- mockEmailSendRecovery = stubSend("email", "sendRecovery");- mockEmailSendDegraded = stubSend("email", "sendDegraded");- mockSlackSendAlert = stubSend("slack", "sendAlert");- mockSlackSendRecovery = stubSend("slack", "sendRecovery");- mockSlackSendDegraded = stubSend("slack", "sendDegraded");- mockDiscordSendAlert = stubSend("discord", "sendAlert");- mockDiscordSendRecovery = stubSend("discord", "sendRecovery");- mockDiscordSendDegraded = stubSend("discord", "sendDegraded");-});--afterEach(() => {- for (const s of stubs) s.restore();- stubs = [];-});-describe("triggerNotifications", () => {+ afterEach(() => {+ mockEmailSendAlert.mockClear();+ mockEmailSendRecovery.mockClear();+ mockEmailSendDegraded.mockClear();+ mockSlackSendAlert.mockClear();+ mockSlackSendRecovery.mockClear();+ mockSlackSendDegraded.mockClear();+ mockDiscordSendAlert.mockClear();+ mockDiscordSendRecovery.mockClear();+ mockDiscordSendDegraded.mockClear();+ });+afterAll(async () => {// Clean up notification triggers created during testsawait db@@ -94,7 +112,7 @@ describe("triggerNotifications", () => {latency: 1500,});- assertSpyCalls(mockEmailSendAlert, 1);+ expect(mockEmailSendAlert).toHaveBeenCalledTimes(1);expect(result).toHaveLength(1);expect(result[0]).toEqual({notificationId: 1,@@ -113,7 +131,7 @@ describe("triggerNotifications", () => {regions: ["ams"],});- assertSpyCalls(mockEmailSendRecovery, 1);+ expect(mockEmailSendRecovery).toHaveBeenCalledTimes(1);expect(result).toHaveLength(1);expect(result[0]).toEqual({notificationId: 1,@@ -133,7 +151,7 @@ describe("triggerNotifications", () => {regions: ["ams"],});- assertSpyCalls(mockEmailSendDegraded, 1);+ expect(mockEmailSendDegraded).toHaveBeenCalledTimes(1);expect(result).toHaveLength(1);expect(result[0]).toEqual({notificationId: 1,@@ -152,7 +170,7 @@ describe("triggerNotifications", () => {cronTimestamp,});- assertSpyCalls(mockEmailSendAlert, 0);+ expect(mockEmailSendAlert).not.toHaveBeenCalled();expect(result).toHaveLength(0);});@@ -167,7 +185,7 @@ describe("triggerNotifications", () => {});expect(first).toHaveLength(1);- assertSpyCalls(mockEmailSendAlert, 1);+ mockEmailSendAlert.mockClear();// Same cronTimestamp should be skipped due to unique constraintconst second = await triggerNotifications({@@ -177,8 +195,7 @@ describe("triggerNotifications", () => {cronTimestamp,});- // still only the first call β the duplicate was skipped- assertSpyCalls(mockEmailSendAlert, 1);+ expect(mockEmailSendAlert).not.toHaveBeenCalled();expect(second).toHaveLength(0);});});@@ -190,6 +207,14 @@ describe("triggerNotifications with multiple providers", () => {// We link slack and discord notifications to it for this test suite.const testMonitorId = 3;+ afterEach(() => {+ mockEmailSendAlert.mockClear();+ mockSlackSendAlert.mockClear();+ mockDiscordSendAlert.mockClear();+ mockSlackSendRecovery.mockClear();+ mockDiscordSendRecovery.mockClear();+ });+afterAll(async () => {// Clean up notification triggersawait db@@ -257,9 +282,9 @@ describe("triggerNotifications with multiple providers", () => {regions: ["ams"],});- assertSpyCalls(mockSlackSendAlert, 1);- assertSpyCalls(mockDiscordSendAlert, 1);- assertSpyCalls(mockEmailSendAlert, 0);+ expect(mockSlackSendAlert).toHaveBeenCalledTimes(1);+ expect(mockDiscordSendAlert).toHaveBeenCalledTimes(1);+ expect(mockEmailSendAlert).not.toHaveBeenCalled();expect(result).toHaveLength(2);expect(result).toContainEqual({@@ -283,8 +308,8 @@ describe("triggerNotifications with multiple providers", () => {regions: ["ams"],});- assertSpyCalls(mockSlackSendRecovery, 1);- assertSpyCalls(mockDiscordSendRecovery, 1);+ expect(mockSlackSendRecovery).toHaveBeenCalledTimes(1);+ expect(mockDiscordSendRecovery).toHaveBeenCalledTimes(1);expect(result).toHaveLength(2);const providers = result.map((r) => r.provider).sort();diff --git a/apps/workflows/src/cron/checker.ts b/apps/workflows/src/cron/checker.tsindex 40dbf7abd..dfdb5b32f 100644--- a/apps/workflows/src/cron/checker.ts+++ b/apps/workflows/src/cron/checker.ts@@ -51,7 +51,7 @@ export const isAuthorizedDomain = (url: string) => {const logger = getLogger("workflow");const client = new CloudTasksClient({- fallback: true,+ fallback: "rest",projectId: env().GCP_PROJECT_ID,credentials: {client_email: env().GCP_CLIENT_EMAIL,diff --git a/apps/workflows/src/cron/index.ts b/apps/workflows/src/cron/index.tsindex 45bd9b6e9..9ca25c81d 100644--- a/apps/workflows/src/cron/index.ts+++ b/apps/workflows/src/cron/index.ts@@ -1,5 +1,5 @@import { monitorPeriodicitySchema } from "@openstatus/db/src/schema/constants";-import * as Sentry from "@sentry/deno";+import * as Sentry from "@sentry/bun";import { Effect, Schedule } from "effect";import { Hono } from "hono";diff --git a/apps/workflows/src/index.ts b/apps/workflows/src/index.tsindex 9cd13daca..fd186562c 100644--- a/apps/workflows/src/index.ts+++ b/apps/workflows/src/index.ts@@ -8,15 +8,9 @@ import {withContext,} from "@logtape/logtape";import { getOpenTelemetrySink } from "@logtape/otel";-import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";import { resourceFromAttributes } from "@opentelemetry/resources";-import {- BatchLogRecordProcessor,- LoggerProvider,-} from "@opentelemetry/sdk-logs";-import { ATTR_SERVICE_NAME } from "@opentelemetry/semantic-conventions";import { ATTR_DEPLOYMENT_ENVIRONMENT_NAME } from "@opentelemetry/semantic-conventions/incubating";-import * as Sentry from "@sentry/deno";+import * as Sentry from "@sentry/bun";import { Hono } from "hono";import { showRoutes } from "hono/dev";import { requestId } from "hono/request-id";@@ -27,7 +21,7 @@ import { cronRouter } from "./cron";import { env } from "./env";import { incidentRoute } from "./incident";-const { NODE_ENV } = env();+const { NODE_ENV, PORT } = env();export type Env = {Variables: {@@ -65,30 +59,18 @@ function shouldSample(event: Record<string, unknown>): boolean {return Math.random() < 0.2;}-// Build the LoggerProvider with a static OTLP exporter import so `deno bundle`-// includes it. Letting @logtape/otel create the exporter triggers a dynamic-// import of a bare specifier, which the compiled --node-modules-dir=none binary-// can't resolve.-const loggerProvider = new LoggerProvider({- resource: resourceFromAttributes({- [ATTR_SERVICE_NAME]: "openstatus-workflows",+const defaultLogger = getOpenTelemetrySink({+ serviceName: "openstatus-workflows",+ otlpExporterConfig: {+ url: "https://eu-central-1.aws.edge.axiom.co/v1/logs",+ headers: {+ Authorization: `Bearer ${env().AXIOM_TOKEN}`,+ "X-Axiom-Dataset": env().AXIOM_DATASET,+ },+ },+ additionalResource: resourceFromAttributes({[ATTR_DEPLOYMENT_ENVIRONMENT_NAME]: env().NODE_ENV,}),- processors: [- new BatchLogRecordProcessor(- new OTLPLogExporter({- url: "https://eu-central-1.aws.edge.axiom.co/v1/logs",- headers: {- Authorization: `Bearer ${env().AXIOM_TOKEN}`,- "X-Axiom-Dataset": env().AXIOM_DATASET,- },- }),- ),- ],-});--const defaultLogger = getOpenTelemetrySink({- loggerProvider,});await configure({@@ -115,7 +97,7 @@ await configure({const logger = getLogger(["workflow"]);const otelLogger = getLogger(["workflow-otel"]);-export const app = new Hono<Env>({ strict: false });+const app = new Hono<Env>({ strict: false });app.use("*", requestId());@@ -200,3 +182,9 @@ app.route("/incident", incidentRoute);if (NODE_ENV === "development") {showRoutes(app, { verbose: true, colorize: true });}++logger.info("Starting server", { port: PORT, environment: NODE_ENV });++const server = { port: PORT, fetch: app.fetch };++export default server;diff --git a/apps/workflows/src/lib/sentry.ts b/apps/workflows/src/lib/sentry.tsindex 45e70c555..542d06d23 100644--- a/apps/workflows/src/lib/sentry.ts+++ b/apps/workflows/src/lib/sentry.ts@@ -1,5 +1,5 @@import { FetchError } from "@openstatus/status-fetcher";-import * as Sentry from "@sentry/deno";+import * as Sentry from "@sentry/bun";import { env } from "../env";diff --git a/apps/workflows/src/serve.ts b/apps/workflows/src/serve.tsdeleted file mode 100644index 6f5205629..000000000--- a/apps/workflows/src/serve.ts+++ /dev/null@@ -1,15 +0,0 @@-/// <reference lib="deno.ns" />--import { getLogger } from "@logtape/logtape";--import { env } from "./env";-import { app } from "./index";--const { NODE_ENV, PORT } = env();--getLogger(["workflow"]).info("Starting server", {- port: PORT,- environment: NODE_ENV,-});--Deno.serve({ port: PORT }, app.fetch);diff --git a/apps/workflows/start.sh b/apps/workflows/start.shindex e24344a23..0c6da27c3 100644--- a/apps/workflows/start.sh+++ b/apps/workflows/start.sh@@ -2,7 +2,7 @@set -eecho "Running database migrations..."-cd /app/packages/db && deno run -A src/migrate.mts+cd /app/packages/db && bun src/migrate.mtsecho "Starting workflows service..."cd /app/apps/workflowsdiff --git a/apps/workflows/tsconfig.json b/apps/workflows/tsconfig.jsonindex a627827e3..9ce54dd0b 100644--- a/apps/workflows/tsconfig.json+++ b/apps/workflows/tsconfig.json@@ -3,6 +3,7 @@"compilerOptions": {"jsx": "react-jsx","jsxImportSource": "hono/jsx",+ "lib": ["ES2022"],"module": "ESNext","target": "ESNext","moduleResolution": "bundler"diff --git a/deno.lock b/deno.lockdeleted file mode 100644index 59e89299d..000000000--- a/deno.lock+++ /dev/null@@ -1,277 +0,0 @@-{- "version": "5",- "specifiers": {- "jsr:@std/assert@^1.0.19": "1.0.19",- "jsr:@std/async@^1.4.0": "1.4.0",- "jsr:@std/data-structures@^1.1.0": "1.1.0",- "jsr:@std/expect@*": "1.0.19",- "jsr:@std/internal@^1.0.12": "1.0.14",- "jsr:@std/internal@^1.0.13": "1.0.14",- "jsr:@std/path@^1.1.4": "1.1.4",- "jsr:@std/testing@*": "1.0.19"- },- "jsr": {- "@std/[email protected]": {- "integrity": "eaada96ee120cb980bc47e040f82814d786fe8162ecc53c91d8df60b8755991e",- "dependencies": [- "jsr:@std/internal@^1.0.12"- ]- },- "@std/[email protected]": {- "integrity": "4d70b008634f571cff9b554090d628c76141c32613aae0ff283fd5fa23d0c379"- },- "@std/[email protected]": {- "integrity": "c35ae4ad5d8e41a38573c2fe3e19b18ea2505f63cfea201edcb8720aca1f7f58"- },- "@std/[email protected]": {- "integrity": "25271785688c7ff902fa54875d6aa4001f552c5578f7f0fefb5b5aac1fc2ed8a",- "dependencies": [- "jsr:@std/assert",- "jsr:@std/internal@^1.0.13",- "jsr:@std/path"- ]- },- "@std/[email protected]": {- "integrity": "291516b3d4c35024d6ffbc0a9df5bf4c64116e05b50012cf846710152d2ffdf7"- },- "@std/[email protected]": {- "integrity": "1d2d43f39efb1b42f0b1882a25486647cb851481862dc7313390b2bb044314b5",- "dependencies": [- "jsr:@std/internal@^1.0.12"- ]- },- "@std/[email protected]": {- "integrity": "f4236172365b216728dc3cc8b5e80a9f4c33083d1e4ede7613d5b25b4014898e",- "dependencies": [- "jsr:@std/assert",- "jsr:@std/async",- "jsr:@std/data-structures"- ]- }- },- "workspace": {- "packageJson": {- "dependencies": [- "npm:[email protected]"- ]- },- "members": {- "apps/server": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "apps/status-page": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "apps/web": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/api": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/db": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/emails": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/header-analysis": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/importers": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/notifications/base": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/notifications/bird-whatsapp": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/notifications/discord": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/notifications/google-chat": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/notifications/grafana-oncall": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/notifications/ms-teams": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/notifications/ntfy": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/notifications/opsgenie": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/notifications/pagerduty": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/notifications/slack": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/notifications/telegram": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/notifications/twillio-sms": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/notifications/webhook": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/services": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/status-fetcher": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/subscriptions": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/test-utils": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/tracker": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- },- "packages/utils": {- "packageJson": {- "dependencies": [- "npm:@jsr/std__expect@^1.0.19",- "npm:@jsr/std__testing@^1.0.19"- ]- }- }- }- }-}diff --git a/package.json b/package.jsonindex 995b4fb7f..fcf9e3f26 100644--- a/package.json+++ b/package.json@@ -16,7 +16,6 @@"format": "oxfmt && oxlint --fix","format:check": "oxfmt --check && oxlint","lint:turbo": "turbo run lint",- "check": "turbo run check","dev:web": "turbo run dev --filter='./apps/web' --filter='./packages/db'","dev:status-page": "turbo run dev --filter='./apps/status-page' --filter='./packages/db'","dev:dashboard": "turbo run dev --filter='./apps/dashboard' --filter='./packages/db'",diff --git a/packages/analytics/package.json b/packages/analytics/package.jsonindex 4c43a19cc..1594951d1 100644--- a/packages/analytics/package.json+++ b/packages/analytics/package.json@@ -6,9 +6,7 @@"license": "ISC","author": "","main": "src/index.ts",- "scripts": {- "check": "deno check --sloppy-imports ."- },+ "scripts": {},"dependencies": {"@openpanel/sdk": "catalog:","@t3-oss/env-core": "catalog:",diff --git a/packages/analytics/tsconfig.json b/packages/analytics/tsconfig.jsonindex 3c1048af8..7f4d9b728 100644--- a/packages/analytics/tsconfig.json+++ b/packages/analytics/tsconfig.json@@ -5,6 +5,7 @@"compilerOptions": {"outDir": "dist","target": "es2021",+ "lib": ["dom", "dom.iterable", "esnext"],"allowJs": true,"checkJs": true,"skipLibCheck": true,diff --git a/packages/api/.env.test b/packages/api/.env.testindex 75fa55964..84a3eccaa 100644--- a/packages/api/.env.test+++ b/packages/api/.env.test@@ -1,4 +1,3 @@-NODE_ENV=testRESEND_API_KEY='test'NEXT_PUBLIC_OPENPANEL_CLIENT_ID='test'OPENPANEL_CLIENT_SECRET='test'diff --git a/packages/api/env.ts b/packages/api/env.tsindex 4796312cc..1dd33b39e 100644--- a/packages/api/env.ts+++ b/packages/api/env.ts@@ -1 +1,2 @@-await Deno.copyFile("./.env.test", "./.env");+const file = Bun.file("./.env.test");+await Bun.write("./.env", file);diff --git a/packages/api/package.json b/packages/api/package.jsonindex b6cfb9e22..ae6b5c2f7 100644--- a/packages/api/package.json+++ b/packages/api/package.json@@ -6,14 +6,9 @@"license": "ISC","author": "","main": "index.ts",- "exports": {- ".": "./index.ts",- "./src/*": "./src/*.ts"- },"scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports --env-file=.env.test --import-map=test.importmap.json",- "env": "deno run -A env.ts"+ "test": "bun test",+ "env": "bun env.ts"},"dependencies": {"@openstatus/analytics": "workspace:*",@@ -57,8 +52,6 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@types/react": "catalog:","@types/react-dom": "catalog:","bun-types": "catalog:",diff --git a/packages/api/src/router/blob.test.ts b/packages/api/src/router/blob.test.tsindex f8498a1e3..a357abdb8 100644--- a/packages/api/src/router/blob.test.ts+++ b/packages/api/src/router/blob.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, it } from "@std/testing/bdd";+import { describe, expect, it } from "bun:test";import { isSvgFile, sanitizeSvg } from "./blob";diff --git a/packages/api/src/router/effective-status.test.ts b/packages/api/src/router/effective-status.test.tsindex 9c7ef9e86..fcd2fcec6 100644--- a/packages/api/src/router/effective-status.test.ts+++ b/packages/api/src/router/effective-status.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { computeEffectiveStatus } from "./effective-status";diff --git a/packages/api/src/router/import.test.ts b/packages/api/src/router/import.test.tsindex ddb77b232..80c3c4c25 100644--- a/packages/api/src/router/import.test.ts+++ b/packages/api/src/router/import.test.ts@@ -1,3 +1,5 @@+import { afterAll, beforeAll, expect, test } from "bun:test";+import { db, eq, inArray } from "@openstatus/db";import {maintenance,@@ -19,8 +21,6 @@ import {MOCK_SUBSCRIBERS,} from "@openstatus/importers/statuspage/fixtures";import { clearAuditLogFor } from "@openstatus/services/test/helpers";-import { expect } from "@std/expect";-import { afterAll, beforeAll, test } from "@std/testing/bdd";import { edgeRouter } from "../edge";import { createInnerTRPCContext } from "../trpc";@@ -341,7 +341,7 @@ test("run creates page, components, and groups in DB", async () => {// Clean up for next testsawait cleanup();-});+}, 15_000);test("run with existing pageId imports into that page", async () => {const result = await caller.import.run({@@ -374,7 +374,7 @@ test("run with existing pageId imports into that page", async () => {expect(matchingComps.length).toBe(MOCK_COMPONENTS.length);await cleanup();-});+}, 15_000);test("re-run skips already-imported resources (idempotency)", async () => {// First run@@ -410,7 +410,7 @@ test("re-run skips already-imported resources (idempotency)", async () => {expect(allGroupsSkipped).toBe(true);await cleanup();-});+}, 15_000);test("run with includeStatusReports creates status reports", async () => {const result = await caller.import.run({@@ -461,7 +461,7 @@ test("run with includeStatusReports creates status reports", async () => {expect(createdMaintIds.length).toBeGreaterThan(0);await cleanup();-});+}, 15_000);// ---------------------------------------------------------------------------// Limit warnings (go through the caller with custom workspace limits todiff --git a/packages/api/src/router/maintenance.test.ts b/packages/api/src/router/maintenance.test.tsindex c24e94259..65c853c0b 100644--- a/packages/api/src/router/maintenance.test.ts+++ b/packages/api/src/router/maintenance.test.ts@@ -1,3 +1,5 @@+import { afterAll, beforeAll, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import {maintenance,@@ -6,8 +8,6 @@ import {pageComponent,} from "@openstatus/db/src/schema";import { clearAuditLogFor } from "@openstatus/services/test/helpers";-import { expect } from "@std/expect";-import { afterAll, beforeAll, test } from "@std/testing/bdd";import { TRPCError } from "@trpc/server";import { edgeRouter } from "../edge";diff --git a/packages/api/src/router/monitor.test.ts b/packages/api/src/router/monitor.test.tsindex 62079b222..d19508a7d 100644--- a/packages/api/src/router/monitor.test.ts+++ b/packages/api/src/router/monitor.test.ts@@ -1,88 +1,40 @@-import { db, eq, inArray } from "@openstatus/db";+import { afterAll, beforeAll, expect, test } from "bun:test";++import { db, eq } from "@openstatus/db";import {monitorTag,monitorTagsToMonitors,- notification,- notificationsToMonitors,privateLocation,privateLocationToMonitors,- workspace,} from "@openstatus/db/src/schema";import { allPlans } from "@openstatus/db/src/schema/plan/config";-import {- createMonitor,- createWorkspace,-} from "@openstatus/db/src/test/factories";-import { expect } from "@std/expect";-import { afterAll, beforeAll, test } from "@std/testing/bdd";import { TRPCError } from "@trpc/server";import { edgeRouter } from "../edge";import { createInnerTRPCContext } from "../trpc";-// Passing both `user` and `workspace` trips the NODE_ENV=test escape hatch in-// the authed middleware, so the caller is scoped to ownWorkspaceId instead of-// resolving the seeded workspace for the session user.-function callerFor(limits?: typeof allPlans.team.limits) {- const ctx = createInnerTRPCContext({- req: undefined,- session: { user: { id: "1" } },- // @ts-expect-error - minimal user for test- user: { id: 1 },- // @ts-expect-error - minimal workspace for test- workspace: limits ? { id: ownWorkspaceId, limits } : { id: ownWorkspaceId },- });- return edgeRouter.createCaller(ctx);-}--// Own workspaces/monitors per suite β these IDOR tests previously shared the-// seeded monitor 5 / workspace 3, which races sibling suites mutating that-// monitor's associations (e.g. privateLocation.test).-let ownWorkspaceId: number;-let otherWorkspaceId: number;-let ownMonitorId: number;-let otherMonitorId: number;let tagId: number;-let notifierId: number;let otherWorkspacePrivateLocationId: number;let ownWorkspacePrivateLocationId: number;beforeAll(async () => {- const own = await createWorkspace();- const other = await createWorkspace();- ownWorkspaceId = own.id;- otherWorkspaceId = other.id;-- const ownMonitor = await createMonitor(own.id);- const otherMonitor = await createMonitor(other.id);- ownMonitorId = ownMonitor.id;- otherMonitorId = otherMonitor.id;-const tag = await db.insert(monitorTag)- .values({ workspaceId: own.id, name: "idor-test-tag", color: "#ff0000" })- .returning()- .get();- tagId = tag.id;-- const notif = await db- .insert(notification).values({- workspaceId: own.id,- name: "idor-test-notif",- provider: "email",- data: JSON.stringify({ email: "[email protected]" }),+ workspaceId: 1,+ name: "idor-test-tag",+ color: "#ff0000",}).returning().get();- notifierId = notif.id;+ tagId = tag.id;const otherLoc = await db.insert(privateLocation).values({- workspaceId: other.id,+ workspaceId: 3,name: "Other workspace private location",- token: `monitor-test-other-${otherWorkspaceId}`,+ token: "monitor-test-other-token",}).returning().get();@@ -91,68 +43,47 @@ beforeAll(async () => {const ownLoc = await db.insert(privateLocation).values({- workspaceId: own.id,+ workspaceId: 1,name: "Own workspace private location",- token: `monitor-test-own-${ownWorkspaceId}`,+ token: "monitor-test-own-token",}).returning().get();ownWorkspacePrivateLocationId = ownLoc.id;-- // Pre-existing association on the cross-workspace monitor; the IDOR test- // asserts a rejected scheduling update does not wipe it.- await db- .insert(privateLocationToMonitors)- .values({ privateLocationId: otherLoc.id, monitorId: otherMonitor.id })- .run();});afterAll(async () => {+ await db+ .delete(monitorTagsToMonitors)+ .where(eq(monitorTagsToMonitors.monitorTagId, tagId));+ await db.delete(monitorTag).where(eq(monitorTag.id, tagId));await db.delete(privateLocationToMonitors).where(- inArray(privateLocationToMonitors.privateLocationId, [- otherWorkspacePrivateLocationId,+ eq(+ privateLocationToMonitors.privateLocationId,ownWorkspacePrivateLocationId,- ]),- )- .catch(() => undefined);+ ),+ );await db.delete(privateLocation)- .where(- inArray(privateLocation.id, [- otherWorkspacePrivateLocationId,- ownWorkspacePrivateLocationId,- ]),- )- .catch(() => undefined);- await db- .delete(monitorTagsToMonitors)- .where(eq(monitorTagsToMonitors.monitorTagId, tagId))- .catch(() => undefined);- await db- .delete(monitorTag)- .where(eq(monitorTag.id, tagId))- .catch(() => undefined);- await db- .delete(notificationsToMonitors)- .where(eq(notificationsToMonitors.notificationId, notifierId))- .catch(() => undefined);- await db- .delete(notification)- .where(eq(notification.id, notifierId))- .catch(() => undefined);+ .where(eq(privateLocation.id, otherWorkspacePrivateLocationId));await db- .delete(workspace)- .where(inArray(workspace.id, [ownWorkspaceId, otherWorkspaceId]))- .catch(() => undefined);+ .delete(privateLocation)+ .where(eq(privateLocation.id, ownWorkspacePrivateLocationId));});test("monitor.updateTags rejects monitor from another workspace", async () => {- const caller = callerFor();+ const ctx = createInnerTRPCContext({+ req: undefined,+ session: { user: { id: "1" } },+ // @ts-expect-error - minimal workspace for test+ workspace: { id: 1 },+ });+ const caller = edgeRouter.createCaller(ctx);try {- await caller.monitor.updateTags({ id: otherMonitorId, tags: [] });+ await caller.monitor.updateTags({ id: 5, tags: [] });throw new Error("Should have thrown");} catch (e) {expect(e).toBeInstanceOf(TRPCError);@@ -161,22 +92,34 @@ test("monitor.updateTags rejects monitor from another workspace", async () => {});test("monitor.updateTags succeeds for own workspace monitor", async () => {- const caller = callerFor();+ const ctx = createInnerTRPCContext({+ req: undefined,+ session: { user: { id: "1" } },+ // @ts-expect-error - minimal workspace for test+ workspace: { id: 1 },+ });+ const caller = edgeRouter.createCaller(ctx);- await caller.monitor.updateTags({ id: ownMonitorId, tags: [tagId] });+ await caller.monitor.updateTags({ id: 1, tags: [tagId] });const result = await db.query.monitorTagsToMonitors.findFirst({- where: eq(monitorTagsToMonitors.monitorId, ownMonitorId),+ where: eq(monitorTagsToMonitors.monitorId, 1),});expect(result).toBeDefined();expect(result?.monitorTagId).toBe(tagId);});test("monitor.updateNotifiers rejects monitor from another workspace", async () => {- const caller = callerFor();+ const ctx = createInnerTRPCContext({+ req: undefined,+ session: { user: { id: "1" } },+ // @ts-expect-error - minimal workspace for test+ workspace: { id: 1 },+ });+ const caller = edgeRouter.createCaller(ctx);try {- await caller.monitor.updateNotifiers({ id: otherMonitorId, notifiers: [] });+ await caller.monitor.updateNotifiers({ id: 5, notifiers: [] });throw new Error("Should have thrown");} catch (e) {expect(e).toBeInstanceOf(TRPCError);@@ -185,26 +128,36 @@ test("monitor.updateNotifiers rejects monitor from another workspace", async ()});test("monitor.updateNotifiers succeeds for own workspace monitor", async () => {- const caller = callerFor();-- await caller.monitor.updateNotifiers({- id: ownMonitorId,- notifiers: [notifierId],+ const ctx = createInnerTRPCContext({+ req: undefined,+ session: { user: { id: "1" } },+ // @ts-expect-error - minimal workspace for test+ workspace: { id: 1 },});+ const caller = edgeRouter.createCaller(ctx);++ await caller.monitor.updateNotifiers({ id: 1, notifiers: [1] });});test("monitor.updateSchedulingRegions rejects monitor from another workspace", async () => {- const caller = callerFor(allPlans.team.limits);+ // Monitor 5 belongs to workspace 3; try to update it from workspace 1+ const ctx = createInnerTRPCContext({+ req: undefined,+ session: { user: { id: "1" } },+ // @ts-expect-error - minimal workspace for test+ workspace: { id: 1, limits: allPlans.team.limits },+ });+ const caller = edgeRouter.createCaller(ctx);// Verify the seed private location association exists before the attackconst before = await db.query.privateLocationToMonitors.findMany({- where: eq(privateLocationToMonitors.monitorId, otherMonitorId),+ where: eq(privateLocationToMonitors.monitorId, 5),});const beforeCount = before.length;try {await caller.monitor.updateSchedulingRegions({- id: otherMonitorId,+ id: 5,regions: ["ams"],periodicity: "30s",privateLocations: [],@@ -217,16 +170,23 @@ test("monitor.updateSchedulingRegions rejects monitor from another workspace", a// Verify private location associations were NOT deletedconst after = await db.query.privateLocationToMonitors.findMany({- where: eq(privateLocationToMonitors.monitorId, otherMonitorId),+ where: eq(privateLocationToMonitors.monitorId, 5),});expect(after.length).toBe(beforeCount);});test("monitor.updateSchedulingRegions succeeds for own workspace monitor", async () => {- const caller = callerFor(allPlans.team.limits);+ const ctx = createInnerTRPCContext({+ req: undefined,+ session: { user: { id: "1" } },+ // @ts-expect-error - minimal workspace for test+ workspace: { id: 1, limits: allPlans.team.limits },+ });+ const caller = edgeRouter.createCaller(ctx);+ // Monitor 1 belongs to workspace 1await caller.monitor.updateSchedulingRegions({- id: ownMonitorId,+ id: 1,regions: ["ams"],periodicity: "1m",privateLocations: [],@@ -234,14 +194,20 @@ test("monitor.updateSchedulingRegions succeeds for own workspace monitor", async});test("monitor.updateSchedulingRegions rejects privateLocations from another workspace", async () => {- const caller = callerFor(allPlans.team.limits);+ const ctx = createInnerTRPCContext({+ req: undefined,+ session: { user: { id: "1" } },+ // @ts-expect-error - minimal workspace for test+ workspace: { id: 1, limits: allPlans.team.limits },+ });+ const caller = edgeRouter.createCaller(ctx);try {await caller.monitor.updateSchedulingRegions({- id: ownMonitorId,+ id: 1, // own monitorregions: ["ams"],periodicity: "1m",- privateLocations: [otherWorkspacePrivateLocationId],+ privateLocations: [otherWorkspacePrivateLocationId], // workspace 2});throw new Error("Should have thrown");} catch (e) {@@ -251,17 +217,23 @@ test("monitor.updateSchedulingRegions rejects privateLocations from another work});test("monitor.updateSchedulingRegions succeeds with own workspace privateLocations", async () => {- const caller = callerFor(allPlans.team.limits);+ const ctx = createInnerTRPCContext({+ req: undefined,+ session: { user: { id: "1" } },+ // @ts-expect-error - minimal workspace for test+ workspace: { id: 1, limits: allPlans.team.limits },+ });+ const caller = edgeRouter.createCaller(ctx);await caller.monitor.updateSchedulingRegions({- id: ownMonitorId,+ id: 1,regions: ["ams"],periodicity: "1m",privateLocations: [ownWorkspacePrivateLocationId],});const associations = await db.query.privateLocationToMonitors.findMany({- where: eq(privateLocationToMonitors.monitorId, ownMonitorId),+ where: eq(privateLocationToMonitors.monitorId, 1),});const linked = associations.find((a) => a.privateLocationId === ownWorkspacePrivateLocationId,diff --git a/packages/api/src/router/notification.test.ts b/packages/api/src/router/notification.test.tsindex a0ef37bf0..d458ca281 100644--- a/packages/api/src/router/notification.test.ts+++ b/packages/api/src/router/notification.test.ts@@ -1,10 +1,10 @@+import { afterAll, beforeAll, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import {notification,notificationsToMonitors,} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, test } from "@std/testing/bdd";import { TRPCError } from "@trpc/server";import { edgeRouter } from "../edge";diff --git a/packages/api/src/router/page.ts b/packages/api/src/router/page.tsindex e7b069f6f..7137893ed 100644--- a/packages/api/src/router/page.ts+++ b/packages/api/src/router/page.ts@@ -32,6 +32,10 @@ import { env } from "../env";import { toServiceCtx, toTRPCError } from "../service-adapter";import { createTRPCRouter, protectedProcedure } from "../trpc";+if (process.env.NODE_ENV === "test") {+ require("../test/preload");+}+// Vercel domain helpers β transport-layer external integrations that// don't belong in the service layer.async function addDomainToVercel(domain: string) {diff --git a/packages/api/src/router/pageComponent.test.ts b/packages/api/src/router/pageComponent.test.tsindex 187cef84c..c14e9f5e0 100644--- a/packages/api/src/router/pageComponent.test.ts+++ b/packages/api/src/router/pageComponent.test.ts@@ -1,8 +1,8 @@+import { afterAll, beforeAll, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import { monitor } from "@openstatus/db/src/schema";import { allPlans } from "@openstatus/db/src/schema/plan/config";-import { expect } from "@std/expect";-import { afterAll, beforeAll, test } from "@std/testing/bdd";import { TRPCError } from "@trpc/server";import { edgeRouter } from "../edge";diff --git a/packages/api/src/router/privateLocation.test.ts b/packages/api/src/router/privateLocation.test.tsindex c621f3514..19e39485f 100644--- a/packages/api/src/router/privateLocation.test.ts+++ b/packages/api/src/router/privateLocation.test.ts@@ -1,61 +1,25 @@-import { db, eq, inArray } from "@openstatus/db";+import { afterAll, beforeAll, expect, test } from "bun:test";++import { db, eq } from "@openstatus/db";import {privateLocation,privateLocationToMonitors,- workspace,} from "@openstatus/db/src/schema";-import {- createMonitor,- createWorkspace,-} from "@openstatus/db/src/test/factories";-import { expect } from "@std/expect";-import { afterAll, beforeAll, test } from "@std/testing/bdd";import { TRPCError } from "@trpc/server";import { edgeRouter } from "../edge";import { createInnerTRPCContext } from "../trpc";-// Passing both `user` and `workspace` trips the NODE_ENV=test escape hatch in-// the authed middleware, so the caller is scoped to ownWorkspaceId instead of-// resolving the seeded workspace for the session user.-function callerFor() {- const ctx = createInnerTRPCContext({- req: undefined,- session: { user: { id: "1" } },- // @ts-expect-error - minimal user for test- user: { id: 1 },- // @ts-expect-error - minimal workspace for test- workspace: { id: ownWorkspaceId },- });- return edgeRouter.createCaller(ctx);-}--// Own workspaces/monitors per suite β sharing the seeded monitor 5 / workspace-// 3 races sibling suites that read or mutate that monitor's associations.-let ownWorkspaceId: number;-let otherWorkspaceId: number;-let ownMonitorId: number;-let otherMonitorId: number;let otherWorkspaceLocationId: number;let ownWorkspaceLocationId: number;beforeAll(async () => {- const own = await createWorkspace();- const other = await createWorkspace();- ownWorkspaceId = own.id;- otherWorkspaceId = other.id;-- const ownMonitor = await createMonitor(own.id);- const otherMonitor = await createMonitor(other.id);- ownMonitorId = ownMonitor.id;- otherMonitorId = otherMonitor.id;-const otherLoc = await db.insert(privateLocation).values({- workspaceId: other.id,+ workspaceId: 3,name: "Other workspace location",- token: `test-token-idor-${otherWorkspaceId}`,+ token: "test-token-idor",}).returning().get();@@ -65,16 +29,16 @@ beforeAll(async () => {.insert(privateLocationToMonitors).values({privateLocationId: otherWorkspaceLocationId,- monitorId: otherMonitorId,+ monitorId: 5,}).run();const ownLoc = await db.insert(privateLocation).values({- workspaceId: own.id,+ workspaceId: 1,name: "Own workspace location",- token: `test-token-own-${ownWorkspaceId}`,+ token: "test-token-own",}).returning().get();@@ -85,29 +49,29 @@ afterAll(async () => {await db.delete(privateLocationToMonitors).where(- inArray(privateLocationToMonitors.privateLocationId, [- otherWorkspaceLocationId,- ownWorkspaceLocationId,- ]),- )- .catch(() => undefined);+ eq(privateLocationToMonitors.privateLocationId, otherWorkspaceLocationId),+ );await db.delete(privateLocation)+ .where(eq(privateLocation.id, otherWorkspaceLocationId));+ await db+ .delete(privateLocationToMonitors).where(- inArray(privateLocation.id, [- otherWorkspaceLocationId,- ownWorkspaceLocationId,- ]),- )- .catch(() => undefined);+ eq(privateLocationToMonitors.privateLocationId, ownWorkspaceLocationId),+ );await db- .delete(workspace)- .where(inArray(workspace.id, [ownWorkspaceId, otherWorkspaceId]))- .catch(() => undefined);+ .delete(privateLocation)+ .where(eq(privateLocation.id, ownWorkspaceLocationId));});test("privateLocation.update rejects location from another workspace", async () => {- const caller = callerFor();+ const ctx = createInnerTRPCContext({+ req: undefined,+ session: { user: { id: "1" } },+ // @ts-expect-error - minimal workspace for test+ workspace: { id: 1 },+ });+ const caller = edgeRouter.createCaller(ctx);try {await caller.privateLocation.update({@@ -132,12 +96,18 @@ test("privateLocation.update rejects location from another workspace", async ()});test("privateLocation.update succeeds for own workspace location", async () => {- const caller = callerFor();+ const ctx = createInnerTRPCContext({+ req: undefined,+ session: { user: { id: "1" } },+ // @ts-expect-error - minimal workspace for test+ workspace: { id: 1 },+ });+ const caller = edgeRouter.createCaller(ctx);const result = await caller.privateLocation.update({id: ownWorkspaceLocationId,name: "Updated Location Name",- monitors: [ownMonitorId],+ monitors: [1],});expect(result).toBeDefined();@@ -145,13 +115,19 @@ test("privateLocation.update succeeds for own workspace location", async () => {});test("privateLocation.new rejects monitors from another workspace", async () => {- const caller = callerFor();+ const ctx = createInnerTRPCContext({+ req: undefined,+ session: { user: { id: "1" } },+ // @ts-expect-error - minimal workspace for test+ workspace: { id: 1 },+ });+ const caller = edgeRouter.createCaller(ctx);try {await caller.privateLocation.new({name: "Injected Location",token: "test-token-inject",- monitors: [otherMonitorId],+ monitors: [5], // monitor 5 belongs to workspace 3});throw new Error("Should have thrown");} catch (e) {@@ -161,12 +137,18 @@ test("privateLocation.new rejects monitors from another workspace", async () =>});test("privateLocation.new succeeds with own workspace monitors", async () => {- const caller = callerFor();+ const ctx = createInnerTRPCContext({+ req: undefined,+ session: { user: { id: "1" } },+ // @ts-expect-error - minimal workspace for test+ workspace: { id: 1 },+ });+ const caller = edgeRouter.createCaller(ctx);const result = await caller.privateLocation.new({name: "Valid Location",token: "test-token-valid-new",- monitors: [ownMonitorId],+ monitors: [1], // monitor 1 belongs to workspace 1});expect(result).toBeDefined();@@ -177,7 +159,7 @@ test("privateLocation.new succeeds with own workspace monitors", async () => {where: eq(privateLocationToMonitors.privateLocationId, result.id),});expect(associations.length).toBe(1);- expect(associations[0].monitorId).toBe(ownMonitorId);+ expect(associations[0].monitorId).toBe(1);// Cleanupawait db@@ -187,13 +169,19 @@ test("privateLocation.new succeeds with own workspace monitors", async () => {});test("privateLocation.update rejects monitors from another workspace", async () => {- const caller = callerFor();+ const ctx = createInnerTRPCContext({+ req: undefined,+ session: { user: { id: "1" } },+ // @ts-expect-error - minimal workspace for test+ workspace: { id: 1 },+ });+ const caller = edgeRouter.createCaller(ctx);try {await caller.privateLocation.update({id: ownWorkspaceLocationId,name: "Updated Location Name",- monitors: [otherMonitorId],+ monitors: [5], // monitor 5 belongs to workspace 3});throw new Error("Should have thrown");} catch (e) {diff --git a/packages/api/src/router/statusPage.e2e.test.ts b/packages/api/src/router/statusPage.e2e.test.tsindex 79c611ab2..1baab894e 100644--- a/packages/api/src/router/statusPage.e2e.test.ts+++ b/packages/api/src/router/statusPage.e2e.test.ts@@ -1,3 +1,5 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { and, db, eq, isNotNull, isNull } from "@openstatus/db";import {incidentTable,@@ -7,8 +9,6 @@ import {pageSubscriber,workspace,} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";/*** End-to-end integration tests for the full unsubscribe flow.@@ -213,7 +213,6 @@ describe("Confirmation page displays correct information", () => {}const email = subscriber.email;- if (!email) throw new Error("Subscriber email not found");expect(email).toBe("[email protected]");// Apply the same masking logic as in the APIdiff --git a/packages/api/src/router/statusPage.unsubscribe.test.ts b/packages/api/src/router/statusPage.unsubscribe.test.tsindex 8cb66d5f6..9800d3fc4 100644--- a/packages/api/src/router/statusPage.unsubscribe.test.ts+++ b/packages/api/src/router/statusPage.unsubscribe.test.ts@@ -1,7 +1,7 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import { page, pageSubscriber } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";// Test data setuplet testPageId: number;diff --git a/packages/api/src/router/statusPage.utils.test.ts b/packages/api/src/router/statusPage.utils.test.tsindex 1961e85f9..15baf7202 100644--- a/packages/api/src/router/statusPage.utils.test.ts+++ b/packages/api/src/router/statusPage.utils.test.ts@@ -1,3 +1,5 @@+import { describe, expect, it } from "bun:test";+import type {Incident,Maintenance,@@ -5,8 +7,6 @@ import type {StatusReport,StatusReportUpdate,} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { describe, it } from "@std/testing/bdd";import {currentImpactByComponent,diff --git a/packages/api/src/router/statusReport.test.ts b/packages/api/src/router/statusReport.test.tsindex 1c63e8ebd..2175fbf4c 100644--- a/packages/api/src/router/statusReport.test.ts+++ b/packages/api/src/router/statusReport.test.ts@@ -1,3 +1,5 @@+import { afterAll, beforeAll, expect, test } from "bun:test";+import { db, eq, inArray } from "@openstatus/db";import {page,@@ -7,8 +9,6 @@ import {statusReportsToPageComponents,} from "@openstatus/db/src/schema";import { clearAuditLogFor } from "@openstatus/services/test/helpers";-import { expect } from "@std/expect";-import { afterAll, beforeAll, test } from "@std/testing/bdd";import { TRPCError } from "@trpc/server";import { edgeRouter } from "../edge";diff --git a/packages/api/src/router/stripe/utils.test.ts b/packages/api/src/router/stripe/utils.test.tsindex 048fd6b54..02299b1b9 100644--- a/packages/api/src/router/stripe/utils.test.ts+++ b/packages/api/src/router/stripe/utils.test.ts@@ -1,6 +1,6 @@+import { describe, expect, test } from "bun:test";+import { getLimits } from "@openstatus/db/src/schema/plan/utils";-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";import type Stripe from "stripe";import { FEATURES, PLANS, buildLimitsFromSubscription } from "./utils";diff --git a/packages/api/src/router/tinybird/index.test.ts b/packages/api/src/router/tinybird/index.test.tsindex 668055290..759d92c66 100644--- a/packages/api/src/router/tinybird/index.test.ts+++ b/packages/api/src/router/tinybird/index.test.ts@@ -1,5 +1,5 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";+import { TRPCError } from "@trpc/server";import { edgeRouter } from "../../edge";diff --git a/packages/api/src/router/workspace.test.ts b/packages/api/src/router/workspace.test.tsindex 3812aff70..02b140020 100644--- a/packages/api/src/router/workspace.test.ts+++ b/packages/api/src/router/workspace.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { test } from "@std/testing/bdd";+import { expect, test } from "bun:test";import { edgeRouter } from "../edge";import { createInnerTRPCContext } from "../trpc";diff --git a/packages/api/src/test/preload.ts b/packages/api/src/test/preload.tsnew file mode 100644index 000000000..4d43b6ffd--- /dev/null+++ b/packages/api/src/test/preload.ts@@ -0,0 +1,12 @@+import { mock } from "bun:test";++mock.module("@openstatus/upstash", () => ({+ Redis: {+ fromEnv() {+ return {+ get: () => Promise.resolve(undefined),+ set: () => Promise.resolve([]),+ };+ },+ },+}));diff --git a/packages/api/src/test/upstash.mock.ts b/packages/api/src/test/upstash.mock.tsdeleted file mode 100644index 7aa2e8467..000000000--- a/packages/api/src/test/upstash.mock.ts+++ /dev/null@@ -1,18 +0,0 @@-// Test double for @openstatus/upstash, swapped in via --import-map in the-// `deno test` command. Keeps tests off a real Upstash Redis instance.-const noopRedis = {- get: () => Promise.resolve(null),- set: () => Promise.resolve("OK"),- del: () => Promise.resolve(0),- getdel: () => Promise.resolve(null),- incr: () => Promise.resolve(1),- expire: () => Promise.resolve(1),-};--export const redis = noopRedis;--export const Redis = {- fromEnv() {- return noopRedis;- },-};diff --git a/packages/api/src/trpc.ts b/packages/api/src/trpc.tsindex d82259216..4e380ee0b 100644--- a/packages/api/src/trpc.ts+++ b/packages/api/src/trpc.ts@@ -7,7 +7,7 @@ import {import { db } from "@openstatus/db";import type { User, Workspace } from "@openstatus/db/src/schema";import { TRPCError, initTRPC } from "@trpc/server";-import { type NextRequest, after } from "next/server.js";+import { type NextRequest, after } from "next/server";import superjson from "superjson";import { ZodError, treeifyError } from "zod";diff --git a/packages/api/test.importmap.json b/packages/api/test.importmap.jsondeleted file mode 100644index 94b18545a..000000000--- a/packages/api/test.importmap.json+++ /dev/null@@ -1,5 +0,0 @@-{- "imports": {- "@openstatus/upstash": "./src/test/upstash.mock.ts"- }-}diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.jsonindex 48baa5cfe..15860ea15 100644--- a/packages/api/tsconfig.json+++ b/packages/api/tsconfig.json@@ -1,7 +1,8 @@{- "extends": "@openstatus/tsconfig/base.json",+ "extends": "@openstatus/tsconfig/nextjs.json","include": ["src", "*.ts"],"compilerOptions": {- "resolveJsonModule": true+ "moduleResolution": "bundler",+ "types": ["bun-types"]}}diff --git a/packages/assertions/package.json b/packages/assertions/package.jsonindex 79323a62c..0472bd9f5 100644--- a/packages/assertions/package.json+++ b/packages/assertions/package.json@@ -6,9 +6,7 @@"license": "ISC","author": "","main": "src/index.ts",- "scripts": {- "check": "deno check --sloppy-imports ."- },+ "scripts": {},"dependencies": {"jsonpath-plus": "catalog:","zod": "catalog:"diff --git a/packages/assertions/src/v1.ts b/packages/assertions/src/v1.tsindex 9b4809882..0b7ea37d7 100644--- a/packages/assertions/src/v1.ts+++ b/packages/assertions/src/v1.ts@@ -309,7 +309,7 @@ export class HeaderAssertion implements Assertion {};}const { success, message } = evaluateString(- req.header[this.schema.key] ?? "",+ req.header[this.schema.key],this.schema.compare,this.schema.target,);diff --git a/packages/assertions/tsconfig.json b/packages/assertions/tsconfig.jsonindex aed15c74a..ec9f2821d 100644--- a/packages/assertions/tsconfig.json+++ b/packages/assertions/tsconfig.json@@ -1,4 +1,7 @@{"extends": "@openstatus/tsconfig/base.json",+ "compilerOptions": {+ "lib": ["es2015", "dom"]+ },"include": ["src", "*.ts"]}diff --git a/packages/db/env.ts b/packages/db/env.tsindex dab63f5f4..dbb28b166 100644--- a/packages/db/env.ts+++ b/packages/db/env.ts@@ -1 +1,2 @@-await Deno.copyFile("./.env.example", "./.env");+const file = Bun.file("./.env.example");+await Bun.write("./.env", file);diff --git a/packages/db/package.json b/packages/db/package.jsonindex 8e7d6d38c..a08d4abc4 100644--- a/packages/db/package.json+++ b/packages/db/package.json@@ -4,27 +4,13 @@"description": "","author": "OpenStatus","main": "src/index.ts",- "exports": {- ".": "./src/index.ts",- "./env.mjs": "./env.mjs",- "./src/schema": "./src/schema/index.ts",- "./src/test/factories": "./src/test/factories.ts",- "./src/schema/api-keys": "./src/schema/api-keys/index.ts",- "./src/schema/check": "./src/schema/check/index.ts",- "./src/schema/incidents": "./src/schema/incidents/index.ts",- "./src/schema/maintenances": "./src/schema/maintenances/index.ts",- "./src/schema/page_components": "./src/schema/page_components/index.ts",- "./src/schema/workspaces": "./src/schema/workspaces/index.ts",- "./src/*": "./src/*.ts"- },"scripts": {- "check": "deno check --sloppy-imports .","generate": "drizzle-kit generate","push": "drizzle-kit push",- "migrate": "deno run -A --env-file src/migrate.mts",+ "migrate": "bun src/migrate.mts","studio": "drizzle-kit studio",- "env": "deno run -A env.ts",- "seed": "deno run -A --env-file --sloppy-imports src/seed.mts",+ "env": "bun env.ts",+ "seed": "bun src/seed.mts","dev": "turso dev --db-file ../../openstatus-dev.db"},"dependencies": {@@ -42,8 +28,6 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@types/bcryptjs": "catalog:","@types/node": "catalog:","drizzle-kit": "catalog:",diff --git a/packages/db/script/region-migration.test.ts b/packages/db/script/region-migration.test.tsindex f52fd0eb0..b9e3bc60a 100644--- a/packages/db/script/region-migration.test.ts+++ b/packages/db/script/region-migration.test.ts@@ -1,5 +1,5 @@-import { expect } from "@std/expect";-import { beforeEach, describe, test } from "@std/testing/bdd";+import { beforeEach, describe, expect, test } from "bun:test";+import type { z } from "zod";import type { monitorRegionSchema } from "../src/schema/constants";diff --git a/packages/db/src/schema/page_components/validation.ts b/packages/db/src/schema/page_components/validation.tsindex fae44fbd5..71188c429 100644--- a/packages/db/src/schema/page_components/validation.ts+++ b/packages/db/src/schema/page_components/validation.ts@@ -10,7 +10,7 @@ import {export const selectPageComponentSchema = createSelectSchema(pageComponent);export const insertPageComponentSchema = createInsertSchema(pageComponent, {- name: z.string().min(1),+ name: (schema) => schema.min(1),}).refine((data) => {// monitorId must be set when type='monitor'diff --git a/packages/db/src/seed.mts b/packages/db/src/seed.mtsindex 8e1264716..bdc4cf4d0 100644--- a/packages/db/src/seed.mts+++ b/packages/db/src/seed.mts@@ -24,35 +24,9 @@ import {import { externalServicesSeed } from "./seed/external-services";async function main() {- if (- !env.DATABASE_URL.includes("localhost") &&- !env.DATABASE_URL.includes("127.0.0.1")- ) {- throw new Error(- `Refusing to wipe non-local database: DATABASE_URL=${env.DATABASE_URL}`,- );- }-- const client = createClient({- url: env.DATABASE_URL,- authToken: env.DATABASE_AUTH_TOKEN,- });- const db = drizzle(client);-- // Fresh slate: wipe every table so re-seeding is idempotent and tests never- // inherit residue from a previous run. `defer_foreign_keys` lets us delete in- // any order within the transaction (all tables end empty, so FKs hold at commit).- const tables = await client.execute(- "SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%' AND name != '__drizzle_migrations'",+ const db = drizzle(+ createClient({ url: env.DATABASE_URL, authToken: env.DATABASE_AUTH_TOKEN }),);- await client.batch(- [- "PRAGMA defer_foreign_keys=ON",- ...tables.rows.map((row) => `DELETE FROM "${row.name}"`),- ],- "write",- );-console.log("Seeding database ");await db.insert(workspace)diff --git a/packages/db/src/test/factories.ts b/packages/db/src/test/factories.tsdeleted file mode 100644index 72b4d2d20..000000000--- a/packages/db/src/test/factories.ts+++ /dev/null@@ -1,50 +0,0 @@-// Test data factories: create fresh, uniquely-identified resources so suites-// don't collide on shared seed IDs (workspace 1, monitors 1-3, β¦). Each call-// inserts a row with an auto-increment id and unique slug/name, then returns-// it β scope the test to the returned id and clean up in afterAll.-//-// Pass a transaction as the last arg to scope creation to it (e.g. inside a-// rolled-back `withTestTransaction`); omit it to commit to the shared db.-import { db as defaultDb } from "../db";-import { monitor, workspace } from "../schema";--type Db = typeof defaultDb;-type WorkspaceInsert = typeof workspace.$inferInsert;-type MonitorInsert = typeof monitor.$inferInsert;--const unique = () => crypto.randomUUID().slice(0, 8);--export async function createWorkspace(- overrides: Partial<WorkspaceInsert> = {},- db: Db = defaultDb,-) {- const u = unique();- const [row] = await db- .insert(workspace)- .values({- slug: `test-ws-${u}`,- name: "Test Workspace",- stripeId: `test-stripe-${u}`,- plan: "team",- ...overrides,- })- .returning();- return row;-}--export async function createMonitor(- workspaceId: number,- overrides: Partial<MonitorInsert> = {},- db: Db = defaultDb,-) {- const [row] = await db- .insert(monitor)- .values({- workspaceId,- url: "https://example.openstatus.dev",- name: `test-monitor-${unique()}`,- ...overrides,- })- .returning();- return row;-}diff --git a/packages/db/src/utils/api-key.test.ts b/packages/db/src/utils/api-key.test.tsindex 8fae1da27..63971b5cd 100644--- a/packages/db/src/utils/api-key.test.ts+++ b/packages/db/src/utils/api-key.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, it } from "@std/testing/bdd";+import { describe, expect, it } from "bun:test";import {generateApiKey,diff --git a/packages/db/tsconfig.json b/packages/db/tsconfig.jsonindex 122f1a767..c3ede0904 100644--- a/packages/db/tsconfig.json+++ b/packages/db/tsconfig.json@@ -5,6 +5,7 @@"compilerOptions": {"outDir": "dist","target": "es2021",+ "lib": ["dom", "dom.iterable", "esnext"],"allowJs": true,"checkJs": true,"skipLibCheck": true,diff --git a/packages/emails/package.json b/packages/emails/package.jsonindex 229b1c93a..849cc2a90 100644--- a/packages/emails/package.json+++ b/packages/emails/package.json@@ -6,15 +6,9 @@"license": "ISC","author": "","main": "./src/index.ts",- "exports": {- ".": "./src/index.ts",- "./src/client": "./src/client.tsx",- "./src/*": "./src/*.ts"- },"scripts": {- "check": "deno check --sloppy-imports .","dev:email": "email dev",- "test": "deno test --parallel -A --no-check --sloppy-imports"+ "test": "bun test"},"dependencies": {"@t3-oss/env-core": "catalog:",@@ -27,8 +21,6 @@"devDependencies": {"@openstatus/tsconfig": "workspace:*","@react-email/ui": "catalog:",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@types/node": "catalog:","@types/react": "catalog:","typescript": "catalog:"diff --git a/packages/emails/src/client.integration.test.tsx b/packages/emails/src/client.integration.test.tsxindex 9de77175c..9733456fd 100644--- a/packages/emails/src/client.integration.test.tsx+++ b/packages/emails/src/client.integration.test.tsx@@ -1,7 +1,7 @@/** @jsxImportSource react */-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";+import { render } from "react-email";import StatusReportEmail from "../emails/status-report";@@ -40,7 +40,6 @@ describe("Status Report Email - Unsubscribe Link in Body", () => {message="Test message"pageComponents={["Monitor 1"]}manageUrl={manageUrl}- unsubscribeUrl=""/>,);diff --git a/packages/emails/src/client.test.ts b/packages/emails/src/client.test.tsindex 59aa8292f..cde4f7bf0 100644--- a/packages/emails/src/client.test.ts+++ b/packages/emails/src/client.test.ts@@ -1,11 +1,4 @@-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import {- assertSpyCalls,- returnsNext,- type Stub,- stub,-} from "@std/testing/mock";+import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test";import { EmailClient } from "./client";@@ -42,8 +35,8 @@ const fail = { data: null, error: { name: "application_error" } } as any;describe("EmailClient.sendStatusReportUpdate - idempotency & chunking", () => {let client: EmailClient;- // biome-ignore lint/suspicious/noExplicitAny: stub over the Resend batch method- let batchSend: Stub<any>;+ // biome-ignore lint/suspicious/noExplicitAny: bun spy handle+ let batchSend: any;beforeEach(() => {// zero backoff so the retry test doesn't wait on the real exponential sleep@@ -51,11 +44,11 @@ describe("EmailClient.sendStatusReportUpdate - idempotency & chunking", () => {apiKey: "re_test_123",retryBackoff: "0 millis",});- batchSend = stub(client.client.batch, "send", () => Promise.resolve(ok));+ batchSend = spyOn(client.client.batch, "send").mockResolvedValue(ok);});afterEach(() => {- batchSend.restore();+ batchSend.mockRestore();});test("passes the base idempotency key suffixed with the batch index", async () => {@@ -63,8 +56,8 @@ describe("EmailClient.sendStatusReportUpdate - idempotency & chunking", () => {baseReq({ idempotencyKey: "status-report-update:5" }),);- assertSpyCalls(batchSend, 1);- const options = batchSend.calls[0].args[1];+ expect(batchSend).toHaveBeenCalledTimes(1);+ const [, options] = batchSend.mock.calls[0];expect(options).toEqual({ idempotencyKey: "status-report-update:5:0" });});@@ -76,31 +69,32 @@ describe("EmailClient.sendStatusReportUpdate - idempotency & chunking", () => {}),);- assertSpyCalls(batchSend, 3);- const keys = batchSend.calls.map((c) => c.args[1]?.idempotencyKey);+ expect(batchSend).toHaveBeenCalledTimes(3);+ const keys = batchSend.mock.calls.map(+ // biome-ignore lint/suspicious/noExplicitAny: positional spy args+ ([, o]: [unknown, any]) => o?.idempotencyKey,+ );expect(keys).toEqual(["status-report-update:9:0","status-report-update:9:1","status-report-update:9:2",]);- const sizes = batchSend.calls.map((c) => c.args[0].length);+ const sizes = batchSend.mock.calls.map(+ // biome-ignore lint/suspicious/noExplicitAny: positional spy args+ ([payload]: [any[]]) => payload.length,+ );expect(sizes).toEqual([100, 100, 50]);});test("omits the option entirely when no base key is provided", async () => {await client.sendStatusReportUpdate(baseReq());- const options = batchSend.calls[0].args[1];+ const [, options] = batchSend.mock.calls[0];expect(options).toBeUndefined();});test("reuses the same key across a retry so Resend dedupes the resend", async () => {- batchSend.restore();- batchSend = stub(- client.client.batch,- "send",- returnsNext([Promise.resolve(fail), Promise.resolve(ok)]),- );+ batchSend.mockResolvedValueOnce(fail).mockResolvedValueOnce(ok);await client.sendStatusReportUpdate(baseReq({ idempotencyKey: "status-report-update:7" }),@@ -108,8 +102,11 @@ describe("EmailClient.sendStatusReportUpdate - idempotency & chunking", () => {// failure β retry: the second attempt must carry the identical key, or// Resend would treat the retry as a fresh batch and double-send.- assertSpyCalls(batchSend, 2);- const keys = batchSend.calls.map((c) => c.args[1]?.idempotencyKey);+ expect(batchSend).toHaveBeenCalledTimes(2);+ const keys = batchSend.mock.calls.map(+ // biome-ignore lint/suspicious/noExplicitAny: positional spy args+ ([, o]: [unknown, any]) => o?.idempotencyKey,+ );expect(keys).toEqual(["status-report-update:7:0","status-report-update:7:0",diff --git a/packages/emails/tsconfig.json b/packages/emails/tsconfig.jsonindex 39fe813f1..e29f2150c 100644--- a/packages/emails/tsconfig.json+++ b/packages/emails/tsconfig.json@@ -1,9 +1,5 @@{- "extends": "@openstatus/tsconfig/base.json",+ "extends": "@openstatus/tsconfig/react-library.json","include": [".", "src/env.ts"],- "exclude": ["dist", "build", "node_modules"],- "compilerOptions": {- "jsx": "react-jsx",- "resolveJsonModule": true- }+ "exclude": ["dist", "build", "node_modules"]}diff --git a/packages/error/package.json b/packages/error/package.jsonindex ab7f55bc3..fd9fe9533 100644--- a/packages/error/package.json+++ b/packages/error/package.json@@ -6,9 +6,7 @@"license": "ISC","author": "","main": "index.ts",- "scripts": {- "check": "deno check --sloppy-imports ."- },+ "scripts": {},"dependencies": {"zod": "catalog:"},diff --git a/packages/header-analysis/package.json b/packages/header-analysis/package.jsonindex 8efdb62f2..ac5d1eef8 100644--- a/packages/header-analysis/package.json+++ b/packages/header-analysis/package.json@@ -7,15 +7,13 @@"author": "","main": "src/index.ts","scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports",- "test:watch": "deno test --parallel -A --no-check --sloppy-imports --watch"+ "test": "bun test",+ "test:watch": "bun test --watch"},"dependencies": {},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19",+ "@types/bun": "latest","typescript": "catalog:"}}diff --git a/packages/header-analysis/src/parser/x-vercel-cache.test.ts b/packages/header-analysis/src/parser/x-vercel-cache.test.tsindex 2780dd223..eb464af71 100644--- a/packages/header-analysis/src/parser/x-vercel-cache.test.ts+++ b/packages/header-analysis/src/parser/x-vercel-cache.test.ts@@ -1,22 +1,19 @@-import { expect } from "@std/expect";-import { describe, it } from "@std/testing/bdd";+import { describe, expect, it } from "bun:test";import { parseXVercelCache } from "./x-vercel-cache";describe("parseXVercelCache", () => {- for (const [value, expectedFragment] of [+ it.each([["MISS", "The response was not found in the edge cache"],["HIT", "The response was served from the edge cache."],["STALE", "A background request to the origin server"],["PRERENDER", "The response was served from static storage."],["REVALIDATED", "the cache was refreshed"],- ]) {- it(`describes the documented state ${value}`, () => {- const result = parseXVercelCache(value);- expect(result.value).toBe(value);- expect(result.description).toContain(expectedFragment);- });- }+ ])("describes the documented state %p", (value, expectedFragment) => {+ const result = parseXVercelCache(value);+ expect(result.value).toBe(value);+ expect(result.description).toContain(expectedFragment);+ });it("matches states case-insensitively", () => {const lower = parseXVercelCache("revalidated");diff --git a/packages/icons/package.json b/packages/icons/package.jsonindex 889ca2a40..f50ea616a 100644--- a/packages/icons/package.json+++ b/packages/icons/package.json@@ -5,7 +5,6 @@"main": "./src/index.tsx","types": "./src/index.tsx","scripts": {- "check": "deno check --sloppy-imports .","lint": "oxlint"},"dependencies": {diff --git a/packages/importers/package.json b/packages/importers/package.jsonindex 9d82d9955..894f486ad 100644--- a/packages/importers/package.json+++ b/packages/importers/package.json@@ -14,9 +14,8 @@"./instatus/fixtures": "./src/providers/instatus/fixtures.ts"},"scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports",- "test:watch": "deno test --parallel -A --no-check --sloppy-imports --watch",+ "test": "bun test",+ "test:watch": "bun test --watch","tsc": "tsc --noEmit"},"dependencies": {@@ -24,8 +23,6 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","typescript": "catalog:"}}diff --git a/packages/importers/src/providers/betterstack/client.test.ts b/packages/importers/src/providers/betterstack/client.test.tsindex fbcd501e7..7b13f5dd1 100644--- a/packages/importers/src/providers/betterstack/client.test.ts+++ b/packages/importers/src/providers/betterstack/client.test.ts@@ -1,6 +1,4 @@-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { assertSpyCalls, spy } from "@std/testing/mock";+import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";import { createBetterstackClient } from "./client";import {@@ -18,7 +16,7 @@ const originalFetch = globalThis.fetch;function mockFetchPaginated(data: unknown[], status = 200) {let callCount = 0;- globalThis.fetch = spy(() => {+ globalThis.fetch = mock(() => {callCount++;const items = callCount === 1 ? data : [];const body = {@@ -41,7 +39,7 @@ function mockFetchPaginated(data: unknown[], status = 200) {}function mockFetchError(status: number, statusText: string) {- globalThis.fetch = spy(() =>+ globalThis.fetch = mock(() =>Promise.resolve(new Response(JSON.stringify({ error: statusText }), {status,@@ -145,9 +143,9 @@ describe("BetterstackClient", () => {test("sends correct auth header", async () => {mockFetchPaginated(MOCK_MONITORS);await client.getMonitors();- const fetchMock = globalThis.fetch as unknown as ReturnType<typeof spy>;- assertSpyCalls(fetchMock, 1);- const [url, options] = fetchMock.calls[0].args as [string, RequestInit];+ const fetchMock = globalThis.fetch as ReturnType<typeof mock>;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const [url, options] = fetchMock.mock.calls[0] as [string, RequestInit];expect(url).toBe("https://uptime.betterstack.com/api/v2/monitors");expect((options.headers as Record<string, string>).Authorization).toBe("Bearer test-api-key",@@ -156,7 +154,7 @@ describe("BetterstackClient", () => {test("follows pagination.next for multiple pages", async () => {let callCount = 0;- globalThis.fetch = spy(() => {+ globalThis.fetch = mock(() => {callCount++;const body =callCount === 1diff --git a/packages/importers/src/providers/betterstack/mapper.test.ts b/packages/importers/src/providers/betterstack/mapper.test.tsindex 70dfab132..e4e238758 100644--- a/packages/importers/src/providers/betterstack/mapper.test.ts+++ b/packages/importers/src/providers/betterstack/mapper.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import {MOCK_INCIDENTS,diff --git a/packages/importers/src/providers/betterstack/provider.test.ts b/packages/importers/src/providers/betterstack/provider.test.tsindex 28aa05453..9ef88f339 100644--- a/packages/importers/src/providers/betterstack/provider.test.ts+++ b/packages/importers/src/providers/betterstack/provider.test.ts@@ -1,6 +1,4 @@-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { spy } from "@std/testing/mock";+import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";import {MOCK_INCIDENTS,@@ -26,7 +24,7 @@ function makePaginated(data: unknown[]) {}function setupMockFetch() {- globalThis.fetch = spy((url: string) => {+ globalThis.fetch = mock((url: string) => {const path = new URL(url as string).pathname;let body: unknown;@@ -88,7 +86,7 @@ describe("BetterstackProvider", () => {});test("validate returns friendly 401 error", async () => {- globalThis.fetch = spy(() =>+ globalThis.fetch = mock(() =>Promise.resolve(new Response(JSON.stringify({ error: "Unauthorized" }), {status: 401,diff --git a/packages/importers/src/providers/instatus/client.test.ts b/packages/importers/src/providers/instatus/client.test.tsindex 79edfe006..7bdcbf178 100644--- a/packages/importers/src/providers/instatus/client.test.ts+++ b/packages/importers/src/providers/instatus/client.test.ts@@ -1,6 +1,4 @@-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { spy } from "@std/testing/mock";+import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";import { createInstatusClient } from "./client";import {@@ -14,7 +12,7 @@ import {const originalFetch = globalThis.fetch;function mockFetch(data: unknown, status = 200) {- globalThis.fetch = spy(() =>+ globalThis.fetch = mock(() =>Promise.resolve(new Response(JSON.stringify(data), {status,@@ -27,7 +25,7 @@ function mockFetch(data: unknown, status = 200) {function mockFetchPaginated(data: unknown, status = 200) {let callCount = 0;- globalThis.fetch = spy(() => {+ globalThis.fetch = mock(() => {callCount++;const body = callCount === 1 ? data : [];return Promise.resolve(@@ -109,8 +107,8 @@ describe("InstatusClient", () => {test("sends correct Bearer auth header", async () => {mockFetchPaginated(MOCK_PAGES);await client.getPages();- const fetchMock = globalThis.fetch as unknown as ReturnType<typeof spy>;- const [url, options] = fetchMock.calls[0].args as [string, RequestInit];+ const fetchMock = globalThis.fetch as unknown as ReturnType<typeof mock>;+ const [url, options] = fetchMock.mock.calls[0] as [string, RequestInit];expect(url).toBe("https://api.instatus.com/v2/pages?page=1&per_page=100");expect((options.headers as Record<string, string>).Authorization).toBe("Bearer test-api-key",@@ -126,7 +124,7 @@ describe("InstatusClient", () => {}));let callCount = 0;- globalThis.fetch = spy(() => {+ globalThis.fetch = mock(() => {callCount++;// First call: 100 items (= per_page), second call: empty arrayconst body = callCount === 1 ? items : [];@@ -147,8 +145,8 @@ describe("InstatusClient", () => {test("uses v1 for incidents and v2 for other endpoints", async () => {mockFetchPaginated(MOCK_INCIDENTS);await client.getIncidents("in_page_001");- const fetchMock = globalThis.fetch as unknown as ReturnType<typeof spy>;- const [url] = fetchMock.calls[0].args as [string, RequestInit];+ const fetchMock = globalThis.fetch as unknown as ReturnType<typeof mock>;+ const [url] = fetchMock.mock.calls[0] as [string, RequestInit];expect(url).toContain("/v1/in_page_001/incidents");});});diff --git a/packages/importers/src/providers/instatus/mapper.test.ts b/packages/importers/src/providers/instatus/mapper.test.tsindex 17a959946..8b008a57c 100644--- a/packages/importers/src/providers/instatus/mapper.test.ts+++ b/packages/importers/src/providers/instatus/mapper.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, it } from "@std/testing/bdd";+import { describe, expect, it } from "bun:test";import {MOCK_COMPONENTS,@@ -113,16 +112,14 @@ describe("mapComponent", () => {});describe("mapIncidentStatus", () => {- for (const [input, expected] of [+ it.each([["INVESTIGATING", "investigating"],["IDENTIFIED", "identified"],["MONITORING", "monitoring"],["RESOLVED", "resolved"],- ] as const) {- it(`maps ${input} to ${expected}`, () => {- expect(mapIncidentStatus(input)).toBe(expected);- });- }+ ] as const)("maps %s to %s", (input, expected) => {+ expect(mapIncidentStatus(input)).toBe(expected);+ });it("defaults to investigating for unknown status", () => {expect(mapIncidentStatus("UNKNOWN")).toBe("investigating");diff --git a/packages/importers/src/providers/instatus/provider.test.ts b/packages/importers/src/providers/instatus/provider.test.tsindex 0b904b362..17b961e81 100644--- a/packages/importers/src/providers/instatus/provider.test.ts+++ b/packages/importers/src/providers/instatus/provider.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, it } from "@std/testing/bdd";+import { afterAll, beforeAll, describe, expect, it } from "bun:test";import {MOCK_COMPONENTS,diff --git a/packages/importers/src/providers/statuspage/client.test.ts b/packages/importers/src/providers/statuspage/client.test.tsindex 79b7c7fcc..d057a5b34 100644--- a/packages/importers/src/providers/statuspage/client.test.ts+++ b/packages/importers/src/providers/statuspage/client.test.ts@@ -1,6 +1,4 @@-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { assertSpyCalls, spy } from "@std/testing/mock";+import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";import { createStatuspageClient } from "./client";import {@@ -14,7 +12,7 @@ import {const originalFetch = globalThis.fetch;function mockFetch(data: unknown, status = 200) {- globalThis.fetch = spy(() =>+ globalThis.fetch = mock(() =>Promise.resolve(new Response(JSON.stringify(data), {status,@@ -30,7 +28,7 @@ function mockFetch(data: unknown, status = 200) {*/function mockFetchPaginated(data: unknown, status = 200) {let callCount = 0;- globalThis.fetch = spy(() => {+ globalThis.fetch = mock(() => {callCount++;const body = callCount === 1 ? data : [];return Promise.resolve(@@ -119,8 +117,8 @@ describe("StatuspageClient", () => {test("getPage calls correct URL path", async () => {mockFetch(MOCK_PAGES[0]);await client.getPage("sp_page_001");- const fetchMock = globalThis.fetch as unknown as ReturnType<typeof spy>;- const [url] = fetchMock.calls[0].args as [string, RequestInit];+ const fetchMock = globalThis.fetch as ReturnType<typeof mock>;+ const [url] = fetchMock.mock.calls[0] as [string, RequestInit];expect(url).toBe("https://api.statuspage.io/v1/pages/sp_page_001");});@@ -139,9 +137,9 @@ describe("StatuspageClient", () => {test("sends correct auth header", async () => {mockFetch(MOCK_PAGES);await client.getPages();- const fetchMock = globalThis.fetch as unknown as ReturnType<typeof spy>;- assertSpyCalls(fetchMock, 1);- const [url, options] = fetchMock.calls[0].args as [string, RequestInit];+ const fetchMock = globalThis.fetch as ReturnType<typeof mock>;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const [url, options] = fetchMock.mock.calls[0] as [string, RequestInit];expect(url).toBe("https://api.statuspage.io/v1/pages");expect((options.headers as Record<string, string>).Authorization).toBe("OAuth test-api-key",diff --git a/packages/importers/src/providers/statuspage/mapper.test.ts b/packages/importers/src/providers/statuspage/mapper.test.tsindex 07b241b1f..40f162f27 100644--- a/packages/importers/src/providers/statuspage/mapper.test.ts+++ b/packages/importers/src/providers/statuspage/mapper.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, it } from "@std/testing/bdd";+import { describe, expect, it } from "bun:test";import {MOCK_COMPONENTS,@@ -126,7 +125,7 @@ describe("mapIncidentToStatusReport", () => {});describe("mapIncidentUpdateStatus", () => {- for (const [input, expected] of [+ it.each([["investigating", "investigating"],["identified", "identified"],["monitoring", "monitoring"],@@ -135,11 +134,9 @@ describe("mapIncidentUpdateStatus", () => {["in_progress", "investigating"],["verifying", "monitoring"],["completed", "resolved"],- ] as const) {- it(`maps ${input} to ${expected}`, () => {- expect(mapIncidentUpdateStatus(input)).toBe(expected);- });- }+ ] as const)("maps %s to %s", (input, expected) => {+ expect(mapIncidentUpdateStatus(input)).toBe(expected);+ });});describe("mapIncidentToMaintenance", () => {diff --git a/packages/importers/src/providers/statuspage/provider.test.ts b/packages/importers/src/providers/statuspage/provider.test.tsindex 3f314f054..c0176167e 100644--- a/packages/importers/src/providers/statuspage/provider.test.ts+++ b/packages/importers/src/providers/statuspage/provider.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, it } from "@std/testing/bdd";+import { afterAll, beforeAll, describe, expect, it } from "bun:test";import {MOCK_COMPONENTS,diff --git a/packages/locales/package.json b/packages/locales/package.jsonindex 33a91be0d..9a4556ff3 100644--- a/packages/locales/package.json+++ b/packages/locales/package.json@@ -6,9 +6,7 @@"license": "ISC","author": "","main": "index.ts",- "scripts": {- "check": "deno check --sloppy-imports ."- },+ "scripts": {},"dependencies": {"date-fns": "catalog:"},diff --git a/packages/notifications/base/package.json b/packages/notifications/base/package.jsonindex 25472b091..cd093dd23 100644--- a/packages/notifications/base/package.json+++ b/packages/notifications/base/package.json@@ -7,8 +7,7 @@"author": "","main": "src/index.ts","scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports",+ "test": "bun test","tsc": "tsc"},"dependencies": {@@ -17,9 +16,8 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@types/node": "catalog:",+ "bun-types": "catalog:","typescript": "catalog:"}}diff --git a/packages/notifications/base/src/utils/duration.test.ts b/packages/notifications/base/src/utils/duration.test.tsindex cd99abb7f..a89d43780 100644--- a/packages/notifications/base/src/utils/duration.test.ts+++ b/packages/notifications/base/src/utils/duration.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, it } from "@std/testing/bdd";+import { describe, expect, it } from "bun:test";import { calculateDuration, formatDuration } from "./duration";diff --git a/packages/notifications/base/src/utils/incident.test.ts b/packages/notifications/base/src/utils/incident.test.tsindex 78b59a7c5..bfacd6a7c 100644--- a/packages/notifications/base/src/utils/incident.test.ts+++ b/packages/notifications/base/src/utils/incident.test.ts@@ -1,6 +1,6 @@+import { describe, expect, it } from "bun:test";+import type { Incident } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { describe, it } from "@std/testing/bdd";import { getIncidentDuration } from "./incident";@@ -22,6 +22,7 @@ function createIncident(overrides: Partial<Incident>): Incident {describe("getIncidentDuration", () => {it("returns null when incident.startedAt is missing", () => {const incident = createIncident({+ startedAt: null,resolvedAt: new Date("2026-01-22T12:00:00Z"),});expect(getIncidentDuration(incident)).toBe(null);diff --git a/packages/notifications/bird-whatsapp/package.json b/packages/notifications/bird-whatsapp/package.jsonindex 5ea406200..98a77afb6 100644--- a/packages/notifications/bird-whatsapp/package.json+++ b/packages/notifications/bird-whatsapp/package.json@@ -3,8 +3,7 @@"version": "0.0.0","main": "src/index.ts","scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports",+ "test": "bun test","tsc": "tsc"},"dependencies": {@@ -15,9 +14,8 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@types/node": "catalog:",+ "bun-types": "catalog:","typescript": "catalog:"}}diff --git a/packages/notifications/bird-whatsapp/src/index.test.ts b/packages/notifications/bird-whatsapp/src/index.test.tsindex ea2039ae9..043e81fbd 100644--- a/packages/notifications/bird-whatsapp/src/index.test.ts+++ b/packages/notifications/bird-whatsapp/src/index.test.ts@@ -1,8 +1,15 @@+import {+ afterEach,+ beforeEach,+ describe,+ expect,+ jest,+ spyOn,+ test,+} from "bun:test";+import type { Monitor } from "@openstatus/db/src/schema";import { selectNotificationSchema } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { assertSpyCalls, type Stub, stub } from "@std/testing/mock";import { sendAlert, sendDegraded, sendRecovery, sendTest } from "./index";@@ -27,7 +34,7 @@ function createNotification() {});}-function parseRequestBody(call: Stub<typeof globalThis>): {+function parseRequestBody(call: ReturnType<typeof spyOn>): {messageRequests: Array<{receiver: {contacts: Array<{ identifierKey: string; identifierValue: string }>;@@ -40,21 +47,22 @@ function parseRequestBody(call: Stub<typeof globalThis>): {};}>;} {- const body = call.calls[0].args[1]?.body;+ const body = (call as ReturnType<typeof spyOn>).mock.calls[0][1]?.body;return JSON.parse(body as string);}describe("WhatsApp Notifications (Bird)", () => {- let fetchMock: Stub<typeof globalThis>;+ let fetchMock: ReturnType<typeof spyOn>;beforeEach(() => {- fetchMock = stub(globalThis, "fetch", () =>+ // @ts-expect-error+ fetchMock = spyOn(global, "fetch").mockImplementation(() =>Promise.resolve(new Response(null, { status: 200 })),);});afterEach(() => {- fetchMock.restore();+ jest.resetAllMocks();});test("sendAlert calls Bird API with alert template", async () => {@@ -66,11 +74,11 @@ describe("WhatsApp Notifications (Bird)", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const url = fetchMock.calls[0].args[0] as string;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const url = fetchMock.mock.calls[0][0] as string;expect(url).toMatch(BIRD_URL_PATTERN);- const options = fetchMock.calls[0].args[1] as RequestInit;+ const options = fetchMock.mock.calls[0][1] as RequestInit;expect(options.headers).toHaveProperty("Authorization");expect((options.headers as Record<string, string>).Authorization).toMatch(/^AccessKey /,@@ -107,7 +115,7 @@ describe("WhatsApp Notifications (Bird)", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);const body = parseRequestBody(fetchMock);expect(body.messageRequests[0].template.projectId).toBe("2068001e-330d-4093-8d06-7071e9d34aa1",@@ -129,7 +137,7 @@ describe("WhatsApp Notifications (Bird)", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);const body = parseRequestBody(fetchMock);expect(body.messageRequests[0].template.projectId).toBe("c9a842d9-cf9e-4a13-8cde-024d57e29143",@@ -145,7 +153,7 @@ describe("WhatsApp Notifications (Bird)", () => {test("sendTest calls Bird API with test template and openstat.us URL", async () => {await sendTest({ phoneNumber: "+33623456789" });- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);const body = parseRequestBody(fetchMock);expect(body.messageRequests[0].receiver.contacts[0].identifierValue).toBe("+33623456789",diff --git a/packages/notifications/bird-whatsapp/tsconfig.json b/packages/notifications/bird-whatsapp/tsconfig.jsonindex 48baa5cfe..b4382e67e 100644--- a/packages/notifications/bird-whatsapp/tsconfig.json+++ b/packages/notifications/bird-whatsapp/tsconfig.json@@ -1,7 +1,7 @@{- "extends": "@openstatus/tsconfig/base.json",+ "extends": "@openstatus/tsconfig/nextjs.json","include": ["src", "*.ts"],"compilerOptions": {- "resolveJsonModule": true+ "types": ["bun-types"]}}diff --git a/packages/notifications/discord/package.json b/packages/notifications/discord/package.jsonindex 90ff88ecb..825b27866 100644--- a/packages/notifications/discord/package.json+++ b/packages/notifications/discord/package.json@@ -3,8 +3,7 @@"version": "1.0.0","main": "src/index.ts","scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports",+ "test": "bun test","tsc": "tsc"},"dependencies": {@@ -15,9 +14,8 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@types/node": "catalog:",+ "bun-types": "catalog:","typescript": "catalog:"}}diff --git a/packages/notifications/discord/src/index.test.ts b/packages/notifications/discord/src/index.test.tsindex 64c6ac7c9..14169bbef 100644--- a/packages/notifications/discord/src/index.test.ts+++ b/packages/notifications/discord/src/index.test.ts@@ -1,8 +1,7 @@+import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test";+import { selectNotificationSchema } from "@openstatus/db/src/schema";import { COLOR_DECIMALS } from "@openstatus/notification-base";-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { assertSpyCalls, type Stub, stub } from "@std/testing/mock";import {sendAlert,@@ -11,18 +10,20 @@ import {sendTestDiscordMessage,} from "./index";-const ok = (): Promise<Response> =>- Promise.resolve(new Response(null, { status: 200 }));-describe("Discord Notifications", () => {- let fetchMock: Stub<typeof globalThis>;+ let fetchMock: any = undefined;beforeEach(() => {- fetchMock = stub(globalThis, "fetch", ok);+ // @ts-expect-error+ fetchMock = spyOn(global, "fetch").mockImplementation(() =>+ Promise.resolve(new Response(null, { status: 200 })),+ );});afterEach(() => {- fetchMock.restore();+ if (fetchMock) {+ fetchMock.mockRestore();+ }});const createMockMonitor = () => ({@@ -62,8 +63,8 @@ describe("Discord Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe("https://discord.com/api/webhooks/123456789/abcdefgh",);@@ -94,8 +95,8 @@ describe("Discord Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];const body = JSON.parse(callArgs[1].body);expect(body.embeds).toBeDefined();expect(body.embeds[0].title).toContain("is recovered");@@ -118,8 +119,8 @@ describe("Discord Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];const body = JSON.parse(callArgs[1].body);expect(body.embeds).toBeDefined();expect(body.embeds[0].title).toContain("is degraded");@@ -131,8 +132,8 @@ describe("Discord Notifications", () => {const webhookUrl = "https://discord.com/api/webhooks/123456789/abcdefgh";await sendTestDiscordMessage(webhookUrl);- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe(webhookUrl);const body = JSON.parse(callArgs[1].body);expect(body.embeds).toBeDefined();@@ -141,12 +142,11 @@ describe("Discord Notifications", () => {test("Send Test Discord Message with empty webhookUrl", async () => {expect(sendTestDiscordMessage("")).rejects.toThrow();- assertSpyCalls(fetchMock, 0);+ expect(fetchMock).not.toHaveBeenCalled();});test("Handle fetch error gracefully", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ fetchMock.mockImplementation(() =>Promise.reject(new Error("Network error")),);diff --git a/packages/notifications/discord/tsconfig.json b/packages/notifications/discord/tsconfig.jsonindex 48baa5cfe..b4382e67e 100644--- a/packages/notifications/discord/tsconfig.json+++ b/packages/notifications/discord/tsconfig.json@@ -1,7 +1,7 @@{- "extends": "@openstatus/tsconfig/base.json",+ "extends": "@openstatus/tsconfig/nextjs.json","include": ["src", "*.ts"],"compilerOptions": {- "resolveJsonModule": true+ "types": ["bun-types"]}}diff --git a/packages/notifications/email/package.json b/packages/notifications/email/package.jsonindex 6078ce1aa..7aee8b5bb 100644--- a/packages/notifications/email/package.json+++ b/packages/notifications/email/package.json@@ -4,8 +4,7 @@"description": "Log drains Vercel integration.","main": "src/index.ts","scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports",+ "test": "bun test","tsc": "tsc"},"dependencies": {@@ -21,10 +20,10 @@"zod": "catalog:"},"devDependencies": {- "@openstatus/test-utils": "workspace:*","@openstatus/tsconfig": "workspace:*","@types/node": "catalog:","@types/react-dom": "catalog:",+ "bun-types": "catalog:","typescript": "catalog:"}}diff --git a/packages/notifications/email/src/index.test.ts b/packages/notifications/email/src/index.test.tsindex 7ea2c2a0d..16b88c71d 100644--- a/packages/notifications/email/src/index.test.ts+++ b/packages/notifications/email/src/index.test.ts@@ -1,31 +1,26 @@-import "./test-preload.ts";+import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";+import { selectNotificationSchema } from "@openstatus/db/src/schema";-import { EmailClient } from "@openstatus/emails/src/client";-import {- afterEach,- assertSpyCalls,- beforeEach,- describe,- expect,- type Stub,- stub,- test,-} from "@openstatus/test-utils";import { sendAlert, sendDegraded, sendRecovery } from "./index";-// biome-ignore lint/suspicious/noExplicitAny: stub over the EmailClient method-let sendMonitorAlertMock: Stub<any>;+const sendMonitorAlertMock = mock(async (_callArgs) => {});++mock.module("@openstatus/emails/src/client", () => ({+ EmailClient: mock((_args: { apiKey: string }) => {+ return {+ sendMonitorAlert: sendMonitorAlertMock,+ };+ }),+}));describe("Email Notifications", () => {beforeEach(() => {- sendMonitorAlertMock = stub(EmailClient.prototype, "sendMonitorAlert", () =>- Promise.resolve(),- );+ sendMonitorAlertMock.mockClear();});afterEach(() => {- sendMonitorAlertMock.restore();+ sendMonitorAlertMock.mockClear();});const createMockMonitor = () => ({@@ -67,8 +62,8 @@ describe("Email Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(sendMonitorAlertMock, 1);- const callArgs = sendMonitorAlertMock.calls[0].args[0];+ expect(sendMonitorAlertMock).toHaveBeenCalledTimes(1);+ const callArgs = sendMonitorAlertMock.mock.calls[0][0];expect(callArgs.name).toBe("API Health Check");expect(callArgs.type).toBe("alert");expect(callArgs.to).toBe("[email protected]");@@ -93,8 +88,8 @@ describe("Email Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(sendMonitorAlertMock, 1);- const callArgs = sendMonitorAlertMock.calls[0].args[0];+ expect(sendMonitorAlertMock).toHaveBeenCalledTimes(1);+ const callArgs = sendMonitorAlertMock.mock.calls[0][0];expect(callArgs.status).toBeUndefined();expect(callArgs.latency).toBe("N/A");expect(callArgs.region).toBe("N/A");@@ -116,8 +111,8 @@ describe("Email Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(sendMonitorAlertMock, 1);- const callArgs = sendMonitorAlertMock.calls[0].args[0];+ expect(sendMonitorAlertMock).toHaveBeenCalledTimes(1);+ const callArgs = sendMonitorAlertMock.mock.calls[0][0];expect(callArgs.type).toBe("recovery");expect(callArgs.name).toBe("API Health Check");expect(callArgs.to).toBe("[email protected]");@@ -142,8 +137,8 @@ describe("Email Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(sendMonitorAlertMock, 1);- const callArgs = sendMonitorAlertMock.calls[0].args[0];+ expect(sendMonitorAlertMock).toHaveBeenCalledTimes(1);+ const callArgs = sendMonitorAlertMock.mock.calls[0][0];expect(callArgs.type).toBe("degraded");expect(callArgs.name).toBe("API Health Check");expect(callArgs.status).toBe("503");@@ -171,6 +166,6 @@ describe("Email Notifications", () => {});// Should not call sendMonitorAlert when data is invalid- assertSpyCalls(sendMonitorAlertMock, 0);+ expect(sendMonitorAlertMock).not.toHaveBeenCalled();});});diff --git a/packages/notifications/email/src/test-preload.ts b/packages/notifications/email/src/test-preload.tsdeleted file mode 100644index 3e4c5cf31..000000000--- a/packages/notifications/email/src/test-preload.ts+++ /dev/null@@ -1,10 +0,0 @@-/**- * Test env setup. Import this FIRST so env vars are set before module-level- * env validations fire on import.- *- * Bun's test runner set NODE_ENV=test automatically; Deno does not. This- * package's env skips validation when NODE_ENV=test, and @openstatus/emails- * validates RESEND_API_KEY at module load.- */-process.env.NODE_ENV = "test";-process.env.RESEND_API_KEY ??= "test-key";diff --git a/packages/notifications/email/tsconfig.json b/packages/notifications/email/tsconfig.jsonindex 48baa5cfe..b4382e67e 100644--- a/packages/notifications/email/tsconfig.json+++ b/packages/notifications/email/tsconfig.json@@ -1,7 +1,7 @@{- "extends": "@openstatus/tsconfig/base.json",+ "extends": "@openstatus/tsconfig/nextjs.json","include": ["src", "*.ts"],"compilerOptions": {- "resolveJsonModule": true+ "types": ["bun-types"]}}diff --git a/packages/notifications/google-chat/package.json b/packages/notifications/google-chat/package.jsonindex 005737cf5..f96697496 100644--- a/packages/notifications/google-chat/package.json+++ b/packages/notifications/google-chat/package.json@@ -3,8 +3,7 @@"version": "1.0.0","main": "src/index.ts","scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports",+ "test": "bun test","tsc": "tsc"},"dependencies": {@@ -15,9 +14,8 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@types/node": "catalog:",+ "bun-types": "catalog:","typescript": "catalog:"}}diff --git a/packages/notifications/google-chat/src/index.test.ts b/packages/notifications/google-chat/src/index.test.tsindex 6a84bffdd..1696d2dbf 100644--- a/packages/notifications/google-chat/src/index.test.ts+++ b/packages/notifications/google-chat/src/index.test.ts@@ -1,21 +1,23 @@+import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test";+import { selectNotificationSchema } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { assertSpyCalls, stub, type Stub } from "@std/testing/mock";import { sendAlert, sendDegraded, sendRecovery, sendTest } from "./index";describe("Google Chat Notifications", () => {- let fetchMock: Stub<typeof globalThis>;+ let fetchMock: any = undefined;beforeEach(() => {- fetchMock = stub(globalThis, "fetch", () =>+ // @ts-expect-error+ fetchMock = spyOn(global, "fetch").mockImplementation(() =>Promise.resolve(new Response(null, { status: 200 })),);});afterEach(() => {- fetchMock.restore();+ if (fetchMock) {+ fetchMock.mockRestore();+ }});const createMockMonitor = () => ({@@ -55,8 +57,8 @@ describe("Google Chat Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe("https://google.com/api/webhooks/123456789/abcdefgh",);@@ -85,8 +87,8 @@ describe("Google Chat Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];const body = JSON.parse(callArgs[1].body);expect(body.text).toContain("β Recovered");expect(body.text).toContain("API Health Check");@@ -107,8 +109,8 @@ describe("Google Chat Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];const body = JSON.parse(callArgs[1].body);expect(body.text).toContain("β οΈ Degraded");expect(body.text).toContain("API Health Check");@@ -120,8 +122,8 @@ describe("Google Chat Notifications", () => {const result = await sendTest(webhookUrl);expect(result).toBe(true);- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe(webhookUrl);const body = JSON.parse(callArgs[1].body);expect(body.text).toContain("π§ͺ Test");@@ -132,12 +134,11 @@ describe("Google Chat Notifications", () => {const result = await sendTest("");expect(result).toBe(false);- assertSpyCalls(fetchMock, 0);+ expect(fetchMock).not.toHaveBeenCalled();});test("Handle fetch error gracefully", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ fetchMock.mockImplementation(() =>Promise.reject(new Error("Network error")),);diff --git a/packages/notifications/google-chat/tsconfig.json b/packages/notifications/google-chat/tsconfig.jsonindex 48baa5cfe..b4382e67e 100644--- a/packages/notifications/google-chat/tsconfig.json+++ b/packages/notifications/google-chat/tsconfig.json@@ -1,7 +1,7 @@{- "extends": "@openstatus/tsconfig/base.json",+ "extends": "@openstatus/tsconfig/nextjs.json","include": ["src", "*.ts"],"compilerOptions": {- "resolveJsonModule": true+ "types": ["bun-types"]}}diff --git a/packages/notifications/grafana-oncall/package.json b/packages/notifications/grafana-oncall/package.jsonindex d68ea6c9c..cc53a5217 100644--- a/packages/notifications/grafana-oncall/package.json+++ b/packages/notifications/grafana-oncall/package.json@@ -3,8 +3,7 @@"version": "0.0.0","main": "src/index.ts","scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports",+ "test": "bun test","tsc": "tsc"},"dependencies": {@@ -15,9 +14,8 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@types/node": "catalog:",+ "bun-types": "catalog:","typescript": "catalog:"}}diff --git a/packages/notifications/grafana-oncall/src/index.test.ts b/packages/notifications/grafana-oncall/src/index.test.tsindex 5676f5c72..824a02df6 100644--- a/packages/notifications/grafana-oncall/src/index.test.ts+++ b/packages/notifications/grafana-oncall/src/index.test.ts@@ -1,21 +1,23 @@+import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test";+import { selectNotificationSchema } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { assertSpyCalls, stub, type Stub } from "@std/testing/mock";import { sendAlert, sendDegraded, sendRecovery, sendTest } from "./index";describe("Grafana OnCall Notifications", () => {- let fetchMock: Stub<typeof globalThis>;+ let fetchMock: any = undefined;beforeEach(() => {- fetchMock = stub(globalThis, "fetch", () =>+ // @ts-expect-error+ fetchMock = spyOn(global, "fetch").mockImplementation(() =>Promise.resolve(new Response(null, { status: 200 })),);});afterEach(() => {- fetchMock.restore();+ if (fetchMock) {+ fetchMock.mockRestore();+ }});const createMockMonitor = () => ({@@ -55,8 +57,8 @@ describe("Grafana OnCall Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe("https://oncall.example.com/integrations/v1/webhook/abc123",);@@ -87,8 +89,8 @@ describe("Grafana OnCall Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];const body = JSON.parse(callArgs[1].body);expect(body.message).toBe("Status code: 503");});@@ -108,8 +110,8 @@ describe("Grafana OnCall Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe("https://oncall.example.com/integrations/v1/webhook/abc123",);@@ -136,8 +138,8 @@ describe("Grafana OnCall Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe("https://oncall.example.com/integrations/v1/webhook/abc123",);@@ -156,8 +158,8 @@ describe("Grafana OnCall Notifications", () => {const result = await sendTest({ webhookUrl });expect(result).toBe(true);- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe(webhookUrl);expect(callArgs[1].method).toBe("POST");@@ -170,8 +172,7 @@ describe("Grafana OnCall Notifications", () => {});test("Send Test returns false on network error", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ fetchMock.mockImplementation(() =>Promise.reject(new Error("Network error")),);@@ -180,12 +181,11 @@ describe("Grafana OnCall Notifications", () => {});expect(result).toBe(false);- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});test("Send Test returns false on non-ok response", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ fetchMock.mockImplementation(() =>Promise.resolve(new Response(null, { status: 401 })),);@@ -194,12 +194,11 @@ describe("Grafana OnCall Notifications", () => {});expect(result).toBe(false);- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});test("Send Alert throws on non-ok response", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ fetchMock.mockImplementation(() =>Promise.resolve(new Response(null, {status: 500,@@ -226,8 +225,7 @@ describe("Grafana OnCall Notifications", () => {});test("Handle fetch error gracefully", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ fetchMock.mockImplementation(() =>Promise.reject(new Error("Network error")),);@@ -236,7 +234,7 @@ describe("Grafana OnCall Notifications", () => {createMockNotification(),);- await expect(+ expect(sendAlert({// @ts-expect-errormonitor,@@ -247,6 +245,6 @@ describe("Grafana OnCall Notifications", () => {}),).rejects.toThrow();- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});});diff --git a/packages/notifications/grafana-oncall/tsconfig.json b/packages/notifications/grafana-oncall/tsconfig.jsonindex 48baa5cfe..b4382e67e 100644--- a/packages/notifications/grafana-oncall/tsconfig.json+++ b/packages/notifications/grafana-oncall/tsconfig.json@@ -1,7 +1,7 @@{- "extends": "@openstatus/tsconfig/base.json",+ "extends": "@openstatus/tsconfig/nextjs.json","include": ["src", "*.ts"],"compilerOptions": {- "resolveJsonModule": true+ "types": ["bun-types"]}}diff --git a/packages/notifications/ms-teams/package.json b/packages/notifications/ms-teams/package.jsonindex 02dd24a63..1e4244f2e 100644--- a/packages/notifications/ms-teams/package.json+++ b/packages/notifications/ms-teams/package.json@@ -3,8 +3,7 @@"version": "0.0.0","main": "src/index.ts","scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports",+ "test": "bun test","tsc": "tsc"},"dependencies": {@@ -15,9 +14,8 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@types/node": "catalog:",+ "bun-types": "catalog:","typescript": "catalog:"}}diff --git a/packages/notifications/ms-teams/src/index.test.ts b/packages/notifications/ms-teams/src/index.test.tsindex 6baccbba5..18c7b6d75 100644--- a/packages/notifications/ms-teams/src/index.test.ts+++ b/packages/notifications/ms-teams/src/index.test.ts@@ -1,12 +1,11 @@+import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test";+import type { Incident, Monitor } from "@openstatus/db/src/schema";import { selectNotificationSchema } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { assertSpyCalls, stub, type Stub } from "@std/testing/mock";import { sendAlert, sendDegraded, sendRecovery, sendTest } from "./index";-type FetchMock = Stub<typeof globalThis>;+type FetchMock = ReturnType<typeof spyOn<typeof globalThis, "fetch">>;type AdaptiveCardElement = {type: string;@@ -42,13 +41,14 @@ describe("Microsoft Teams Notifications", () => {let fetchMock: FetchMock;beforeEach(() => {- fetchMock = stub(globalThis, "fetch", () =>+ // @ts-expect-error spyOn typing requires the full `typeof fetch` (incl. preconnect)+ fetchMock = spyOn(globalThis, "fetch").mockImplementation(() =>Promise.resolve(new Response(null, { status: 200 })),);});afterEach(() => {- fetchMock.restore();+ fetchMock.mockRestore();});const createMockMonitor = (): Monitor => ({@@ -114,8 +114,8 @@ describe("Microsoft Teams Notifications", () => {});const readMessagePayload = (): MessagePayload => {- const calls = fetchMock.calls;- const init = calls[0].args[1];+ const calls = fetchMock.mock.calls;+ const init = calls[0][1];if (!init || typeof init.body !== "string") {throw new Error("expected string body");}@@ -169,8 +169,8 @@ describe("Microsoft Teams Notifications", () => {regions: ["iad"],});- assertSpyCalls(fetchMock, 1);- const [url, init] = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const [url, init] = fetchMock.mock.calls[0];expect(String(url)).toContain("logic.azure.com");expect(init?.method).toBe("POST");@@ -302,7 +302,7 @@ describe("Microsoft Teams Notifications", () => {"https://prod-00.westeurope.logic.azure.com:443/workflows/test/triggers/manual/paths/invoke",});- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);const card = getCard(readMessagePayload());const header = findContainerByStyle(card, "good");expect(header?.items?.[0]?.text).toBe("Test notification");@@ -311,12 +311,12 @@ describe("Microsoft Teams Notifications", () => {test("Send Test with empty webhookUrl", async () => {await expect(sendTest({ webhookUrl: "" })).rejects.toThrow();- assertSpyCalls(fetchMock, 0);+ expect(fetchMock).not.toHaveBeenCalled();});test("Handle fetch error", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ // @ts-expect-error see beforeEach+ fetchMock.mockImplementation(() =>Promise.reject(new Error("Network error")),);diff --git a/packages/notifications/ms-teams/tsconfig.json b/packages/notifications/ms-teams/tsconfig.jsonindex 48baa5cfe..b4382e67e 100644--- a/packages/notifications/ms-teams/tsconfig.json+++ b/packages/notifications/ms-teams/tsconfig.json@@ -1,7 +1,7 @@{- "extends": "@openstatus/tsconfig/base.json",+ "extends": "@openstatus/tsconfig/nextjs.json","include": ["src", "*.ts"],"compilerOptions": {- "resolveJsonModule": true+ "types": ["bun-types"]}}diff --git a/packages/notifications/ntfy/package.json b/packages/notifications/ntfy/package.jsonindex da39ed211..4d6230d4d 100644--- a/packages/notifications/ntfy/package.json+++ b/packages/notifications/ntfy/package.json@@ -3,8 +3,7 @@"version": "1.0.0","main": "src/index.ts","scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports",+ "test": "bun test","tsc": "tsc"},"dependencies": {@@ -15,9 +14,8 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@types/node": "catalog:",+ "bun-types": "catalog:","typescript": "catalog:"}}diff --git a/packages/notifications/ntfy/src/index.test.ts b/packages/notifications/ntfy/src/index.test.tsindex a46f9284c..f7a61d856 100644--- a/packages/notifications/ntfy/src/index.test.ts+++ b/packages/notifications/ntfy/src/index.test.ts@@ -1,21 +1,23 @@+import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test";+import { selectNotificationSchema } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { assertSpyCalls, stub, type Stub } from "@std/testing/mock";import { sendAlert, sendDegraded, sendRecovery, sendTest } from "./index";describe("Ntfy Notifications", () => {- let fetchMock: Stub<typeof globalThis>;+ let fetchMock: any = undefined;beforeEach(() => {- fetchMock = stub(globalThis, "fetch", () =>+ // @ts-expect-error+ fetchMock = spyOn(global, "fetch").mockImplementation(() =>Promise.resolve(new Response(null, { status: 200 })),);});afterEach(() => {- fetchMock.restore();+ if (fetchMock) {+ fetchMock.mockRestore();+ }});const createMockMonitor = () => ({@@ -70,8 +72,8 @@ describe("Ntfy Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe("https://ntfy.sh/my-topic");expect(callArgs[1].method).toBe("post");expect(callArgs[1].body).toContain("API Health Check");@@ -94,8 +96,8 @@ describe("Ntfy Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe("https://ntfy.example.com/my-topic");});@@ -114,8 +116,8 @@ describe("Ntfy Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[1].headers.Authorization).toBe("Bearer test-token-123");});@@ -133,8 +135,8 @@ describe("Ntfy Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[1].body).toContain("error: Connection timeout");});@@ -153,8 +155,8 @@ describe("Ntfy Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[1].body).toContain("is up again");});@@ -171,8 +173,8 @@ describe("Ntfy Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[1].headers.Authorization).toBe("Bearer test-token-123");});@@ -191,8 +193,8 @@ describe("Ntfy Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[1].body).toContain("is degraded");});@@ -202,8 +204,8 @@ describe("Ntfy Notifications", () => {});expect(result).toBe(true);- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe("https://ntfy.sh/test-topic");expect(callArgs[1].body).toBe("This is a test message from OpenStatus");expect(callArgs[1].headers).not.toHaveProperty("Authorization");@@ -216,8 +218,8 @@ describe("Ntfy Notifications", () => {});expect(result).toBe(true);- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe("https://ntfy.example.com/test-topic");});@@ -228,14 +230,13 @@ describe("Ntfy Notifications", () => {});expect(result).toBe(true);- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[1].headers.Authorization).toBe("Bearer test-token");});test("Handle fetch error gracefully", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ fetchMock.mockImplementation(() =>Promise.reject(new Error("Network error")),);@@ -256,12 +257,11 @@ describe("Ntfy Notifications", () => {}),).rejects.toThrow();- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});test("Send Test returns false on error", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ fetchMock.mockImplementation(() =>Promise.reject(new Error("Network error")),);@@ -270,6 +270,6 @@ describe("Ntfy Notifications", () => {});expect(result).toBe(false);- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});});diff --git a/packages/notifications/ntfy/tsconfig.json b/packages/notifications/ntfy/tsconfig.jsonindex 48baa5cfe..b4382e67e 100644--- a/packages/notifications/ntfy/tsconfig.json+++ b/packages/notifications/ntfy/tsconfig.json@@ -1,7 +1,7 @@{- "extends": "@openstatus/tsconfig/base.json",+ "extends": "@openstatus/tsconfig/nextjs.json","include": ["src", "*.ts"],"compilerOptions": {- "resolveJsonModule": true+ "types": ["bun-types"]}}diff --git a/packages/notifications/opsgenie/package.json b/packages/notifications/opsgenie/package.jsonindex 087a5e762..678250f3c 100644--- a/packages/notifications/opsgenie/package.json+++ b/packages/notifications/opsgenie/package.json@@ -3,8 +3,7 @@"version": "0.0.0","main": "src/index.ts","scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports",+ "test": "bun test","tsc": "tsc"},"dependencies": {@@ -17,11 +16,10 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@types/node": "catalog:","@types/react": "catalog:","@types/react-dom": "catalog:",+ "bun-types": "catalog:","typescript": "catalog:"}}diff --git a/packages/notifications/opsgenie/src/index.test.ts b/packages/notifications/opsgenie/src/index.test.tsindex ba6788235..00ff98247 100644--- a/packages/notifications/opsgenie/src/index.test.ts+++ b/packages/notifications/opsgenie/src/index.test.ts@@ -1,21 +1,23 @@+import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test";+import { selectNotificationSchema } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { assertSpyCalls, stub, type Stub } from "@std/testing/mock";import { sendAlert, sendDegraded, sendTest } from "./index";describe("OpsGenie Notifications", () => {- let fetchMock: Stub<typeof globalThis>;+ let fetchMock: any = undefined;beforeEach(() => {- fetchMock = stub(globalThis, "fetch", () =>+ // @ts-expect-error+ fetchMock = spyOn(global, "fetch").mockImplementation(() =>Promise.resolve(new Response(null, { status: 200 })),);});afterEach(() => {- fetchMock.restore();+ if (fetchMock) {+ fetchMock.mockRestore();+ }});const createMockMonitor = () => ({@@ -73,8 +75,8 @@ describe("OpsGenie Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe("https://api.opsgenie.com/v2/alerts");expect(callArgs[1].method).toBe("POST");expect(callArgs[1].headers["Content-Type"]).toBe("application/json");@@ -105,8 +107,8 @@ describe("OpsGenie Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe("https://api.eu.opsgenie.com/v2/alerts");});@@ -127,16 +129,15 @@ describe("OpsGenie Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];const body = JSON.parse(callArgs[1].body);expect(body.details.severity).toBe("degraded");expect(body.message).toBe("API Health Check is degraded");});test("Handle fetch error gracefully", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ fetchMock.mockImplementation(() =>Promise.reject(new Error("Network error")),);@@ -158,12 +159,11 @@ describe("OpsGenie Notifications", () => {}),).rejects.toThrow();- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});test("Send Test returns false on error", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ fetchMock.mockImplementation(() =>Promise.reject(new Error("Network error")),);@@ -173,6 +173,6 @@ describe("OpsGenie Notifications", () => {});expect(result).toBe(false);- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});});diff --git a/packages/notifications/opsgenie/tsconfig.json b/packages/notifications/opsgenie/tsconfig.jsonindex 48baa5cfe..b4382e67e 100644--- a/packages/notifications/opsgenie/tsconfig.json+++ b/packages/notifications/opsgenie/tsconfig.json@@ -1,7 +1,7 @@{- "extends": "@openstatus/tsconfig/base.json",+ "extends": "@openstatus/tsconfig/nextjs.json","include": ["src", "*.ts"],"compilerOptions": {- "resolveJsonModule": true+ "types": ["bun-types"]}}diff --git a/packages/notifications/pagerduty/package.json b/packages/notifications/pagerduty/package.jsonindex 7fc66f4ae..d242877d4 100644--- a/packages/notifications/pagerduty/package.json+++ b/packages/notifications/pagerduty/package.json@@ -3,8 +3,7 @@"version": "0.0.0","main": "src/index.ts","scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports",+ "test": "bun test","tsc": "tsc"},"dependencies": {@@ -17,11 +16,10 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@types/node": "catalog:","@types/react": "catalog:","@types/react-dom": "catalog:",+ "bun-types": "catalog:","typescript": "catalog:"}}diff --git a/packages/notifications/pagerduty/src/index.test.ts b/packages/notifications/pagerduty/src/index.test.tsindex a1a94b335..840cb57d6 100644--- a/packages/notifications/pagerduty/src/index.test.ts+++ b/packages/notifications/pagerduty/src/index.test.ts@@ -1,21 +1,23 @@+import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test";+import { selectNotificationSchema } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { assertSpyCalls, stub, type Stub } from "@std/testing/mock";import { sendAlert, sendDegraded, sendRecovery, sendTest } from "./index";describe("PagerDuty Notifications", () => {- let fetchMock: Stub<typeof globalThis>;+ let fetchMock: any = undefined;beforeEach(() => {- fetchMock = stub(globalThis, "fetch", () =>+ // @ts-expect-error+ fetchMock = spyOn(global, "fetch").mockImplementation(() =>Promise.resolve(new Response(null, { status: 200 })),);});afterEach(() => {- fetchMock.restore();+ if (fetchMock) {+ fetchMock.mockRestore();+ }});const createMockMonitor = () => ({@@ -68,8 +70,8 @@ describe("PagerDuty Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe("https://events.pagerduty.com/v2/enqueue");expect(callArgs[1].method).toBe("POST");@@ -107,9 +109,9 @@ describe("PagerDuty Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 2);- expect(fetchMock.calls[0].args[1].body).toContain("key1");- expect(fetchMock.calls[1].args[1].body).toContain("key2");+ expect(fetchMock).toHaveBeenCalledTimes(2);+ expect(fetchMock.mock.calls[0][1].body).toContain("key1");+ expect(fetchMock.mock.calls[1][1].body).toContain("key2");});test("Send Degraded", async () => {@@ -130,8 +132,8 @@ describe("PagerDuty Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];const body = JSON.parse(callArgs[1].body);expect(body.payload.summary).toBe("API Health Check is degraded");expect(body.payload.severity).toBe("warning");@@ -156,8 +158,8 @@ describe("PagerDuty Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe("https://events.pagerduty.com/v2/enqueue");const body = JSON.parse(callArgs[1].body);expect(body.routing_key).toBe("my_key");@@ -171,8 +173,8 @@ describe("PagerDuty Notifications", () => {});expect(result).toBe(true);- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe("https://events.pagerduty.com/v2/enqueue");expect(callArgs[1].method).toBe("POST");@@ -186,8 +188,7 @@ describe("PagerDuty Notifications", () => {});test("Send Test returns false on error", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ fetchMock.mockImplementation(() =>Promise.reject(new Error("Network error")),);@@ -196,12 +197,11 @@ describe("PagerDuty Notifications", () => {});expect(result).toBe(false);- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});test("Handle fetch error gracefully", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ fetchMock.mockImplementation(() =>Promise.reject(new Error("Network error")),);@@ -224,6 +224,6 @@ describe("PagerDuty Notifications", () => {}),).rejects.toThrow();- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});});diff --git a/packages/notifications/pagerduty/tsconfig.json b/packages/notifications/pagerduty/tsconfig.jsonindex 48baa5cfe..b4382e67e 100644--- a/packages/notifications/pagerduty/tsconfig.json+++ b/packages/notifications/pagerduty/tsconfig.json@@ -1,7 +1,7 @@{- "extends": "@openstatus/tsconfig/base.json",+ "extends": "@openstatus/tsconfig/nextjs.json","include": ["src", "*.ts"],"compilerOptions": {- "resolveJsonModule": true+ "types": ["bun-types"]}}diff --git a/packages/notifications/slack/package.json b/packages/notifications/slack/package.jsonindex e63632c06..66b0aee6f 100644--- a/packages/notifications/slack/package.json+++ b/packages/notifications/slack/package.json@@ -3,8 +3,7 @@"version": "0.0.0","main": "src/index.ts","scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports",+ "test": "bun test","tsc": "tsc"},"dependencies": {@@ -15,9 +14,8 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@types/node": "catalog:",+ "bun-types": "catalog:","typescript": "catalog:"}}diff --git a/packages/notifications/slack/src/index.test.ts b/packages/notifications/slack/src/index.test.tsindex 4fe9de091..aa16993ff 100644--- a/packages/notifications/slack/src/index.test.ts+++ b/packages/notifications/slack/src/index.test.ts@@ -1,8 +1,7 @@+import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test";+import { selectNotificationSchema } from "@openstatus/db/src/schema";import { COLORS } from "@openstatus/notification-base";-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { assertSpyCalls, stub, type Stub } from "@std/testing/mock";import {sendAlert,@@ -12,16 +11,19 @@ import {} from "./index";describe("Slack Notifications", () => {- let fetchMock: Stub<typeof globalThis>;+ let fetchMock: any = undefined;beforeEach(() => {- fetchMock = stub(globalThis, "fetch", () =>+ // @ts-expect-error+ fetchMock = spyOn(global, "fetch").mockImplementation(() =>Promise.resolve(new Response(null, { status: 200 })),);});afterEach(() => {- fetchMock.restore();+ if (fetchMock) {+ fetchMock.mockRestore();+ }});const createMockMonitor = () => ({@@ -61,8 +63,8 @@ describe("Slack Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe("https://hooks.slack.com/services/url");expect(callArgs[1].method).toBe("POST");@@ -88,8 +90,8 @@ describe("Slack Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];const body = JSON.parse(callArgs[1].body);expect(body.attachments[0].color).toBe(COLORS.red);expect(body.attachments[0].blocks[3].fields[0].text).toContain("Unknown");@@ -110,8 +112,8 @@ describe("Slack Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];const body = JSON.parse(callArgs[1].body);expect(body.attachments).toBeDefined();expect(body.attachments[0].color).toBe(COLORS.green);@@ -133,8 +135,8 @@ describe("Slack Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];const body = JSON.parse(callArgs[1].body);expect(body.attachments).toBeDefined();expect(body.attachments[0].color).toBe(COLORS.yellow);@@ -146,8 +148,8 @@ describe("Slack Notifications", () => {await sendTestSlackMessage(webhookUrl);- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe(webhookUrl);const body = JSON.parse(callArgs[1].body);@@ -157,18 +159,16 @@ describe("Slack Notifications", () => {});test("Send Test Slack Message throws error on empty webhookUrl", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ fetchMock.mockImplementation(() =>Promise.reject(new Error("Network error")),);expect(sendTestSlackMessage("")).rejects.toThrow();- assertSpyCalls(fetchMock, 0);+ expect(fetchMock).toHaveBeenCalledTimes(0);});test("Handle fetch error gracefully", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ fetchMock.mockImplementation(() =>Promise.reject(new Error("Network error")),);@@ -177,7 +177,8 @@ describe("Slack Notifications", () => {createMockNotification(),);- await expect(+ // Should not throw - function catches errors internally+ expect(sendAlert({// @ts-expect-errormonitor,@@ -188,6 +189,6 @@ describe("Slack Notifications", () => {}),).rejects.toThrow();- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});});diff --git a/packages/notifications/slack/tsconfig.json b/packages/notifications/slack/tsconfig.jsonindex 48baa5cfe..b4382e67e 100644--- a/packages/notifications/slack/tsconfig.json+++ b/packages/notifications/slack/tsconfig.json@@ -1,7 +1,7 @@{- "extends": "@openstatus/tsconfig/base.json",+ "extends": "@openstatus/tsconfig/nextjs.json","include": ["src", "*.ts"],"compilerOptions": {- "resolveJsonModule": true+ "types": ["bun-types"]}}diff --git a/packages/notifications/telegram/package.json b/packages/notifications/telegram/package.jsonindex 0e907adc5..13f66b1ef 100644--- a/packages/notifications/telegram/package.json+++ b/packages/notifications/telegram/package.json@@ -3,8 +3,7 @@"version": "1.0.0","main": "src/index.ts","scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports",+ "test": "bun test","tsc": "tsc"},"dependencies": {@@ -14,9 +13,8 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@types/node": "catalog:",+ "bun-types": "catalog:","typescript": "catalog:"}}diff --git a/packages/notifications/telegram/src/index.test.ts b/packages/notifications/telegram/src/index.test.tsindex 805cec19b..93e56e313 100644--- a/packages/notifications/telegram/src/index.test.ts+++ b/packages/notifications/telegram/src/index.test.ts@@ -1,27 +1,29 @@+import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test";+import { selectNotificationSchema } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { assertSpyCalls, stub, type Stub } from "@std/testing/mock";import { sendAlert, sendDegraded, sendRecovery, sendTest } from "./index";describe("Telegram Notifications", () => {- let fetchMock: Stub<typeof globalThis>;+ let fetchMock: any = undefined;const originalEnv = process.env.TELEGRAM_BOT_TOKEN;beforeEach(() => {process.env.TELEGRAM_BOT_TOKEN = "test-bot-token-123";- fetchMock = stub(globalThis, "fetch", () =>+ // @ts-expect-error+ fetchMock = spyOn(global, "fetch").mockImplementation(() =>Promise.resolve(new Response(null, { status: 200 })),);});afterEach(() => {- fetchMock.restore();+ if (fetchMock) {+ fetchMock.mockRestore();+ }if (originalEnv) {process.env.TELEGRAM_BOT_TOKEN = originalEnv;} else {- delete process.env.TELEGRAM_BOT_TOKEN;+ process.env.TELEGRAM_BOT_TOKEN = undefined;}});@@ -66,8 +68,8 @@ describe("Telegram Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toContain("https://api.telegram.org/bottest-bot-token-123/sendMessage",);@@ -89,8 +91,8 @@ describe("Telegram Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toContain("error: Connection timeout");});@@ -109,8 +111,8 @@ describe("Telegram Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toContain("is up again");});@@ -129,8 +131,8 @@ describe("Telegram Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toContain("is degraded");});@@ -140,8 +142,8 @@ describe("Telegram Notifications", () => {});expect(result).toBe(true);- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toContain("https://api.telegram.org/bottest-bot-token-123/sendMessage",);@@ -150,8 +152,7 @@ describe("Telegram Notifications", () => {});test("Send Test returns false on error", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ fetchMock.mockImplementation(() =>Promise.reject(new Error("Network error")),);@@ -160,12 +161,11 @@ describe("Telegram Notifications", () => {});expect(result).toBe(false);- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});test("Handle fetch error gracefully", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ fetchMock.mockImplementation(() =>Promise.reject(new Error("Network error")),);@@ -174,7 +174,7 @@ describe("Telegram Notifications", () => {createMockNotification(),);- await expect(+ expect(sendAlert({// @ts-expect-errormonitor,@@ -185,18 +185,18 @@ describe("Telegram Notifications", () => {}),).rejects.toThrow();- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});test("fetch not called when TELEGRAM_BOT_TOKEN is not set", async () => {- delete process.env.TELEGRAM_BOT_TOKEN;+ process.env.TELEGRAM_BOT_TOKEN = undefined;const monitor = createMockMonitor();const notification = selectNotificationSchema.parse(createMockNotification(),);- await expect(+ expect(sendAlert({// @ts-expect-errormonitor,@@ -207,6 +207,6 @@ describe("Telegram Notifications", () => {}),).rejects.toThrow();// Should not call fetch when token is missing- assertSpyCalls(fetchMock, 0);+ expect(fetchMock).not.toHaveBeenCalled();});});diff --git a/packages/notifications/telegram/tsconfig.json b/packages/notifications/telegram/tsconfig.jsonindex 48baa5cfe..b4382e67e 100644--- a/packages/notifications/telegram/tsconfig.json+++ b/packages/notifications/telegram/tsconfig.json@@ -1,7 +1,7 @@{- "extends": "@openstatus/tsconfig/base.json",+ "extends": "@openstatus/tsconfig/nextjs.json","include": ["src", "*.ts"],"compilerOptions": {- "resolveJsonModule": true+ "types": ["bun-types"]}}diff --git a/packages/notifications/twillio-sms/package.json b/packages/notifications/twillio-sms/package.jsonindex 74f26cc09..90199e778 100644--- a/packages/notifications/twillio-sms/package.json+++ b/packages/notifications/twillio-sms/package.json@@ -3,8 +3,7 @@"version": "0.0.0","main": "src/index.ts","scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports",+ "test": "bun test","tsc": "tsc"},"dependencies": {@@ -16,10 +15,9 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@types/node": "catalog:","@types/validator": "catalog:",+ "bun-types": "catalog:","typescript": "catalog:"}}diff --git a/packages/notifications/twillio-sms/src/index.test.ts b/packages/notifications/twillio-sms/src/index.test.tsindex 21b334ca8..12e3c25cf 100644--- a/packages/notifications/twillio-sms/src/index.test.ts+++ b/packages/notifications/twillio-sms/src/index.test.ts@@ -1,12 +1,11 @@+import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test";+import { selectNotificationSchema } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { assertSpyCalls, stub, type Stub } from "@std/testing/mock";import { sendAlert, sendDegraded, sendRecovery } from "./index";describe("Twilio SMS Notifications", () => {- let fetchMock: Stub<typeof globalThis>;+ let fetchMock: any = undefined;const originalEnv = {TWILLIO_ACCOUNT_ID: process.env.TWILLIO_ACCOUNT_ID,TWILLIO_AUTH_TOKEN: process.env.TWILLIO_AUTH_TOKEN,@@ -15,13 +14,16 @@ describe("Twilio SMS Notifications", () => {beforeEach(() => {process.env.TWILLIO_ACCOUNT_ID = "test-account-id";process.env.TWILLIO_AUTH_TOKEN = "test-auth-token";- fetchMock = stub(globalThis, "fetch", () =>+ // @ts-expect-error+ fetchMock = spyOn(global, "fetch").mockImplementation(() =>Promise.resolve(new Response(null, { status: 200 })),);});afterEach(() => {- fetchMock.restore();+ if (fetchMock) {+ fetchMock.mockRestore();+ }if (originalEnv.TWILLIO_ACCOUNT_ID) {process.env.TWILLIO_ACCOUNT_ID = originalEnv.TWILLIO_ACCOUNT_ID;} else {@@ -71,8 +73,8 @@ describe("Twilio SMS Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];expect(callArgs[0]).toBe("https://api.twilio.com/2010-04-01/Accounts/test-account-id/Messages.json",);@@ -102,8 +104,8 @@ describe("Twilio SMS Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];const formData = callArgs[1].body as FormData;expect(formData.get("Body")).toContain("error: Connection timeout");});@@ -123,8 +125,8 @@ describe("Twilio SMS Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];const formData = callArgs[1].body as FormData;expect(formData.get("Body")).toContain("is up again");expect(formData.get("Body")).toContain("API Health Check");@@ -145,16 +147,15 @@ describe("Twilio SMS Notifications", () => {cronTimestamp: Date.now(),});- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];const formData = callArgs[1].body as FormData;expect(formData.get("Body")).toContain("is degraded");expect(formData.get("Body")).toContain("API Health Check");});test("Handle fetch error gracefully", async () => {- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>+ fetchMock.mockImplementation(() =>Promise.reject(new Error("Network error")),);@@ -174,6 +175,6 @@ describe("Twilio SMS Notifications", () => {}),).rejects.toThrow();- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});});diff --git a/packages/notifications/twillio-sms/tsconfig.json b/packages/notifications/twillio-sms/tsconfig.jsonindex 48baa5cfe..b4382e67e 100644--- a/packages/notifications/twillio-sms/tsconfig.json+++ b/packages/notifications/twillio-sms/tsconfig.json@@ -1,7 +1,7 @@{- "extends": "@openstatus/tsconfig/base.json",+ "extends": "@openstatus/tsconfig/nextjs.json","include": ["src", "*.ts"],"compilerOptions": {- "resolveJsonModule": true+ "types": ["bun-types"]}}diff --git a/packages/notifications/webhook/package.json b/packages/notifications/webhook/package.jsonindex bb543a272..dca6d6518 100644--- a/packages/notifications/webhook/package.json+++ b/packages/notifications/webhook/package.json@@ -3,8 +3,7 @@"version": "1.0.0","main": "src/index.ts","scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports",+ "test": "bun test","tsc": "tsc"},"dependencies": {@@ -15,9 +14,8 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","@types/node": "catalog:",+ "bun-types": "catalog:","typescript": "catalog:"}}diff --git a/packages/notifications/webhook/src/index.test.ts b/packages/notifications/webhook/src/index.test.tsindex f0000ee15..ca5d0d63b 100644--- a/packages/notifications/webhook/src/index.test.ts+++ b/packages/notifications/webhook/src/index.test.ts@@ -1,35 +1,31 @@-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { assertSpyCalls, stub, type Stub } from "@std/testing/mock";+import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test";import { sendTest } from "./index";describe("Webhook sendTest", () => {- let fetchMock: Stub<typeof globalThis>;+ let fetchMock: any = undefined;beforeEach(() => {- fetchMock = stub(globalThis, "fetch", () =>- Promise.resolve(new Response(null, { status: 200 })),- );+ fetchMock = spyOn(global, "fetch");});afterEach(() => {- fetchMock.restore();+ if (fetchMock) {+ fetchMock.mockClear();+ fetchMock.mockRestore();+ }});test("should send test webhook successfully", async () => {const url = "https://example.com/webhook";- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>- Promise.resolve(new Response(null, { status: 200 })),- );+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));const result = await sendTest({ url });expect(result).toBe(true);- assertSpyCalls(fetchMock, 1);- expect(fetchMock.calls[0].args[0]).toBe(url);- expect(fetchMock.calls[0].args[1]).toEqual(+ expect(fetchMock).toHaveBeenCalledTimes(1);+ expect(fetchMock).toHaveBeenCalledWith(+ url,expect.objectContaining({method: "post",body: expect.any(String),@@ -37,7 +33,7 @@ describe("Webhook sendTest", () => {}),);- const callArgs = fetchMock.calls[0].args;+ const callArgs = fetchMock.mock.calls[0];const body = JSON.parse(callArgs[1].body);expect(body).toMatchObject({monitor: {@@ -49,7 +45,7 @@ describe("Webhook sendTest", () => {statusCode: 200,latency: 1337,});- expect(typeof body.cronTimestamp).toBe("number");+ expect(body.cronTimestamp).toBeTypeOf("number");});test("should send test webhook with headers", async () => {@@ -58,17 +54,14 @@ describe("Webhook sendTest", () => {{ key: "Authorization", value: "Bearer token123" },{ key: "Content-Type", value: "application/json" },];- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>- Promise.resolve(new Response(null, { status: 200 })),- );+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));const result = await sendTest({ url, headers });expect(result).toBe(true);- assertSpyCalls(fetchMock, 1);- expect(fetchMock.calls[0].args[0]).toBe(url);- expect(fetchMock.calls[0].args[1]).toEqual(+ expect(fetchMock).toHaveBeenCalledTimes(1);+ expect(fetchMock).toHaveBeenCalledWith(+ url,expect.objectContaining({method: "post",body: expect.any(String),@@ -82,63 +75,50 @@ describe("Webhook sendTest", () => {test("should throw error when response is not ok", async () => {const url = "https://example.com/webhook";- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>- Promise.resolve(new Response(null, { status: 400 })),- );+ fetchMock.mockResolvedValue(new Response(null, { status: 400 }));await expect(sendTest({ url })).rejects.toThrow("Failed to send test");- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});test("should throw error when fetch fails", async () => {const url = "https://example.com/webhook";const networkError = new Error("Network error");- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () => Promise.reject(networkError));+ fetchMock.mockRejectedValue(networkError);await expect(sendTest({ url })).rejects.toThrow("Failed to send test");- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});test("should send test webhook with empty headers array", async () => {const url = "https://example.com/webhook";const headers: { key: string; value: string }[] = [];- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>- Promise.resolve(new Response(null, { status: 200 })),- );+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));const result = await sendTest({ url, headers });expect(result).toBe(true);- assertSpyCalls(fetchMock, 1);- const callArgs = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const callArgs = fetchMock.mock.calls[0];// Empty headers array should still include Content-Typeexpect(callArgs[1].headers).toEqual({ "Content-Type": "application/json" });});test("should send test webhook with 500 status code", async () => {const url = "https://example.com/webhook";- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>- Promise.resolve(new Response(null, { status: 500 })),- );+ fetchMock.mockResolvedValue(new Response(null, { status: 500 }));await expect(sendTest({ url })).rejects.toThrow("Failed to send test");- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});test("should send test webhook with 201 status code (success)", async () => {const url = "https://example.com/webhook";- fetchMock.restore();- fetchMock = stub(globalThis, "fetch", () =>- Promise.resolve(new Response(null, { status: 201 })),- );+ fetchMock.mockResolvedValue(new Response(null, { status: 201 }));const result = await sendTest({ url });expect(result).toBe(true);- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});});diff --git a/packages/proto/package.json b/packages/proto/package.jsonindex a9773b68e..72bff34eb 100644--- a/packages/proto/package.json+++ b/packages/proto/package.json@@ -35,7 +35,6 @@}},"scripts": {- "check": "deno check --sloppy-imports .","buf:openapi": "buf generate --path api/openstatus --template buf.gen.openapi.yaml && bun scripts/clean-openapi.ts","buf:ts": "buf generate --path api/openstatus --template buf.gen.ts.yaml","buf:go": "buf generate --path internal/private_location --template buf.gen.go.yaml",@@ -46,7 +45,7 @@"dependencies": {"@bufbuild/protobuf": "catalog:","@bufbuild/protovalidate": "catalog:",- "@connectrpc/connect": "catalog:"+ "@connectrpc/connect": "^2.1.1"},"devDependencies": {"@bufbuild/buf": "catalog:",diff --git a/packages/regions/package.json b/packages/regions/package.jsonindex 0754493e0..eef4b0cdb 100644--- a/packages/regions/package.json+++ b/packages/regions/package.json@@ -6,9 +6,7 @@"license": "ISC","author": "","main": "index.ts",- "scripts": {- "check": "deno check --sloppy-imports ."- },+ "scripts": {},"dependencies": {"zod": "catalog:"},diff --git a/packages/services/package.json b/packages/services/package.jsonindex 7a863399f..74d255428 100644--- a/packages/services/package.json+++ b/packages/services/package.json@@ -127,8 +127,7 @@}},"scripts": {- "check": "deno check --sloppy-imports .",- "test": "NODE_ENV=test RESEND_API_KEY=test-key deno test --parallel -A --no-check --sloppy-imports",+ "test": "bun test","tsc": "tsc --noEmit"},"dependencies": {@@ -146,8 +145,7 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19",+ "@types/bun": "latest","typescript": "catalog:"}}diff --git a/packages/services/src/__tests__/retry.test.ts b/packages/services/src/__tests__/retry.test.tsindex ada57ea13..9f26dcaac 100644--- a/packages/services/src/__tests__/retry.test.ts+++ b/packages/services/src/__tests__/retry.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { NotFoundError } from "../errors";import {diff --git a/packages/services/src/__tests__/with-test-transaction.test.ts b/packages/services/src/__tests__/with-test-transaction.test.tsindex cb9a1f643..68fc513c3 100644--- a/packages/services/src/__tests__/with-test-transaction.test.ts+++ b/packages/services/src/__tests__/with-test-transaction.test.ts@@ -1,7 +1,7 @@+import { afterAll, describe, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import { auditLog } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, describe, test } from "@std/testing/bdd";import { SEEDED_WORKSPACE_TEAM_ID } from "../../test/fixtures";import { withTestTransaction } from "../../test/helpers";diff --git a/packages/services/src/__tests__/with-transaction.test.ts b/packages/services/src/__tests__/with-transaction.test.tsindex aa86f019f..1bb9c4770 100644--- a/packages/services/src/__tests__/with-transaction.test.ts+++ b/packages/services/src/__tests__/with-transaction.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { beforeAll, describe, test } from "@std/testing/bdd";+import { beforeAll, describe, expect, test } from "bun:test";import { SEEDED_WORKSPACE_TEAM_ID } from "../../test/fixtures";import { loadSeededWorkspace } from "../../test/helpers";diff --git a/packages/services/src/agent-tools/__tests__/docs.test.ts b/packages/services/src/agent-tools/__tests__/docs.test.tsindex 63f50d313..039400c36 100644--- a/packages/services/src/agent-tools/__tests__/docs.test.ts+++ b/packages/services/src/agent-tools/__tests__/docs.test.ts@@ -1,6 +1,4 @@-import { expect } from "@std/expect";-import { afterEach, describe, test } from "@std/testing/bdd";-import { assertSpyCalls, spy } from "@std/testing/mock";+import { afterEach, describe, expect, mock, test } from "bun:test";import type { ServiceContext } from "../../context";import { getDocPageTool, searchDocsTool } from "../docs";@@ -15,7 +13,7 @@ afterEach(() => {});function mockFetch(response: Response) {- const fn = spy(async () => response);+ const fn = mock(async () => response);globalThis.fetch = fn as unknown as typeof fetch;return fn;}@@ -113,11 +111,9 @@ describe("get_doc_page", () => {});expect(result.truncated).toBe(true);expect(result.markdown.length).toBeLessThan(24_200);- expect(- result.markdown.endsWith(- "[truncated β content continues at https://www.openstatus.dev/docs/concept/page-1]",- ),- ).toBe(true);+ expect(result.markdown).toEndWith(+ "[truncated β content continues at https://www.openstatus.dev/docs/concept/page-1]",+ );});test("returns error shape on 404", async () => {@@ -153,6 +149,6 @@ describe("get_doc_page", () => {);expect(getDocPageTool.outputSchema.safeParse(result).success).toBe(true);}- assertSpyCalls(fn, 0);+ expect(fn).not.toHaveBeenCalled();});});diff --git a/packages/services/src/agent-tools/__tests__/shape-equivalence.test.ts b/packages/services/src/agent-tools/__tests__/shape-equivalence.test.tsindex ae1a50e68..c6bfd1b3d 100644--- a/packages/services/src/agent-tools/__tests__/shape-equivalence.test.ts+++ b/packages/services/src/agent-tools/__tests__/shape-equivalence.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { beforeAll, describe, test } from "@std/testing/bdd";+import { beforeAll, describe, expect, test } from "bun:test";import { SEEDED_WORKSPACE_TEAM_ID } from "../../../test/fixtures";import { loadSeededWorkspace, makeUserCtx } from "../../../test/helpers";diff --git a/packages/services/src/agent-tools/__tests__/status-report-impacts.test.ts b/packages/services/src/agent-tools/__tests__/status-report-impacts.test.tsindex cb0f7c38d..dd21661cc 100644--- a/packages/services/src/agent-tools/__tests__/status-report-impacts.test.ts+++ b/packages/services/src/agent-tools/__tests__/status-report-impacts.test.ts@@ -1,6 +1,6 @@+import { beforeAll, describe, expect, test } from "bun:test";+import { page, pageComponent } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { beforeAll, describe, test } from "@std/testing/bdd";import { SEEDED_WORKSPACE_TEAM_ID } from "../../../test/fixtures";import {diff --git a/packages/services/src/api-key/__tests__/api-key.test.ts b/packages/services/src/api-key/__tests__/api-key.test.tsindex 7a199c8b7..e401e304f 100644--- a/packages/services/src/api-key/__tests__/api-key.test.ts+++ b/packages/services/src/api-key/__tests__/api-key.test.ts@@ -1,8 +1,15 @@+import { beforeAll, describe, expect, test } from "bun:test";+import { eq } from "@openstatus/db";import { apiKey } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { beforeAll, describe, test } from "@std/testing/bdd";+import {+ createApiKey,+ listApiKeys,+ revokeApiKey,+ updateApiKeyLastUsed,+ verifyApiKey,+} from "..";import { SEEDED_WORKSPACE_TEAM_ID } from "../../../test/fixtures";import {expectAuditRow,@@ -14,13 +21,6 @@ import {} from "../../../test/helpers";import type { ServiceContext } from "../../context";import { ForbiddenError, NotFoundError } from "../../errors";-import {- createApiKey,- listApiKeys,- revokeApiKey,- updateApiKeyLastUsed,- verifyApiKey,-} from "../index.ts";const TEST_PREFIX = "svc-apikey-test";diff --git a/packages/services/src/audit/__tests__/audit.test.ts b/packages/services/src/audit/__tests__/audit.test.tsindex de082c72f..016e8d83e 100644--- a/packages/services/src/audit/__tests__/audit.test.ts+++ b/packages/services/src/audit/__tests__/audit.test.ts@@ -1,8 +1,8 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import { auditLog, user } from "@openstatus/db/src/schema";import type { AuditEntry } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";import {SEEDED_WORKSPACE_FREE_ID,diff --git a/packages/services/src/auth/__tests__/matches-scope.test.ts b/packages/services/src/auth/__tests__/matches-scope.test.tsindex 0a70f4750..de72ef4e5 100644--- a/packages/services/src/auth/__tests__/matches-scope.test.ts+++ b/packages/services/src/auth/__tests__/matches-scope.test.ts@@ -1,6 +1,6 @@+import { describe, expect, test } from "bun:test";+import type { Scope } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";import { matchesScope } from "../matches-scope";diff --git a/packages/services/src/auth/__tests__/require-scope.test.ts b/packages/services/src/auth/__tests__/require-scope.test.tsindex cd46a1769..0278626b1 100644--- a/packages/services/src/auth/__tests__/require-scope.test.ts+++ b/packages/services/src/auth/__tests__/require-scope.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import type { Actor, ServiceContext } from "../../context";import { ForbiddenError } from "../../errors";diff --git a/packages/services/src/external-service-component/__tests__/external-service-component.test.ts b/packages/services/src/external-service-component/__tests__/external-service-component.test.tsindex e8062d017..08324142a 100644--- a/packages/services/src/external-service-component/__tests__/external-service-component.test.ts+++ b/packages/services/src/external-service-component/__tests__/external-service-component.test.ts@@ -1,11 +1,11 @@+import { afterEach, describe, expect, test } from "bun:test";+import { and, db, eq, like } from "@openstatus/db";import type { ApiConfigType } from "@openstatus/db/src/schema";import {externalService,externalServiceComponent,} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterEach, describe, test } from "@std/testing/bdd";import {getExternalComponentBySlug,diff --git a/packages/services/src/external-service-component/__tests__/internal.test.ts b/packages/services/src/external-service-component/__tests__/internal.test.tsindex 7b304e958..f219bb83f 100644--- a/packages/services/src/external-service-component/__tests__/internal.test.ts+++ b/packages/services/src/external-service-component/__tests__/internal.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { assignComponentSlugs, slugifyComponentName } from "../internal";diff --git a/packages/services/src/external-service-incident/__tests__/external-service-incident.test.ts b/packages/services/src/external-service-incident/__tests__/external-service-incident.test.tsindex 66ddc5a0a..5134ddde1 100644--- a/packages/services/src/external-service-incident/__tests__/external-service-incident.test.ts+++ b/packages/services/src/external-service-incident/__tests__/external-service-incident.test.ts@@ -1,10 +1,10 @@+import { afterEach, describe, expect, test } from "bun:test";+import { and, db, eq, like } from "@openstatus/db";import {externalService,externalServiceIncident,} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterEach, describe, test } from "@std/testing/bdd";import {type UpsertExternalIncidentInput,diff --git a/packages/services/src/external-service-report/__tests__/record.test.ts b/packages/services/src/external-service-report/__tests__/record.test.tsindex 853831f78..43a9524ca 100644--- a/packages/services/src/external-service-report/__tests__/record.test.ts+++ b/packages/services/src/external-service-report/__tests__/record.test.ts@@ -1,11 +1,11 @@+import { afterEach, describe, expect, test } from "bun:test";+import { db, eq, inArray, like } from "@openstatus/db";import {externalService,externalServiceComponent,externalServiceReport,} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterEach, describe, test } from "@std/testing/bdd";import { NotFoundError } from "../../errors";import {diff --git a/packages/services/src/external-service/__tests__/external-service.test.ts b/packages/services/src/external-service/__tests__/external-service.test.tsindex 6dc0c8977..dccf79918 100644--- a/packages/services/src/external-service/__tests__/external-service.test.ts+++ b/packages/services/src/external-service/__tests__/external-service.test.ts@@ -1,7 +1,7 @@+import { afterEach, describe, expect, test } from "bun:test";+import { db, like, sql } from "@openstatus/db";import { externalService } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterEach, describe, test } from "@std/testing/bdd";import { ConflictError } from "../../errors";import { assertSlugAvailable } from "../internal";diff --git a/packages/services/src/import/__tests__/incidents-phase.test.ts b/packages/services/src/import/__tests__/incidents-phase.test.tsindex 64d2b6d6a..7070bc570 100644--- a/packages/services/src/import/__tests__/incidents-phase.test.ts+++ b/packages/services/src/import/__tests__/incidents-phase.test.ts@@ -1,3 +1,5 @@+import { beforeAll, describe, expect, test } from "bun:test";+import { eq } from "@openstatus/db";import {page,@@ -8,8 +10,6 @@ import {statusReportsToPageComponents,} from "@openstatus/db/src/schema";import type { PhaseResult } from "@openstatus/importers";-import { expect } from "@std/expect";-import { beforeAll, describe, test } from "@std/testing/bdd";import { SEEDED_WORKSPACE_TEAM_ID } from "../../../test/fixtures";import {diff --git a/packages/services/src/import/__tests__/unit.test.ts b/packages/services/src/import/__tests__/unit.test.tsindex ad3b74cfa..b7f14668b 100644--- a/packages/services/src/import/__tests__/unit.test.ts+++ b/packages/services/src/import/__tests__/unit.test.ts@@ -1,10 +1,10 @@+import { beforeAll, describe, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import { monitor, pageComponent } from "@openstatus/db/src/schema";import { allPlans } from "@openstatus/db/src/schema/plan/config";import type { Limits } from "@openstatus/db/src/schema/plan/schema";import type { ImportSummary } from "@openstatus/importers";-import { expect } from "@std/expect";-import { beforeAll, describe, test } from "@std/testing/bdd";import { addLimitWarnings, clampPeriodicity, computePhaseStatus } from "../";import { withTestTransaction } from "../../../test/helpers";diff --git a/packages/services/src/incident/__tests__/incident.test.ts b/packages/services/src/incident/__tests__/incident.test.tsindex ae0eec54d..0b27432c5 100644--- a/packages/services/src/incident/__tests__/incident.test.ts+++ b/packages/services/src/incident/__tests__/incident.test.ts@@ -1,7 +1,7 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import { incidentTable, monitor } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";import {SEEDED_WORKSPACE_FREE_ID,diff --git a/packages/services/src/integration/__tests__/install-slack-agent.test.ts b/packages/services/src/integration/__tests__/install-slack-agent.test.tsindex ddbfa8771..7092a8bfc 100644--- a/packages/services/src/integration/__tests__/install-slack-agent.test.ts+++ b/packages/services/src/integration/__tests__/install-slack-agent.test.ts@@ -1,7 +1,7 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { and, db, desc, eq } from "@openstatus/db";import { integration } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";import { SEEDED_WORKSPACE_TEAM_ID } from "../../../test/fixtures";import {@@ -238,9 +238,9 @@ describe("installSlackAgent", () => {// shape as create/update β proves delete-path symmetry.const deleteRow = all.find((r) => r.action === "integration.delete");expect(- typeof (deleteRow?.before as Record<string, unknown> | null)+ (deleteRow?.before as Record<string, unknown> | null)?.credentialFingerprint,- ).toBe("string");+ ).toBeTypeOf("string");});});diff --git a/packages/services/src/invitation/__tests__/invitation.test.ts b/packages/services/src/invitation/__tests__/invitation.test.tsindex 58ff31328..8309e1b36 100644--- a/packages/services/src/invitation/__tests__/invitation.test.ts+++ b/packages/services/src/invitation/__tests__/invitation.test.ts@@ -1,8 +1,15 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import { invitation, user, usersToWorkspaces } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";+import {+ acceptInvitation,+ createInvitation,+ deleteInvitation,+ getInvitationByToken,+ listInvitations,+} from "..";import {SEEDED_WORKSPACE_FREE_ID,SEEDED_WORKSPACE_TEAM_ID,@@ -20,13 +27,6 @@ import {LimitExceededError,NotFoundError,} from "../../errors";-import {- acceptInvitation,- createInvitation,- deleteInvitation,- getInvitationByToken,- listInvitations,-} from "../index.ts";const TEST_PREFIX = "svc-inv-test";diff --git a/packages/services/src/maintenance/__tests__/maintenance.test.ts b/packages/services/src/maintenance/__tests__/maintenance.test.tsindex 32afbbba2..c7a8890c2 100644--- a/packages/services/src/maintenance/__tests__/maintenance.test.ts+++ b/packages/services/src/maintenance/__tests__/maintenance.test.ts@@ -1,17 +1,18 @@-import { db, eq, inArray } from "@openstatus/db";-import {- maintenancesToPageComponents,- page,- pageComponent,-} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";import {afterAll,beforeAll,beforeEach,describe,+ expect,test,-} from "@std/testing/bdd";+} from "bun:test";++import { db, eq, inArray } from "@openstatus/db";+import {+ maintenancesToPageComponents,+ page,+ pageComponent,+} from "@openstatus/db/src/schema";import {SEEDED_WORKSPACE_FREE_ID,diff --git a/packages/services/src/member/__tests__/member.test.ts b/packages/services/src/member/__tests__/member.test.tsindex 305d8885c..a682723a4 100644--- a/packages/services/src/member/__tests__/member.test.ts+++ b/packages/services/src/member/__tests__/member.test.ts@@ -1,8 +1,9 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { and, db, eq } from "@openstatus/db";import { user, usersToWorkspaces } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";+import { deleteMember, listMembers } from "..";import {SEEDED_WORKSPACE_FREE_ID,SEEDED_WORKSPACE_TEAM_ID,@@ -22,7 +23,6 @@ import {NotFoundError,PreconditionFailedError,} from "../../errors";-import { deleteMember, listMembers } from "../index.ts";const OWNER_USER_ID = 1;const VICTIM_USER_ID = 4242;diff --git a/packages/services/src/monitor-tag/__tests__/monitor-tag.test.ts b/packages/services/src/monitor-tag/__tests__/monitor-tag.test.tsindex 121cbe4a9..26238ff79 100644--- a/packages/services/src/monitor-tag/__tests__/monitor-tag.test.ts+++ b/packages/services/src/monitor-tag/__tests__/monitor-tag.test.ts@@ -1,8 +1,9 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import { monitorTag } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";+import { listMonitorTags, syncMonitorTags } from "..";import { SEEDED_WORKSPACE_TEAM_ID } from "../../../test/fixtures";import {clearAuditLog,@@ -14,7 +15,6 @@ import {} from "../../../test/helpers";import type { ServiceContext } from "../../context";import { ForbiddenError } from "../../errors";-import { listMonitorTags, syncMonitorTags } from "../index.ts";let teamCtx: ServiceContext;diff --git a/packages/services/src/monitor/__tests__/monitor.test.ts b/packages/services/src/monitor/__tests__/monitor.test.tsindex d8af1b469..9979ea2f7 100644--- a/packages/services/src/monitor/__tests__/monitor.test.ts+++ b/packages/services/src/monitor/__tests__/monitor.test.ts@@ -1,3 +1,5 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { db, eq, inArray } from "@openstatus/db";import {monitor,@@ -5,15 +7,15 @@ import {monitorTagsToMonitors,notification,notificationsToMonitors,- selectWorkspaceSchema,- workspace,} from "@openstatus/db/src/schema";-import { createWorkspace } from "@openstatus/db/src/test/factories";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";+import {+ SEEDED_WORKSPACE_FREE_ID,+ SEEDED_WORKSPACE_TEAM_ID,+} from "../../../test/fixtures";import {expectAuditRow,+ loadSeededWorkspace,makeApiKeyCtx,makeSystemCtx,makeUserCtx,@@ -33,18 +35,12 @@ const TEST_PREFIX = "svc-monitor-test";let teamCtx: ServiceContext;let freeCtx: ServiceContext;-let teamWorkspaceId: number;-let freeWorkspaceId: number;let testTagId: number;let testNotificationId: number;beforeAll(async () => {- // Own workspaces per suite β relying on the shared seeded workspace races- // sibling suites that wipe its tags/notifications (e.g. monitor-tag).- const team = selectWorkspaceSchema.parse(await createWorkspace());- const free = selectWorkspaceSchema.parse(await createWorkspace());- teamWorkspaceId = team.id;- freeWorkspaceId = free.id;+ const team = await loadSeededWorkspace(SEEDED_WORKSPACE_TEAM_ID);+ const free = await loadSeededWorkspace(SEEDED_WORKSPACE_FREE_ID);teamCtx = makeUserCtx(team, { userId: 1 });freeCtx = makeUserCtx(free, { userId: 2 });@@ -81,10 +77,6 @@ afterAll(async () => {.delete(notification).where(eq(notification.id, testNotificationId)).catch(() => undefined);- await db- .delete(workspace)- .where(inArray(workspace.id, [teamWorkspaceId, freeWorkspaceId]))- .catch(() => undefined);});describe("createMonitor", () => {diff --git a/packages/services/src/monitor/__tests__/reads.test.ts b/packages/services/src/monitor/__tests__/reads.test.tsindex ba2b25f06..ef90d9cb3 100644--- a/packages/services/src/monitor/__tests__/reads.test.ts+++ b/packages/services/src/monitor/__tests__/reads.test.ts@@ -1,6 +1,6 @@+import { beforeAll, describe, expect, test } from "bun:test";+import { monitorStatusTable } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { beforeAll, describe, test } from "@std/testing/bdd";import {SEEDED_WORKSPACE_FREE_ID,diff --git a/packages/services/src/monitor/__tests__/stream-monitor-preview.test.ts b/packages/services/src/monitor/__tests__/stream-monitor-preview.test.tsindex 0a54da729..431a9302c 100644--- a/packages/services/src/monitor/__tests__/stream-monitor-preview.test.ts+++ b/packages/services/src/monitor/__tests__/stream-monitor-preview.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";+import { afterAll, beforeAll, describe, expect, test } from "bun:test";import { SEEDED_WORKSPACE_TEAM_ID } from "../../../test/fixtures";import {@@ -67,13 +66,11 @@ describe("streamMonitorPreview", () => {input: { monitorId: 999_999_999 },});- await expect(- (async () => {- for await (const _ of generator) {- // drain- }- })(),- ).rejects.toThrow(NotFoundError);+ await expect(async () => {+ for await (const _ of generator) {+ // drain+ }+ }).toThrow(NotFoundError);});});diff --git a/packages/services/src/notification/__tests__/notification.test.ts b/packages/services/src/notification/__tests__/notification.test.tsindex 5082f9718..afd4c3114 100644--- a/packages/services/src/notification/__tests__/notification.test.ts+++ b/packages/services/src/notification/__tests__/notification.test.ts@@ -1,11 +1,11 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import {monitor,notification,notificationsToMonitors,} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";import {SEEDED_WORKSPACE_FREE_ID,diff --git a/packages/services/src/page-component/__tests__/get-daily-summary.test.ts b/packages/services/src/page-component/__tests__/get-daily-summary.test.tsindex 10a2f0887..02db33a04 100644--- a/packages/services/src/page-component/__tests__/get-daily-summary.test.ts+++ b/packages/services/src/page-component/__tests__/get-daily-summary.test.ts@@ -1,3 +1,5 @@+import { beforeAll, describe, expect, test } from "bun:test";+import {maintenance,maintenancesToPageComponents,@@ -9,8 +11,6 @@ import {statusReportUpdateToPageComponents,statusReportsToPageComponents,} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { beforeAll, describe, test } from "@std/testing/bdd";import { SEEDED_WORKSPACE_TEAM_ID } from "../../../test/fixtures";import {diff --git a/packages/services/src/page-component/__tests__/page-component.test.ts b/packages/services/src/page-component/__tests__/page-component.test.tsindex 447099d21..119c69528 100644--- a/packages/services/src/page-component/__tests__/page-component.test.ts+++ b/packages/services/src/page-component/__tests__/page-component.test.ts@@ -1,3 +1,5 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { and, db, eq, inArray } from "@openstatus/db";import {monitor,@@ -5,8 +7,6 @@ import {pageComponent,pageComponentGroup,} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";import {SEEDED_WORKSPACE_FREE_ID,diff --git a/packages/services/src/page-subscriber/__tests__/page-subscriber.test.ts b/packages/services/src/page-subscriber/__tests__/page-subscriber.test.tsindex 3fa02a4cd..abbfd66c4 100644--- a/packages/services/src/page-subscriber/__tests__/page-subscriber.test.ts+++ b/packages/services/src/page-subscriber/__tests__/page-subscriber.test.ts@@ -1,20 +1,30 @@-import { and, db, eq } from "@openstatus/db";-import {- auditLog,- page,- pageSubscriber,- pageSubscriberToPageComponent,-} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";import {afterAll,afterEach,beforeAll,beforeEach,describe,+ expect,test,-} from "@std/testing/bdd";+} from "bun:test";++import { and, db, eq } from "@openstatus/db";+import {+ auditLog,+ page,+ pageSubscriber,+ pageSubscriberToPageComponent,+} from "@openstatus/db/src/schema";+import {+ createPageSubscriber,+ getSubscriberByToken,+ hasPendingSubscriber,+ unsubscribeSubscriber,+ updateSubscriberScope,+ upsertSelfSignupSubscriber,+ verifySelfSignupSubscriber,+} from "..";import {SEEDED_WORKSPACE_FREE_ID,SEEDED_WORKSPACE_TEAM_ID,@@ -28,15 +38,6 @@ import {withTestTransaction,} from "../../../test/helpers";import { ForbiddenError } from "../../errors";-import {- createPageSubscriber,- getSubscriberByToken,- hasPendingSubscriber,- unsubscribeSubscriber,- updateSubscriberScope,- upsertSelfSignupSubscriber,- verifySelfSignupSubscriber,-} from "../index.ts";// Seeded data we lean on (see packages/db/src/seed.mts):// workspace 1 = team plan, has status-subscribers=truediff --git a/packages/services/src/page/__tests__/page.test.ts b/packages/services/src/page/__tests__/page.test.tsindex fd8673dae..429f682d8 100644--- a/packages/services/src/page/__tests__/page.test.ts+++ b/packages/services/src/page/__tests__/page.test.ts@@ -1,7 +1,7 @@+import { afterAll, beforeAll, describe, expect, test } from "bun:test";+import { db, eq } from "@openstatus/db";import { monitor, pageComponent } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { afterAll, beforeAll, describe, test } from "@std/testing/bdd";import {SEEDED_WORKSPACE_FREE_ID,diff --git a/packages/services/src/status-report/__tests__/status-report.test.ts b/packages/services/src/status-report/__tests__/status-report.test.tsindex 7104b8d13..fb7bab4d0 100644--- a/packages/services/src/status-report/__tests__/status-report.test.ts+++ b/packages/services/src/status-report/__tests__/status-report.test.ts@@ -1,3 +1,12 @@+import {+ afterAll,+ beforeAll,+ beforeEach,+ describe,+ expect,+ test,+} from "bun:test";+import { db, eq } from "@openstatus/db";import {page,@@ -8,14 +17,6 @@ import {statusReportUpdateToPageComponents,statusReportsToPageComponents,} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import {- afterAll,- beforeAll,- beforeEach,- describe,- test,-} from "@std/testing/bdd";import {SEEDED_WORKSPACE_FREE_ID,diff --git a/packages/services/src/workspace/__tests__/workspace.test.ts b/packages/services/src/workspace/__tests__/workspace.test.tsindex 6efc00f55..21dde2aef 100644--- a/packages/services/src/workspace/__tests__/workspace.test.ts+++ b/packages/services/src/workspace/__tests__/workspace.test.ts@@ -1,8 +1,14 @@+import { beforeAll, describe, expect, test } from "bun:test";+import { eq } from "@openstatus/db";import { workspace } from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { beforeAll, describe, test } from "@std/testing/bdd";+import {+ getWorkspace,+ getWorkspaceWithUsage,+ listWorkspaces,+ updateWorkspaceName,+} from "..";import { SEEDED_WORKSPACE_TEAM_ID } from "../../../test/fixtures";import {expectAuditRow,@@ -13,12 +19,6 @@ import {} from "../../../test/helpers";import type { ServiceContext } from "../../context";import { ForbiddenError } from "../../errors";-import {- getWorkspace,- getWorkspaceWithUsage,- listWorkspaces,- updateWorkspaceName,-} from "../index.ts";let teamCtx: ServiceContext;diff --git a/packages/services/test/helpers.ts b/packages/services/test/helpers.tsindex 688bdf151..7dda22670 100644--- a/packages/services/test/helpers.ts+++ b/packages/services/test/helpers.ts@@ -1,3 +1,5 @@+import { expect } from "bun:test";+import { and, db, desc, eq, inArray } from "@openstatus/db";import {type Scope,@@ -8,7 +10,6 @@ import {selectWorkspaceSchema,workspace as workspaceTable,} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";import type { Actor, DB, DrizzleTx, ServiceContext } from "../src/context";import type { Workspace } from "../src/types";diff --git a/packages/services/tsconfig.json b/packages/services/tsconfig.jsonindex 0da708f7f..54a1ac325 100644--- a/packages/services/tsconfig.json+++ b/packages/services/tsconfig.json@@ -1,9 +1,8 @@{- "extends": "@openstatus/tsconfig/base.json",+ "extends": "@openstatus/tsconfig/react-library.json","include": ["src", "test"],"exclude": ["dist", "build", "node_modules"],"compilerOptions": {- "module": "ESNext","moduleResolution": "bundler"}}diff --git a/packages/status-fetcher/__tests__/fetch.test.ts b/packages/status-fetcher/__tests__/fetch.test.tsindex 7bafe97de..36556d49f 100644--- a/packages/status-fetcher/__tests__/fetch.test.ts+++ b/packages/status-fetcher/__tests__/fetch.test.ts@@ -1,6 +1,5 @@-import { expect } from "@std/expect";-import { beforeEach, describe, it } from "@std/testing/bdd";-import { spy } from "@std/testing/mock";+import { beforeEach, describe, expect, it, mock } from "bun:test";+import { Cause, Effect, Exit, Option } from "effect";import { z } from "zod";@@ -11,7 +10,7 @@ const TEST_URL = "https://api.example.com/status";type FetchImpl = (url: string, init?: RequestInit) => Promise<Response>;const installMockFetch = (impl: FetchImpl) => {- const fn = spy(impl);+ const fn = mock(impl);global.fetch = fn as unknown as typeof fetch;return fn;};@@ -80,7 +79,7 @@ describe("fetchJson", () => {expect(err.httpStatus).toBe(404);expect(err.fetcherName).toBe("test");expect(err.entryId).toBe("x");- expect(fetchMock.calls.length).toBe(1);+ expect(fetchMock.mock.calls.length).toBe(1);});it("retries up to 3 times on 5xx then fails", async () => {@@ -93,7 +92,7 @@ describe("fetchJson", () => {);const err = expectFailure(exit);expect(err.httpStatus).toBe(503);- expect(fetchMock.calls.length).toBe(4);+ expect(fetchMock.mock.calls.length).toBe(4);});it("retries up to 3 times on network error then fails", async () => {@@ -106,7 +105,7 @@ describe("fetchJson", () => {);const err = expectFailure(exit);expect(err.httpStatus).toBeUndefined();- expect(fetchMock.calls.length).toBe(4);+ expect(fetchMock.mock.calls.length).toBe(4);});it("fails with FetchError on schema mismatch without retrying", async () => {@@ -119,7 +118,7 @@ describe("fetchJson", () => {);const err = expectFailure(exit);expect(err.cause).toBeInstanceOf(Error);- expect(fetchMock.calls.length).toBe(1);+ expect(fetchMock.mock.calls.length).toBe(1);});it("applies default User-Agent and Accept headers", async () => {@@ -201,7 +200,7 @@ describe("fetchText", () => {const exit = await Effect.runPromiseExit(fetchText({ url: TEST_URL }));const err = expectFailure(exit);expect(err.httpStatus).toBe(500);- expect(fetchMock.calls.length).toBe(4);+ expect(fetchMock.mock.calls.length).toBe(4);});});diff --git a/packages/status-fetcher/__tests__/fetchers/atlassian.test.ts b/packages/status-fetcher/__tests__/fetchers/atlassian.test.tsindex ae7a8d2c1..09baa515c 100644--- a/packages/status-fetcher/__tests__/fetchers/atlassian.test.ts+++ b/packages/status-fetcher/__tests__/fetchers/atlassian.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { beforeEach, describe, it } from "@std/testing/bdd";+import { beforeEach, describe, expect, it } from "bun:test";import { AtlassianFetcher } from "../../src/fetchers/atlassian";import type { StatusPageEntry } from "../../src/types";@@ -114,11 +113,8 @@ describe("AtlassianFetcher", () => {expect(result.description).toBe("All Systems Operational");expect(result.timezone).toBe("Etc/UTC");expect(typeof result.updated_at).toBe("number");- const call = fetchMock.calls[fetchMock.calls.length - 1];- expect(call.args[0]).toBe(+ expect(fetchMock).toHaveBeenCalledWith("https://www.githubstatus.com/api/v2/summary.json",- );- expect(call.args[1]).toEqual(expect.objectContaining({headers: expect.objectContaining({"User-Agent": "OpenStatus-Directory/1.0",@@ -238,9 +234,10 @@ describe("AtlassianFetcher", () => {await runFetcher(fetcher, entry);- const call = fetchMock.calls[fetchMock.calls.length - 1];- expect(call.args[0]).toBe("https://custom.endpoint.com/status.json");- expect(call.args[1]).toEqual(expect.any(Object));+ expect(fetchMock).toHaveBeenCalledWith(+ "https://custom.endpoint.com/status.json",+ expect.any(Object),+ );});it("should fail with FetchError on non-200 response", async () => {@@ -335,11 +332,10 @@ describe("AtlassianFetcher", () => {const incidents = await runIncidents(fetcher, entry);- const call = fetchMock.calls[fetchMock.calls.length - 1];- expect(call.args[0]).toBe(+ expect(fetchMock).toHaveBeenCalledWith("https://www.githubstatus.com/api/v2/incidents.json",+ expect.any(Object),);- expect(call.args[1]).toEqual(expect.any(Object));expect(incidents).toHaveLength(2);expect(incidents[0]).toMatchObject({providerIncidentId: "abc",diff --git a/packages/status-fetcher/__tests__/fetchers/betterstack.test.ts b/packages/status-fetcher/__tests__/fetchers/betterstack.test.tsindex d1bb0869a..355f070f6 100644--- a/packages/status-fetcher/__tests__/fetchers/betterstack.test.ts+++ b/packages/status-fetcher/__tests__/fetchers/betterstack.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { beforeEach, describe, it } from "@std/testing/bdd";+import { beforeEach, describe, expect, it } from "bun:test";import { BetterStackFetcher } from "../../src/fetchers/betterstack";import type { StatusPageEntry } from "../../src/types";@@ -122,9 +121,8 @@ describe("BetterStackFetcher", () => {expect(result.description).toBe("All Systems Operational");expect(result.timezone).toBe("America/New_York");expect(typeof result.updated_at).toBe("number");- const call = fetchMock.calls[fetchMock.calls.length - 1];- expect(call.args[0]).toBe("https://status.test.com/index.json");- expect(call.args[1]).toEqual(+ expect(fetchMock).toHaveBeenCalledWith(+ "https://status.test.com/index.json",expect.objectContaining({headers: expect.objectContaining({"User-Agent": "OpenStatus-Directory/1.0",@@ -242,9 +240,10 @@ describe("BetterStackFetcher", () => {await runFetcher(fetcher, entry);- const call = fetchMock.calls[fetchMock.calls.length - 1];- expect(call.args[0]).toBe("https://custom.endpoint.com/status.json");- expect(call.args[1]).toEqual(expect.any(Object));+ expect(fetchMock).toHaveBeenCalledWith(+ "https://custom.endpoint.com/status.json",+ expect.any(Object),+ );});it("should fail with FetchError on 4xx response", async () => {diff --git a/packages/status-fetcher/__tests__/fetchers/components.test.ts b/packages/status-fetcher/__tests__/fetchers/components.test.tsindex d87f3ae31..15b1aaf4d 100644--- a/packages/status-fetcher/__tests__/fetchers/components.test.ts+++ b/packages/status-fetcher/__tests__/fetchers/components.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { beforeEach, describe, it } from "@std/testing/bdd";+import { beforeEach, describe, expect, it } from "bun:test";import { AtlassianFetcher } from "../../src/fetchers/atlassian";import { IncidentioFetcher } from "../../src/fetchers/incidentio";@@ -82,11 +81,10 @@ function itNormalizes(const components = await runComponents(fetcher, entry);- const call = fetchMock.calls[fetchMock.calls.length - 1];- expect(call.args[0]).toBe(+ expect(fetchMock).toHaveBeenCalledWith(`${entry.status_page_url}/api/v2/components.json`,+ expect.any(Object),);- expect(call.args[1]).toEqual(expect.any(Object));// group container "grp" is excluded; only the three leaves remainexpect(components).toHaveLength(3);diff --git a/packages/status-fetcher/__tests__/fetchers/custom.test.ts b/packages/status-fetcher/__tests__/fetchers/custom.test.tsindex a30914704..bd435051c 100644--- a/packages/status-fetcher/__tests__/fetchers/custom.test.ts+++ b/packages/status-fetcher/__tests__/fetchers/custom.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { beforeEach, describe, it } from "@std/testing/bdd";+import { beforeEach, describe, expect, it } from "bun:test";import { CustomApiFetcher } from "../../src/fetchers/custom";import type { StatusPageEntry } from "../../src/types";diff --git a/packages/status-fetcher/__tests__/fetchers/edge-cases.test.ts b/packages/status-fetcher/__tests__/fetchers/edge-cases.test.tsindex d0a5194c8..548186a48 100644--- a/packages/status-fetcher/__tests__/fetchers/edge-cases.test.ts+++ b/packages/status-fetcher/__tests__/fetchers/edge-cases.test.ts@@ -1,5 +1,5 @@-import { expect } from "@std/expect";-import { describe, it } from "@std/testing/bdd";+import { describe, expect, it } from "bun:test";+import { Exit } from "effect";import { AtlassianFetcher } from "../../src/fetchers/atlassian";diff --git a/packages/status-fetcher/__tests__/fetchers/html.test.ts b/packages/status-fetcher/__tests__/fetchers/html.test.tsindex ddbac6a13..209577d1e 100644--- a/packages/status-fetcher/__tests__/fetchers/html.test.ts+++ b/packages/status-fetcher/__tests__/fetchers/html.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { beforeEach, describe, it } from "@std/testing/bdd";+import { beforeEach, describe, expect, it } from "bun:test";import { HtmlScraperFetcher } from "../../src/fetchers/html";import type { StatusPageEntry } from "../../src/types";@@ -93,9 +92,8 @@ describe("HtmlScraperFetcher", () => {expect(result.description).toBe("All Systems Operational");expect(result.timezone).toBe("UTC");expect(typeof result.updated_at).toBe("number");- const call = fetchMock.calls[fetchMock.calls.length - 1];- expect(call.args[0]).toBe("https://status.test.com");- expect(call.args[1]).toEqual(+ expect(fetchMock).toHaveBeenCalledWith(+ "https://status.test.com",expect.objectContaining({headers: expect.objectContaining({"User-Agent": "Mozilla/5.0 (compatible; OpenStatus-Bot/1.0)",diff --git a/packages/status-fetcher/__tests__/fetchers/incidentio.test.ts b/packages/status-fetcher/__tests__/fetchers/incidentio.test.tsindex 6a759fdd1..cbc6f75b7 100644--- a/packages/status-fetcher/__tests__/fetchers/incidentio.test.ts+++ b/packages/status-fetcher/__tests__/fetchers/incidentio.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { beforeEach, describe, it } from "@std/testing/bdd";+import { beforeEach, describe, expect, it } from "bun:test";import { IncidentioFetcher } from "../../src/fetchers/incidentio";import type { StatusPageEntry } from "../../src/types";@@ -112,9 +111,8 @@ describe("IncidentioFetcher", () => {expect(result.status).toBe("operational");expect(result.description).toBe("All Systems Operational");expect(typeof result.updated_at).toBe("number");- const call = fetchMock.calls[fetchMock.calls.length - 1];- expect(call.args[0]).toBe("https://status.test.com/api/v2/summary.json");- expect(call.args[1]).toEqual(+ expect(fetchMock).toHaveBeenCalledWith(+ "https://status.test.com/api/v2/summary.json",expect.objectContaining({headers: expect.objectContaining({"User-Agent": "OpenStatus-Directory/1.0",@@ -236,9 +234,10 @@ describe("IncidentioFetcher", () => {await runFetcher(fetcher, entry);- const call = fetchMock.calls[fetchMock.calls.length - 1];- expect(call.args[0]).toBe("https://custom.endpoint.com/summary.json");- expect(call.args[1]).toEqual(expect.any(Object));+ expect(fetchMock).toHaveBeenCalledWith(+ "https://custom.endpoint.com/summary.json",+ expect.any(Object),+ );});it("should fail with FetchError on 5xx response", async () => {@@ -324,11 +323,10 @@ describe("IncidentioFetcher", () => {const incidents = await runIncidents(fetcher, entry);- const call = fetchMock.calls[fetchMock.calls.length - 1];- expect(call.args[0]).toBe(+ expect(fetchMock).toHaveBeenCalledWith("https://status.linear.app/api/v2/incidents.json",+ expect.any(Object),);- expect(call.args[1]).toEqual(expect.any(Object));expect(incidents).toHaveLength(1);expect(incidents[0]).toMatchObject({providerIncidentId: "INC-1",diff --git a/packages/status-fetcher/__tests__/fetchers/instatus.test.ts b/packages/status-fetcher/__tests__/fetchers/instatus.test.tsindex b7c528cd7..5abaf1c1b 100644--- a/packages/status-fetcher/__tests__/fetchers/instatus.test.ts+++ b/packages/status-fetcher/__tests__/fetchers/instatus.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { beforeEach, describe, it } from "@std/testing/bdd";+import { beforeEach, describe, expect, it } from "bun:test";import { InstatusFetcher } from "../../src/fetchers/instatus";import type { StatusPageEntry } from "../../src/types";@@ -110,9 +109,8 @@ describe("InstatusFetcher", () => {expect(result.description).toBe("All Systems Operational");expect(result.timezone).toBe("UTC");expect(typeof result.updated_at).toBe("number");- const call = fetchMock.calls[fetchMock.calls.length - 1];- expect(call.args[0]).toBe("https://test.instatus.com/summary.json");- expect(call.args[1]).toEqual(+ expect(fetchMock).toHaveBeenCalledWith(+ "https://test.instatus.com/summary.json",expect.objectContaining({headers: expect.objectContaining({"User-Agent": "OpenStatus-Directory/1.0",@@ -232,9 +230,10 @@ describe("InstatusFetcher", () => {await runFetcher(fetcher, entry);- const call = fetchMock.calls[fetchMock.calls.length - 1];- expect(call.args[0]).toBe("https://custom.endpoint.com/status.json");- expect(call.args[1]).toEqual(expect.any(Object));+ expect(fetchMock).toHaveBeenCalledWith(+ "https://custom.endpoint.com/status.json",+ expect.any(Object),+ );});it("should fail with FetchError on non-200 response (after retries)", async () => {diff --git a/packages/status-fetcher/__tests__/fetchers/uptimerobot.test.ts b/packages/status-fetcher/__tests__/fetchers/uptimerobot.test.tsindex 01dd69181..72c6e9b39 100644--- a/packages/status-fetcher/__tests__/fetchers/uptimerobot.test.ts+++ b/packages/status-fetcher/__tests__/fetchers/uptimerobot.test.ts@@ -1,6 +1,4 @@-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, it } from "@std/testing/bdd";-import { spy } from "@std/testing/mock";+import { afterEach, beforeEach, describe, expect, it, mock } from "bun:test";import { UptimeRobotFetcher } from "../../src/fetchers/uptimerobot";import type { StatusPageEntry } from "../../src/types";@@ -140,9 +138,8 @@ describe("UptimeRobotFetcher", () => {expect(result.description).toBe("0 monitors down (3 total)");expect(result.timezone).toBe("UTC");expect(typeof result.updated_at).toBe("number");- const lastCall = fetchMock.calls[fetchMock.calls.length - 1];- expect(lastCall.args[0]).toBe(ENDPOINT);- expect(lastCall.args[1]).toEqual(+ expect(fetchMock).toHaveBeenCalledWith(+ ENDPOINT,expect.objectContaining({headers: expect.objectContaining({"User-Agent": "OpenStatus-Directory/1.0",@@ -275,7 +272,7 @@ describe("UptimeRobotFetcher", () => {});it("unknown statusClass folds to operational with a warn", async () => {- const warnSpy = spy(() => {});+ const warnSpy = mock(() => {});const originalWarn = console.warn;console.warn = warnSpy;@@ -290,7 +287,7 @@ describe("UptimeRobotFetcher", () => {expect(result.severity).toBe("none");expect(result.status).toBe("operational");- expect(warnSpy.calls.length).toBeGreaterThan(0);+ expect(warnSpy).toHaveBeenCalled();} finally {console.warn = originalWarn;}diff --git a/packages/status-fetcher/__tests__/helpers.ts b/packages/status-fetcher/__tests__/helpers.tsindex bcf6a5270..20f73dba6 100644--- a/packages/status-fetcher/__tests__/helpers.ts+++ b/packages/status-fetcher/__tests__/helpers.ts@@ -1,4 +1,5 @@-import { spy } from "@std/testing/mock";+import { mock } from "bun:test";+import { Cause, Effect, Exit, Option } from "effect";import type { FetchError } from "../src/fetch";@@ -13,7 +14,7 @@ import type {type FetchImpl = (url: string, init?: RequestInit) => Promise<Response>;export const installMockFetch = (impl: FetchImpl) => {- const fn = spy(impl);+ const fn = mock(impl);global.fetch = fn as unknown as typeof fetch;return fn;};diff --git a/packages/status-fetcher/__tests__/integration.test.ts b/packages/status-fetcher/__tests__/integration.test.tsindex 73ab88a08..4c171dbd0 100644--- a/packages/status-fetcher/__tests__/integration.test.ts+++ b/packages/status-fetcher/__tests__/integration.test.ts@@ -1,5 +1,5 @@-import { expect } from "@std/expect";-import { describe, it } from "@std/testing/bdd";+import { describe, expect, it } from "bun:test";+import { Effect } from "effect";import { fetchers as allFetchers } from "../src/fetchers";diff --git a/packages/status-fetcher/__tests__/utils.test.ts b/packages/status-fetcher/__tests__/utils.test.tsindex f2d78f56b..ae1179a38 100644--- a/packages/status-fetcher/__tests__/utils.test.ts+++ b/packages/status-fetcher/__tests__/utils.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, it } from "@std/testing/bdd";+import { describe, expect, it } from "bun:test";import { inferStatus, urlHostnameEndsWith } from "../src/utils";diff --git a/packages/status-fetcher/package.json b/packages/status-fetcher/package.jsonindex 8f4d305d2..8e7c9118a 100644--- a/packages/status-fetcher/package.json+++ b/packages/status-fetcher/package.json@@ -11,9 +11,8 @@"./types": "./src/types.ts"},"scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports",- "test:watch": "deno test --parallel -A --no-check --sloppy-imports --watch",+ "test": "bun test",+ "test:watch": "bun test --watch","tsc": "tsc --noEmit"},"dependencies": {@@ -22,7 +21,6 @@"zod": "catalog:"},"devDependencies": {- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19"+ "@types/bun": "latest"}}diff --git a/packages/status-fetcher/tsconfig.json b/packages/status-fetcher/tsconfig.jsonindex 0d9806dbf..9d6eaf3f5 100644--- a/packages/status-fetcher/tsconfig.json+++ b/packages/status-fetcher/tsconfig.json@@ -2,6 +2,7 @@"compilerOptions": {"target": "ES2022","module": "ESNext",+ "lib": ["ES2022"],"moduleResolution": "bundler","allowImportingTsExtensions": true,"noEmit": true,diff --git a/packages/subscriptions/package.json b/packages/subscriptions/package.jsonindex ada827459..c50cc3b9f 100644--- a/packages/subscriptions/package.json+++ b/packages/subscriptions/package.json@@ -15,8 +15,7 @@}},"scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test -A --no-check --sloppy-imports"+ "test": "bun test"},"dependencies": {"@openstatus/db": "workspace:*",@@ -28,8 +27,7 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19",+ "@types/bun": "latest","typescript": "catalog:"}}diff --git a/packages/subscriptions/src/channels/email.test.ts b/packages/subscriptions/src/channels/email.test.tsindex bda440661..6772acebe 100644--- a/packages/subscriptions/src/channels/email.test.ts+++ b/packages/subscriptions/src/channels/email.test.ts@@ -1,8 +1,6 @@-import "../test-preload.ts";+import { beforeEach, describe, expect, spyOn, test } from "bun:test";+import { EmailClient } from "@openstatus/emails";-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { assertSpyCalls, type Stub, stub } from "@std/testing/mock";import type { PageUpdate, Subscription } from "../types";import {@@ -14,8 +12,15 @@ import {// RESEND_API_KEY is set in test-preload.ts (see bunfig.toml) so @openstatus/emails// loads successfully and EmailClient prototype methods can be spied on.-let sendPageSubscriptionMock: Stub<EmailClient>;-let sendStatusReportUpdateMock: Stub<EmailClient>;+const sendPageSubscriptionMock = spyOn(+ EmailClient.prototype,+ "sendPageSubscription",+).mockResolvedValue(undefined);++const sendStatusReportUpdateMock = spyOn(+ EmailClient.prototype,+ "sendStatusReportUpdate",+).mockResolvedValue(undefined);function makeSub(overrides: Partial<Subscription> = {}): Subscription {return {@@ -46,21 +51,8 @@ function makeUpdate(overrides: Partial<PageUpdate> = {}): PageUpdate {}beforeEach(() => {- sendPageSubscriptionMock = stub(- EmailClient.prototype,- "sendPageSubscription",- () => Promise.resolve(undefined),- );- sendStatusReportUpdateMock = stub(- EmailClient.prototype,- "sendStatusReportUpdate",- () => Promise.resolve(undefined),- );-});--afterEach(() => {- sendPageSubscriptionMock.restore();- sendStatusReportUpdateMock.restore();+ sendPageSubscriptionMock.mockClear();+ sendStatusReportUpdateMock.mockClear();});// βββ validateEmailConfig ββββββββββββββββββββββββββββββββββββββββββββββββββββββ@@ -102,8 +94,8 @@ describe("sendEmailVerification", () => {const sub = makeSub({ email: "[email protected]", pageName: "My Page" });await sendEmailVerification(sub, "https://example.com/verify/abc");- assertSpyCalls(sendPageSubscriptionMock, 1);- const [args] = sendPageSubscriptionMock.calls[0].args;+ expect(sendPageSubscriptionMock).toHaveBeenCalledTimes(1);+ const [args] = sendPageSubscriptionMock.mock.calls[0];expect(args.to).toBe("[email protected]");expect(args.link).toBe("https://example.com/verify/abc");expect(args.page).toBe("My Page");@@ -115,13 +107,13 @@ describe("sendEmailVerification", () => {describe("sendEmailNotifications", () => {test("does nothing for an empty subscriptions array", async () => {await sendEmailNotifications([], makeUpdate());- assertSpyCalls(sendStatusReportUpdateMock, 0);+ expect(sendStatusReportUpdateMock).not.toHaveBeenCalled();});test("filters out subscriptions without an email address", async () => {const sub = makeSub({ email: undefined });await sendEmailNotifications([sub], makeUpdate());- assertSpyCalls(sendStatusReportUpdateMock, 0);+ expect(sendStatusReportUpdateMock).not.toHaveBeenCalled();});test("calls sendStatusReportUpdate once with all valid subscribers", async () => {@@ -131,8 +123,8 @@ describe("sendEmailNotifications", () => {await sendEmailNotifications([sub1, sub2], update);- assertSpyCalls(sendStatusReportUpdateMock, 1);- const [args] = sendStatusReportUpdateMock.calls[0].args;+ expect(sendStatusReportUpdateMock).toHaveBeenCalledTimes(1);+ const [args] = sendStatusReportUpdateMock.mock.calls[0];expect(args.subscribers).toHaveLength(2);expect(args.subscribers[0].email).toBe("[email protected]");expect(args.subscribers[1].email).toBe("[email protected]");@@ -146,7 +138,7 @@ describe("sendEmailNotifications", () => {await sendEmailNotifications([sub], update);- const [args] = sendStatusReportUpdateMock.calls[0].args;+ const [args] = sendStatusReportUpdateMock.mock.calls[0];expect(args.pageComponents).toEqual(["API", "Database"]);});@@ -154,7 +146,7 @@ describe("sendEmailNotifications", () => {const sub = makeSub();await sendEmailNotifications([sub], makeUpdate({ updateId: 77 }));- const [args] = sendStatusReportUpdateMock.calls[0].args;+ const [args] = sendStatusReportUpdateMock.mock.calls[0];expect(args.idempotencyKey).toBe("status-report-update:77");});@@ -165,7 +157,7 @@ describe("sendEmailNotifications", () => {makeUpdate({ id: 17, updateId: undefined, status: "maintenance" }),);- const [args] = sendStatusReportUpdateMock.calls[0].args;+ const [args] = sendStatusReportUpdateMock.mock.calls[0];expect(args.idempotencyKey).toBe("page-update:17:maintenance");});});diff --git a/packages/subscriptions/src/channels/index.test.ts b/packages/subscriptions/src/channels/index.test.tsindex d635918b5..fc6df14f8 100644--- a/packages/subscriptions/src/channels/index.test.ts+++ b/packages/subscriptions/src/channels/index.test.ts@@ -1,6 +1,4 @@-import "../test-preload.ts";-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";+import { describe, expect, test } from "bun:test";import { getChannel } from "./index";diff --git a/packages/subscriptions/src/channels/webhook.test.ts b/packages/subscriptions/src/channels/webhook.test.tsindex d17be6f40..a10a9b416 100644--- a/packages/subscriptions/src/channels/webhook.test.ts+++ b/packages/subscriptions/src/channels/webhook.test.ts@@ -1,6 +1,4 @@-import { expect } from "@std/expect";-import { afterEach, beforeEach, describe, test } from "@std/testing/bdd";-import { assertSpyCalls, type Stub, stub } from "@std/testing/mock";+import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test";import { webhookPayloadSchema } from "../payload";import type { PageUpdate, Subscription } from "../types";@@ -17,21 +15,7 @@ import {const SLACK_URL = "https://hooks.slack.com/services/T1/B1/XXX";const DISCORD_URL = "https://discord.com/api/webhooks/1/xxx";-let fetchMock: Stub<typeof globalThis>;--function setFetch(- impl: (- input: Request | string | URL,- init?: RequestInit,- ) => Promise<Response>,-) {- fetchMock?.restore();- fetchMock = stub(globalThis, "fetch", impl);-}--function resolveFetch(response: Response) {- setFetch(() => Promise.resolve(response));-}+let fetchMock: any;function makeSub(overrides: Partial<Subscription> = {}): Subscription {return {@@ -62,13 +46,11 @@ function makeUpdate(overrides: Partial<PageUpdate> = {}): PageUpdate {}beforeEach(() => {- fetchMock = stub(globalThis, "fetch", () =>- Promise.resolve(new Response(null, { status: 200 })),- );+ fetchMock = spyOn(global, "fetch");});afterEach(() => {- fetchMock.restore();+ fetchMock.mockRestore();});// βββ validateWebhookConfig ββββββββββββββββββββββββββββββββββββββββββββββββββββ@@ -117,7 +99,7 @@ describe("sendWebhookVerification", () => {});test("resolves when fetch returns 200", async () => {- resolveFetch(new Response(null, { status: 200 }));+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));const sub = makeSub();await expect(sendWebhookVerification(sub, "https://example.com/verify/abc"),@@ -125,7 +107,7 @@ describe("sendWebhookVerification", () => {});test("throws when fetch returns a non-ok status", async () => {- resolveFetch(+ fetchMock.mockResolvedValue(new Response(null, { status: 500, statusText: "Server Error" }),);const sub = makeSub();@@ -135,15 +117,15 @@ describe("sendWebhookVerification", () => {});test("posts to the correct URL with the expected payload", async () => {- resolveFetch(new Response(null, { status: 200 }));+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));const sub = makeSub({token: "my-token",webhookUrl: "https://hooks.example.com/sub",});await sendWebhookVerification(sub, "https://example.com/verify/my-token");- assertSpyCalls(fetchMock, 1);- const [url, init] = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const [url, init] = fetchMock.mock.calls[0];expect(url).toBe("https://hooks.example.com/sub");expect(init?.method).toBe("POST");const body = JSON.parse(init?.body as string);@@ -159,11 +141,11 @@ describe("sendWebhookNotifications", () => {test("skips subscriptions without a webhookUrl", async () => {const sub = makeSub({ webhookUrl: undefined });await sendWebhookNotifications([sub], makeUpdate());- assertSpyCalls(fetchMock, 0);+ expect(fetchMock).not.toHaveBeenCalled();});test("sends a POST request to each webhook URL", async () => {- resolveFetch(new Response(null, { status: 200 }));+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));const sub1 = makeSub({webhookUrl: "https://hooks.slack.com/services/T1/B1/aaa",});@@ -173,14 +155,14 @@ describe("sendWebhookNotifications", () => {await sendWebhookNotifications([sub1, sub2], makeUpdate());- assertSpyCalls(fetchMock, 2);- const urls = fetchMock.calls.map((c) => c.args[0]);+ expect(fetchMock).toHaveBeenCalledTimes(2);+ const urls = fetchMock.mock.calls.map(([url]: [string]) => url);expect(urls).toContain("https://hooks.slack.com/services/T1/B1/aaa");expect(urls).toContain("https://hooks.slack.com/services/T2/B2/bbb");});test("sends a generic JSON payload to non-Slack/Discord URLs", async () => {- resolveFetch(new Response(null, { status: 200 }));+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));const generic = makeSub({id: 101,webhookUrl: "https://example.com/webhook",@@ -192,19 +174,19 @@ describe("sendWebhookNotifications", () => {makeUpdate({ updateId: 42 }),);- assertSpyCalls(fetchMock, 2);+ expect(fetchMock).toHaveBeenCalledTimes(2);const byUrl = new Map<string, any>(- fetchMock.calls.map((c) => {- const [url, init] = c.args as [string, RequestInit];- return [url, JSON.parse(init.body as string)];- }),+ fetchMock.mock.calls.map(([url, init]: [string, RequestInit]) => [+ url,+ JSON.parse(init.body as string),+ ]),);expect(byUrl.get("https://example.com/webhook").type).toBe("status_report");expect(byUrl.get(SLACK_URL).attachments).toBeDefined();});test("the status_report body sent over the wire satisfies webhookPayloadSchema (v1)", async () => {- resolveFetch(new Response(null, { status: 200 }));+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));const sub = makeSub({ webhookUrl: "https://example.com/webhook" });await sendWebhookNotifications(@@ -218,14 +200,14 @@ describe("sendWebhookNotifications", () => {}),);- const [, init] = fetchMock.calls[0].args;+ const [, init] = fetchMock.mock.calls[0];const sentBody = JSON.parse(init?.body as string);const result = webhookPayloadSchema.safeParse(sentBody);expect(result.success).toBe(true);});test("the maintenance body sent over the wire satisfies webhookPayloadSchema (v1)", async () => {- resolveFetch(new Response(null, { status: 200 }));+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));const sub = makeSub({ webhookUrl: "https://example.com/webhook" });await sendWebhookNotifications(@@ -238,14 +220,14 @@ describe("sendWebhookNotifications", () => {}),);- const [, init] = fetchMock.calls[0].args;+ const [, init] = fetchMock.mock.calls[0];const sentBody = JSON.parse(init?.body as string);const result = webhookPayloadSchema.safeParse(sentBody);expect(result.success).toBe(true);});test("applies custom headers from channelConfig", async () => {- resolveFetch(new Response(null, { status: 200 }));+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));const sub = makeSub({channelConfig: JSON.stringify({headers: [{ key: "X-Custom-Header", value: "my-value" }],@@ -254,17 +236,17 @@ describe("sendWebhookNotifications", () => {await sendWebhookNotifications([sub], makeUpdate());- const [, init] = fetchMock.calls[0].args;+ const [, init] = fetchMock.mock.calls[0];const headers = init?.headers as Record<string, string>;expect(headers["X-Custom-Header"]).toBe("my-value");});test("continues sending to remaining webhooks when one keeps failing", async () => {const failUrl = "https://hooks.slack.com/services/T1/B1/fail";- setFetch((input) =>- String(input) === failUrl+ fetchMock.mockImplementation(async (url: string) =>+ url === failUrl? Promise.reject(new Error("Network error"))- : Promise.resolve(new Response(null, { status: 200 })),+ : new Response(null, { status: 200 }),);const sub1 = makeSub({ webhookUrl: failUrl });@@ -276,22 +258,17 @@ describe("sendWebhookNotifications", () => {sendWebhookNotifications([sub1, sub2], makeUpdate()),).resolves.toBeUndefined();- const calls = fetchMock.calls.map((c) => String(c.args[0]));+ const calls = fetchMock.mock.calls.map(([url]: [string]) => url);expect(calls).toContain("https://hooks.slack.com/services/T2/B2/succeed");});test("retries transient failures then succeeds", async () => {let attempts = 0;- setFetch(() => {+ fetchMock.mockImplementation(async () => {attempts += 1;- return Promise.resolve(- attempts < 3- ? new Response(null, {- status: 503,- statusText: "Service Unavailable",- })- : new Response(null, { status: 200 }),- );+ return attempts < 3+ ? new Response(null, { status: 503, statusText: "Service Unavailable" })+ : new Response(null, { status: 200 });});await expect(@@ -302,13 +279,13 @@ describe("sendWebhookNotifications", () => {});test("does not retry non-retryable 4xx responses", async () => {- resolveFetch(+ fetchMock.mockResolvedValue(new Response(null, { status: 400, statusText: "Bad Request" }),);await sendWebhookNotifications([makeSub()], makeUpdate());- assertSpyCalls(fetchMock, 1);+ expect(fetchMock).toHaveBeenCalledTimes(1);});});@@ -336,31 +313,31 @@ describe("detectWebhookFlavor", () => {describe("sendWebhookNotifications (flavor detection)", () => {test("emits Slack blocks payload for hooks.slack.com URLs", async () => {- resolveFetch(new Response(null, { status: 200 }));+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));const sub = makeSub({ webhookUrl: SLACK_URL });await sendWebhookNotifications([sub], makeUpdate());- const [, init] = fetchMock.calls[0].args;+ const [, init] = fetchMock.mock.calls[0];const body = JSON.parse(init?.body as string);expect(body.attachments).toBeDefined();expect(body.attachments[0].blocks).toBeInstanceOf(Array);});test("emits Discord embed payload for discord.com URLs", async () => {- resolveFetch(new Response(null, { status: 200 }));+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));const sub = makeSub({ webhookUrl: DISCORD_URL });await sendWebhookNotifications([sub], makeUpdate());- const [, init] = fetchMock.calls[0].args;+ const [, init] = fetchMock.mock.calls[0];const body = JSON.parse(init?.body as string);expect(body.embeds).toBeInstanceOf(Array);expect(body.embeds[0].title).toBe("Test Incident");});test("Slack payload includes manage/unsubscribe links", async () => {- resolveFetch(new Response(null, { status: 200 }));+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));const sub = makeSub({token: "tok-123",pageSlug: "demo",@@ -368,7 +345,7 @@ describe("sendWebhookNotifications (flavor detection)", () => {await sendWebhookNotifications([sub], makeUpdate());- const [, init] = fetchMock.calls[0].args;+ const [, init] = fetchMock.mock.calls[0];const stringified = init?.body as string;expect(stringified).toContain("https://demo.openstatus.dev/manage/tok-123");expect(stringified).toContain(@@ -377,7 +354,7 @@ describe("sendWebhookNotifications (flavor detection)", () => {});test("Slack payload uses custom domain when present", async () => {- resolveFetch(new Response(null, { status: 200 }));+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));const sub = makeSub({token: "tok-123",customDomain: "status.partner.com",@@ -385,18 +362,18 @@ describe("sendWebhookNotifications (flavor detection)", () => {await sendWebhookNotifications([sub], makeUpdate());- const [, init] = fetchMock.calls[0].args;+ const [, init] = fetchMock.mock.calls[0];const stringified = init?.body as string;expect(stringified).toContain("https://status.partner.com/manage/tok-123");});test("Slack payload links to the event details and the page origin", async () => {- resolveFetch(new Response(null, { status: 200 }));+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));const sub = makeSub({ pageSlug: "demo", pageName: "Demo" });await sendWebhookNotifications([sub], makeUpdate({ id: 99 }));- const [, init] = fetchMock.calls[0].args;+ const [, init] = fetchMock.mock.calls[0];const body = JSON.parse(init?.body as string);const stringified = init?.body as string;// title stays in a plain_text header block@@ -411,7 +388,7 @@ describe("sendWebhookNotifications (flavor detection)", () => {});test("Discord embed url points at the event; maintenance uses the maintenance path", async () => {- resolveFetch(new Response(null, { status: 200 }));+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));const sub = makeSub({webhookUrl: DISCORD_URL,pageSlug: "demo",@@ -423,7 +400,7 @@ describe("sendWebhookNotifications (flavor detection)", () => {makeUpdate({ id: 7, status: "maintenance" }),);- const [, init] = fetchMock.calls[0].args;+ const [, init] = fetchMock.mock.calls[0];const body = JSON.parse(init?.body as string);expect(body.embeds[0].url).toBe("https://demo.openstatus.dev/events/maintenance/7",@@ -607,14 +584,14 @@ describe("buildTestPayload", () => {describe("sendTestWebhookRequest", () => {test("POSTs flavor-appropriate payload", async () => {- resolveFetch(new Response(null, { status: 200 }));+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));await sendTestWebhookRequest({url: "https://example.com/hook",flavor: "generic",});- assertSpyCalls(fetchMock, 1);- const [url, init] = fetchMock.calls[0].args;+ expect(fetchMock).toHaveBeenCalledTimes(1);+ const [url, init] = fetchMock.mock.calls[0];expect(url).toBe("https://example.com/hook");expect(init?.method).toBe("POST");const body = JSON.parse(init?.body as string);@@ -622,7 +599,9 @@ describe("sendTestWebhookRequest", () => {});test("throws on non-2xx response", async () => {- resolveFetch(new Response(null, { status: 404, statusText: "Not Found" }));+ fetchMock.mockResolvedValue(+ new Response(null, { status: 404, statusText: "Not Found" }),+ );await expect(sendTestWebhookRequest({url: "https://example.com/hook",@@ -632,14 +611,14 @@ describe("sendTestWebhookRequest", () => {});test("passes custom headers", async () => {- resolveFetch(new Response(null, { status: 200 }));+ fetchMock.mockResolvedValue(new Response(null, { status: 200 }));await sendTestWebhookRequest({url: "https://example.com/hook",flavor: "generic",headers: { "X-Custom": "abc" },});- const [, init] = fetchMock.calls[0].args;+ const [, init] = fetchMock.mock.calls[0];const headers = init?.headers as Record<string, string>;expect(headers["X-Custom"]).toBe("abc");});diff --git a/packages/subscriptions/src/dispatcher.test.ts b/packages/subscriptions/src/dispatcher.test.tsindex 8888bc937..4cb54ac17 100644--- a/packages/subscriptions/src/dispatcher.test.ts+++ b/packages/subscriptions/src/dispatcher.test.ts@@ -1,20 +1,19 @@-import "./test-preload.ts";-import { db, eq } from "@openstatus/db";-import {- pageSubscriber,- pageSubscriberToPageComponent,-} from "@openstatus/db/src/schema";-import { EmailClient } from "@openstatus/emails";-import { expect } from "@std/expect";import {afterAll,- afterEach,beforeAll,beforeEach,describe,+ expect,+ spyOn,test,-} from "@std/testing/bdd";-import { assertSpyCalls, type Stub, stub } from "@std/testing/mock";+} from "bun:test";++import { db, eq } from "@openstatus/db";+import {+ pageSubscriber,+ pageSubscriberToPageComponent,+} from "@openstatus/db/src/schema";+import { EmailClient } from "@openstatus/emails";import { dispatchPageUpdate } from "./dispatcher";import type { PageUpdate } from "./types";@@ -22,8 +21,10 @@ import type { PageUpdate } from "./types";// RESEND_API_KEY is set in test-preload.ts (see bunfig.toml) so @openstatus/emails// loads successfully and EmailClient prototype methods can be spied on.-let sendStatusReportUpdateMock: Stub<EmailClient>;-let rejectNextSend: Error | null = null;+const sendStatusReportUpdateMock = spyOn(+ EmailClient.prototype,+ "sendStatusReportUpdate",+).mockResolvedValue(undefined);// IDs present in the seeded databaseconst PAGE_ID = 1; // slug: "status"@@ -104,23 +105,7 @@ beforeAll(async () => {afterAll(cleanAll);beforeEach(() => {- rejectNextSend = null;- sendStatusReportUpdateMock = stub(- EmailClient.prototype,- "sendStatusReportUpdate",- () => {- if (rejectNextSend) {- const error = rejectNextSend;- rejectNextSend = null;- return Promise.reject(error);- }- return Promise.resolve(undefined);- },- );-});--afterEach(() => {- sendStatusReportUpdateMock.restore();+ sendStatusReportUpdateMock.mockClear();});// βββ dispatchPageUpdate - component filtering βββββββββββββββββββββββββββββββββ@@ -131,8 +116,8 @@ describe("dispatchPageUpdate - component filtering", () => {makePageUpdate({ pageComponentIds: [COMPONENT_1] }),);- assertSpyCalls(sendStatusReportUpdateMock, 1);- const { subscribers } = sendStatusReportUpdateMock.calls[0].args[0];+ expect(sendStatusReportUpdateMock).toHaveBeenCalledTimes(1);+ const { subscribers } = sendStatusReportUpdateMock.mock.calls[0][0];const emails = subscribers.map((s: { email: string }) => s.email);expect(emails).toContain(EMAILS.entirePage);@@ -145,7 +130,7 @@ describe("dispatchPageUpdate - component filtering", () => {makePageUpdate({ pageComponentIds: [COMPONENT_2] }),);- const { subscribers } = sendStatusReportUpdateMock.calls[0].args[0];+ const { subscribers } = sendStatusReportUpdateMock.mock.calls[0][0];const emails = subscribers.map((s: { email: string }) => s.email);expect(emails).toContain(EMAILS.entirePage);@@ -158,7 +143,7 @@ describe("dispatchPageUpdate - component filtering", () => {makePageUpdate({ pageComponentIds: [COMPONENT_1, COMPONENT_2] }),);- const { subscribers } = sendStatusReportUpdateMock.calls[0].args[0];+ const { subscribers } = sendStatusReportUpdateMock.mock.calls[0][0];const emails = subscribers.map((s: { email: string }) => s.email);expect(emails).toContain(EMAILS.entirePage);@@ -169,8 +154,8 @@ describe("dispatchPageUpdate - component filtering", () => {test("notifies only the entire-page subscriber when update has no affected components", async () => {await dispatchPageUpdate(makePageUpdate({ pageComponentIds: [] }));- assertSpyCalls(sendStatusReportUpdateMock, 1);- const { subscribers } = sendStatusReportUpdateMock.calls[0].args[0];+ expect(sendStatusReportUpdateMock).toHaveBeenCalledTimes(1);+ const { subscribers } = sendStatusReportUpdateMock.mock.calls[0][0];expect(subscribers).toHaveLength(1);expect(subscribers[0].email).toBe(EMAILS.entirePage);@@ -182,7 +167,7 @@ describe("dispatchPageUpdate - component filtering", () => {makePageUpdate({ pageComponentIds: [COMPONENT_1] }),);- const { subscribers } = sendStatusReportUpdateMock.calls[0].args[0];+ const { subscribers } = sendStatusReportUpdateMock.mock.calls[0][0];const emails = subscribers.map((s: { email: string }) => s.email);expect(emails).not.toContain(EMAILS.component2);@@ -197,11 +182,11 @@ describe("dispatchPageUpdate - edge cases", () => {makePageUpdate({ pageId: 99999, pageComponentIds: [COMPONENT_1] }),);- assertSpyCalls(sendStatusReportUpdateMock, 0);+ expect(sendStatusReportUpdateMock).not.toHaveBeenCalled();});test("does not propagate channel failure β resolves even when sendStatusReportUpdate throws", async () => {- rejectNextSend = new Error("SMTP failure");+ sendStatusReportUpdateMock.mockRejectedValueOnce(new Error("SMTP failure"));await expect(dispatchPageUpdate(makePageUpdate({ pageComponentIds: [] })),diff --git a/packages/subscriptions/src/test-preload.ts b/packages/subscriptions/src/test-preload.tsindex b26048d3c..291707044 100644--- a/packages/subscriptions/src/test-preload.ts+++ b/packages/subscriptions/src/test-preload.ts@@ -1,11 +1,6 @@/**- * Test env setup. Import this FIRST in any test file so env vars are set- * before module-level env validations (e.g. @openstatus/emails, @openstatus/db)- * fire on import.- *- * Bun's test runner set NODE_ENV=test automatically; Deno does not, so we set- * it here. The @openstatus/db env hack maps NODE_ENV=test to the local turso- * URL, and @openstatus/emails validates RESEND_API_KEY at module load.+ * Preload file for bun test.+ * Runs before any test file is loaded, ensuring env vars are set+ * before module-level env validations (e.g. @openstatus/emails) fire.*/-process.env.NODE_ENV = "test";-process.env.RESEND_API_KEY ??= "test-key";+process.env.RESEND_API_KEY = "test-key";diff --git a/packages/subscriptions/tsconfig.json b/packages/subscriptions/tsconfig.jsonindex 4225a2de0..868037cfc 100644--- a/packages/subscriptions/tsconfig.json+++ b/packages/subscriptions/tsconfig.json@@ -1,10 +1,12 @@{"extends": "@openstatus/tsconfig/base.json","compilerOptions": {+ "lib": ["ES2022", "DOM"],"module": "ESNext","target": "ES2022","moduleResolution": "bundler",- "jsx": "react-jsx"+ "jsx": "react-jsx",+ "types": ["bun"]},"include": [".", "src"],"exclude": ["dist", "build", "node_modules"]diff --git a/packages/test-utils/package.json b/packages/test-utils/package.jsondeleted file mode 100644index ee345766c..000000000--- a/packages/test-utils/package.json+++ /dev/null@@ -1,20 +0,0 @@-{- "name": "@openstatus/test-utils",- "version": "1.0.0",- "private": true,- "main": "src/index.ts",- "exports": {- ".": "./src/index.ts"- },- "scripts": {- "check": "deno check --sloppy-imports ."- },- "dependencies": {- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19"- },- "devDependencies": {- "@openstatus/tsconfig": "workspace:*",- "typescript": "catalog:"- }-}diff --git a/packages/test-utils/src/index.ts b/packages/test-utils/src/index.tsdeleted file mode 100644index 25c2570b3..000000000--- a/packages/test-utils/src/index.ts+++ /dev/null@@ -1,27 +0,0 @@-// Single import surface for migrated tests: `import { ... } from "@openstatus/test-utils"`.-// Importing this module registers the Bun-compat matchers (./matchers side-effect).-import "./matchers.ts";--export {- after,- afterAll,- afterEach,- before,- beforeAll,- beforeEach,- describe,- it,- test,-} from "./runner.ts";-export { expect } from "jsr:@std/expect";-export { type MockFn, mock } from "./mock-fn.ts";-export {- assertSpyCall,- assertSpyCalls,- returnsNext,- type Spy,- spy,- type Stub,- stub,-} from "jsr:@std/testing/mock";-export { FakeTime } from "jsr:@std/testing/time";diff --git a/packages/test-utils/src/matchers.ts b/packages/test-utils/src/matchers.tsdeleted file mode 100644index 36d58bd32..000000000--- a/packages/test-utils/src/matchers.ts+++ /dev/null@@ -1,95 +0,0 @@-import { expect } from "jsr:@std/expect";--// @std/expect stopped re-exporting its matcher-context type; these matchers only-// read `value`, so a minimal local shape is enough.-type ExpectMatcherContext = { value: unknown };--type MatcherResult = { pass: boolean; message: () => string };--const isObject = (v: unknown): v is Record<string, unknown> =>- typeof v === "object" && v !== null;--const size = (v: unknown): number => {- if (typeof v === "string" || Array.isArray(v)) return v.length;- if (v instanceof Map || v instanceof Set) return v.size;- if (isObject(v)) return Object.keys(v).length;- return -1;-};--// Bun's `expect` extension matchers, reimplemented on @std/expect so the ~150-// existing call sites keep working under `deno test`.-expect.extend({- toBeNumber(context: ExpectMatcherContext): MatcherResult {- const pass =- typeof context.value === "number" && !Number.isNaN(context.value);- return { pass, message: () => `expected ${context.value} to be a number` };- },- toBeString(context: ExpectMatcherContext): MatcherResult {- return {- pass: typeof context.value === "string",- message: () => `expected ${context.value} to be a string`,- };- },- toBeBoolean(context: ExpectMatcherContext): MatcherResult {- return {- pass: typeof context.value === "boolean",- message: () => `expected ${context.value} to be a boolean`,- };- },- toBeArray(context: ExpectMatcherContext): MatcherResult {- return {- pass: Array.isArray(context.value),- message: () => `expected ${context.value} to be an array`,- };- },- toBeTrue(context: ExpectMatcherContext): MatcherResult {- return {- pass: context.value === true,- message: () => `expected ${context.value} to be true`,- };- },- toBeFalse(context: ExpectMatcherContext): MatcherResult {- return {- pass: context.value === false,- message: () => `expected ${context.value} to be false`,- };- },- toBeNil(context: ExpectMatcherContext): MatcherResult {- return {- pass: context.value === null || context.value === undefined,- message: () => `expected ${context.value} to be null or undefined`,- };- },- toBeEmpty(context: ExpectMatcherContext): MatcherResult {- return {- pass: size(context.value) === 0,- message: () => `expected ${context.value} to be empty`,- };- },- toBeOneOf(- context: ExpectMatcherContext,- expected: readonly unknown[],- ): MatcherResult {- return {- pass: expected.includes(context.value),- message: () =>- `expected ${context.value} to be one of ${JSON.stringify(expected)}`,- };- },- toContainValue(context: ExpectMatcherContext, value: unknown): MatcherResult {- const pass =- isObject(context.value) && Object.values(context.value).includes(value);- return { pass, message: () => `expected object to contain value ${value}` };- },- toContainKey(context: ExpectMatcherContext, key: string): MatcherResult {- const pass =- isObject(context.value) && Object.keys(context.value).includes(key);- return { pass, message: () => `expected object to contain key ${key}` };- },- pass(_context: ExpectMatcherContext, _message?: string): MatcherResult {- return { pass: true, message: () => _message ?? "passed" };- },- fail(_context: ExpectMatcherContext, message?: string): MatcherResult {- return { pass: false, message: () => message ?? "failed" };- },-});diff --git a/packages/test-utils/src/mock-fn.ts b/packages/test-utils/src/mock-fn.tsdeleted file mode 100644index 2d71214fb..000000000--- a/packages/test-utils/src/mock-fn.ts+++ /dev/null@@ -1,112 +0,0 @@-// Bun-compatible `mock()` for the Deno migration. Bun's mock function isn't-// available under `deno test`; this reimplements the subset our suites use-// (the jest-style `.mock.calls` + `.mockX()` helpers) on plain closures.-//-// NOTE: bun's `mock.module(specifier, factory)` has no Deno equivalent and is-// intentionally NOT provided here β module replacement is done via the-// `--import-map` flag and test-double modules instead.--// oxlint-disable-next-line typescript/no-explicit-any-type AnyFn = (...args: any[]) => any;--interface MockState {- // oxlint-disable-next-line typescript/no-explicit-any- calls: any[][];- results: { type: "return" | "throw"; value: unknown }[];-}--export interface MockFn extends AnyFn {- mock: MockState;- mockClear(): MockFn;- mockReset(): MockFn;- mockImplementation(fn: AnyFn): MockFn;- mockImplementationOnce(fn: AnyFn): MockFn;- mockReturnValue(value: unknown): MockFn;- mockReturnValueOnce(value: unknown): MockFn;- mockResolvedValue(value: unknown): MockFn;- mockResolvedValueOnce(value: unknown): MockFn;- mockRejectedValue(value: unknown): MockFn;- mockRestore(): MockFn;-}--export function mock(impl?: AnyFn): MockFn {- let defaultImpl = impl;- const onceQueue: AnyFn[] = [];- const state: MockState = { calls: [], results: [] };-- // oxlint-disable-next-line typescript/no-explicit-any- const fn = ((...args: any[]) => {- state.calls.push(args);- const use = onceQueue.length ? onceQueue.shift() : defaultImpl;- try {- const value = use ? use(...args) : undefined;- state.results.push({ type: "return", value });- return value;- } catch (err) {- state.results.push({ type: "throw", value: err });- throw err;- }- }) as MockFn;-- fn.mock = state;- // Expose the @std/expect mock interface (Symbol.for("@MOCK")) so its- // `.toHaveBeenCalled*` matchers recognize this shim, not just `.mock.calls`.- Object.defineProperty(fn, Symbol.for("@MOCK"), {- get() {- return {- calls: state.calls.map((args, i) => {- const r = state.results[i];- return {- args,- returned: r?.type === "return" ? r.value : undefined,- thrown: r?.type === "throw" ? r.value : undefined,- timestamp: 0,- returns: r?.type === "return",- throws: r?.type === "throw",- };- }),- };- },- });- fn.mockClear = () => {- state.calls = [];- state.results = [];- return fn;- };- fn.mockReset = () => {- fn.mockClear();- onceQueue.length = 0;- defaultImpl = undefined;- return fn;- };- fn.mockImplementation = (f) => {- defaultImpl = f;- return fn;- };- fn.mockImplementationOnce = (f) => {- onceQueue.push(f);- return fn;- };- fn.mockReturnValue = (value) => {- defaultImpl = () => value;- return fn;- };- fn.mockReturnValueOnce = (value) => {- onceQueue.push(() => value);- return fn;- };- fn.mockResolvedValue = (value) => {- defaultImpl = () => Promise.resolve(value);- return fn;- };- fn.mockResolvedValueOnce = (value) => {- onceQueue.push(() => Promise.resolve(value));- return fn;- };- fn.mockRejectedValue = (value) => {- defaultImpl = () => Promise.reject(value);- return fn;- };- fn.mockRestore = () => fn;- return fn;-}diff --git a/packages/test-utils/src/runner.ts b/packages/test-utils/src/runner.tsdeleted file mode 100644index 55dd22f4a..000000000--- a/packages/test-utils/src/runner.ts+++ /dev/null@@ -1,58 +0,0 @@-import {- describe as nodeDescribe,- it as nodeIt,- test as nodeTest,-} from "node:test";--type Body = () => void | Promise<void>;-type BaseFn = (name: string, body: Body) => void;-type EachCase = readonly unknown[];--const formatName = (name: string, args: EachCase, index: number): string => {- let i = 0;- const interpolated = name.replace(/%[spdijfo%]/g, (token) => {- if (token === "%%") return "%";- const arg = args[i++];- return typeof arg === "string" ? arg : JSON.stringify(arg);- });- return interpolated === name && args.length > 0- ? `${name} [${index}]`- : interpolated;-};--const makeEach =- (base: BaseFn) =>- <T extends EachCase>(cases: readonly T[]) =>- (name: string, body: (...args: T) => void | Promise<void>): void => {- cases.forEach((args, index) => {- base(formatName(name, args, index), () => body(...args));- });- };--// node:test's `test`/`it`/`describe` lack Jest/Bun's `.each`; everything else-// (.skip/.todo/.only) exists natively and is preserved by reference.-type Augmented<F> = F & {- each: <T extends EachCase>(- cases: readonly T[],- ) => (name: string, body: (...args: T) => void | Promise<void>) => void;-};--const augment = <F extends typeof nodeTest>(base: F): Augmented<F> => {- const fn = base as Augmented<F>;- fn.each = makeEach(base as unknown as BaseFn);- return fn;-};--export const test = augment(nodeTest);-export const it = augment(nodeIt);-export const describe = augment(- nodeDescribe as unknown as typeof nodeTest,-) as unknown as Augmented<typeof nodeDescribe>;-export {- after,- after as afterAll,- afterEach,- before,- before as beforeAll,- beforeEach,-} from "node:test";diff --git a/packages/theme-store/package.json b/packages/theme-store/package.jsonindex ffc39d712..cdb625530 100644--- a/packages/theme-store/package.json+++ b/packages/theme-store/package.json@@ -6,9 +6,7 @@"license": "ISC","author": "","main": "src/index.ts",- "scripts": {- "check": "deno check --sloppy-imports ."- },+ "scripts": {},"dependencies": {},"devDependencies": {"@openstatus/tsconfig": "workspace:*",diff --git a/packages/tinybird/package.json b/packages/tinybird/package.jsonindex c575aa6a6..17a465bcf 100644--- a/packages/tinybird/package.json+++ b/packages/tinybird/package.json@@ -3,9 +3,6 @@"version": "0.0.0","license": "MIT","main": "src/index.ts",- "scripts": {- "check": "deno check --sloppy-imports ."- },"dependencies": {"@chronark/zod-bird": "catalog:","zod": "catalog:"diff --git a/packages/tracker/package.json b/packages/tracker/package.jsonindex f73478cc2..6f654a01e 100644--- a/packages/tracker/package.json+++ b/packages/tracker/package.json@@ -7,8 +7,7 @@"author": "","main": "src/index.ts","scripts": {- "check": "deno check --sloppy-imports .",- "test": "deno test --parallel -A --no-check --sloppy-imports"+ "test": "bun test"},"dependencies": {"@openstatus/db": "workspace:*",@@ -17,8 +16,7 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19",+ "bun-types": "catalog:","typescript": "catalog:"}}diff --git a/packages/tracker/src/mock.ts b/packages/tracker/src/mock.tsindex 50082d4c1..5f338e46b 100644--- a/packages/tracker/src/mock.ts+++ b/packages/tracker/src/mock.ts@@ -1,4 +1,6 @@-import { type Monitor, Tracker } from "./tracker";+import type { Monitor } from "@openstatus/tinybird";++import { Tracker } from "./tracker";export const mockMonitor: Monitor[] = [{ day: "2024-02-21 00:00:00", count: 762, ok: 762 },diff --git a/packages/tracker/src/tracker.test.ts b/packages/tracker/src/tracker.test.tsindex 8f42f53f1..0c4fddf38 100644--- a/packages/tracker/src/tracker.test.ts+++ b/packages/tracker/src/tracker.test.ts@@ -1,11 +1,11 @@+import { describe, expect, test } from "bun:test";+import type {Incident,Maintenance,StatusReport,StatusReportUpdate,} from "@openstatus/db/src/schema";-import { expect } from "@std/expect";-import { describe, test } from "@std/testing/bdd";import { blacklistDates } from "./blacklist";import { classNames, statusDetails } from "./config";@@ -149,12 +149,10 @@ describe("Tracker", () => {["0% β Major Outage", 100, 0, Status.MajorOutage],];- for (const [label, count, ok, expected] of cases) {- test(label, () => {- const tracker = new Tracker({ data: [day("2024-01-01", count, ok)] });- expect(tracker.currentStatus).toBe(expected);- });- }+ test.each(cases)("%s", (_label, count, ok, expected) => {+ const tracker = new Tracker({ data: [day("2024-01-01", count, ok)] });+ expect(tracker.currentStatus).toBe(expected);+ });// NOTE: the lower boundary is `> 30`, while the other two are `>=`. So// exactly 30% uptime is Major (not Partial) Outage. Pinning current@@ -338,9 +336,7 @@ describe("Tracker", () => {describe("per-day precedence (maintenance > report > incident > uptime)", () => {const DAY = "2024-01-01";- // date-only string so `new Date(day)` anchors to UTC midnight, matching- // the UTC fixture dates below regardless of the runner's timezone.- const okData = [day(DAY, 864, 864)];+ const okData = [day(`${DAY} 00:00:00`, 864, 864)];test("maintenance overlapping the day wins", () => {const [bucket] = new Tracker({@@ -398,7 +394,7 @@ describe("Tracker", () => {test("an incident resolved on a previous day does not affect this bucket", () => {const [bucket] = new Tracker({- data: [day("2024-01-02", 864, 864)],+ data: [day("2024-01-02 00:00:00", 864, 864)],incidents: [createIncident({startedAt: new Date("2024-01-01T12:00:00.000Z"),diff --git a/packages/tracker/src/tracker.ts b/packages/tracker/src/tracker.tsindex f5da4d4ca..e96bec6fc 100644--- a/packages/tracker/src/tracker.ts+++ b/packages/tracker/src/tracker.ts@@ -11,7 +11,7 @@ import type { StatusDetails, StatusVariant } from "./types";import { Status } from "./types";import { endOfDay, isSameDay, startOfDay } from "./utils";-export type Monitor = {+type Monitor = {count: number;ok: number;day: string;diff --git a/packages/tracker/tsconfig.json b/packages/tracker/tsconfig.jsonindex bded80f35..f40fdec76 100644--- a/packages/tracker/tsconfig.json+++ b/packages/tracker/tsconfig.json@@ -2,6 +2,7 @@"extends": "@openstatus/tsconfig/base.json","include": ["src", "*.ts"],"compilerOptions": {- "target": "ES2021"+ "target": "ES2021",+ "types": ["bun-types"]}}diff --git a/packages/upstash/package.json b/packages/upstash/package.jsonindex 68403d46a..ebda567ff 100644--- a/packages/upstash/package.json+++ b/packages/upstash/package.json@@ -3,9 +3,6 @@"version": "0.0.0","license": "MIT","main": "./src/index.ts",- "scripts": {- "check": "deno check --sloppy-imports ."- },"dependencies": {"@upstash/qstash": "catalog:","@upstash/redis": "catalog:"diff --git a/packages/utils/package.json b/packages/utils/package.jsonindex 23419d760..666520a49 100644--- a/packages/utils/package.json+++ b/packages/utils/package.json@@ -6,9 +6,7 @@"license": "ISC","author": "","main": "src/index.ts",- "scripts": {- "check": "deno check --sloppy-imports ."- },+ "scripts": {},"dependencies": {"@openstatus/assertions": "workspace:*","@openstatus/regions": "workspace:*",@@ -16,8 +14,6 @@},"devDependencies": {"@openstatus/tsconfig": "workspace:*",- "@std/expect": "jsr:^1.0.19",- "@std/testing": "jsr:^1.0.19","typescript": "catalog:"}}diff --git a/packages/utils/src/ssrf.test.ts b/packages/utils/src/ssrf.test.tsindex e687e0e91..387ad3a76 100644--- a/packages/utils/src/ssrf.test.ts+++ b/packages/utils/src/ssrf.test.ts@@ -1,5 +1,4 @@-import { expect } from "@std/expect";-import { describe, it } from "@std/testing/bdd";+import { describe, expect, it } from "bun:test";import { assertSafeUrl, assertSafeUrlSync, safeUrlSchema } from "./ssrf";diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 1c8e88032..4fcd37569 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -105,15 +105,9 @@ catalogs:'@openpanel/sdk':specifier: 1.3.1version: 1.3.1- '@opentelemetry/exporter-logs-otlp-http':- specifier: 0.208.0- version: 0.208.0'@opentelemetry/resources':specifier: 2.7.1version: 2.7.1- '@opentelemetry/sdk-logs':- specifier: 0.208.0- version: 0.208.0'@opentelemetry/semantic-conventions':specifier: 1.41.1version: 1.41.1@@ -195,9 +189,9 @@ catalogs:'@scalar/hono-api-reference':specifier: 0.8.10version: 0.8.10- '@sentry/deno':- specifier: 10.61.0- version: 10.61.0+ '@sentry/bun':+ specifier: 10.53.1+ version: 10.53.1'@sentry/nextjs':specifier: 10.53.1version: 10.53.1@@ -763,7 +757,7 @@ importers:version: 16.2.6(@babel/[email protected])(@opentelemetry/[email protected])([email protected])([email protected]([email protected]))([email protected])next-auth:specifier: 'catalog:'- version: 5.0.0-beta.31([email protected](@opentelemetry/[email protected])([email protected]([email protected]))([email protected]))([email protected])+ version: 5.0.0-beta.31([email protected](@opentelemetry/[email protected])([email protected])([email protected]([email protected]))([email protected]))([email protected])next-themes:specifier: 'catalog:'@@ -927,7 +921,7 @@ importers:version: 2.1.1(@logtape/[email protected])'@logtape/sentry':specifier: 'catalog:'- version: 2.1.1(@logtape/[email protected])(@sentry/[email protected])+ version: 2.1.1(@logtape/[email protected])(@sentry/[email protected])'@modelcontextprotocol/sdk':specifier: 'catalog:'version: 1.29.0([email protected])@@ -1006,15 +1000,9 @@ importers:'@openstatus/utils':specifier: workspace:*version: link:../../packages/utils- '@opentelemetry/exporter-logs-otlp-http':- specifier: 'catalog:'- version: 0.208.0(@opentelemetry/[email protected])'@opentelemetry/resources':specifier: 'catalog:'version: 2.7.1(@opentelemetry/[email protected])- '@opentelemetry/sdk-logs':- specifier: 'catalog:'- version: 0.208.0(@opentelemetry/[email protected])'@opentelemetry/semantic-conventions':specifier: 'catalog:'version: 1.41.1@@ -1058,21 +1046,15 @@ importers:'@openstatus/locales':specifier: workspace:*version: link:../../packages/locales- '@openstatus/test-utils':- specifier: workspace:*- version: link:../../packages/test-utils'@openstatus/tsconfig':specifier: workspace:*version: link:../../packages/tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@types/validator':specifier: 'catalog:'version: 13.15.10+ bun-types:+ specifier: 'catalog:'+ version: 1.3.14dotenv:specifier: 'catalog:'version: 16.6.1@@ -1210,7 +1192,7 @@ importers:version: 16.2.6(@babel/[email protected])(@opentelemetry/[email protected])([email protected])([email protected]([email protected]))([email protected])next-auth:specifier: 'catalog:'- version: 5.0.0-beta.31([email protected](@opentelemetry/[email protected])([email protected]([email protected]))([email protected]))([email protected])+ version: 5.0.0-beta.31([email protected](@opentelemetry/[email protected])([email protected])([email protected]([email protected]))([email protected]))([email protected])next-intl:specifier: 'catalog:'version: 4.12.0([email protected](@opentelemetry/[email protected])([email protected])([email protected]([email protected]))([email protected]))([email protected])([email protected])@@ -1269,12 +1251,6 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../../packages/tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@tailwindcss/postcss':specifier: 'catalog:'version: 4.3.0@@ -1293,6 +1269,9 @@ importers:'@types/react-dom':specifier: 'catalog:'version: 19.2.3(@types/[email protected])+ bun-types:+ specifier: 'catalog:'+ version: 1.3.14shadcn:specifier: 'catalog:'@@ -1478,7 +1457,7 @@ importers:version: 16.2.6(@babel/[email protected])(@opentelemetry/[email protected])([email protected])([email protected]([email protected]))([email protected])next-auth:specifier: 'catalog:'- version: 5.0.0-beta.31([email protected](@opentelemetry/[email protected])([email protected]([email protected]))([email protected]))([email protected])+ version: 5.0.0-beta.31([email protected](@opentelemetry/[email protected])([email protected])([email protected]([email protected]))([email protected]))([email protected])next-mdx-remote:specifier: 'catalog:'version: 6.0.0(@types/[email protected])([email protected])@@ -1558,12 +1537,6 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../../packages/tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@tailwindcss/postcss':specifier: 'catalog:'version: 4.3.0@@ -1614,7 +1587,7 @@ importers:version: 2.1.1(@logtape/[email protected])'@logtape/sentry':specifier: 'catalog:'- version: 2.1.1(@logtape/[email protected])(@sentry/[email protected])+ version: 2.1.1(@logtape/[email protected])(@sentry/[email protected])'@openstatus/db':specifier: workspace:*version: link:../../packages/db@@ -1681,21 +1654,15 @@ importers:'@openstatus/utils':specifier: workspace:*version: link:../../packages/utils- '@opentelemetry/exporter-logs-otlp-http':- specifier: 'catalog:'- version: 0.208.0(@opentelemetry/[email protected])'@opentelemetry/resources':specifier: 'catalog:'version: 2.7.1(@opentelemetry/[email protected])- '@opentelemetry/sdk-logs':- specifier: 'catalog:'- version: 0.208.0(@opentelemetry/[email protected])'@opentelemetry/semantic-conventions':specifier: 'catalog:'version: 1.41.1- '@sentry/deno':+ '@sentry/bun':specifier: 'catalog:'- version: 10.61.0+ version: 10.53.1'@upstash/qstash':specifier: 'catalog:'version: 2.11.0@@ -1715,12 +1682,12 @@ importers:specifier: 'catalog:'version: 4.1.13devDependencies:- '@openstatus/test-utils':- specifier: workspace:*- version: link:../../packages/test-utils'@openstatus/tsconfig':specifier: workspace:*version: link:../../packages/tsconfig+ '@types/bun':+ specifier: latest+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -1867,12 +1834,6 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@types/react':specifier: 'catalog:'version: 19.2.15@@ -1941,12 +1902,6 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@types/bcryptjs':specifier: 'catalog:'version: 3.0.0@@ -1958,7 +1913,7 @@ importers:version: 0.31.10next-auth:specifier: 'catalog:'- version: 5.0.0-beta.31([email protected](@opentelemetry/[email protected])([email protected]([email protected]))([email protected]))([email protected])+ version: 5.0.0-beta.31([email protected](@opentelemetry/[email protected])([email protected])([email protected]([email protected]))([email protected]))([email protected])typescript:specifier: 'catalog:'version: 5.9.3@@ -1990,12 +1945,6 @@ importers:'@react-email/ui':specifier: 'catalog:'version: 6.1.5(@opentelemetry/[email protected])([email protected]([email protected]))([email protected])- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@types/node':specifier: 'catalog:'version: 24.12.4@@ -2024,12 +1973,9 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'+ '@types/bun':+ specifier: latest+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -2062,12 +2008,6 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'typescript:specifier: 'catalog:'version: 5.9.3@@ -2097,15 +2037,12 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@types/node':specifier: 'catalog:'version: 24.12.4+ bun-types:+ specifier: 'catalog:'+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -2128,15 +2065,12 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@types/node':specifier: 'catalog:'version: 24.12.4+ bun-types:+ specifier: 'catalog:'+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -2159,15 +2093,12 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@types/node':specifier: 'catalog:'version: 24.12.4+ bun-types:+ specifier: 'catalog:'+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -2205,9 +2136,6 @@ importers:specifier: 'catalog:'version: 4.1.13devDependencies:- '@openstatus/test-utils':- specifier: workspace:*- version: link:../../test-utils'@openstatus/tsconfig':specifier: workspace:*version: link:../../tsconfig@@ -2217,6 +2145,9 @@ importers:'@types/react-dom':specifier: 'catalog:'version: 19.2.3(@types/[email protected])+ bun-types:+ specifier: 'catalog:'+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -2239,15 +2170,12 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@types/node':specifier: 'catalog:'version: 24.12.4+ bun-types:+ specifier: 'catalog:'+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -2270,15 +2198,12 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@types/node':specifier: 'catalog:'version: 24.12.4+ bun-types:+ specifier: 'catalog:'+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -2301,15 +2226,12 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@types/node':specifier: 'catalog:'version: 24.12.4+ bun-types:+ specifier: 'catalog:'+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -2332,15 +2254,12 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@types/node':specifier: 'catalog:'version: 24.12.4+ bun-types:+ specifier: 'catalog:'+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -2369,12 +2288,6 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@types/node':specifier: 'catalog:'version: 24.12.4@@ -2384,6 +2297,9 @@ importers:'@types/react-dom':specifier: 'catalog:'version: 19.2.3(@types/[email protected])+ bun-types:+ specifier: 'catalog:'+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -2412,12 +2328,6 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@types/node':specifier: 'catalog:'version: 24.12.4@@ -2427,6 +2337,9 @@ importers:'@types/react-dom':specifier: 'catalog:'version: 19.2.3(@types/[email protected])+ bun-types:+ specifier: 'catalog:'+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -2449,15 +2362,12 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@types/node':specifier: 'catalog:'version: 24.12.4+ bun-types:+ specifier: 'catalog:'+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -2477,15 +2387,12 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@types/node':specifier: 'catalog:'version: 24.12.4+ bun-types:+ specifier: 'catalog:'+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -2511,18 +2418,15 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@types/node':specifier: 'catalog:'version: 24.12.4'@types/validator':specifier: 'catalog:'version: 13.15.10+ bun-types:+ specifier: 'catalog:'+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -2545,15 +2449,12 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]''@types/node':specifier: 'catalog:'version: 24.12.4+ bun-types:+ specifier: 'catalog:'+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -2567,7 +2468,7 @@ importers:specifier: 'catalog:'version: 1.2.0(@bufbuild/[email protected])'@connectrpc/connect':- specifier: 'catalog:'+ specifier: ^2.1.1version: 2.1.1(@bufbuild/[email protected])devDependencies:'@bufbuild/buf':@@ -2663,12 +2564,9 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'+ '@types/bun':+ specifier: latest+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -2685,12 +2583,9 @@ importers:specifier: 'catalog:'version: 4.1.13devDependencies:- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'+ '@types/bun':+ specifier: latest+ version: 1.3.14packages/subscriptions:dependencies:@@ -2716,28 +2611,9 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- typescript:- specifier: 'catalog:'- version: 5.9.3-- packages/test-utils:- dependencies:- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- devDependencies:- '@openstatus/tsconfig':- specifier: workspace:*- version: link:../tsconfig+ '@types/bun':+ specifier: latest+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -2797,12 +2673,9 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'+ bun-types:+ specifier: 'catalog:'+ version: 1.3.14typescript:specifier: 'catalog:'version: 5.9.3@@ -3021,12 +2894,6 @@ importers:'@openstatus/tsconfig':specifier: workspace:*version: link:../tsconfig- '@std/expect':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'- '@std/testing':- specifier: jsr:^1.0.19- version: '@jsr/[email protected]'typescript:specifier: 'catalog:'version: 5.9.3@@ -3079,17 +2946,6 @@ packages:resolution: {integrity: sha512-9q/yCljni37pkMr4sPrI3G4jqdIk074+iukc5aFJl7kmDCCsiJrbZ6zKxnES1Gwg+i9RcDZwvktl23puGslmvA==}hasBin: true- '@apm-js-collab/[email protected]':- resolution: {integrity: sha512-YxLBY5nGlurL7QeJLq6e5g0ouBpAp0pwgyA/5rHXEXwhiPLn9ZHbT+Y2LlP90GT872cSocfjWRYu/fnpuBudNQ==}- engines: {node: '>=18.0.0'}-- '@apm-js-collab/[email protected]':- resolution: {integrity: sha512-XmXYVs8CzJ1Aj79noVbn2weUO/XWtRyURpGqx7aU7DOXlUQhR0WKOQNF0okh7PCeY37vxf7kU3v57OAkEPm3ww==}- hasBin: true-- '@apm-js-collab/[email protected]':- resolution: {integrity: sha512-2/Z3NTewJTruUkmsSnBC5bJlLNUd9keuD1OLlTEpim4FyLhm6m2Rnfv+wrFdUvFfhmH8CRdiDZBqBrn+wyaGuA==}-'@asamuzakjp/[email protected]':resolution: {integrity: sha512-KVw6qIiCTUQhByfTd78h2yD1/00waTmm9uy/R7Ck/ctUyAPj+AEDLkQIdJW0T8+qGgj3j5bpNKK7Q3G+LedJWg==}engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}@@ -4449,30 +4305,6 @@ packages:'@js-sdsl/[email protected]':resolution: {integrity: sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==}- '@jsr/[email protected]':- resolution: {integrity: sha512-pEj6RPkGbqlgRmyKwATp4cUs6+ijxtdrv3bq8v1d2I2CEcMEyPaO8cVKro61wGRDH4cNg8Zx6haztvK/9m7gkA==, tarball: https://npm.jsr.io/~/11/@jsr/std__assert/1.0.19.tgz}-- '@jsr/[email protected]':- resolution: {integrity: sha512-epQ5wsMrnAxeVtzmO9VviX14siVOSvF2o5dAm9qa6ajdWnWrrQ/oup7/Z2ctAOaxSOJbDWrfhgsenzHsODAogw==, tarball: https://npm.jsr.io/~/11/@jsr/std__async/1.4.0.tgz}-- '@jsr/[email protected]':- resolution: {integrity: sha512-V/Lrzz3ZBT2ps09SbUuQKIDQ0Ac7qTTloCFNNF7r2MNoIzdz3xsW9+Vd+ZzgXFKdm46+XqBmkv0lpW/HzgRQfg==, tarball: https://npm.jsr.io/~/11/@jsr/std__data-structures/1.1.0.tgz}-- '@jsr/[email protected]':- resolution: {integrity: sha512-t8BEISf1666L7dGDIG1nriYh0TQKoU+8mrx93zz+Kj40eov9wNKjKCX96x17p8I8bDcHby4wSv+7jy4+9W6IPg==, tarball: https://npm.jsr.io/~/11/@jsr/std__expect/1.0.19.tgz}-- '@jsr/[email protected]':- resolution: {integrity: sha512-UunW2Rg++9sA74NJnYMGTsMVQgoFRAwPP02wRRohL0PQBNorbyxHiyCMRaxYQCtLepTLkC4nUyMtcwrGKqTR6g==, tarball: https://npm.jsr.io/~/11/@jsr/std__fs/1.0.24.tgz}-- '@jsr/[email protected]':- resolution: {integrity: sha512-JT8b/t40WcR9q0GDwRZUooY7aXeXnFal8iidE/5TckdAFtvpVAsaJ71/Xgf1SfoChs41s6CZkuCYM8toaNgdvA==, tarball: https://npm.jsr.io/~/11/@jsr/std__internal/1.0.14.tgz}-- '@jsr/[email protected]':- resolution: {integrity: sha512-3z/0rfvMEz6qiiaZ3quFpEv8BbWQgcpd+ASX29WEdecyJsdPN9uViQf1VxIua265cmGCdICk0WghMjGFoNZ5Ig==, tarball: https://npm.jsr.io/~/11/@jsr/std__path/1.1.5.tgz}-- '@jsr/[email protected]':- resolution: {integrity: sha512-maQIRFWIcTTWB7ITYIVbql1Q3KA9AsgR4/Ep2SfEq65V2SxQq52iLcFxuvX0azRp1leBCb8mBUXZr389SajY7Q==, tarball: https://npm.jsr.io/~/11/@jsr/std__testing/1.0.19.tgz}-'@libsql/[email protected]':resolution: {integrity: sha512-lYayFWasDV78A+TjlEhr6ubb3odBV6OHjb+wdp8VQcyWWAEIjuwbCHaraEUS4m4yWoo0BvZo96It4VdzZRmRWw==}@@ -4913,6 +4745,10 @@ packages:peerDependencies:'@opentelemetry/api': '>=1.3.0 <1.10.0'+ '@opentelemetry/[email protected]':+ resolution: {integrity: sha512-kocjix+/sSggfJhwXqClZ3i9Y/MI0fp7b+g7kCRm6psy2dsf8uApTRclwG18h8Avm7C9+fnt+O36PspJ/OzoWg==}+ engines: {node: '>=14'}+'@opentelemetry/[email protected]':resolution: {integrity: sha512-/UhIkaZgPutTFmQ7RnIJGgDXZmtEJ7Dvi86xNTFWcnRxVRNk/aotsqDJYeEvDP+FSMB2SdW+pQzNMcWP0rwuNA==}engines: {node: '>=14'}@@ -6440,6 +6276,10 @@ packages:resolution: {integrity: sha512-zXF373hzUOGzUOrqd8xb1U3LQi5uYC3mwv+z5OMKUUinQlu30tTWBs7ypy6YTchtix9QlYaHWlayUF8vBZ5UjA==}engines: {node: '>=18'}+ '@sentry/[email protected]':+ resolution: {integrity: sha512-UCRUtEc3qLaanmp+9rKQi58d+weBdovytqW6d8ria1fkmxfvnVCYQqVQ0c/FLrGggqjqizO4b4WnLnuy/y/CXw==}+ engines: {node: '>=18'}+'@sentry/[email protected]':resolution: {integrity: sha512-L5T60sWdAI3qWwdg3Ptwek/0TY59PERrxyqp4XMUkroayQvGd9r5dIW9Q1kSeXX9iJ442nXbFZKAOyCKV4Z13Q==}engines: {node: '>= 18'}@@ -6496,25 +6336,14 @@ packages:engines: {node: '>= 10'}hasBin: true- '@sentry/[email protected]':- resolution: {integrity: sha512-z1JQrl/1SLY+8wpzvork6vl+fpsg/oCCxM7HWWhUnI/R+OGNyoIzieQuggX3uUMY7NBtp8UWCQx6FeFazzOF9g==}- engines: {node: '>=14'}-'@sentry/[email protected]':resolution: {integrity: sha512-XG4ezlkyuAPjBC5+9kXC94rXXuqYTw9NRhfaDHssbTFaGnqBR8vQX2UUgZfY7ucbeelRDGfBu1sywoU+mB04uA==}engines: {node: '>=18'}- '@sentry/[email protected]':- resolution: {integrity: sha512-Edg8t2w45qEKiFnjeA6zRmU47R6la5FEMG+maZEOB2oTyJ+ujmh8LGaZ3G8aC0VdkKn8CXhHtDesze6oDc1oTA==}- engines: {node: '>=18'}-'@sentry/[email protected]':resolution: {integrity: sha512-ixm8NISFlPlEo3FjSaqmq4nnd13BRHoafwJ5MG+okCz6BKGZ1SexEggP42/QpGvDprUUHnfncG6WUMgcarr1zA==}engines: {node: '>=14.18'}- '@sentry/[email protected]':- resolution: {integrity: sha512-TLs+Z+I5xWL0YdXtQ/LqJ7F1T/rRytxFlSJD1gXm5mx3T+wwNrni20N4XGnV1Bo8s8EB05HTjJXGzFb96CJDFw==}-'@sentry/[email protected]':resolution: {integrity: sha512-pkwqrpAG//LtW5W1Odud0PLLT+rnjDjodUEbScULHVaZE6/Gt+WGBMZmtzpNM+UwhsN19/4PyO7ocLTx/IFrkQ==}engines: {node: '>=18'}@@ -6564,10 +6393,6 @@ packages:peerDependencies:react: ^16.14.0 || 17.x || 18.x || 19.x- '@sentry/[email protected]':- resolution: {integrity: sha512-IrOyMzlOyBkWtnVYb54sALf2f8WVqyyp7woRfHw8c3IMwUr5AskGOi7k2rjmUXO3Q0UkfHNVarexiEfo8ZqTsg==}- engines: {node: '>=18'}-'@sentry/[email protected]':resolution: {integrity: sha512-+LFOyQGl+zk5SZRGZD2MEURf7i5RHgP/mt3s85Rza+vz8M211WJ0YsjkIGUJFSY842nged5QLx4JysLaBlLymg==}engines: {node: '>=14.18'}@@ -7044,6 +6869,9 @@ packages:resolution: {integrity: sha512-WRZOuCuaz8UcZZE4R5HXTco2goQSI2XxjGY3hbM/xDvwmqFWd4ivooImsMx65OKM6CtNKbnZ5YL+YwAwK7c1dg==}deprecated: This is a stub types definition. bcryptjs provides its own type definitions, so you do not need this installed.+ '@types/[email protected]':+ resolution: {integrity: sha512-h1hFqFVcvAvD9j9K7ZW7vd82aSA+rTdznZa+5bwvCwqSB1jmmfLcbIWhOLx1/+boy/xmjgCs/OMUL8hRJSmnPw==}+'@types/[email protected]':resolution: {integrity: sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==}@@ -7141,6 +6969,9 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-YfWiV16IY0OeBfBCk8+hXKmdTKrKlwKN1MNKAPBu5JYxLwBEZl7QzeEpGnlZb3VMGJrrGmB84gXiH+ofs/TezA==}+ '@types/[email protected]':+ resolution: {integrity: sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==}+'@types/[email protected]':resolution: {integrity: sha512-GUUEShf+PBCGW2KaXwcIt3Yk+e3pkKwWKb9GSyM9WQVE+ep2jzmHdGsHzu4wgcZy5fN9FBdVzjpBQsYlpfpgLA==}@@ -8027,6 +7858,10 @@ packages:resolution: {integrity: sha512-MVUtAugQMOff5RnBy2d9N31iG0lNwg1qAoAOn7pOK5wf94WIaE3My2p3uwTQuvS2AcqchkcR3bHByjaM0mmi7Q==}engines: {node: '>=20'}+ resolution: {integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==}+ engines: {node: '>=12'}+resolution: {integrity: sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==}engines: {node: '>=12'}@@ -8225,9 +8060,6 @@ packages:resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==}- resolution: {integrity: sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==}-resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}engines: {node: '>= 0.4'}@@ -8290,10 +8122,6 @@ packages:engines: {node: '>=4'}hasBin: true- resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==}- engines: {node: '>=0.10'}-resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}engines: {node: '>=4.0'}@@ -8352,6 +8180,10 @@ packages:resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}engines: {node: '>=0.8.x'}+ resolution: {integrity: sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg==}+ engines: {node: '>=18.0.0'}+resolution: {integrity: sha512-70QWGkr4snxr0OXLRWsFLeRBIRPuQOvt4s8QYjmUlmlkyTZkRqS7EDVRZtzU3TiyDbXSzaOeF0XUKy8PchzukQ==}engines: {node: '>=18.0.0'}@@ -8726,6 +8558,10 @@ packages:peerDependencies:hono: ^4.1.1+ resolution: {integrity: sha512-eVkB/CYCCei7K2WElZW9yYQFWssG0DhaDhVvr7wy5jJ22K+ck8fWW0EsLpB0sITUTvPnc97+rrbQqIr5iqiy9Q==}+ engines: {node: '>=16.9.0'}+resolution: {integrity: sha512-uV63apnb0kyPtAUwoWgaGh9HyIFcv8lgmzPZSiTBQAFOFGIzka5EZ1dZocmGnn0XdX0+XTqJ6Tqv7selMuGLRQ==}engines: {node: '>=16.9.0'}@@ -9280,6 +9116,10 @@ packages:resolution: {integrity: sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==}+ resolution: {integrity: sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==}+ engines: {node: 20 || >=22}+resolution: {integrity: sha512-5YgH9UJd7wVb9hIouI2adWpgqrrICkt070Dnj8EUY1+B4B2P9eRLPAkAAo6NICA7CEhOIeBHl46u9zSNpNu7zA==}engines: {node: 20 || >=22}@@ -9388,10 +9228,6 @@ packages:resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}engines: {node: '>= 8'}- resolution: {integrity: sha512-Sz8FzjzI0kN13GK/6MVEsVzMZEPvOhnmmI1lU5+/1cGOiK3QUahntrNNtdVeihrO7t9JpoH75iMNXg6R6uWflQ==}- engines: {node: '>=18.0.0'}-resolution: {integrity: sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==}@@ -9539,6 +9375,10 @@ packages:resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}+ resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}+ engines: {node: '>=16 || 14 >=14.17'}+resolution: {integrity: sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==}engines: {node: '>=16 || 14 >=14.17'}@@ -9583,6 +9423,11 @@ packages:resolution: {integrity: sha512-/iCyQHwt36XkaIvSE9fcC8p6DiMPCZMTSMj9UT56Cv6T7f5CuxvOMhpNncaNieQ4z4d32p7ruEtAfRsb7Ya8Gw==}+ resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==}+ engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}+ hasBin: true+resolution: {integrity: sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==}engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}@@ -9593,6 +9438,11 @@ packages:engines: {node: ^18 || >=20}hasBin: true+ resolution: {integrity: sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg==}+ engines: {node: ^18 || >=20}+ hasBin: true+resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}engines: {node: '>= 0.6'}@@ -9960,6 +9810,10 @@ packages:resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}+ resolution: {integrity: sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==}+ engines: {node: 20 || >=22}+resolution: {integrity: sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==}engines: {node: 18 || 20 || >=22}@@ -10064,6 +9918,10 @@ packages:resolution: {integrity: sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==}engines: {node: ^10 || ^12 || >=14}+ resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==}+ engines: {node: ^10 || ^12 || >=14}+resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}engines: {node: '>=4'}@@ -10518,9 +10376,6 @@ packages:resolution: {integrity: sha512-5TF+l7p4+OsnP8BCCvSyZiSPc4x4//p5uPwK8TCnVPJYRmU2aYKMpOXvw8zM5a5JvuuCGN1jmsMwuU2W02ukfA==}- resolution: {integrity: sha512-xXR3KGeoxTNWPD4aBvL5NUpMTT7WMANr3EWnaS190QVkY52lqqcVRD7Q05UVbBhiWDGWMlJEUam9m7uFFGVScw==}-resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}hasBin: true@@ -10831,6 +10686,9 @@ packages:resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==}engines: {node: '>=20'}+ resolution: {integrity: sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==}+resolution: {integrity: sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==}@@ -10891,6 +10749,10 @@ packages:resolution: {integrity: sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==}+ resolution: {integrity: sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==}+ engines: {node: '>=18'}+resolution: {integrity: sha512-dAqSqE/RabpBKI8+h26GfLq6Vb3JVXs30XYQjdMjaj/c2tS8IYYMbIzP599KtRj7c57/wYApb3QjgRgXmrCukA==}engines: {node: '>=18'}@@ -11373,6 +11235,11 @@ packages:resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}engines: {node: '>= 6'}+ resolution: {integrity: sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==}+ engines: {node: '>= 14.6'}+ hasBin: true+resolution: {integrity: sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==}engines: {node: '>= 14.6'}@@ -11476,31 +11343,7 @@ snapshots:ansis: 4.2.0fzf: 0.5.2package-manager-detector: 1.6.0- tinyexec: 1.1.2-- '@apm-js-collab/[email protected]':- dependencies:- '@apm-js-collab/code-transformer': 0.15.0- es-module-lexer: 2.1.0- magic-string: 0.30.21- module-details-from-path: 1.0.4-- '@apm-js-collab/[email protected]':- dependencies:- '@types/estree': 1.0.8- astring: 1.9.0- esquery: 1.7.0- meriyah: 6.1.4- semifies: 1.0.0- source-map: 0.6.1-- '@apm-js-collab/[email protected]':- dependencies:- '@apm-js-collab/code-transformer': 0.15.0- debug: 4.4.3- module-details-from-path: 1.0.4- transitivePeerDependencies:- - supports-color+ tinyexec: 1.0.2'@asamuzakjp/[email protected]':dependencies:@@ -12534,7 +12377,7 @@ snapshots:'@opentelemetry/api': 1.9.1'@opentelemetry/core': 2.7.1(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.212.0(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0minimatch: 10.2.5transitivePeerDependencies:- supports-color@@ -12617,9 +12460,9 @@ snapshots:pkce-challenge: 5.0.1zod: 4.1.13- '@hono/[email protected]([email protected])':+ '@hono/[email protected]([email protected])':dependencies:- hono: 4.12.21+ hono: 4.11.8'@hono/[email protected]([email protected])':dependencies:@@ -12832,44 +12675,6 @@ snapshots:'@js-sdsl/[email protected]': {}- '@jsr/[email protected]':- dependencies:- '@jsr/std__internal': 1.0.14-- '@jsr/[email protected]':- dependencies:- '@jsr/std__data-structures': 1.1.0-- '@jsr/[email protected]':- dependencies:- '@jsr/std__assert': 1.0.19-- '@jsr/[email protected]':- dependencies:- '@jsr/std__assert': 1.0.19- '@jsr/std__internal': 1.0.14- '@jsr/std__path': 1.1.5-- '@jsr/[email protected]':- dependencies:- '@jsr/std__internal': 1.0.14- '@jsr/std__path': 1.1.5-- '@jsr/[email protected]': {}-- '@jsr/[email protected]':- dependencies:- '@jsr/std__internal': 1.0.14-- '@jsr/[email protected]':- dependencies:- '@jsr/std__assert': 1.0.19- '@jsr/std__async': 1.4.0- '@jsr/std__data-structures': 1.1.0- '@jsr/std__fs': 1.0.24- '@jsr/std__internal': 1.0.14- '@jsr/std__path': 1.1.5-'@libsql/[email protected]':dependencies:'@libsql/core': 0.17.4@@ -12941,12 +12746,12 @@ snapshots:'@opentelemetry/otlp-exporter-base': 0.208.0(@opentelemetry/[email protected])'@opentelemetry/resources': 2.7.1(@opentelemetry/[email protected])'@opentelemetry/sdk-logs': 0.208.0(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0dependencies:'@logtape/logtape': 2.1.1- '@sentry/core': 10.61.0+ '@sentry/core': 10.53.1'@mdx-js/[email protected]':dependencies:@@ -12986,17 +12791,17 @@ snapshots:'@modelcontextprotocol/[email protected]([email protected])':dependencies:- '@hono/node-server': 1.19.9([email protected])+ '@hono/node-server': 1.19.9([email protected])ajv: 8.17.1ajv-formats: 3.0.1([email protected])content-type: 1.0.5cors: 2.8.5cross-spawn: 7.0.6eventsource: 3.0.7- eventsource-parser: 3.0.8+ eventsource-parser: 3.0.6express: 5.2.1express-rate-limit: 8.2.1([email protected])- hono: 4.12.21+ hono: 4.11.8jose: 6.1.3json-schema-typed: 8.0.2pkce-challenge: 5.0.1@@ -13008,17 +12813,17 @@ snapshots:'@modelcontextprotocol/[email protected]([email protected])':dependencies:- '@hono/node-server': 1.19.9([email protected])+ '@hono/node-server': 1.19.9([email protected])ajv: 8.17.1ajv-formats: 3.0.1([email protected])content-type: 1.0.5cors: 2.8.5cross-spawn: 7.0.6eventsource: 3.0.7- eventsource-parser: 3.0.8+ eventsource-parser: 3.0.6express: 5.2.1express-rate-limit: 8.2.1([email protected])- hono: 4.12.21+ hono: 4.11.8jose: 6.1.3json-schema-typed: 8.0.2pkce-challenge: 5.0.1@@ -13139,17 +12944,17 @@ snapshots:'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.1- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.1- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.1- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:@@ -13186,7 +12991,7 @@ snapshots:'@opentelemetry/api': 1.9.1'@opentelemetry/core': 2.7.1(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.214.0(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0transitivePeerDependencies:- supports-color@@ -13195,7 +13000,7 @@ snapshots:'@opentelemetry/api': 1.9.1'@opentelemetry/core': 2.7.1(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.214.0(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0'@types/connect': 3.4.38transitivePeerDependencies:- supports-color@@ -13234,7 +13039,7 @@ snapshots:'@opentelemetry/api': 1.9.1'@opentelemetry/core': 2.7.1(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.214.0(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0transitivePeerDependencies:- supports-color@@ -13243,7 +13048,7 @@ snapshots:'@opentelemetry/api': 1.9.1'@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.214.0(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0forwarded-parse: 2.1.2transitivePeerDependencies:- supports-color@@ -13252,7 +13057,7 @@ snapshots:dependencies:'@opentelemetry/api': 1.9.1'@opentelemetry/instrumentation': 0.214.0(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0transitivePeerDependencies:- supports-color@@ -13260,7 +13065,7 @@ snapshots:dependencies:'@opentelemetry/api': 1.9.1'@opentelemetry/instrumentation': 0.214.0(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0transitivePeerDependencies:- supports-color@@ -13269,7 +13074,7 @@ snapshots:'@opentelemetry/api': 1.9.1'@opentelemetry/core': 2.7.1(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.214.0(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0transitivePeerDependencies:- supports-color@@ -13284,7 +13089,7 @@ snapshots:dependencies:'@opentelemetry/api': 1.9.1'@opentelemetry/instrumentation': 0.214.0(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0transitivePeerDependencies:- supports-color@@ -13293,7 +13098,7 @@ snapshots:'@opentelemetry/api': 1.9.1'@opentelemetry/core': 2.7.1(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.214.0(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0transitivePeerDependencies:- supports-color@@ -13301,7 +13106,7 @@ snapshots:dependencies:'@opentelemetry/api': 1.9.1'@opentelemetry/instrumentation': 0.214.0(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0'@opentelemetry/sql-common': 0.41.2(@opentelemetry/[email protected])transitivePeerDependencies:- supports-color@@ -13310,7 +13115,7 @@ snapshots:dependencies:'@opentelemetry/api': 1.9.1'@opentelemetry/instrumentation': 0.214.0(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0'@types/mysql': 2.15.27transitivePeerDependencies:- supports-color@@ -13320,7 +13125,7 @@ snapshots:'@opentelemetry/api': 1.9.1'@opentelemetry/core': 2.7.1(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.214.0(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0'@opentelemetry/sql-common': 0.41.2(@opentelemetry/[email protected])'@types/pg': 8.15.6'@types/pg-pool': 2.0.7@@ -13331,7 +13136,7 @@ snapshots:dependencies:'@opentelemetry/api': 1.9.1'@opentelemetry/instrumentation': 0.214.0(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0'@types/tedious': 4.0.14transitivePeerDependencies:- supports-color@@ -13392,13 +13197,13 @@ snapshots:dependencies:'@opentelemetry/api': 1.9.1'@opentelemetry/core': 2.2.0(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.1'@opentelemetry/core': 2.7.1(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:@@ -13418,14 +13223,16 @@ snapshots:'@opentelemetry/api': 1.9.1'@opentelemetry/core': 2.2.0(@opentelemetry/[email protected])'@opentelemetry/resources': 2.2.0(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.1'@opentelemetry/core': 2.7.1(@opentelemetry/[email protected])'@opentelemetry/resources': 2.7.1(@opentelemetry/[email protected])- '@opentelemetry/semantic-conventions': 1.41.1+ '@opentelemetry/semantic-conventions': 1.38.0++ '@opentelemetry/[email protected]': {}'@opentelemetry/[email protected]': {}@@ -14676,7 +14483,7 @@ snapshots:'@scalar/[email protected]':dependencies:'@scalar/openapi-types': 0.2.3- nanoid: 5.1.11+ nanoid: 5.1.6zod: 3.24.1'@schummar/[email protected]': {}@@ -14716,12 +14523,20 @@ snapshots:'@sentry-internal/replay-canvas': 10.53.1'@sentry/core': 10.53.1+ '@sentry/[email protected]':+ dependencies:+ '@sentry/core': 10.53.1+ '@sentry/node': 10.53.1+ transitivePeerDependencies:+ - '@opentelemetry/exporter-trace-otlp-http'+ - supports-color+'@sentry/[email protected]':dependencies:'@babel/core': 7.28.5'@sentry/babel-plugin-component-annotate': 5.3.0'@sentry/cli': 2.58.5- dotenv: 16.6.1+ dotenv: 16.3.1find-up: 5.0.0glob: 13.0.6magic-string: 0.30.21@@ -14773,25 +14588,13 @@ snapshots:- encoding- supports-color- '@sentry/[email protected]': {}-'@sentry/[email protected]': {}- '@sentry/[email protected]': {}-'@sentry/[email protected]':dependencies:'@sentry/types': 8.9.2'@sentry/utils': 8.9.2- '@sentry/[email protected]':- dependencies:- '@opentelemetry/api': 1.9.1- '@sentry/core': 10.61.0- '@sentry/server-utils': 10.61.0- transitivePeerDependencies:- - supports-color-'@sentry/[email protected](@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))([email protected](@opentelemetry/[email protected])([email protected]([email protected]))([email protected]))([email protected])([email protected](@swc/[email protected]))':dependencies:'@opentelemetry/api': 1.9.1@@ -14878,17 +14681,6 @@ snapshots:'@sentry/core': 10.53.1react: 19.2.6- '@sentry/[email protected]':- dependencies:- '@apm-js-collab/code-transformer': 0.15.0- '@apm-js-collab/code-transformer-bundler-plugins': 0.5.0- '@apm-js-collab/tracing-hooks': 0.10.0- '@sentry/conventions': 0.12.0- '@sentry/core': 10.61.0- magic-string: 0.30.21- transitivePeerDependencies:- - supports-color-'@sentry/[email protected]': {}'@sentry/[email protected]':@@ -14954,7 +14746,7 @@ snapshots:dependencies:'@slack/logger': 4.0.1'@slack/types': 2.21.1- '@types/node': 24.12.4+ '@types/node': 24.10.1'@types/retry': 0.12.0axios: 1.16.1eventemitter3: 5.0.1@@ -15326,6 +15118,10 @@ snapshots:dependencies:bcryptjs: 3.0.3+ '@types/[email protected]':+ dependencies:+ bun-types: 1.3.14+'@types/[email protected]': {}'@types/[email protected]':@@ -15426,6 +15222,10 @@ snapshots:dependencies:'@types/node': 24.12.4+ '@types/[email protected]':+ dependencies:+ undici-types: 7.16.0+'@types/[email protected]':dependencies:undici-types: 7.16.0@@ -16305,6 +16105,8 @@ snapshots:dependencies:type-fest: 5.2.0+ [email protected]: {}+@@ -16419,8 +16221,6 @@ snapshots:- [email protected]: {}-dependencies:es-errors: 1.3.0@@ -16554,10 +16354,6 @@ snapshots:- dependencies:- estraverse: 5.3.0-dependencies:estraverse: 5.3.0@@ -16613,11 +16409,13 @@ snapshots:+ [email protected]: {}+dependencies:- eventsource-parser: 3.0.8+ eventsource-parser: 3.0.6dependencies:@@ -16923,9 +16721,9 @@ snapshots:foreground-child: 3.3.1jackspeak: 4.1.1minimatch: 10.2.5- minipass: 7.1.3+ minipass: 7.1.2package-json-from-dist: 1.0.1- path-scurry: 2.0.2+ path-scurry: 2.0.1dependencies:@@ -17139,6 +16937,8 @@ snapshots:dependencies:hono: 4.12.21+ [email protected]: {}+[email protected](@noble/[email protected]):@@ -17547,7 +17347,7 @@ snapshots:typescript: 5.9.3unbash: 2.2.0yaml: 2.9.0- zod: 4.4.3+ zod: 4.1.13dependencies:@@ -17678,6 +17478,8 @@ snapshots:+ [email protected]: {}+@@ -17879,8 +17681,6 @@ snapshots:- [email protected]: {}-dependencies:decode-named-character-reference: 1.2.0@@ -18180,6 +17980,8 @@ snapshots:+ [email protected]: {}+@@ -18231,10 +18033,14 @@ snapshots:+ [email protected]: {}++ [email protected]: {}+@@ -18245,7 +18051,7 @@ snapshots:- [email protected]([email protected](@opentelemetry/[email protected])([email protected]([email protected]))([email protected]))([email protected]):+ [email protected]([email protected](@opentelemetry/[email protected])([email protected])([email protected]([email protected]))([email protected]))([email protected]):dependencies:'@auth/core': 0.41.2next: 16.2.6(@babel/[email protected])(@opentelemetry/[email protected])([email protected])([email protected]([email protected]))([email protected])@@ -18432,7 +18238,7 @@ snapshots:dependencies:- yaml: 2.9.0+ yaml: 2.8.1dependencies:@@ -18665,6 +18471,11 @@ snapshots:+ dependencies:+ lru-cache: 11.2.7+ minipass: 7.1.2+dependencies:lru-cache: 11.5.0@@ -18723,7 +18534,7 @@ snapshots:[email protected]([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected])):dependencies:lilconfig: 3.1.3- yaml: 2.9.0+ yaml: 2.8.1optionalDependencies:postcss: 8.5.15@@ -18740,7 +18551,7 @@ snapshots:dependencies:- nanoid: 3.3.12+ nanoid: 3.3.11picocolors: 1.1.1source-map-js: 1.2.1@@ -18750,6 +18561,12 @@ snapshots:picocolors: 1.1.1source-map-js: 1.2.1+ dependencies:+ nanoid: 3.3.11+ picocolors: 1.1.1+ source-map-js: 1.2.1+@@ -19357,7 +19174,7 @@ snapshots:is-plain-object: 5.0.0launder: 1.7.1parse-srcset: 1.0.2- postcss: 8.5.15+ postcss: 8.5.6@@ -19387,8 +19204,6 @@ snapshots:dependencies:parseley: 0.12.1- [email protected]: {}-@@ -19455,12 +19270,12 @@ snapshots:node-fetch: 3.3.2open: 11.0.0ora: 8.2.0- postcss: 8.5.15+ postcss: 8.5.6postcss-selector-parser: 7.1.1prompts: 2.4.2recast: 0.23.11stringify-object: 5.0.0- tailwind-merge: 3.6.0+ tailwind-merge: 3.3.1ts-morph: 26.0.0tsconfig-paths: 4.2.0validate-npm-package-name: 7.0.2@@ -19715,7 +19530,7 @@ snapshots:dependencies:- '@types/node': 24.12.4+ '@types/node': 24.10.1qs: 6.14.0@@ -19795,6 +19610,8 @@ snapshots:+ [email protected]: {}+@@ -19850,6 +19667,8 @@ snapshots:+ [email protected]: {}+@@ -20182,7 +20001,7 @@ snapshots:dependencies:vfile: 6.0.3- yaml: 2.9.0+ yaml: 2.8.1dependencies:@@ -20360,6 +20179,8 @@ snapshots:+ [email protected]: {}+diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yamlindex a61cf7762..c259c6f17 100644--- a/pnpm-workspace.yaml+++ b/pnpm-workspace.yaml@@ -2,8 +2,10 @@ packages:- apps/*- packages/**/*- packages/config/*+trustPolicy: off-minimumReleaseAge: 1440+minimumReleaseAge: 1440 # 1 day (default)+allowBuilds:"@bufbuild/buf": true"@parcel/watcher": true@@ -15,7 +17,9 @@ allowBuilds:msw: trueprotobufjs: truesharp: true+autoInstallPeers: true+catalog:"@ai-sdk/anthropic": 1.2.12"@ai-sdk/react": 3.0.190@@ -42,6 +46,7 @@ catalog:"@dnd-kit/sortable": 10.0.0"@dnd-kit/utilities": 3.2.2"@fontsource-variable/inter": 5.2.8+ # Pinned to 4.0.1 β 4.1.0+ ships an ESM build that reads config JSON via fs.readFileSync, breaking `bun build --compile` in apps/workflows"@google-cloud/tasks": 4.0.1"@hono/mcp": 0.2.5"@hono/sentry": 1.2.2@@ -58,9 +63,7 @@ catalog:"@openpanel/astro": 1.4.1"@openpanel/nextjs": 1.5.1"@openpanel/sdk": 1.3.1- "@opentelemetry/exporter-logs-otlp-http": 0.208.0"@opentelemetry/resources": 2.7.1- "@opentelemetry/sdk-logs": 0.208.0"@opentelemetry/semantic-conventions": 1.41.1"@radix-ui/react-accordion": 1.2.12"@radix-ui/react-alert-dialog": 1.1.15@@ -89,7 +92,6 @@ catalog:"@react-email/ui": 6.1.5"@scalar/hono-api-reference": 0.8.10"@sentry/bun": 10.53.1- "@sentry/deno": 10.61.0"@sentry/nextjs": 10.53.1"@slack/web-api": 7.16.0"@stripe/stripe-js": 2.4.0@@ -105,6 +107,7 @@ catalog:"@tanstack/react-table": 8.21.3"@trpc/client": 11.17.0"@trpc/next": 11.17.0+ "@types/react": 19.2.15"@trpc/react-query": 11.17.0"@trpc/server": 11.17.0"@trpc/tanstack-react-query": 11.17.0@@ -113,7 +116,6 @@ catalog:"@types/dom-speech-recognition": 0.0.6"@types/luxon": 3.7.1"@types/node": 24.12.4- "@types/react": 19.2.15"@types/react-dom": 19.2.3"@types/sanitize-html": 2.16.1"@types/validator": 13.15.10@@ -197,9 +199,9 @@ catalog:stripe: 13.11.0sugar-high: 0.9.5superjson: 2.2.6- tailwind-merge: 3.6.0tailwindcss: 4.3.0tailwindcss-animate: 1.0.7+ tailwind-merge: 3.6.0tsup: 7.2.0tw-animate-css: 1.4.0typescript: 5.9.3diff --git a/turbo.json b/turbo.jsonindex e6a28cd2b..7d319815b 100644--- a/turbo.json+++ b/turbo.json@@ -32,7 +32,6 @@"outputs": [".next/**", "!.next/cache/**", "dist/**"]},"lint": {},- "check": {},"dev": {"cache": false},