From 41fb13c330de629df2d23379209e79c7af0f2e9a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 27 Aug 2021 14:32:44 +0200 Subject: esModuleInterop to true --- server/initializers/checker-after-init.ts | 10 +++++----- server/initializers/checker-before-init.ts | 5 ++++- server/initializers/config.ts | 2 +- server/initializers/installer.ts | 8 ++++---- server/initializers/migrator.ts | 10 +++++----- 5 files changed, 19 insertions(+), 16 deletions(-) (limited to 'server/initializers') diff --git a/server/initializers/checker-after-init.ts b/server/initializers/checker-after-init.ts index 09f587274..c0a6c41ab 100644 --- a/server/initializers/checker-after-init.ts +++ b/server/initializers/checker-after-init.ts @@ -1,4 +1,4 @@ -import * as config from 'config' +import { util, has, get } from 'config' import { uniq } from 'lodash' import { URL } from 'url' import { getFFmpegVersion } from '@server/helpers/ffmpeg-utils' @@ -18,8 +18,8 @@ async function checkActivityPubUrls () { const parsed = new URL(actor.url) if (WEBSERVER.HOST !== parsed.host) { - const NODE_ENV = config.util.getEnv('NODE_ENV') - const NODE_CONFIG_DIR = config.util.getEnv('NODE_CONFIG_DIR') + const NODE_ENV = util.getEnv('NODE_ENV') + const NODE_CONFIG_DIR = util.getEnv('NODE_CONFIG_DIR') logger.warn( 'It seems PeerTube was started (and created some data) with another domain name. ' + @@ -36,7 +36,7 @@ async function checkActivityPubUrls () { function checkConfig () { // Moved configuration keys - if (config.has('services.csp-logger')) { + if (has('services.csp-logger')) { logger.warn('services.csp-logger configuration has been renamed to csp.report_uri. Please update your configuration file.') } @@ -97,7 +97,7 @@ function checkConfig () { // Check storage directory locations if (isProdInstance()) { - const configStorage = config.get('storage') + const configStorage = get('storage') for (const key of Object.keys(configStorage)) { if (configStorage[key].startsWith('storage/')) { logger.warn( diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index 93c019121..16dc137c0 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts @@ -1,7 +1,10 @@ -import * as config from 'config' +import { IConfig } from 'config' import { parseSemVersion, promisify0 } from '../helpers/core-utils' import { logger } from '../helpers/logger' +// Special behaviour for config because we can reload it +const config: IConfig = require('config') + // ONLY USE CORE MODULES IN THIS FILE! // Check the config files diff --git a/server/initializers/config.ts b/server/initializers/config.ts index 0e684eef8..be9fc61f0 100644 --- a/server/initializers/config.ts +++ b/server/initializers/config.ts @@ -1,4 +1,4 @@ -import * as bytes from 'bytes' +import bytes from 'bytes' import { IConfig } from 'config' import decache from 'decache' import { dirname, join } from 'path' diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts index 676f88653..75daeb5d8 100644 --- a/server/initializers/installer.ts +++ b/server/initializers/installer.ts @@ -1,15 +1,15 @@ -import * as passwordGenerator from 'password-generator' +import { ensureDir, remove } from 'fs-extra' +import passwordGenerator from 'password-generator' import { UserRole } from '../../shared' import { logger } from '../helpers/logger' import { createApplicationActor, createUserAccountAndChannelAndPlaylist } from '../lib/user' -import { UserModel } from '../models/user/user' import { ApplicationModel } from '../models/application/application' import { OAuthClientModel } from '../models/oauth/oauth-client' +import { UserModel } from '../models/user/user' import { applicationExist, clientsExist, usersExist } from './checker-after-init' +import { CONFIG } from './config' import { FILES_CACHE, HLS_STREAMING_PLAYLIST_DIRECTORY, LAST_MIGRATION_VERSION, RESUMABLE_UPLOAD_DIRECTORY } from './constants' import { sequelizeTypescript } from './database' -import { ensureDir, remove } from 'fs-extra' -import { CONFIG } from './config' async function installApplication () { try { diff --git a/server/initializers/migrator.ts b/server/initializers/migrator.ts index 77203ae24..7d7c9f8cb 100644 --- a/server/initializers/migrator.ts +++ b/server/initializers/migrator.ts @@ -1,9 +1,9 @@ -import * as path from 'path' +import { readdir } from 'fs-extra' +import { join } from 'path' +import { QueryTypes } from 'sequelize' import { logger } from '../helpers/logger' import { LAST_MIGRATION_VERSION } from './constants' import { sequelizeTypescript } from './database' -import { readdir } from 'fs-extra' -import { QueryTypes } from 'sequelize' async function migrate () { const tables = await sequelizeTypescript.getQueryInterface().showAllTables() @@ -58,7 +58,7 @@ export { // --------------------------------------------------------------------------- async function getMigrationScripts () { - const files = await readdir(path.join(__dirname, 'migrations')) + const files = await readdir(join(__dirname, 'migrations')) const filesToMigrate: { version: string script: string @@ -88,7 +88,7 @@ async function executeMigration (actualVersion: number, entity: { version: strin const migrationScriptName = entity.script logger.info('Executing %s migration script.', migrationScriptName) - const migrationScript = require(path.join(__dirname, 'migrations', migrationScriptName)) + const migrationScript = require(join(__dirname, 'migrations', migrationScriptName)) return sequelizeTypescript.transaction(async t => { const options = { -- cgit v1.2.3