From 647c0c32f4ecd7a1f842e740924beb04847e93c1 Mon Sep 17 00:00:00 2001 From: BinBashBanana <51469593+BinBashBanana@users.noreply.github.com> Date: Tue, 1 Nov 2022 18:01:14 -0700 Subject: [PATCH 1/3] Better errors see https://github.com/titaniumnetwork-development/Ultraviolet-Static/pull/3 --- src/index.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/index.js b/src/index.js index b4bdf64..5cc2ca3 100644 --- a/src/index.js +++ b/src/index.js @@ -13,6 +13,11 @@ app.use(express.static(publicPath)); // The vendor's uv.config.js won't conflict with our uv.config.js inside the publicPath directory. app.use("/uv/", express.static(uvPath)); +// Error for everything else +app.use(function(req, res) { + res.status(404).sendFile(publicPath + "error.html"); +}); + const server = createServer(); server.on("request", (req, res) => { From 51a19a53b1b9c52a82f308afaed30ef723e25928 Mon Sep 17 00:00:00 2001 From: David Reed Date: Tue, 1 Nov 2022 21:20:36 -0400 Subject: [PATCH 2/3] use 404.html --- src/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index 5cc2ca3..14d75e7 100644 --- a/src/index.js +++ b/src/index.js @@ -3,6 +3,7 @@ import express from "express"; import { createServer } from "node:http"; import { publicPath } from "ultraviolet-static"; import { uvPath } from "@titaniumnetwork-dev/ultraviolet"; +import { join } from "node:path"; const bare = createBareServer("/bare/"); const app = express(); @@ -14,8 +15,9 @@ app.use(express.static(publicPath)); app.use("/uv/", express.static(uvPath)); // Error for everything else -app.use(function(req, res) { - res.status(404).sendFile(publicPath + "error.html"); +app.use((req, res) => { + res.status(404); + res.sendFile(join(publicPath, "404.html")); }); const server = createServer(); From 684b07d2ed3f5e994091e955fb0d71b7e0dd274b Mon Sep 17 00:00:00 2001 From: David Reed Date: Tue, 1 Nov 2022 21:21:38 -0400 Subject: [PATCH 3/3] update ultraviolet-static dependency --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5d4f971..160e130 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2013,7 +2013,7 @@ }, "node_modules/ultraviolet-static": { "version": "1.0.2", - "resolved": "git+ssh://git@github.com/titaniumnetwork-development/Ultraviolet-Static.git#97155032e6082a86d9f701bd1bd729fe3593e137", + "resolved": "git+ssh://git@github.com/titaniumnetwork-development/Ultraviolet-Static.git#298cc59dd54f4f3df5e36f41b149493d3a2ff092", "peerDependencies": { "ultraviolet": "https://github.com/titaniumnetwork-development/Ultraviolet/releases/download/v1.0.1/ultraviolet-1.0.1.tgz" } @@ -3533,7 +3533,7 @@ } }, "ultraviolet-static": { - "version": "git+ssh://git@github.com/titaniumnetwork-development/Ultraviolet-Static.git#97155032e6082a86d9f701bd1bd729fe3593e137", + "version": "git+ssh://git@github.com/titaniumnetwork-development/Ultraviolet-Static.git#298cc59dd54f4f3df5e36f41b149493d3a2ff092", "from": "ultraviolet-static@github:titaniumnetwork-development/Ultraviolet-Static", "requires": {} },