From 464687bb96cf98d00714279750fd5f19a42b6a02 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 21 Oct 2019 16:02:15 +0200 Subject: Fix bug with tsconfig paths --- server.ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'server.ts') diff --git a/server.ts b/server.ts index 5cfa09445..b49d10344 100644 --- a/server.ts +++ b/server.ts @@ -1,12 +1,18 @@ -require('module-alias/register') +import { resolve } from 'path' -// FIXME: https://github.com/nodejs/node/pull/16853 -import { PluginManager } from './server/lib/plugins/plugin-manager' +const tsConfig = require('./tsconfig.json') +const tsConfigPaths = require('tsconfig-paths') + +// Thanks: https://github.com/dividab/tsconfig-paths/issues/75#issuecomment-458936883 +tsConfigPaths.register({ + baseUrl: resolve(tsConfig.compilerOptions.baseUrl || '', tsConfig.compilerOptions.outDir || ''), + paths: tsConfig.compilerOptions.paths +}) +// FIXME: https://github.com/nodejs/node/pull/16853 require('tls').DEFAULT_ECDH_CURVE = 'auto' import { isTestInstance } from './server/helpers/core-utils' - if (isTestInstance()) { require('source-map-support').install() } @@ -121,6 +127,7 @@ import { PeerTubeSocket } from './server/lib/peertube-socket' import { updateStreamingPlaylistsInfohashesIfNeeded } from './server/lib/hls' import { PluginsCheckScheduler } from './server/lib/schedulers/plugins-check-scheduler' import { Hooks } from './server/lib/plugins/hooks' +import { PluginManager } from './server/lib/plugins/plugin-manager' // ----------- Command line ----------- -- cgit v1.2.3