Skip to content

Commit eba58c2

Browse files
committed
Attempting to implement a better 404 handling SPA method...
1 parent 3dbd08b commit eba58c2

File tree

3 files changed

+64
-3
lines changed

3 files changed

+64
-3
lines changed

.github/workflows/deploy.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ jobs:
2727
- name: Build Sitemap
2828
run: npm run sitemap
2929

30-
- name: 404 handling
31-
run: cp dist/index.html dist/404.html
32-
3330
- name: Install SSH Client
3431
uses: webfactory/[email protected]
3532
with:

index.html

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,30 @@
1111
<link href="https://fonts.googleapis.com/css2?family=Open+Sans+Condensed:wght@300&family=Slabo+27px&display=swap" rel="stylesheet">
1212

1313
<title>Minecraft Item Browser</title>
14+
<!-- Start Single Page Apps for GitHub Pages -->
15+
<script type="text/javascript">
16+
// Single Page Apps for GitHub Pages
17+
// MIT License
18+
// https://github.com/rafgraph/spa-github-pages
19+
// This script checks to see if a redirect is present in the query string,
20+
// converts it back into the correct url and adds it to the
21+
// browser's history using window.history.replaceState(...),
22+
// which won't cause the browser to attempt to load the new url.
23+
// When the single page app is loaded further down in this file,
24+
// the correct url will be waiting in the browser's history for
25+
// the single page app to route accordingly.
26+
(function(l) {
27+
if (l.search[1] === '/' ) {
28+
var decoded = l.search.slice(1).split('&').map(function(s) {
29+
return s.replace(/~and~/g, '&')
30+
}).join('?');
31+
window.history.replaceState(null, null,
32+
l.pathname.slice(0, -1) + decoded + l.hash
33+
);
34+
}
35+
}(window.location))
36+
</script>
37+
<!-- End Single Page Apps for GitHub Pages -->
1438
<script type="module" src="/src/main.js"></script>
1539
<link rel="stylesheet" href="/css/textures.css" />
1640

public/404.html

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>Single Page Apps for GitHub Pages</title>
6+
<script type="text/javascript">
7+
// Single Page Apps for GitHub Pages
8+
// MIT License
9+
// https://github.com/rafgraph/spa-github-pages
10+
// This script takes the current url and converts the path and query
11+
// string into just a query string, and then redirects the browser
12+
// to the new url with only a query string and hash fragment,
13+
// e.g. https://www.foo.tld/one/two?a=b&c=d#qwe, becomes
14+
// https://www.foo.tld/?/one/two&a=b~and~c=d#qwe
15+
// Note: this 404.html file must be at least 512 bytes for it to work
16+
// with Internet Explorer (it is currently > 512 bytes)
17+
18+
// If you're creating a Project Pages site and NOT using a custom domain,
19+
// then set pathSegmentsToKeep to 1 (enterprise users may need to set it to > 1).
20+
// This way the code will only replace the route part of the path, and not
21+
// the real directory in which the app resides, for example:
22+
// https://username.github.io/repo-name/one/two?a=b&c=d#qwe becomes
23+
// https://username.github.io/repo-name/?/one/two&a=b~and~c=d#qwe
24+
// Otherwise, leave pathSegmentsToKeep as 0.
25+
var pathSegmentsToKeep = 0;
26+
27+
var l = window.location;
28+
l.replace(
29+
l.protocol + '//' + l.hostname + (l.port ? ':' + l.port : '') +
30+
l.pathname.split('/').slice(0, 1 + pathSegmentsToKeep).join('/') + '/?/' +
31+
l.pathname.slice(1).split('/').slice(pathSegmentsToKeep).join('/').replace(/&/g, '~and~') +
32+
(l.search ? '&' + l.search.slice(1).replace(/&/g, '~and~') : '') +
33+
l.hash
34+
);
35+
36+
</script>
37+
</head>
38+
<body>
39+
</body>
40+
</html>

0 commit comments

Comments
 (0)