From 030aec2f3ee35ba93c0ed0647815f358ee8f1c2e Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 17 Feb 2024 11:43:30 +0200 Subject: [PATCH] server-ts: Fix more references to js files for converted files --- src/etapi/branches.js | 2 +- src/etapi/etapi_utils.js | 2 +- src/routes/index.js | 2 +- src/services/app_icon.js | 2 +- src/services/auth.js | 2 +- src/services/backend_script_api.js | 2 +- src/services/cloning.js | 2 +- src/services/consistency_checks.js | 2 +- src/services/host.js | 2 +- src/services/import/zip.js | 2 +- src/services/notes.js | 2 +- src/services/port.js | 2 +- src/services/scheduler.js | 2 +- src/services/sql_init.js | 4 ++-- src/services/sync_options.js | 2 +- src/services/tree.js | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/etapi/branches.js b/src/etapi/branches.js index 2206d2224..6d0fa772c 100644 --- a/src/etapi/branches.js +++ b/src/etapi/branches.js @@ -1,7 +1,7 @@ const becca = require('../becca/becca'); const eu = require('./etapi_utils'); const mappers = require('./mappers.js'); -const BBranch = require('../becca/entities/bbranch.js'); +const BBranch = require('../becca/entities/bbranch'); const entityChangesService = require('../services/entity_changes.js'); const v = require('./validators.js'); diff --git a/src/etapi/etapi_utils.js b/src/etapi/etapi_utils.js index 5fe5459fb..0ec013b20 100644 --- a/src/etapi/etapi_utils.js +++ b/src/etapi/etapi_utils.js @@ -3,7 +3,7 @@ const sql = require('../services/sql'); const log = require('../services/log'); const becca = require('../becca/becca'); const etapiTokenService = require('../services/etapi_tokens.js'); -const config = require('../services/config.js'); +const config = require('../services/config'); const GENERIC_CODE = "GENERIC"; const noAuthentication = config.General && config.General.noAuthentication === true; diff --git a/src/routes/index.js b/src/routes/index.js index f39c37852..a7bf71e9f 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -2,7 +2,7 @@ const sql = require('../services/sql'); const attributeService = require('../services/attributes.js'); -const config = require('../services/config.js'); +const config = require('../services/config'); const optionService = require('../services/options'); const log = require('../services/log'); const env = require('../services/env.js'); diff --git a/src/services/app_icon.js b/src/services/app_icon.js index ec18dab45..bc845ab8c 100644 --- a/src/services/app_icon.js +++ b/src/services/app_icon.js @@ -5,7 +5,7 @@ const {ELECTRON_APP_ROOT_DIR} = require('./resource_dir'); const log = require('./log'); const os = require('os'); const fs = require('fs'); -const config = require('./config.js'); +const config = require('./config'); const utils = require('./utils'); const template = `[Desktop Entry] diff --git a/src/services/auth.js b/src/services/auth.js index 8db06bc07..d1a928ac2 100644 --- a/src/services/auth.js +++ b/src/services/auth.js @@ -5,7 +5,7 @@ const log = require('./log'); const sqlInit = require('./sql_init.js'); const utils = require('./utils'); const passwordEncryptionService = require('./encryption/password_encryption.js'); -const config = require('./config.js'); +const config = require('./config'); const passwordService = require('./encryption/password.js'); const noAuthentication = config.General && config.General.noAuthentication === true; diff --git a/src/services/backend_script_api.js b/src/services/backend_script_api.js index 4a0218d27..58d6613dd 100644 --- a/src/services/backend_script_api.js +++ b/src/services/backend_script_api.js @@ -5,7 +5,7 @@ const utils = require('./utils'); const attributeService = require('./attributes.js'); const dateNoteService = require('./date_notes.js'); const treeService = require('./tree.js'); -const config = require('./config.js'); +const config = require('./config'); const axios = require('axios'); const dayjs = require('dayjs'); const xml2js = require('xml2js'); diff --git a/src/services/cloning.js b/src/services/cloning.js index b942867ab..a42df4ba8 100644 --- a/src/services/cloning.js +++ b/src/services/cloning.js @@ -3,7 +3,7 @@ const sql = require('./sql'); const eventChangesService = require('./entity_changes'); const treeService = require('./tree.js'); -const BBranch = require('../becca/entities/bbranch.js'); +const BBranch = require('../becca/entities/bbranch'); const becca = require('../becca/becca'); const log = require('./log'); diff --git a/src/services/consistency_checks.js b/src/services/consistency_checks.js index 9e9585d19..e5ceb594f 100644 --- a/src/services/consistency_checks.js +++ b/src/services/consistency_checks.js @@ -8,7 +8,7 @@ const syncMutexService = require('./sync_mutex.js'); const cls = require('./cls'); const entityChangesService = require('./entity_changes'); const optionsService = require('./options'); -const BBranch = require('../becca/entities/bbranch.js'); +const BBranch = require('../becca/entities/bbranch'); const revisionService = require('./revisions.js'); const becca = require('../becca/becca'); const utils = require('../services/utils'); diff --git a/src/services/host.js b/src/services/host.js index 2430d45c2..389203e99 100644 --- a/src/services/host.js +++ b/src/services/host.js @@ -1,3 +1,3 @@ -const config = require('./config.js'); +const config = require('./config'); module.exports = process.env.TRILIUM_HOST || config['Network']['host'] || '0.0.0.0'; diff --git a/src/services/import/zip.js b/src/services/import/zip.js index fd42ce3d6..69cbdd4bf 100644 --- a/src/services/import/zip.js +++ b/src/services/import/zip.js @@ -5,7 +5,7 @@ const utils = require('../../services/utils'); const log = require('../../services/log'); const noteService = require('../../services/notes.js'); const attributeService = require('../../services/attributes.js'); -const BBranch = require('../../becca/entities/bbranch.js'); +const BBranch = require('../../becca/entities/bbranch'); const path = require('path'); const protectedSessionService = require('../protected_session'); const mimeService = require('./mime.js'); diff --git a/src/services/notes.js b/src/services/notes.js index 251c665cf..fa513854c 100644 --- a/src/services/notes.js +++ b/src/services/notes.js @@ -12,7 +12,7 @@ const request = require('./request.js'); const path = require('path'); const url = require('url'); const becca = require('../becca/becca'); -const BBranch = require('../becca/entities/bbranch.js'); +const BBranch = require('../becca/entities/bbranch'); const BNote = require('../becca/entities/bnote.js'); const BAttribute = require('../becca/entities/battribute.js'); const BAttachment = require('../becca/entities/battachment.js'); diff --git a/src/services/port.js b/src/services/port.js index b34490648..cec3be8d6 100644 --- a/src/services/port.js +++ b/src/services/port.js @@ -1,4 +1,4 @@ -const config = require('./config.js'); +const config = require('./config'); const utils = require('./utils'); const env = require('./env.js'); const dataDir = require('./data_dir'); diff --git a/src/services/scheduler.js b/src/services/scheduler.js index 907fc1ec5..2a712a1ce 100644 --- a/src/services/scheduler.js +++ b/src/services/scheduler.js @@ -1,7 +1,7 @@ const scriptService = require('./script.js'); const cls = require('./cls'); const sqlInit = require('./sql_init.js'); -const config = require('./config.js'); +const config = require('./config'); const log = require('./log'); const attributeService = require('../services/attributes.js'); const protectedSessionService = require('../services/protected_session'); diff --git a/src/services/sql_init.js b/src/services/sql_init.js index c200ba58a..49a101cf6 100644 --- a/src/services/sql_init.js +++ b/src/services/sql_init.js @@ -9,7 +9,7 @@ const BOption = require('../becca/entities/boption.js'); const TaskContext = require('./task_context.js'); const migrationService = require('./migration.js'); const cls = require('./cls'); -const config = require('./config.js'); +const config = require('./config'); const dbReady = utils.deferred(); @@ -63,7 +63,7 @@ async function createInitialDatabase() { require('../becca/becca_loader.js').load(); const BNote = require('../becca/entities/bnote.js'); - const BBranch = require('../becca/entities/bbranch.js'); + const BBranch = require('../becca/entities/bbranch'); log.info("Creating root note ..."); diff --git a/src/services/sync_options.js b/src/services/sync_options.js index 8f8038849..a059be973 100644 --- a/src/services/sync_options.js +++ b/src/services/sync_options.js @@ -1,7 +1,7 @@ "use strict"; const optionService = require('./options'); -const config = require('./config.js'); +const config = require('./config'); /* * Primary configuration for sync is in the options (document), but we allow to override diff --git a/src/services/tree.js b/src/services/tree.js index bd90b784b..66276ab2f 100644 --- a/src/services/tree.js +++ b/src/services/tree.js @@ -2,7 +2,7 @@ const sql = require('./sql'); const log = require('./log'); -const BBranch = require('../becca/entities/bbranch.js'); +const BBranch = require('../becca/entities/bbranch'); const entityChangesService = require('./entity_changes'); const becca = require('../becca/becca');