diff options
Diffstat (limited to 'server')
-rw-r--r-- | server/helpers/register-ts-paths.ts | 16 | ||||
-rw-r--r-- | server/tools/peertube-auth.ts | 3 | ||||
-rw-r--r-- | server/tools/peertube-get-access-token.ts | 3 | ||||
-rw-r--r-- | server/tools/peertube-import-videos.ts | 3 | ||||
-rw-r--r-- | server/tools/peertube-plugins.ts | 3 | ||||
-rw-r--r-- | server/tools/peertube-repl.ts | 3 | ||||
-rw-r--r-- | server/tools/peertube-upload.ts | 3 | ||||
-rw-r--r-- | server/tools/peertube-watch.ts | 3 | ||||
-rw-r--r-- | server/tools/peertube.ts | 3 |
9 files changed, 40 insertions, 0 deletions
diff --git a/server/helpers/register-ts-paths.ts b/server/helpers/register-ts-paths.ts new file mode 100644 index 000000000..e8db369e3 --- /dev/null +++ b/server/helpers/register-ts-paths.ts | |||
@@ -0,0 +1,16 @@ | |||
1 | import { resolve } from 'path' | ||
2 | const tsConfigPaths = require('tsconfig-paths') | ||
3 | |||
4 | const tsConfig = require('../../tsconfig.json') | ||
5 | |||
6 | function registerTSPaths () { | ||
7 | // Thanks: https://github.com/dividab/tsconfig-paths/issues/75#issuecomment-458936883 | ||
8 | tsConfigPaths.register({ | ||
9 | baseUrl: resolve(tsConfig.compilerOptions.baseUrl || '', tsConfig.compilerOptions.outDir || ''), | ||
10 | paths: tsConfig.compilerOptions.paths | ||
11 | }) | ||
12 | } | ||
13 | |||
14 | export { | ||
15 | registerTSPaths | ||
16 | } | ||
diff --git a/server/tools/peertube-auth.ts b/server/tools/peertube-auth.ts index b5ecbd470..6597a5c36 100644 --- a/server/tools/peertube-auth.ts +++ b/server/tools/peertube-auth.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import * as program from 'commander' | 4 | import * as program from 'commander' |
2 | import * as prompt from 'prompt' | 5 | import * as prompt from 'prompt' |
3 | import { getNetrc, getSettings, writeSettings } from './cli' | 6 | import { getNetrc, getSettings, writeSettings } from './cli' |
diff --git a/server/tools/peertube-get-access-token.ts b/server/tools/peertube-get-access-token.ts index 103495347..6d47d8922 100644 --- a/server/tools/peertube-get-access-token.ts +++ b/server/tools/peertube-get-access-token.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import * as program from 'commander' | 4 | import * as program from 'commander' |
2 | import { getClient, Server, serverLogin } from '../../shared/extra-utils' | 5 | import { getClient, Server, serverLogin } from '../../shared/extra-utils' |
3 | 6 | ||
diff --git a/server/tools/peertube-import-videos.ts b/server/tools/peertube-import-videos.ts index fcb90cca3..39184f46d 100644 --- a/server/tools/peertube-import-videos.ts +++ b/server/tools/peertube-import-videos.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | // FIXME: https://github.com/nodejs/node/pull/16853 | 4 | // FIXME: https://github.com/nodejs/node/pull/16853 |
2 | require('tls').DEFAULT_ECDH_CURVE = 'auto' | 5 | require('tls').DEFAULT_ECDH_CURVE = 'auto' |
3 | 6 | ||
diff --git a/server/tools/peertube-plugins.ts b/server/tools/peertube-plugins.ts index 20254b3b4..e40606107 100644 --- a/server/tools/peertube-plugins.ts +++ b/server/tools/peertube-plugins.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import * as program from 'commander' | 4 | import * as program from 'commander' |
2 | import { PluginType } from '../../shared/models/plugins/plugin.type' | 5 | import { PluginType } from '../../shared/models/plugins/plugin.type' |
3 | import { getAccessToken } from '../../shared/extra-utils/users/login' | 6 | import { getAccessToken } from '../../shared/extra-utils/users/login' |
diff --git a/server/tools/peertube-repl.ts b/server/tools/peertube-repl.ts index fbdec1613..ab6e215d9 100644 --- a/server/tools/peertube-repl.ts +++ b/server/tools/peertube-repl.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import * as repl from 'repl' | 4 | import * as repl from 'repl' |
2 | import * as path from 'path' | 5 | import * as path from 'path' |
3 | import * as _ from 'lodash' | 6 | import * as _ from 'lodash' |
diff --git a/server/tools/peertube-upload.ts b/server/tools/peertube-upload.ts index 4569cbb85..f604c9bee 100644 --- a/server/tools/peertube-upload.ts +++ b/server/tools/peertube-upload.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import * as program from 'commander' | 4 | import * as program from 'commander' |
2 | import { access, constants } from 'fs-extra' | 5 | import { access, constants } from 'fs-extra' |
3 | import { isAbsolute } from 'path' | 6 | import { isAbsolute } from 'path' |
diff --git a/server/tools/peertube-watch.ts b/server/tools/peertube-watch.ts index 7c27c1364..9ac1d05f9 100644 --- a/server/tools/peertube-watch.ts +++ b/server/tools/peertube-watch.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import * as program from 'commander' | 4 | import * as program from 'commander' |
2 | import { join } from 'path' | 5 | import { join } from 'path' |
3 | import { execSync } from 'child_process' | 6 | import { execSync } from 'child_process' |
diff --git a/server/tools/peertube.ts b/server/tools/peertube.ts index ddfe5b771..fc85c4210 100644 --- a/server/tools/peertube.ts +++ b/server/tools/peertube.ts | |||
@@ -1,5 +1,8 @@ | |||
1 | #!/usr/bin/env node | 1 | #!/usr/bin/env node |
2 | 2 | ||
3 | import { registerTSPaths } from '../helpers/register-ts-paths' | ||
4 | registerTSPaths() | ||
5 | |||
3 | import * as program from 'commander' | 6 | import * as program from 'commander' |
4 | import { | 7 | import { |
5 | version, | 8 | version, |