mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 18:36:30 +01:00 
			
		
		
		
	server-ts: Fix build errors
This commit is contained in:
		| @@ -1,4 +1,4 @@ | |||||||
| const appInfo = require('../services/app_info.js'); | const appInfo = require('../services/app_info'); | ||||||
| const eu = require('./etapi_utils'); | const eu = require('./etapi_utils'); | ||||||
|  |  | ||||||
| function register(router) { | function register(router) { | ||||||
|   | |||||||
| @@ -28,7 +28,7 @@ import AdvancedSyncOptions from "./options/advanced/sync.js"; | |||||||
| import DatabaseIntegrityCheckOptions from "./options/advanced/database_integrity_check.js"; | import DatabaseIntegrityCheckOptions from "./options/advanced/database_integrity_check.js"; | ||||||
| import ConsistencyChecksOptions from "./options/advanced/consistency_checks.js"; | import ConsistencyChecksOptions from "./options/advanced/consistency_checks.js"; | ||||||
| import VacuumDatabaseOptions from "./options/advanced/vacuum_database.js"; | import VacuumDatabaseOptions from "./options/advanced/vacuum_database.js"; | ||||||
| import DatabaseAnonymizationOptions from "./options/advanced/database_anonymization"; | import DatabaseAnonymizationOptions from "./options/advanced/database_anonymization.js"; | ||||||
| import BackendLogWidget from "./content/backend_log.js"; | import BackendLogWidget from "./content/backend_log.js"; | ||||||
| import AttachmentErasureTimeoutOptions from "./options/other/attachment_erasure_timeout.js"; | import AttachmentErasureTimeoutOptions from "./options/other/attachment_erasure_timeout.js"; | ||||||
| import RibbonOptions from "./options/appearance/ribbon.js"; | import RibbonOptions from "./options/appearance/ribbon.js"; | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| "use strict"; | "use strict"; | ||||||
|  |  | ||||||
| const appInfo = require('../../services/app_info.js'); | const appInfo = require('../../services/app_info'); | ||||||
|  |  | ||||||
| function getAppInfo() { | function getAppInfo() { | ||||||
|     return appInfo; |     return appInfo; | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ const noteService = require('../../services/notes.js'); | |||||||
| const dateNoteService = require('../../services/date_notes.js'); | const dateNoteService = require('../../services/date_notes.js'); | ||||||
| const dateUtils = require('../../services/date_utils'); | const dateUtils = require('../../services/date_utils'); | ||||||
| const imageService = require('../../services/image.js'); | const imageService = require('../../services/image.js'); | ||||||
| const appInfo = require('../../services/app_info.js'); | const appInfo = require('../../services/app_info'); | ||||||
| const ws = require('../../services/ws'); | const ws = require('../../services/ws'); | ||||||
| const log = require('../../services/log'); | const log = require('../../services/log'); | ||||||
| const utils = require('../../services/utils'); | const utils = require('../../services/utils'); | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ const dateUtils = require('../../services/date_utils'); | |||||||
| const instanceId = require('../../services/instance_id'); | const instanceId = require('../../services/instance_id'); | ||||||
| const passwordEncryptionService = require('../../services/encryption/password_encryption'); | const passwordEncryptionService = require('../../services/encryption/password_encryption'); | ||||||
| const protectedSessionService = require('../../services/protected_session'); | const protectedSessionService = require('../../services/protected_session'); | ||||||
| const appInfo = require('../../services/app_info.js'); | const appInfo = require('../../services/app_info'); | ||||||
| const eventService = require('../../services/events'); | const eventService = require('../../services/events'); | ||||||
| const sqlInit = require('../../services/sql_init.js'); | const sqlInit = require('../../services/sql_init.js'); | ||||||
| const sql = require('../../services/sql'); | const sql = require('../../services/sql'); | ||||||
|   | |||||||
| @@ -3,7 +3,7 @@ | |||||||
| const sqlInit = require('../../services/sql_init.js'); | const sqlInit = require('../../services/sql_init.js'); | ||||||
| const setupService = require('../../services/setup.js'); | const setupService = require('../../services/setup.js'); | ||||||
| const log = require('../../services/log'); | const log = require('../../services/log'); | ||||||
| const appInfo = require('../../services/app_info.js'); | const appInfo = require('../../services/app_info'); | ||||||
|  |  | ||||||
| function getStatus() { | function getStatus() { | ||||||
|     return { |     return { | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ const utils = require('../services/utils'); | |||||||
| const protectedSessionService = require('../services/protected_session'); | const protectedSessionService = require('../services/protected_session'); | ||||||
| const packageJson = require('../../package.json'); | const packageJson = require('../../package.json'); | ||||||
| const assetPath = require('../services/asset_path'); | const assetPath = require('../services/asset_path'); | ||||||
| const appPath = require('../services/app_path.js'); | const appPath = require('../services/app_path'); | ||||||
|  |  | ||||||
| function index(req, res) { | function index(req, res) { | ||||||
|     const options = optionService.getOptionMap(); |     const options = optionService.getOptionMap(); | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ const myScryptService = require('../services/encryption/my_scrypt'); | |||||||
| const log = require('../services/log'); | const log = require('../services/log'); | ||||||
| const passwordService = require('../services/encryption/password'); | const passwordService = require('../services/encryption/password'); | ||||||
| const assetPath = require('../services/asset_path'); | const assetPath = require('../services/asset_path'); | ||||||
| const appPath = require('../services/app_path.js'); | const appPath = require('../services/app_path'); | ||||||
| const ValidationError = require('../errors/validation_error'); | const ValidationError = require('../errors/validation_error'); | ||||||
|  |  | ||||||
| function loginPage(req, res) { | function loginPage(req, res) { | ||||||
|   | |||||||
| @@ -35,7 +35,7 @@ const passwordApiRoute = require('./api/password'); | |||||||
| const syncApiRoute = require('./api/sync.js'); | const syncApiRoute = require('./api/sync.js'); | ||||||
| const loginApiRoute = require('./api/login.js'); | const loginApiRoute = require('./api/login.js'); | ||||||
| const recentNotesRoute = require('./api/recent_notes.js'); | const recentNotesRoute = require('./api/recent_notes.js'); | ||||||
| const appInfoRoute = require('./api/app_info.js'); | const appInfoRoute = require('./api/app_info'); | ||||||
| const exportRoute = require('./api/export.js'); | const exportRoute = require('./api/export.js'); | ||||||
| const importRoute = require('./api/import.js'); | const importRoute = require('./api/import.js'); | ||||||
| const setupApiRoute = require('./api/setup.js'); | const setupApiRoute = require('./api/setup.js'); | ||||||
| @@ -62,7 +62,7 @@ const otherRoute = require('./api/other.js'); | |||||||
| const shareRoutes = require('../share/routes.js'); | const shareRoutes = require('../share/routes.js'); | ||||||
|  |  | ||||||
| const etapiAuthRoutes = require('../etapi/auth.js'); | const etapiAuthRoutes = require('../etapi/auth.js'); | ||||||
| const etapiAppInfoRoutes = require('../etapi/app_info.js'); | const etapiAppInfoRoutes = require('../etapi/app_info'); | ||||||
| const etapiAttachmentRoutes = require('../etapi/attachments.js'); | const etapiAttachmentRoutes = require('../etapi/attachments.js'); | ||||||
| const etapiAttributeRoutes = require('../etapi/attributes.js'); | const etapiAttributeRoutes = require('../etapi/attributes.js'); | ||||||
| const etapiBranchRoutes = require('../etapi/branches.js'); | const etapiBranchRoutes = require('../etapi/branches.js'); | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ const sqlInit = require('../services/sql_init.js'); | |||||||
| const setupService = require('../services/setup.js'); | const setupService = require('../services/setup.js'); | ||||||
| const utils = require('../services/utils'); | const utils = require('../services/utils'); | ||||||
| const assetPath = require('../services/asset_path'); | const assetPath = require('../services/asset_path'); | ||||||
| const appPath = require('../services/app_path.js'); | const appPath = require('../services/app_path'); | ||||||
|  |  | ||||||
| function setupPage(req, res) { | function setupPage(req, res) { | ||||||
|     if (sqlInit.isDbInitialized()) { |     if (sqlInit.isDbInitialized()) { | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ const axios = require('axios'); | |||||||
| const dayjs = require('dayjs'); | const dayjs = require('dayjs'); | ||||||
| const xml2js = require('xml2js'); | const xml2js = require('xml2js'); | ||||||
| const cloningService = require('./cloning.js'); | const cloningService = require('./cloning.js'); | ||||||
| const appInfo = require('./app_info.js'); | const appInfo = require('./app_info'); | ||||||
| const searchService = require('./search/services/search.js'); | const searchService = require('./search/services/search.js'); | ||||||
| const SearchContext = require('./search/search_context.js'); | const SearchContext = require('./search/search_context.js'); | ||||||
| const becca = require('../becca/becca'); | const becca = require('../becca/becca'); | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ const fs = require('fs-extra'); | |||||||
| const log = require('./log'); | const log = require('./log'); | ||||||
| const utils = require('./utils'); | const utils = require('./utils'); | ||||||
| const resourceDir = require('./resource_dir'); | const resourceDir = require('./resource_dir'); | ||||||
| const appInfo = require('./app_info.js'); | const appInfo = require('./app_info'); | ||||||
| const cls = require('./cls'); | const cls = require('./cls'); | ||||||
|  |  | ||||||
| async function migrate() { | async function migrate() { | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| const optionService = require('./options'); | const optionService = require('./options'); | ||||||
| const appInfo = require('./app_info.js'); | const appInfo = require('./app_info'); | ||||||
| const utils = require('./utils'); | const utils = require('./utils'); | ||||||
| const log = require('./log'); | const log = require('./log'); | ||||||
| const dateUtils = require('./date_utils'); | const dateUtils = require('./date_utils'); | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ const sqlInit = require('./sql_init.js'); | |||||||
| const optionService = require('./options'); | const optionService = require('./options'); | ||||||
| const syncOptions = require('./sync_options.js'); | const syncOptions = require('./sync_options.js'); | ||||||
| const request = require('./request.js'); | const request = require('./request.js'); | ||||||
| const appInfo = require('./app_info.js'); | const appInfo = require('./app_info'); | ||||||
| const utils = require('./utils'); | const utils = require('./utils'); | ||||||
| const becca = require('../becca/becca'); | const becca = require('../becca/becca'); | ||||||
|  |  | ||||||
|   | |||||||
| @@ -8,7 +8,7 @@ const instanceId = require('./instance_id'); | |||||||
| const dateUtils = require('./date_utils'); | const dateUtils = require('./date_utils'); | ||||||
| const syncUpdateService = require('./sync_update.js'); | const syncUpdateService = require('./sync_update.js'); | ||||||
| const contentHashService = require('./content_hash.js'); | const contentHashService = require('./content_hash.js'); | ||||||
| const appInfo = require('./app_info.js'); | const appInfo = require('./app_info'); | ||||||
| const syncOptions = require('./sync_options.js'); | const syncOptions = require('./sync_options.js'); | ||||||
| const syncMutexService = require('./sync_mutex'); | const syncMutexService = require('./sync_mutex'); | ||||||
| const cls = require('./cls'); | const cls = require('./cls'); | ||||||
|   | |||||||
| @@ -8,7 +8,7 @@ const shacaLoader = require('./shaca/shaca_loader.js'); | |||||||
| const shareRoot = require('./share_root.js'); | const shareRoot = require('./share_root.js'); | ||||||
| const contentRenderer = require('./content_renderer.js'); | const contentRenderer = require('./content_renderer.js'); | ||||||
| const assetPath = require('../services/asset_path'); | const assetPath = require('../services/asset_path'); | ||||||
| const appPath = require('../services/app_path.js'); | const appPath = require('../services/app_path'); | ||||||
| const searchService = require('../services/search/services/search.js'); | const searchService = require('../services/search/services/search.js'); | ||||||
| const SearchContext = require('../services/search/search_context.js'); | const SearchContext = require('../services/search/search_context.js'); | ||||||
| const log = require('../services/log'); | const log = require('../services/log'); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user