mirror of
https://github.com/zadam/trilium.git
synced 2025-06-06 18:08:33 +02:00
server-ts: Fix references to cls.js
This commit is contained in:
parent
96b6d17d77
commit
ff2e05fe83
@ -1,7 +1,7 @@
|
|||||||
module.exports = () => {
|
module.exports = () => {
|
||||||
const beccaLoader = require('../../src/becca/becca_loader.js');
|
const beccaLoader = require('../../src/becca/becca_loader.js');
|
||||||
const becca = require('../../src/becca/becca.js');
|
const becca = require('../../src/becca/becca.js');
|
||||||
const cls = require('../../src/services/cls.js');
|
const cls = require('../../src/services/cls');
|
||||||
const log = require('../../src/services/log');
|
const log = require('../../src/services/log');
|
||||||
const sql = require('../../src/services/sql.js');
|
const sql = require('../../src/services/sql.js');
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ const BBranch = require('./entities/bbranch.js');
|
|||||||
const BAttribute = require('./entities/battribute.js');
|
const BAttribute = require('./entities/battribute.js');
|
||||||
const BOption = require('./entities/boption.js');
|
const BOption = require('./entities/boption.js');
|
||||||
const BEtapiToken = require('./entities/betapi_token.js');
|
const BEtapiToken = require('./entities/betapi_token.js');
|
||||||
const cls = require('../services/cls.js');
|
const cls = require('../services/cls');
|
||||||
const entityConstructor = require('../becca/entity_constructor.js');
|
const entityConstructor = require('../becca/entity_constructor.js');
|
||||||
|
|
||||||
const beccaLoaded = new Promise((res, rej) => {
|
const beccaLoaded = new Promise((res, rej) => {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const becca = require('./becca.js');
|
const becca = require('./becca.js');
|
||||||
const cls = require('../services/cls.js');
|
const cls = require('../services/cls');
|
||||||
const log = require('../services/log');
|
const log = require('../services/log');
|
||||||
|
|
||||||
function isNotePathArchived(notePath) {
|
function isNotePathArchived(notePath) {
|
||||||
|
@ -5,7 +5,7 @@ const sql = require('../../services/sql.js');
|
|||||||
const entityChangesService = require('../../services/entity_changes.js');
|
const entityChangesService = require('../../services/entity_changes.js');
|
||||||
const eventService = require('../../services/events.js');
|
const eventService = require('../../services/events.js');
|
||||||
const dateUtils = require('../../services/date_utils.js');
|
const dateUtils = require('../../services/date_utils.js');
|
||||||
const cls = require('../../services/cls.js');
|
const cls = require('../../services/cls');
|
||||||
const log = require('../../services/log');
|
const log = require('../../services/log');
|
||||||
const protectedSessionService = require('../../services/protected_session.js');
|
const protectedSessionService = require('../../services/protected_session.js');
|
||||||
const blobService = require('../../services/blob.js');
|
const blobService = require('../../services/blob.js');
|
||||||
|
@ -5,7 +5,7 @@ const AbstractBeccaEntity = require('./abstract_becca_entity.js');
|
|||||||
const dateUtils = require('../../services/date_utils.js');
|
const dateUtils = require('../../services/date_utils.js');
|
||||||
const utils = require('../../services/utils.js');
|
const utils = require('../../services/utils.js');
|
||||||
const TaskContext = require('../../services/task_context.js');
|
const TaskContext = require('../../services/task_context.js');
|
||||||
const cls = require('../../services/cls.js');
|
const cls = require('../../services/cls');
|
||||||
const log = require('../../services/log');
|
const log = require('../../services/log');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
const cls = require('../services/cls.js');
|
const cls = require('../services/cls');
|
||||||
const sql = require('../services/sql.js');
|
const sql = require('../services/sql.js');
|
||||||
const log = require('../services/log');
|
const log = require('../services/log');
|
||||||
const becca = require('../becca/becca.js');
|
const becca = require('../becca/becca.js');
|
||||||
|
@ -4,7 +4,7 @@ const beccaService = require('../../becca/becca_service.js');
|
|||||||
const searchService = require('../../services/search/services/search.js');
|
const searchService = require('../../services/search/services/search.js');
|
||||||
const log = require('../../services/log');
|
const log = require('../../services/log');
|
||||||
const utils = require('../../services/utils.js');
|
const utils = require('../../services/utils.js');
|
||||||
const cls = require('../../services/cls.js');
|
const cls = require('../../services/cls');
|
||||||
const becca = require('../../becca/becca.js');
|
const becca = require('../../becca/becca.js');
|
||||||
|
|
||||||
function getAutocomplete(req) {
|
function getAutocomplete(req) {
|
||||||
|
@ -4,7 +4,7 @@ const enexImportService = require('../../services/import/enex.js');
|
|||||||
const opmlImportService = require('../../services/import/opml.js');
|
const opmlImportService = require('../../services/import/opml.js');
|
||||||
const zipImportService = require('../../services/import/zip.js');
|
const zipImportService = require('../../services/import/zip.js');
|
||||||
const singleImportService = require('../../services/import/single.js');
|
const singleImportService = require('../../services/import/single.js');
|
||||||
const cls = require('../../services/cls.js');
|
const cls = require('../../services/cls');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const becca = require('../../becca/becca.js');
|
const becca = require('../../becca/becca.js');
|
||||||
const beccaLoader = require('../../becca/becca_loader.js');
|
const beccaLoader = require('../../becca/becca_loader.js');
|
||||||
|
@ -4,7 +4,7 @@ const beccaService = require('../../becca/becca_service.js');
|
|||||||
const revisionService = require('../../services/revisions.js');
|
const revisionService = require('../../services/revisions.js');
|
||||||
const utils = require('../../services/utils.js');
|
const utils = require('../../services/utils.js');
|
||||||
const sql = require('../../services/sql.js');
|
const sql = require('../../services/sql.js');
|
||||||
const cls = require('../../services/cls.js');
|
const cls = require('../../services/cls');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const becca = require('../../becca/becca.js');
|
const becca = require('../../becca/becca.js');
|
||||||
const blobService = require('../../services/blob.js');
|
const blobService = require('../../services/blob.js');
|
||||||
|
@ -4,7 +4,7 @@ const becca = require('../../becca/becca.js');
|
|||||||
const SearchContext = require('../../services/search/search_context.js');
|
const SearchContext = require('../../services/search/search_context.js');
|
||||||
const searchService = require('../../services/search/services/search.js');
|
const searchService = require('../../services/search/services/search.js');
|
||||||
const bulkActionService = require('../../services/bulk_actions.js');
|
const bulkActionService = require('../../services/bulk_actions.js');
|
||||||
const cls = require('../../services/cls.js');
|
const cls = require('../../services/cls');
|
||||||
const {formatAttrForSearch} = require('../../services/attribute_formatter.js');
|
const {formatAttrForSearch} = require('../../services/attribute_formatter.js');
|
||||||
const ValidationError = require('../../errors/validation_error.js');
|
const ValidationError = require('../../errors/validation_error.js');
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
const dateNoteService = require('../../services/date_notes.js');
|
const dateNoteService = require('../../services/date_notes.js');
|
||||||
const sql = require('../../services/sql.js');
|
const sql = require('../../services/sql.js');
|
||||||
const cls = require('../../services/cls.js');
|
const cls = require('../../services/cls');
|
||||||
const specialNotesService = require('../../services/special_notes.js');
|
const specialNotesService = require('../../services/special_notes.js');
|
||||||
const becca = require('../../becca/becca.js');
|
const becca = require('../../becca/becca.js');
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
const log = require('../services/log');
|
const log = require('../services/log');
|
||||||
const fileService = require('./api/files.js');
|
const fileService = require('./api/files.js');
|
||||||
const scriptService = require('../services/script.js');
|
const scriptService = require('../services/script.js');
|
||||||
const cls = require('../services/cls.js');
|
const cls = require('../services/cls');
|
||||||
const sql = require('../services/sql.js');
|
const sql = require('../services/sql.js');
|
||||||
const becca = require('../becca/becca.js');
|
const becca = require('../becca/becca.js');
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ const log = require('../services/log');
|
|||||||
const express = require('express');
|
const express = require('express');
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
const auth = require('../services/auth.js');
|
const auth = require('../services/auth.js');
|
||||||
const cls = require('../services/cls.js');
|
const cls = require('../services/cls');
|
||||||
const sql = require('../services/sql.js');
|
const sql = require('../services/sql.js');
|
||||||
const entityChangesService = require('../services/entity_changes.js');
|
const entityChangesService = require('../services/entity_changes.js');
|
||||||
const csurf = require('csurf');
|
const csurf = require('csurf');
|
||||||
|
@ -6,7 +6,7 @@ const fs = require('fs-extra');
|
|||||||
const dataDir = require('./data_dir');
|
const dataDir = require('./data_dir');
|
||||||
const log = require('./log');
|
const log = require('./log');
|
||||||
const syncMutexService = require('./sync_mutex.js');
|
const syncMutexService = require('./sync_mutex.js');
|
||||||
const cls = require('./cls.js');
|
const cls = require('./cls');
|
||||||
const sql = require('./sql.js');
|
const sql = require('./sql.js');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ const sqlInit = require('./sql_init.js');
|
|||||||
const log = require('./log');
|
const log = require('./log');
|
||||||
const ws = require('./ws.js');
|
const ws = require('./ws.js');
|
||||||
const syncMutexService = require('./sync_mutex.js');
|
const syncMutexService = require('./sync_mutex.js');
|
||||||
const cls = require('./cls.js');
|
const cls = require('./cls');
|
||||||
const entityChangesService = require('./entity_changes.js');
|
const entityChangesService = require('./entity_changes.js');
|
||||||
const optionsService = require('./options.js');
|
const optionsService = require('./options.js');
|
||||||
const BBranch = require('../becca/entities/bbranch.js');
|
const BBranch = require('../becca/entities/bbranch.js');
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
const dayjs = require('dayjs');
|
const dayjs = require('dayjs');
|
||||||
const cls = require('./cls.js');
|
const cls = require('./cls');
|
||||||
|
|
||||||
const LOCAL_DATETIME_FORMAT = 'YYYY-MM-DD HH:mm:ss.SSSZZ';
|
const LOCAL_DATETIME_FORMAT = 'YYYY-MM-DD HH:mm:ss.SSSZZ';
|
||||||
const UTC_DATETIME_FORMAT = 'YYYY-MM-DD HH:mm:ssZ';
|
const UTC_DATETIME_FORMAT = 'YYYY-MM-DD HH:mm:ssZ';
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
const sql = require('./sql.js');
|
const sql = require('./sql.js');
|
||||||
const dateUtils = require('./date_utils.js');
|
const dateUtils = require('./date_utils.js');
|
||||||
const log = require('./log');
|
const log = require('./log');
|
||||||
const cls = require('./cls.js');
|
const cls = require('./cls');
|
||||||
const utils = require('./utils.js');
|
const utils = require('./utils.js');
|
||||||
const instanceId = require('./instance_id.js');
|
const instanceId = require('./instance_id.js');
|
||||||
const becca = require('../becca/becca.js');
|
const becca = require('../becca/becca.js');
|
||||||
|
@ -5,7 +5,7 @@ const entityChangesService = require("./entity_changes.js");
|
|||||||
const optionService = require("./options.js");
|
const optionService = require("./options.js");
|
||||||
const dateUtils = require("./date_utils.js");
|
const dateUtils = require("./date_utils.js");
|
||||||
const sqlInit = require("./sql_init.js");
|
const sqlInit = require("./sql_init.js");
|
||||||
const cls = require("./cls.js");
|
const cls = require("./cls");
|
||||||
|
|
||||||
function eraseNotes(noteIdsToErase) {
|
function eraseNotes(noteIdsToErase) {
|
||||||
if (noteIdsToErase.length === 0) {
|
if (noteIdsToErase.length === 0) {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
const cls = require('./cls.js');
|
const cls = require('./cls');
|
||||||
const becca = require('../becca/becca.js');
|
const becca = require('../becca/becca.js');
|
||||||
|
|
||||||
function getHoistedNoteId() {
|
function getHoistedNoteId() {
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
import { Request, Response } from "express";
|
import { Request, Response } from "express";
|
||||||
import fs = require("fs");
|
import fs = require("fs");
|
||||||
import dataDir = require('./data_dir');
|
import dataDir = require('./data_dir');
|
||||||
import cls = require('./cls.js');
|
import cls = require('./cls');
|
||||||
|
|
||||||
if (!fs.existsSync(dataDir.LOG_DIR)) {
|
if (!fs.existsSync(dataDir.LOG_DIR)) {
|
||||||
fs.mkdirSync(dataDir.LOG_DIR, 0o700);
|
fs.mkdirSync(dataDir.LOG_DIR, 0o700);
|
||||||
|
@ -5,7 +5,7 @@ const log = require('./log');
|
|||||||
const utils = require('./utils.js');
|
const utils = require('./utils.js');
|
||||||
const resourceDir = require('./resource_dir.js');
|
const resourceDir = require('./resource_dir.js');
|
||||||
const appInfo = require('./app_info.js');
|
const appInfo = require('./app_info.js');
|
||||||
const cls = require('./cls.js');
|
const cls = require('./cls');
|
||||||
|
|
||||||
async function migrate() {
|
async function migrate() {
|
||||||
const currentDbVersion = getDbVersion();
|
const currentDbVersion = getDbVersion();
|
||||||
|
@ -3,7 +3,7 @@ const optionService = require('./options.js');
|
|||||||
const dateUtils = require('./date_utils.js');
|
const dateUtils = require('./date_utils.js');
|
||||||
const entityChangesService = require('./entity_changes.js');
|
const entityChangesService = require('./entity_changes.js');
|
||||||
const eventService = require('./events.js');
|
const eventService = require('./events.js');
|
||||||
const cls = require('../services/cls.js');
|
const cls = require('../services/cls');
|
||||||
const protectedSessionService = require('../services/protected_session.js');
|
const protectedSessionService = require('../services/protected_session.js');
|
||||||
const log = require('../services/log');
|
const log = require('../services/log');
|
||||||
const utils = require('../services/utils.js');
|
const utils = require('../services/utils.js');
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
const scriptService = require('./script.js');
|
const scriptService = require('./script.js');
|
||||||
const cls = require('./cls.js');
|
const cls = require('./cls');
|
||||||
const sqlInit = require('./sql_init.js');
|
const sqlInit = require('./sql_init.js');
|
||||||
const config = require('./config.js');
|
const config = require('./config.js');
|
||||||
const log = require('./log');
|
const log = require('./log');
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
const ScriptContext = require('./script_context.js');
|
const ScriptContext = require('./script_context.js');
|
||||||
const cls = require('./cls.js');
|
const cls = require('./cls');
|
||||||
const log = require('./log');
|
const log = require('./log');
|
||||||
const becca = require('../becca/becca.js');
|
const becca = require('../becca/becca.js');
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
const log = require('./log');
|
const log = require('./log');
|
||||||
const Database = require('better-sqlite3');
|
const Database = require('better-sqlite3');
|
||||||
const dataDir = require('./data_dir');
|
const dataDir = require('./data_dir');
|
||||||
const cls = require('./cls.js');
|
const cls = require('./cls');
|
||||||
const fs = require("fs-extra");
|
const fs = require("fs-extra");
|
||||||
|
|
||||||
const dbConnection = new Database(dataDir.DOCUMENT_PATH);
|
const dbConnection = new Database(dataDir.DOCUMENT_PATH);
|
||||||
|
@ -8,7 +8,7 @@ const port = require('./port.js');
|
|||||||
const BOption = require('../becca/entities/boption.js');
|
const BOption = require('../becca/entities/boption.js');
|
||||||
const TaskContext = require('./task_context.js');
|
const TaskContext = require('./task_context.js');
|
||||||
const migrationService = require('./migration.js');
|
const migrationService = require('./migration.js');
|
||||||
const cls = require('./cls.js');
|
const cls = require('./cls');
|
||||||
const config = require('./config.js');
|
const config = require('./config.js');
|
||||||
|
|
||||||
const dbReady = utils.deferred();
|
const dbReady = utils.deferred();
|
||||||
|
@ -11,7 +11,7 @@ const contentHashService = require('./content_hash.js');
|
|||||||
const appInfo = require('./app_info.js');
|
const appInfo = require('./app_info.js');
|
||||||
const syncOptions = require('./sync_options.js');
|
const syncOptions = require('./sync_options.js');
|
||||||
const syncMutexService = require('./sync_mutex.js');
|
const syncMutexService = require('./sync_mutex.js');
|
||||||
const cls = require('./cls.js');
|
const cls = require('./cls');
|
||||||
const request = require('./request.js');
|
const request = require('./request.js');
|
||||||
const ws = require('./ws.js');
|
const ws = require('./ws.js');
|
||||||
const entityChangesService = require('./entity_changes.js');
|
const entityChangesService = require('./entity_changes.js');
|
||||||
|
@ -5,7 +5,7 @@ const optionService = require('./options.js');
|
|||||||
const env = require('./env.js');
|
const env = require('./env.js');
|
||||||
const log = require('./log');
|
const log = require('./log');
|
||||||
const sqlInit = require('./sql_init.js');
|
const sqlInit = require('./sql_init.js');
|
||||||
const cls = require('./cls.js');
|
const cls = require('./cls');
|
||||||
const keyboardActionsService = require('./keyboard_actions.js');
|
const keyboardActionsService = require('./keyboard_actions.js');
|
||||||
const {ipcMain} = require('electron');
|
const {ipcMain} = require('electron');
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ const WebSocket = require('ws');
|
|||||||
const utils = require('./utils.js');
|
const utils = require('./utils.js');
|
||||||
const log = require('./log');
|
const log = require('./log');
|
||||||
const sql = require('./sql.js');
|
const sql = require('./sql.js');
|
||||||
const cls = require('./cls.js');
|
const cls = require('./cls');
|
||||||
const config = require('./config.js');
|
const config = require('./config.js');
|
||||||
const syncMutexService = require('./sync_mutex.js');
|
const syncMutexService = require('./sync_mutex.js');
|
||||||
const protectedSessionService = require('./protected_session.js');
|
const protectedSessionService = require('./protected_session.js');
|
||||||
|
@ -7,7 +7,7 @@ require('../becca/entity_constructor.js');
|
|||||||
const sqlInit = require('../services/sql_init.js');
|
const sqlInit = require('../services/sql_init.js');
|
||||||
const noteService = require('../services/notes.js');
|
const noteService = require('../services/notes.js');
|
||||||
const attributeService = require('../services/attributes.js');
|
const attributeService = require('../services/attributes.js');
|
||||||
const cls = require('../services/cls.js');
|
const cls = require('../services/cls');
|
||||||
const cloningService = require('../services/cloning.js');
|
const cloningService = require('../services/cloning.js');
|
||||||
const loremIpsum = require('lorem-ipsum').loremIpsum;
|
const loremIpsum = require('lorem-ipsum').loremIpsum;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user