fix(404): redirect

prncss-xyz · Jul 20, 2024 · fe0fa6c · fe0fa6c
1 parent cbcc26e
commit fe0fa6c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 63 deletions.
diff --git a/packages/web/public/404.html b/packages/web/public/404.html
@@ -4,46 +4,11 @@
 		<meta charset="utf-8" />
 		<title>Single Page Apps for GitHub Pages</title>
 		<script type="text/javascript">
-			// Single Page Apps for GitHub Pages
-			// MIT License
-			// https://github.com/rafgraph/spa-github-pages
-			// This script takes the current url and converts the path and query
-			// string into just a query string, and then redirects the browser
-			// to the new url with only a query string and hash fragment,
-			// e.g. https://www.foo.tld/one/two?a=b&c=d#qwe, becomes
-			// https://www.foo.tld/?/one/two&a=b~and~c=d#qwe
-			// Note: this 404.html file must be at least 512 bytes for it to work
-			// with Internet Explorer (it is currently > 512 bytes)
-
-			// If you're creating a Project Pages site and NOT using a custom domain,
-			// then set pathSegmentsToKeep to 1 (enterprise users may need to set it to > 1).
-			// This way the code will only replace the route part of the path, and not
-			// the real directory in which the app resides, for example:
-			// https://username.github.io/repo-name/one/two?a=b&c=d#qwe becomes
-			// https://username.github.io/repo-name/?/one/two&a=b~and~c=d#qwe
-			// Otherwise, leave pathSegmentsToKeep as 0.
-			var pathSegmentsToKeep = 0
-
-			var l = window.location
-			l.replace(
-				l.protocol +
-					'//' +
-					l.hostname +
-					(l.port ? ':' + l.port : '') +
-					l.pathname
-						.split('/')
-						.slice(0, 1 + pathSegmentsToKeep)
-						.join('/') +
-					'/?/' +
-					l.pathname
-						.slice(1)
-						.split('/')
-						.slice(pathSegmentsToKeep)
-						.join('/')
-						.replace(/&/g, '~and~') +
-					(l.search ? '&' + l.search.slice(1).replace(/&/g, '~and~') : '') +
-					l.hash,
-			)
+			const base = '/renote'
+			const l = window.location
+			const s = new URLSearchParams()
+			s.set('to', l.pathname.slice(base.length) + l.search + l.hash)
+			l.replace(`${base}?${s}`)
 		</script>
 	</head>
 	<body></body>

diff --git a/packages/web/src/routes/index.tsx b/packages/web/src/routes/index.tsx
@@ -1,32 +1,15 @@
-import { createFileRoute, useSearch } from '@tanstack/react-router'
-import { useEffect } from 'react'
+import { createFileRoute, Navigate, useSearch } from '@tanstack/react-router'
 import { z } from 'zod'
 
 export const Route = createFileRoute('/')({
 	component: Component,
-	validateSearch: z.object({ path: z.string().catch('') }),
+	validateSearch: z.object({
+		to: z.string().catch('/notes'),
+	}),
 })
 
-// this is to support github pages
-// https://github.com/rafgraph/spa-github-pages/blob/gh-pages/index.html#L21-L42
-function decodePath(path: string) {
-	return path
-		.slice(1)
-		.split('&')
-		.map(function (s) {
-			return s.replace(/~and~/g, '&')
-		})
-		.join('?')
-}
-
 function Component() {
-	const { path } = useSearch({ from: Route.fullPath })
-	const to = `${import.meta.env.BASE_URL}/${path ? decodePath(path) : '/notes'}`
-	// __AUTO_GENERATED_PRINT_VAR_START__
+	const { to } = useSearch({ from: Route.fullPath })
 	console.log('Component to: %s', to) // __AUTO_GENERATED_PRINT_VAR_END__
-	useEffect(() => {
-		console.log('effect')
-		window.location.replace(to)
-	}, [to])
-	return null
+	return <Navigate to={to} />
 }