update deps

TymanWasTaken · TymanWasTaken · commit a4bca82e80fa · 2025-07-09T15:28:17.000-06:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,5 +8,5 @@
   "editor.detectIndentation": false,
   "editor.insertSpaces": false,
   "editor.tabSize": 4,
-  "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs",
+  "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs"
 }
diff --git a/.yarn/sdks/prettier/bin/prettier.cjs b/.yarn/sdks/prettier/bin/prettier.cjs
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
 const absRequire = createRequire(absPnpApiPath);
 
 const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
   }
 }
 
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
 // Defer to the real prettier/bin/prettier.cjs your application uses
-module.exports = absRequire(`prettier/bin/prettier.cjs`);
+module.exports = wrapWithUserWrapper(absRequire(`prettier/bin/prettier.cjs`));
diff --git a/.yarn/sdks/prettier/index.cjs b/.yarn/sdks/prettier/index.cjs
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
 const relPnpApiPath = "../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
 const absRequire = createRequire(absPnpApiPath);
 
 const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
   }
 }
 
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
 // Defer to the real prettier your application uses
-module.exports = absRequire(`prettier`);
+module.exports = wrapWithUserWrapper(absRequire(`prettier`));
diff --git a/.yarn/sdks/prettier/package.json b/.yarn/sdks/prettier/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "3.3.3-sdk",
+  "version": "3.6.2-sdk",
   "main": "./index.cjs",
   "type": "commonjs",
   "bin": "./bin/prettier.cjs"
diff --git a/.yarn/sdks/typescript/bin/tsc b/.yarn/sdks/typescript/bin/tsc
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
 const absRequire = createRequire(absPnpApiPath);
 
 const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
   }
 }
 
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
 // Defer to the real typescript/bin/tsc your application uses
-module.exports = absRequire(`typescript/bin/tsc`);
+module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsc`));
diff --git a/.yarn/sdks/typescript/bin/tsserver b/.yarn/sdks/typescript/bin/tsserver
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
 const absRequire = createRequire(absPnpApiPath);
 
 const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
   }
 }
 
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
 // Defer to the real typescript/bin/tsserver your application uses
-module.exports = absRequire(`typescript/bin/tsserver`);
+module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsserver`));
diff --git a/.yarn/sdks/typescript/lib/tsc.js b/.yarn/sdks/typescript/lib/tsc.js
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
 const absRequire = createRequire(absPnpApiPath);
 
 const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
   }
 }
 
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
 // Defer to the real typescript/lib/tsc.js your application uses
-module.exports = absRequire(`typescript/lib/tsc.js`);
+module.exports = wrapWithUserWrapper(absRequire(`typescript/lib/tsc.js`));
diff --git a/.yarn/sdks/typescript/lib/tsserver.js b/.yarn/sdks/typescript/lib/tsserver.js
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
 const absRequire = createRequire(absPnpApiPath);
 
 const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,7 +24,15 @@ if (existsSync(absPnpApiPath)) {
   }
 }
 
-const moduleWrapper = tsserver => {
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
+const moduleWrapper = exports => {
+  return wrapWithUserWrapper(moduleWrapperFn(exports));
+};
+
+const moduleWrapperFn = tsserver => {
   if (!process.versions.pnp) {
     return tsserver;
   }
diff --git a/.yarn/sdks/typescript/lib/tsserverlibrary.js b/.yarn/sdks/typescript/lib/tsserverlibrary.js
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
 const absRequire = createRequire(absPnpApiPath);
 
 const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,7 +24,15 @@ if (existsSync(absPnpApiPath)) {
   }
 }
 
-const moduleWrapper = tsserver => {
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
+const moduleWrapper = exports => {
+  return wrapWithUserWrapper(moduleWrapperFn(exports));
+};
+
+const moduleWrapperFn = tsserver => {
   if (!process.versions.pnp) {
     return tsserver;
   }
diff --git a/.yarn/sdks/typescript/lib/typescript.js b/.yarn/sdks/typescript/lib/typescript.js
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
 const absRequire = createRequire(absPnpApiPath);
 
 const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
   }
 }
 
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
 // Defer to the real typescript your application uses
-module.exports = absRequire(`typescript`);
+module.exports = wrapWithUserWrapper(absRequire(`typescript`));
diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "5.5.3-sdk",
+  "version": "5.8.3-sdk",
   "main": "./lib/typescript.js",
   "type": "commonjs",
   "bin": {
diff --git a/astro.config.mjs b/astro.config.mjs
@@ -1,13 +1,23 @@
-import { defineConfig } from "astro/config";
+import { defineConfig, envField } from "astro/config";
 
 import node from "@astrojs/node";
 
 // https://astro.build/config
 export default defineConfig({
-	output: "hybrid",
+	output: "static",
 	adapter: node({
 		mode: "standalone"
 	}),
+	env: {
+		schema: {
+			REDIRECT_SCHEME: envField.string({ context: "server", access: "secret" }),
+			REDIRECT_HOST: envField.string({ context: "server", access: "secret" }),
+			CLIENT_ID: envField.string({ context: "server", access: "secret" }),
+			CLIENT_SECRET: envField.string({ context: "server", access: "secret" }),
+			BANNED_IDS: envField.string({ context: "server", access: "secret" }),
+			WEBHOOK_URL: envField.string({ context: "server", access: "secret" })
+		}
+	},
 	...(
 		process.env.NODE_ENV === "production"
 			? {
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -10,15 +10,16 @@
         (flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; in {
             devShells.default = pkgs.mkShell {
                 packages = with pkgs; [
-                    nodejs_23
+                    nodejs_24
+		    corepack
                 ];
             };
 
             packages.default = self.packages.${system}.website;
             packages.website = pkgs.callPackage ./nix/package.nix {
-                nodejs = pkgs.nodejs_23;
+                nodejs = pkgs.nodejs_24;
             };
         })) // {
             nixosModules.default = import ./nix/module.nix { inherit self; };
         };
-}
+}
diff --git a/package.json b/package.json
@@ -10,16 +10,16 @@
 		"astro": "astro"
 	},
 	"dependencies": {
-		"@astrojs/check": "^0.8.1",
-		"@astrojs/node": "^8.3.2",
-		"@sapphire/result": "^2.6.6",
-		"astro": "^4.11.5",
-		"typescript": "^5.5.3",
-		"zod": "^3.23.8"
+		"@astrojs/check": "^0.9.4",
+		"@astrojs/node": "^9.3.0",
+		"@sapphire/result": "^2.7.2",
+		"astro": "^5.11.0",
+		"typescript": "^5.8.3",
+		"zod": "^4.0.0"
 	},
-	"packageManager": "yarn@4.3.1+sha512.af78262d7d125afbfeed740602ace8c5e4405cd7f4735c08feb327286b2fdb2390fbca01589bfd1f50b1240548b74806767f5a063c94b67e431aabd0d86f7774",
+	"packageManager": "yarn@4.9.1+sha512.f95ce356460e05be48d66401c1ae64ef84d163dd689964962c6888a9810865e39097a5e9de748876c2e0bf89b232d583c33982773e9903ae7a76257270986538",
 	"devDependencies": {
-		"prettier": "^3.3.3",
+		"prettier": "^3.6.2",
 		"prettier-plugin-astro": "^0.14.1"
 	},
 	"license": "CC0-1.0"
diff --git a/src/pages/appeals/form.astro b/src/pages/appeals/form.astro
@@ -1,6 +1,9 @@
 ---
 export const prerender = false;
 
+import { CLIENT_ID, REDIRECT_SCHEME, REDIRECT_HOST } from "astro:env/server";
+
+import z from "zod";
 import Layout from "../../layouts/Layout.astro";
 import { validateForm } from "../../utils";
 import { Result } from "@sapphire/result";
@@ -18,7 +21,7 @@ if (Astro.request.method === "POST") {
 		if (typeof decodedData.punishmentType === "string") type = decodedData.punishmentType;
 		// Validate data
 		const validated = validateForm(decodedData).mapErr(zodError => {
-			const formatted = zodError.flatten();
+			const formatted = z.flattenError(zodError);
 			return `Validation error(s):${formatted.formErrors.map(formError => `\n- ${formError}`)}${Object.entries(formatted.fieldErrors).map(([key, fieldErrors]) => fieldErrors.map(fieldError => `\n- Error in ${key}: ${fieldError}`))}`;
 		});
 		if (validated.isErr()) throw validated.unwrapErr();
@@ -41,7 +44,7 @@ if (Astro.request.method === "POST") {
 	discordState !== null ? (
 		<meta
 			http-equiv="refresh"
-			content={`0; url=https://discord.com/oauth2/authorize?client_id=${import.meta.env.CLIENT_ID}&response_type=code&redirect_uri=${import.meta.env.REDIRECT_SCHEME}%3A%2F%2F${encodeURIComponent(import.meta.env.REDIRECT_HOST)}%2Fappeals%2Foauth2-callback&scope=identify&state=${discordState}`}
+			content={`0; url=https://discord.com/oauth2/authorize?client_id=${CLIENT_ID}&response_type=code&redirect_uri=${REDIRECT_SCHEME}%3A%2F%2F${encodeURIComponent(REDIRECT_HOST)}%2Fappeals%2Foauth2-callback&scope=identify&state=${discordState}`}
 		/>
 	) : null
 }
diff --git a/src/pages/appeals/oauth2-callback.astro b/src/pages/appeals/oauth2-callback.astro
@@ -1,6 +1,8 @@
 ---
 export const prerender = false;
 
+import { BANNED_IDS, REDIRECT_SCHEME, REDIRECT_HOST, CLIENT_ID, CLIENT_SECRET, WEBHOOK_URL } from "astro:env/server";
+
 import { Result } from "@sapphire/result";
 import Layout from "../../layouts/Layout.astro";
 import { validateForm } from "../../utils";
@@ -17,7 +19,7 @@ const questionsMap = {
 	punishmentReason: "Why were you given this punishment?",
 	fairness: "Do you believe this punishment was fair?",
 	reasoning: "Why should we reverse this punishment?"
-};
+} as const;
 
 const result = await Result.fromAsync(async () => {
 	if (code === null)
@@ -36,9 +38,9 @@ const result = await Result.fromAsync(async () => {
 		body: new URLSearchParams({
 			grant_type: "authorization_code",
 			code,
-			redirect_uri: `${import.meta.env.REDIRECT_SCHEME}://${import.meta.env.REDIRECT_HOST}/appeals/oauth2-callback`,
-			client_id: import.meta.env.CLIENT_ID,
-			client_secret: import.meta.env.CLIENT_SECRET
+			redirect_uri: `${REDIRECT_SCHEME}://${REDIRECT_HOST}/appeals/oauth2-callback`,
+			client_id: CLIENT_ID,
+			client_secret: CLIENT_SECRET
 		}).toString()
 	}).then(r => r.json());
 
@@ -54,11 +56,11 @@ const result = await Result.fromAsync(async () => {
 			Authorization: `Bearer ${bearerToken}`
 		}
 	}).then(r => r.json());
-	if (import.meta.env.BANNED_IDS.split(",").includes(meResponse.user.id))
+	if (BANNED_IDS.split(",").includes(meResponse.user.id))
 		throw "You have been banned from making appeals";
 
 	// Submit the webhook
-	await fetch(import.meta.env.WEBHOOK_URL, {
+	await fetch(WEBHOOK_URL, {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/json"
@@ -76,7 +78,7 @@ const result = await Result.fromAsync(async () => {
 							value: meResponse.user.id
 						},
 						...Object.entries(validResponses).map(([k, v]) => ({
-							name: questionsMap[k as keyof typeof validResponses],
+							name: questionsMap[k as keyof typeof questionsMap],
 							value: v
 						}))
 					]
diff --git a/src/utils.ts b/src/utils.ts
@@ -21,13 +21,10 @@ export function validateForm(data: unknown) {
 				.object({
 					punishmentType: z.literal("channelBlock").transform(() => "Channel Block" as const),
 					blockedChannel: z
-						.string({
-							errorMap: (i, ctx) => ({
-								message:
-									i.code === "invalid_string" && i.validation === "regex" ? "Invalid channel name" : ctx.defaultError
-							})
+						.string()
+						.regex(/^[\w-]{1,100}$/, {
+							error: _ => "Invalid channel name"
 						})
-						.regex(/^[\w-]{1,100}$/)
 				})
 				.extend(base),
 			z
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@`
`8`	`8`	`"editor.detectIndentation": false,`
`9`	`9`	`"editor.insertSpaces": false,`
`10`	`10`	`"editor.tabSize": 4,`
`11`		`- "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs",`
	`11`	`+ "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs"`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "prettier",`
`3`		`- "version": "3.3.3-sdk",`
	`3`	`+ "version": "3.6.2-sdk",`
`4`	`4`	`"main": "./index.cjs",`
`5`	`5`	`"type": "commonjs",`
`6`	`6`	`"bin": "./bin/prettier.cjs"`