titaniumnet-mirror/Nebula
1
0
Fork 0
mirror of https://github.com/NebulaServices/Nebula.git synced 2025-05-17 13:30:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #250 from MotorTruck1221/tgt

Browse source 
Fix Stupid Shit
This commit is contained in:
rift 2024-04-18 16:39:30 -05:00 • committed by GitHub
commit 89b93549cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 388 additions and 367 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.prettierignore
View file

@ -6,3 +6,4 @@ public/uv/
public/dynamic/ public/dynamic/
pnpm-lock.yaml pnpm-lock.yaml
package-lock.json package-lock.json
package.json

130
package.json
View file

@ -1,65 +1,65 @@
{ {
"name": "nebula", "name": "nebula",
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "concurrently \"vite\" \"tsx server.ts\"", "dev": "concurrently \"vite\" \"tsx server.ts\"",
"build": "vite build", "build": "vite build",
"bstart": "npm run build && tsx server.ts", "bstart": "npm run build && tsx server.ts",
"start": "tsx server.ts", "start": "tsx server.ts",
"preview": "vite preview", "preview": "vite preview",
"format": "prettier --write ." "format": "prettier --write ."
}, },
"dependencies": { "dependencies": {
"@fastify/compress": "^6.5.0", "@fastify/compress": "^6.5.0",
"@fastify/cookie": "^9.3.1", "@fastify/cookie": "^9.3.1",
"@fastify/static": "^6.12.0", "@fastify/static": "^6.12.0",
"@mercuryworkshop/bare-mux": "^1.0.7", "@mercuryworkshop/bare-mux": "^1.0.7",
"@mercuryworkshop/epoxy-transport": "^1.1.0", "@mercuryworkshop/epoxy-transport": "^1.1.0",
"@mercuryworkshop/libcurl-transport": "^1.3.1", "@mercuryworkshop/libcurl-transport": "^1.3.1",
"@nebula-services/dynamic": "0.7.2-patch.2", "@nebula-services/dynamic": "0.7.2-patch.2",
"@titaniumnetwork-dev/ultraviolet": "^3.0.0", "@titaniumnetwork-dev/ultraviolet": "^3.0.2",
"@tomphttp/bare-server-node": "2.0.3", "@tomphttp/bare-server-node": "2.0.3",
"@tsparticles/engine": "^3.3.0", "@tsparticles/engine": "^3.3.0",
"@tsparticles/react": "^3.0.0", "@tsparticles/react": "^3.0.0",
"@tsparticles/slim": "^3.3.0", "@tsparticles/slim": "^3.3.0",
"chalk": "^5.3.0", "chalk": "^5.3.0",
"classnames": "^2.5.1", "classnames": "^2.5.1",
"compression": "^1.7.4", "compression": "^1.7.4",
"cookie-parser": "^1.4.6", "cookie-parser": "^1.4.6",
"crypto-js": "^4.2.0", "crypto-js": "^4.2.0",
"fastify": "^4.26.2", "fastify": "^4.26.2",
"fastify-plugin": "^4.5.1", "fastify-plugin": "^4.5.1",
"framer-motion": "^10.18.0", "framer-motion": "^10.18.0",
"i18next": "^23.10.1", "i18next": "^23.11.2",
"i18next-browser-languagedetector": "^7.2.0", "i18next-browser-languagedetector": "^7.2.1",
"localforage": "^1.10.0", "localforage": "^1.10.0",
"million": "^2.6.4", "million": "^2.6.4",
"preact": "^10.20.0", "preact": "^10.20.2",
"preact-iso": "^2.4.0", "preact-iso": "^2.6.2",
"preact-render-to-string": "^6.4.1", "preact-render-to-string": "^6.4.2",
"preact-router": "^4.1.2", "preact-router": "^4.1.2",
"rammerhead": "https://github.com/NebulaServices/rammerhead/releases/download/rammerhead-1.2.41-nebula.8/rammerhead-1.2.41-nebula.7.tgz", "rammerhead": "https://github.com/NebulaServices/rammerhead/releases/download/rammerhead-1.2.41-nebula.8/rammerhead-1.2.41-nebula.7.tgz",
"react-helmet": "^6.1.0", "react-helmet": "^6.1.0",
"react-i18next": "^13.5.0", "react-i18next": "^13.5.0",
"react-icons": "^4.12.0", "react-icons": "^4.12.0",
"react-toastify": "^9.1.3", "react-toastify": "^9.1.3",
"tsx": "^4.7.1", "tsx": "^4.7.2",
"wisp-server-node": "^1.0.4", "wisp-server-node": "^1.0.4",
"ws": "^8.16.0" "ws": "^8.16.0"
}, },
"devDependencies": { "devDependencies": {
"@preact/preset-vite": "^2.8.2", "@preact/preset-vite": "^2.8.2",
"autoprefixer": "^10.4.19", "autoprefixer": "^10.4.19",
"concurrently": "^8.2.2", "concurrently": "^8.2.2",
"eslint": "^8.57.0", "eslint": "^8.57.0",
"eslint-config-preact": "^1.3.0", "eslint-config-preact": "^1.3.0",
"postcss": "^8.4.38", "postcss": "^8.4.38",
"prettier": "^3.2.5", "prettier": "^3.2.5",
"prettier-plugin-tailwindcss": "^0.5.12", "prettier-plugin-tailwindcss": "^0.5.14",
"tailwindcss": "^3.4.1", "tailwindcss": "^3.4.3",
"typescript": "^5.4.3", "typescript": "^5.4.5",
"vite": "^5.2.3", "vite": "^5.2.9",
"vite-plugin-static-copy": "^1.0.1" "vite-plugin-static-copy": "^1.0.2"
} }
} }

612
pnpm-lock.yaml generated
View file

File diff suppressed because it is too large Load diff

2
server.ts
View file

@ -67,7 +67,7 @@ const serverFactory = (handler, opts) => {
} else if (shouldRouteRh(req)) { } else if (shouldRouteRh(req)) {
routeRhUpgrade(req, socket, head); routeRhUpgrade(req, socket, head);
} else if (req.url.endsWith("/wisp/")) { } else if (req.url.endsWith("/wisp/")) {
wisp.routeRequest(req, socket as Socket, head); wisp.routeRequest(req, socket, head);
} }
}); });
}; };

8
src/index.tsx
View file

@ -37,12 +37,10 @@ export default function App() {
{window.location.origin === "https://nebulaproxy.io" && <Meta />} {window.location.origin === "https://nebulaproxy.io" && <Meta />}
{/* {window.location.origin === "http://localhost:8080" && <Meta />} */} {/* {window.location.origin === "http://localhost:8080" && <Meta />} */}
<Suspense fallback={<LoadSuspense />}> <Suspense fallback={<LoadSuspense />}>
<main className="absolute z-30 h-screen w-screen"> <div className="z-30 h-full w-full">
<Routes /> <Routes />
</main> </div>
<div <div className={`z-20 h-full w-full ${!background && "bg-primary"}`}>
className={`z-20 h-screen w-screen ${!background && "bg-primary"}`}
>
{init && particlesUrl !== "none" && ( {init && particlesUrl !== "none" && (
<Particles <Particles
id="tsparticles" id="tsparticles"

2
vite.config.ts
View file

@ -54,7 +54,7 @@ export default defineConfig({
server: { server: {
proxy: { proxy: {
"/bare/": { "/bare/": {
target: "http://localhost:8080/", target: "http://localhost:8080/bare/",
changeOrigin: true, changeOrigin: true,
rewrite: (path) => path.replace(/^\/bare\//, "") rewrite: (path) => path.replace(/^\/bare\//, "")
}, },