Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-27 18:12:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(server/esbuild): switch to cjs to embed deps

Browse Source
This commit is contained in:
Elian Doran 2025-05-23 11:56:45 +03:00
parent 9ff2271423
commit 1abf1d3f60
No known key found for this signature in database
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/server/package.json
View File

@ -114,21 +114,12 @@
"targets": { "targets": {
"serve": { "serve": {
"executor": "@nx/js:node", "executor": "@nx/js:node",
"defaultConfiguration": "development",
"dependsOn": [ "dependsOn": [
"build-without-client" "build-without-client"
], ],
"options": { "options": {
"buildTarget": "server:build", "buildTarget": "server:build-without-client:development",
"runBuildTargetDependencies": false "runBuildTargetDependencies": false
},
"configurations": {
"development": {
"buildTarget": "server:build-without-client"
},
"production": {
"buildTarget": "server:build:production"
}
} }
}, },
"package": { "package": {
@ -141,7 +132,7 @@
"dependsOn": [ "dependsOn": [
"build" "build"
], ],
"command": "node apps/server/dist/main.js" "command": "node apps/server/dist/main.cjs"
}, },
"docker-build": { "docker-build": {
"dependsOn": [ "dependsOn": [
@ -190,10 +181,12 @@
"platform": "node", "platform": "node",
"external": [ "external": [
"electron", "electron",
"@electron/remote" "@electron/remote",
"better-sqlite3",
"jsdom"
], ],
"format": [ "format": [
"esm" "cjs"
], ],
"declarationRootDir": "apps/server/src" "declarationRootDir": "apps/server/src"
}, },
@ -264,6 +257,5 @@
}, },
"types": "./dist/main.d.ts", "types": "./dist/main.d.ts",
"module": "./dist/main.js", "module": "./dist/main.js",
"type": "module",
"main": "./dist/main.js" "main": "./dist/main.js"
} }

3
apps/server/src/routes/assets.ts
View File

@ -1,6 +1,5 @@
import { assetUrlFragment } from "../services/asset_path.js"; import { assetUrlFragment } from "../services/asset_path.js";
import path from "path"; import path from "path";
import { fileURLToPath } from "url";
import express from "express"; import express from "express";
import { getResourceDir, isDev } from "../services/utils.js"; import { getResourceDir, isDev } from "../services/utils.js";
import type serveStatic from "serve-static"; import type serveStatic from "serve-static";
@ -18,7 +17,7 @@ const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOp
}; };
async function register(app: express.Application) { async function register(app: express.Application) {
const srcRoot = path.join(path.dirname(fileURLToPath(import.meta.url)), ".."); const srcRoot = path.join(__dirname, "..");
const resourceDir = getResourceDir(); const resourceDir = getResourceDir();
if (isDev) { if (isDev) {

2
apps/server/src/services/i18n.ts
View File

@ -16,7 +16,7 @@ let dayjsLocale: string;
export async function initializeTranslations() { export async function initializeTranslations() {
const resourceDir = getResourceDir(); const resourceDir = getResourceDir();
const Backend = (await import("i18next-fs-backend")).default; const Backend = (await import("i18next-fs-backend/cjs")).default;
const locale = getCurrentLanguage(); const locale = getCurrentLanguage();
// Initialize translations // Initialize translations