diff --git a/Dockerfile b/Dockerfile index 518ecd2d..bc85b0aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,6 +29,9 @@ RUN if [ "$DATABASE" = "pg" ]; then \ node esbuild.mjs -e server/setup/migrationsSqlite.ts -o dist/migrations.mjs; \ fi +# test to make sure the build output is there and error if not +RUN test -f dist/server.mjs + RUN npm run build:cli FROM node:22-alpine AS runner diff --git a/server/private/routers/internal.ts b/server/private/routers/internal.ts index 444d416e..b393b884 100644 --- a/server/private/routers/internal.ts +++ b/server/private/routers/internal.ts @@ -17,7 +17,6 @@ import * as orgIdp from "#private/routers/orgIdp"; import * as billing from "#private/routers/billing"; import * as license from "#private/routers/license"; -import { Router } from "express"; import { verifySessionUserMiddleware } from "@server/middlewares"; import { internalRouter as ir } from "@server/routers/internal"; diff --git a/src/app/[orgId]/page.tsx b/src/app/[orgId]/page.tsx index 4c3ac07b..25b3de1f 100644 --- a/src/app/[orgId]/page.tsx +++ b/src/app/[orgId]/page.tsx @@ -1,7 +1,6 @@ import { verifySession } from "@app/lib/auth/verifySession"; import UserProvider from "@app/providers/UserProvider"; import { cache } from "react"; -import OrganizationLandingCard from "../../components/OrganizationLandingCard"; import MemberResourcesPortal from "../../components/MemberResourcesPortal"; import { GetOrgOverviewResponse } from "@server/routers/org/getOrgOverview"; import { internal } from "@app/lib/api"; diff --git a/src/app/[orgId]/settings/resources/[niceId]/proxy/page.tsx b/src/app/[orgId]/settings/resources/[niceId]/proxy/page.tsx index aa7b78ee..822d95f3 100644 --- a/src/app/[orgId]/settings/resources/[niceId]/proxy/page.tsx +++ b/src/app/[orgId]/settings/resources/[niceId]/proxy/page.tsx @@ -666,7 +666,7 @@ export default function ReverseProxyTargets(props: { ...target, ...data, updated: true, - siteType: site?.type || null + // siteType: site?.type || null } : target ) diff --git a/src/app/auth/(private)/org/page.tsx b/src/app/auth/(private)/org/page.tsx index 0e831384..ff3604c3 100644 --- a/src/app/auth/(private)/org/page.tsx +++ b/src/app/auth/(private)/org/page.tsx @@ -69,6 +69,9 @@ export default async function OrgAuthPage(props: { } catch (e) {} if (!loginPage) { + console.debug( + `No login page found for host ${host}, redirecting to dashboard` + ); redirect(env.app.dashboardUrl); } @@ -90,6 +93,9 @@ export default async function OrgAuthPage(props: { : subscriptionStatus?.tier === TierId.STANDARD; if (build === "saas" && !subscribed) { + console.log( + `Org ${loginPage.orgId} is not subscribed, redirecting to dashboard` + ); redirect(env.app.dashboardUrl); } @@ -116,6 +122,7 @@ export default async function OrgAuthPage(props: { } } } else { + console.log(`Host ${host} is the same`); redirect(env.app.dashboardUrl); } diff --git a/src/components/PathMatchRenameModal.tsx b/src/components/PathMatchRenameModal.tsx index 357f2cf9..bbb3dbc0 100644 --- a/src/components/PathMatchRenameModal.tsx +++ b/src/components/PathMatchRenameModal.tsx @@ -113,11 +113,11 @@ export function PathMatchModal({ - {value?.path && ( + {/* {value?.path && ( + )} */} - )}