diff --git a/src/routes/assets.ts b/src/routes/assets.ts index a46801559..e22e34658 100644 --- a/src/routes/assets.ts +++ b/src/routes/assets.ts @@ -2,11 +2,11 @@ import assetPath from "../services/asset_path.js"; import path from "path"; import { fileURLToPath } from "url"; import express from "express"; -import env from "../services/env.js"; +import { isDev } from "../services/utils.js"; import type serveStatic from "serve-static"; const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOptions>>) => { - if (!env.isDev()) { + if (!isDev) { options = { maxAge: "1y", ...options @@ -17,7 +17,7 @@ const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOp async function register(app: express.Application) { const srcRoot = path.join(path.dirname(fileURLToPath(import.meta.url)), ".."); - if (env.isDev()) { + if (isDev) { const webpack = (await import("webpack")).default; const webpackMiddleware = (await import("webpack-dev-middleware")).default; const productionConfig = (await import("../../webpack.config.js")).default; diff --git a/src/routes/index.ts b/src/routes/index.ts index 0365d9bf8..966f71ab3 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -5,8 +5,7 @@ import attributeService from "../services/attributes.js"; import config from "../services/config.js"; import optionService from "../services/options.js"; import log from "../services/log.js"; -import env from "../services/env.js"; -import { isElectron } from "../services/utils.js"; +import { isDev, isElectron } from "../services/utils.js"; import protectedSessionService from "../services/protected_session.js"; import packageJson from "../../package.json" with { type: "json" }; import assetPath from "../services/asset_path.js"; @@ -52,7 +51,7 @@ function index(req: Request, res: Response) { maxEntityChangeSyncIdAtLoad: sql.getValue("SELECT COALESCE(MAX(id), 0) FROM entity_changes WHERE isSynced = 1"), instanceName: config.General ? config.General.instanceName : null, appCssNoteIds: getAppCssNoteIds(), - isDev: env.isDev(), + isDev, isMainWindow: view === "mobile" ? true : !req.query.extraWindow, isProtectedSessionAvailable: protectedSessionService.isProtectedSessionAvailable(), maxContentWidth: Math.max(640, parseInt(options.maxContentWidth)), diff --git a/src/services/app_path.ts b/src/services/app_path.ts index f4ae316c3..8f2a57809 100644 --- a/src/services/app_path.ts +++ b/src/services/app_path.ts @@ -1,4 +1,4 @@ import assetPath from "./asset_path.js"; -import env from "./env.js"; +import { isDev } from "./utils.js"; -export default env.isDev() ? assetPath + "/app" : assetPath + "/app-dist"; +export default isDev ? assetPath + "/app" : assetPath + "/app-dist"; \ No newline at end of file diff --git a/src/services/code_block_theme.ts b/src/services/code_block_theme.ts index e56dc8ee4..8351b2519 100644 --- a/src/services/code_block_theme.ts +++ b/src/services/code_block_theme.ts @@ -8,8 +8,7 @@ import fs from "fs"; import themeNames from "./code_block_theme_names.json" with { type: "json" }; import { t } from "i18next"; import { join } from "path"; -import { isElectron, getResourceDir } from "./utils.js"; -import env from "./env.js"; +import { isDev, isElectron, getResourceDir } from "./utils.js"; /** * Represents a color scheme for the code block syntax highlight. @@ -46,7 +45,7 @@ export function listSyntaxHighlightingThemes() { } function getStylesDirectory() { - if (isElectron() && !env.isDev()) { + if (isElectron && !isDev) { return "styles"; } diff --git a/src/services/env.ts b/src/services/env.ts deleted file mode 100644 index 08737bb2d..000000000 --- a/src/services/env.ts +++ /dev/null @@ -1,7 +0,0 @@ -function isDev() { - return !!(process.env.TRILIUM_ENV && process.env.TRILIUM_ENV === "dev"); -} - -export default { - isDev -}; diff --git a/src/services/port.ts b/src/services/port.ts index 3d7cfe9b2..8e76a2afc 100644 --- a/src/services/port.ts +++ b/src/services/port.ts @@ -1,6 +1,5 @@ import config from "./config.js"; -import { isElectron } from "./utils.js"; -import env from "./env.js"; +import { isDev, isElectron } from "./utils.js"; import dataDir from "./data_dir.js"; function parseAndValidate(portStr: string, source: string) { @@ -19,7 +18,7 @@ let port: number; if (process.env.TRILIUM_PORT) { port = parseAndValidate(process.env.TRILIUM_PORT, "environment variable TRILIUM_PORT"); } else if (isElectron) { - port = env.isDev() ? 37740 : 37840; + port = isDev ? 37740 : 37840; } else { port = parseAndValidate(config["Network"]["port"] || "3000", `Network.port in ${dataDir.CONFIG_INI_PATH}`); } diff --git a/src/services/utils.ts b/src/services/utils.ts index d8f353de8..b00c1e488 100644 --- a/src/services/utils.ts +++ b/src/services/utils.ts @@ -8,7 +8,6 @@ import sanitize from "sanitize-filename"; import mimeTypes from "mime-types"; import path from "path"; import { fileURLToPath } from "url"; -import env from "./env.js"; import { dirname, join } from "path"; const randtoken = generator({ source: "crypto" }); @@ -19,6 +18,8 @@ export const isWindows = process.platform === "win32"; export const isElectron = !!process.versions["electron"]; +export const isDev = !!(process.env.TRILIUM_ENV && process.env.TRILIUM_ENV === "dev"); + export function newEntityId() { return randomString(12); } @@ -316,7 +317,7 @@ export function envToBoolean(val: string | undefined) { * @returns the resource dir. */ export function getResourceDir() { - if (isElectron && !env.isDev()) { + if (isElectron && !isDev) { return process.resourcesPath; } else { return join(dirname(fileURLToPath(import.meta.url)), "..", ".."); diff --git a/src/services/window.ts b/src/services/window.ts index 70107285c..84c8f5a46 100644 --- a/src/services/window.ts +++ b/src/services/window.ts @@ -2,7 +2,6 @@ import path from "path"; import url from "url"; import port from "./port.js"; import optionService from "./options.js"; -import env from "./env.js"; import log from "./log.js"; import sqlInit from "./sql_init.js"; import cls from "./cls.js"; @@ -10,7 +9,7 @@ import keyboardActionsService from "./keyboard_actions.js"; import remoteMain from "@electron/remote/main/index.js"; import type { App, BrowserWindow, BrowserWindowConstructorOptions, WebContents } from "electron"; import { ipcMain } from "electron"; -import { isMac, isWindows } from "./utils.js"; +import { isDev, isMac, isWindows } from "./utils.js"; import { fileURLToPath } from "url"; import { dirname } from "path"; @@ -169,7 +168,7 @@ function configureWebContents(webContents: WebContents, spellcheckEnabled: boole } function getIcon() { - return path.join(dirname(fileURLToPath(import.meta.url)), "../../images/app-icons/png/256x256" + (env.isDev() ? "-dev" : "") + ".png"); + return path.join(dirname(fileURLToPath(import.meta.url)), "../../images/app-icons/png/256x256" + (isDev ? "-dev" : "") + ".png"); } async function createSetupWindow() { diff --git a/src/services/ws.ts b/src/services/ws.ts index 21e80bc6b..9215b4572 100644 --- a/src/services/ws.ts +++ b/src/services/ws.ts @@ -1,5 +1,5 @@ import { WebSocketServer as WebSocketServer, WebSocket } from "ws"; -import { isElectron, randomString } from "./utils.js"; +import { isDev, isElectron, randomString } from "./utils.js"; import log from "./log.js"; import sql from "./sql.js"; import cls from "./cls.js"; @@ -9,11 +9,10 @@ import protectedSessionService from "./protected_session.js"; import becca from "../becca/becca.js"; import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js"; -import env from "./env.js"; import type { IncomingMessage, Server as HttpServer } from "http"; import type { EntityChange } from "./entity_changes_interface.js"; -if (env.isDev()) { +if (isDev) { const chokidar = (await import("chokidar")).default; const debounce = (await import("debounce")).default; const debouncedReloadFrontend = debounce(() => reloadFrontend("source code change"), 200);