Improvement new tsconfig (#63)

GervinFung · web-flow · commit 7e105fa830fc · 2024-07-21T22:03:25.000+08:00
* improvement(*): type improvement based on new tsconfig

* fix(workflows): update `pnpm` version

* fix(test/snapshot): remove unused `CHROMIUM_PATH`

* fix(web/proxy): fix `orGet` receive string instead of function
diff --git a/.github/workflows/root.yaml b/.github/workflows/root.yaml
@@ -18,7 +18,7 @@ jobs:
             - name: Setup Pnpm
               uses: pnpm/action-setup@v4
               with:
-                  version: 8
+                  version: 9
 
             - name: Use Node.js ${{ matrix.node-version }}
               uses: actions/setup-node@v3
diff --git a/apps/web/pages/_document.tsx b/apps/web/pages/_document.tsx
@@ -8,7 +8,7 @@ import Document, {
 } from 'next/document';
 
 export default class Doc extends Document {
-	static getInitialProps = async (context: DocumentContext) => {
+	static override getInitialProps = async (context: DocumentContext) => {
 		const { renderPage: originalRenderPage } = context;
 
 		// Run the React rendering logic synchronously
@@ -29,7 +29,7 @@ export default class Doc extends Document {
 		return await Document.getInitialProps(context);
 	};
 
-	render = () => {
+	override render = () => {
 		return (
 			<Html lang="en">
 				<Head>
diff --git a/apps/web/pages/templates/index.tsx b/apps/web/pages/templates/index.tsx
@@ -460,7 +460,7 @@ const Templates = () => {
 	const router = useRouter();
 
 	const names = decodeURIComponent(
-		parse(schemas.names, router.query.names ?? '')
+		parse(schemas.names, router.query['names'] ?? '')
 	)
 		.split(delimiter)
 		.filter(Boolean);
diff --git a/apps/web/src/web/components/error/boundary.tsx b/apps/web/src/web/components/error/boundary.tsx
@@ -16,7 +16,7 @@ class ErrorBoundary extends React.Component<
 	}>,
 	State
 > {
-	state: State = {
+	override state: State = {
 		error: undefined,
 		closedAlert: false,
 	};
@@ -28,12 +28,12 @@ class ErrorBoundary extends React.Component<
 		};
 	};
 
-	componentDidCatch = (error: Error, errorInfo: React.ErrorInfo) => {
+	override componentDidCatch = (error: Error, errorInfo: React.ErrorInfo) => {
 		console.error({ error, errorInfo });
 		this.setState({ error });
 	};
 
-	render = () => {
+	override render = () => {
 		return !this.state.error ? (
 			this.props.children
 		) : (
diff --git a/apps/web/src/web/proxy/client.ts b/apps/web/src/web/proxy/client.ts
@@ -2,7 +2,7 @@ import { createTRPCProxyClient, httpLink } from '@trpc/client';
 
 import superjson from 'superjson';
 
-import { isBrowser } from '@poolofdeath20/util';
+import { Defined, isBrowser } from '@poolofdeath20/util';
 
 import type { AppRouter } from '../../api/routes/internal/_app';
 
@@ -11,13 +11,12 @@ const getBaseUrl = () => {
 		return '';
 	}
 
-	if (process.env.VERCEL_URL) {
-		// reference for vercel.com
-		return `https://${process.env.VERCEL_URL}`;
-	}
-
-	// assume localhost
-	return process.env.NEXT_PUBLIC_ORIGIN;
+	return Defined.parse(process.env['VERCEL_URL'])
+		.map((vercelUrl) => {
+			// reference for vercel.com
+			return `https://${vercelUrl}`;
+		})
+		.orGet(process.env.NEXT_PUBLIC_ORIGIN);
 };
 
 const trpcClient = createTRPCProxyClient<AppRouter>({
diff --git a/apps/web/test/snapshot/index.test.ts b/apps/web/test/snapshot/index.test.ts
@@ -19,7 +19,6 @@ const testSnapshot = () => {
 				headless: true,
 				defaultViewport: null,
 				args: ['--start-maximized', '--no-sandbox'],
-				executablePath: process.env.CHROMIUM_PATH,
 			});
 		});
 	});

Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ const Templates = () => {`
`460`	`460`	`const router = useRouter();`
`461`	`461`
`462`	`462`	`const names = decodeURIComponent(`
`463`		`- parse(schemas.names, router.query.names ?? '')`
	`463`	`+ parse(schemas.names, router.query['names'] ?? '')`
`464`	`464`	`)`
`465`	`465`	`.split(delimiter)`
`466`	`466`	`.filter(Boolean);`