From bc9b82dab1767b2fa1085fcf22336c455a7f89c1 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Sat, 10 May 2025 02:37:08 +0000 Subject: [PATCH] Refactors internal loading of the library package.json --- server/package.json | 4 ++-- server/src/baseRoutes/main.js | 4 +--- server/src/vars.js | 9 ++++----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/server/package.json b/server/package.json index 41c79f6..85b655c 100755 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "linebridge", - "version": "1.0.0-a3", + "version": "1.0.0-alpha.2", "description": "Multiproposal framework to build fast, scalable, and secure servers.", "author": "RageStudio ", "bugs": { @@ -37,7 +37,7 @@ "sucrase": "^3.35.0" }, "devDependencies": { - "@ragestudio/hermes": "^1.0.0", + "@ragestudio/hermes": "^1.0.1", "mocha": "^11.1.0" } } diff --git a/server/src/baseRoutes/main.js b/server/src/baseRoutes/main.js index 575bc08..fcd0467 100755 --- a/server/src/baseRoutes/main.js +++ b/server/src/baseRoutes/main.js @@ -1,5 +1,3 @@ -import path from "node:path" - import Route from "../classes/Route" import Vars from "../vars" @@ -10,7 +8,7 @@ export default class MainRoute extends Route { get = async (req, res, ctx) => { return { name: ctx.server.params.refName ?? "unknown", - version: Vars.projectPkg.version ?? "unknown", + version: Vars.projectPkg.version, engine: ctx.server.params.useEngine ?? "unknown", lb_version: Vars.libPkg.version ?? "unknown", experimental: ctx.server.isExperimental ?? "unknown", diff --git a/server/src/vars.js b/server/src/vars.js index e27f4c1..56c8d4c 100755 --- a/server/src/vars.js +++ b/server/src/vars.js @@ -1,14 +1,13 @@ import path from "node:path" const rootLibPath = path.resolve(__dirname, "../") -const packageJSON = require(rootLibPath, "../package.json") +const libPkg = require(path.resolve(rootLibPath, "package.json")) const projectPkg = require(path.resolve(process.cwd(), "package.json")) export default { - libPath: __dirname, rootLibPath: rootLibPath, - libPkg: packageJSON, - projectCwd: process.cwd(), + libPath: __dirname, + libPkg: libPkg, projectPkg: projectPkg, defaultParams: { refName: "linebridge", @@ -37,7 +36,7 @@ export default { }, baseHeaders: { server: "linebridge", - "lb-version": packageJSON.version, + "lb-version": libPkg.version, }, baseMiddlewares: { logs: require("./middlewares/logger").default,