Skip to content

Commit 524d873

Browse files
guidefariguidefari
committed
chore: upgrade packages, including sst
- [v3.16.0](https://github.com/sst/sst/releases/tag/v3.16.0) had breaking changes on cloudflare
1 parent 9f2f85c commit 524d873

6 files changed

Lines changed: 82 additions & 84 deletions

File tree

‎backend/sst-env.d.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,6 @@ declare module "sst" {
8989
}
9090
}
9191
}
92-
// cloudflare
93-
import * as cloudflare from "@cloudflare/workers-types";
94-
declare module "sst" {
95-
export interface Resource {
96-
"ApiWorker": cloudflare.Service
97-
"AuthWorkerCF": cloudflare.Service
98-
}
99-
}
10092

10193
import "sst"
10294
export {}

‎bun.lock‎

Lines changed: 24 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎infra/api.ts‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,28 +29,28 @@ const apiFn = new sst.aws.Function("Api", {
2929
link: [...allSecrets, bucket, auth, UserTable, ContentTable, contentBucket, mixesBucket, fileRouter],
3030
});
3131

32-
export const api = new sst.cloudflare.Worker("ApiWorker", {
33-
url: true,
34-
domain: `api.${domain}`,
35-
handler: "./backend/src/proxy.ts",
36-
environment: {
37-
ORIGIN_URL: apiFn.url,
38-
NO_CACHE: String(isPermanentStage),
39-
},
40-
});
32+
// export const api = new sst.cloudflare.Worker("ApiWorker", {
33+
// url: true,
34+
// domain: `api.${domain}`,
35+
// handler: "./backend/src/proxy.ts",
36+
// environment: {
37+
// ORIGIN_URL: apiFn.url,
38+
// NO_CACHE: String(isPermanentStage),
39+
// },
40+
// });
4141

42-
export const authRouter = new sst.cloudflare.Worker("AuthWorkerCF", {
43-
url: true,
44-
dev: false,
45-
domain: `auth.${domain}`,
46-
handler: "./backend/src/proxy.ts",
47-
environment: {
48-
ORIGIN_URL: auth.url,
49-
},
50-
});
42+
// export const authRouter = new sst.cloudflare.Worker("AuthWorkerCF", {
43+
// url: true,
44+
// dev: false,
45+
// domain: `auth.${domain}`,
46+
// handler: "./backend/src/proxy.ts",
47+
// environment: {
48+
// ORIGIN_URL: auth.url,
49+
// },
50+
// });
5151

5252
export const outputs = {
53-
auth: authRouter.url,
54-
api: api.url,
55-
swagger: api.url.apply(url => `${url}/swag`),
53+
// auth: authRouter.url,
54+
// api: api.url,
55+
// swagger: api.url.apply(url => `${url}/swag`),
5656
};

‎infra/dns.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ export const domain =
66

77
// export const shortDomain = domain.replace(/goosebumps\.fm$/, "gbfm.dev");
88

9-
export const zone = cloudflare.getZoneOutput({
10-
name: "goosebumps.fm",
11-
});
9+
// export const zone = cloudflare.getZoneOutput({
10+
// filter: {
11+
// name: domain,
12+
// },
13+
// });
1214

1315
// export const shortZone = cloudflare.getZoneOutput({
1416
// name: "gbfm.dev",

‎infra/www.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { api, authRouter } from "./api";
1+
// import { api, authRouter } from "./api";
22
import { domain } from "./dns";
33

44
export const www = new sst.aws.StaticSite("gbfm-www", {
@@ -9,9 +9,11 @@ export const www = new sst.aws.StaticSite("gbfm-www", {
99
},
1010
environment: {
1111
// @ts-expect-error - should be fine
12-
VITE_API_BASE_URL: api.url,
12+
// VITE_API_BASE_URL: api.url,
13+
VITE_API_BASE_URL: "yooo",
1314
// @ts-expect-error - should be fine
14-
VITE_AUTH_BASE_URL: authRouter.url,
15+
// VITE_AUTH_BASE_URL: authRouter.url,
16+
VITE_AUTH_BASE_URL: "bu",
1517
},
1618
domain: {
1719
name: `www.${domain}`,

‎package.json‎

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
11
{
2-
"name": "gbfm",
3-
"version": "0.0.0",
4-
"sideEffects": false,
5-
"scripts": {
6-
"dev": "sst dev --stage=local",
7-
"sso": "aws sso login --sso-session=terminal --no-browser",
8-
"typecheck": "bun --filter=* typecheck",
9-
"deploy": "sst deploy --stage=staging",
10-
"deploy:prod": "sst deploy --stage=prod",
11-
"gen": "cd vps && sst shell drizzle-kit generate"
12-
},
13-
"workspaces": [
14-
"backend",
15-
"core",
16-
"web",
17-
"vps"
18-
],
19-
"dependencies": {
20-
"@effect/platform": "latest",
21-
"@effect/schema": "latest",
22-
"@mdx-js/mdx": "3.1.0",
23-
"@openauthjs/openauth": "0.4.3",
24-
"effect": "latest",
25-
"gray-matter": "4.0.3",
26-
"sst": "3.14.11",
27-
"zod": "^3.24.3"
28-
},
29-
"devDependencies": {
30-
"@tsconfig/node20": "^20.1.5",
31-
"typescript": "latest"
32-
}
2+
"name": "gbfm",
3+
"version": "0.0.0",
4+
"sideEffects": false,
5+
"scripts": {
6+
"dev": "sst dev --stage=local",
7+
"refresh": "sst refresh --stage=local",
8+
"sso": "aws sso login --sso-session=terminal --no-browser",
9+
"typecheck": "bun --filter=* typecheck",
10+
"deploy": "sst deploy --stage=staging",
11+
"deploy:prod": "sst deploy --stage=prod",
12+
"gen": "cd vps && sst shell drizzle-kit generate"
13+
},
14+
"workspaces": ["backend", "core", "web", "vps"],
15+
"dependencies": {
16+
"@effect/platform": "latest",
17+
"@effect/schema": "latest",
18+
"@mdx-js/mdx": "3.1.0",
19+
"@openauthjs/openauth": "0.4.3",
20+
"effect": "latest",
21+
"gray-matter": "4.0.3",
22+
"sst": "3.17.5",
23+
"zod": "3.25.64"
24+
},
25+
"devDependencies": {
26+
"@tsconfig/node20": "^20.1.6",
27+
"typescript": "latest"
28+
}
3329
}

0 commit comments

Comments
 (0)