diff options
author | Chocobozzz <me@florianbigard.com> | 2019-10-21 17:13:07 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-10-21 17:13:22 +0200 |
commit | 2aaa1a3fdc49be77aec5309dab5507865c38d392 (patch) | |
tree | bc83c5b1ff49faf03461c78a110e0a5613343c31 | |
parent | 576ddf645ff2223126d28ef172bb6388602c35f4 (diff) | |
download | PeerTube-2aaa1a3fdc49be77aec5309dab5507865c38d392.tar.gz PeerTube-2aaa1a3fdc49be77aec5309dab5507865c38d392.tar.zst PeerTube-2aaa1a3fdc49be77aec5309dab5507865c38d392.zip |
Use typescript paths in cli scripts too
-rw-r--r-- | scripts/create-import-video-file-job.ts | 3 | ||||
-rwxr-xr-x | scripts/create-transcoding-job.ts | 3 | ||||
-rw-r--r-- | scripts/danger/clean/cleaner.ts | 3 | ||||
-rwxr-xr-x | scripts/generate-code-contributors.ts | 3 | ||||
-rwxr-xr-x | scripts/i18n/create-custom-files.ts | 3 | ||||
-rwxr-xr-x | scripts/i18n/xliff2json.ts | 3 | ||||
-rw-r--r-- | scripts/optimize-old-videos.ts | 3 | ||||
-rwxr-xr-x | scripts/parse-log.ts | 3 | ||||
-rwxr-xr-x | scripts/plugin/install.ts | 3 | ||||
-rwxr-xr-x | scripts/plugin/uninstall.ts | 4 | ||||
-rwxr-xr-x | scripts/prune-storage.ts | 3 | ||||
-rwxr-xr-x | scripts/reset-password.ts | 3 | ||||
-rwxr-xr-x | scripts/update-host.ts | 3 | ||||
-rw-r--r-- | server.ts | 11 | ||||
-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 |
23 files changed, 82 insertions, 9 deletions
diff --git a/scripts/create-import-video-file-job.ts b/scripts/create-import-video-file-job.ts index 2b636014a..204337d55 100644 --- a/scripts/create-import-video-file-job.ts +++ b/scripts/create-import-video-file-job.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../server/helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import * as program from 'commander' | 4 | import * as program from 'commander' |
2 | import { resolve } from 'path' | 5 | import { resolve } from 'path' |
3 | import { VideoModel } from '../server/models/video/video' | 6 | import { VideoModel } from '../server/models/video/video' |
diff --git a/scripts/create-transcoding-job.ts b/scripts/create-transcoding-job.ts index 2eb872169..67a270a86 100755 --- a/scripts/create-transcoding-job.ts +++ b/scripts/create-transcoding-job.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../server/helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import * as program from 'commander' | 4 | import * as program from 'commander' |
2 | import { VideoModel } from '../server/models/video/video' | 5 | import { VideoModel } from '../server/models/video/video' |
3 | import { initDatabaseModels } from '../server/initializers' | 6 | import { initDatabaseModels } from '../server/initializers' |
diff --git a/scripts/danger/clean/cleaner.ts b/scripts/danger/clean/cleaner.ts index d575af283..ed35ef79f 100644 --- a/scripts/danger/clean/cleaner.ts +++ b/scripts/danger/clean/cleaner.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../../../server/helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import * as Promise from 'bluebird' | 4 | import * as Promise from 'bluebird' |
2 | import * as rimraf from 'rimraf' | 5 | import * as rimraf from 'rimraf' |
3 | import { initDatabaseModels, sequelizeTypescript } from '../../../server/initializers' | 6 | import { initDatabaseModels, sequelizeTypescript } from '../../../server/initializers' |
diff --git a/scripts/generate-code-contributors.ts b/scripts/generate-code-contributors.ts index c745b1cb2..8493d3d0c 100755 --- a/scripts/generate-code-contributors.ts +++ b/scripts/generate-code-contributors.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../server/helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import { doRequest } from '../server/helpers/requests' | 4 | import { doRequest } from '../server/helpers/requests' |
2 | import { readFileSync } from 'fs-extra' | 5 | import { readFileSync } from 'fs-extra' |
3 | 6 | ||
diff --git a/scripts/i18n/create-custom-files.ts b/scripts/i18n/create-custom-files.ts index 95897afa3..e946b8fd6 100755 --- a/scripts/i18n/create-custom-files.ts +++ b/scripts/i18n/create-custom-files.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../../server/helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import * as jsToXliff12 from 'xliff/jsToXliff12' | 4 | import * as jsToXliff12 from 'xliff/jsToXliff12' |
2 | import { writeFile } from 'fs-extra' | 5 | import { writeFile } from 'fs-extra' |
3 | import { join } from 'path' | 6 | import { join } from 'path' |
diff --git a/scripts/i18n/xliff2json.ts b/scripts/i18n/xliff2json.ts index 7e6de2893..68fc95f34 100755 --- a/scripts/i18n/xliff2json.ts +++ b/scripts/i18n/xliff2json.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../../server/helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import * as xliff12ToJs from 'xliff/xliff12ToJs' | 4 | import * as xliff12ToJs from 'xliff/xliff12ToJs' |
2 | import { readFileSync, unlink, writeFile } from 'fs-extra' | 5 | import { readFileSync, unlink, writeFile } from 'fs-extra' |
3 | import { join } from 'path' | 6 | import { join } from 'path' |
diff --git a/scripts/optimize-old-videos.ts b/scripts/optimize-old-videos.ts index 0b0e6037e..eb61ec43c 100644 --- a/scripts/optimize-old-videos.ts +++ b/scripts/optimize-old-videos.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../server/helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import { VIDEO_TRANSCODING_FPS } from '../server/initializers/constants' | 4 | import { VIDEO_TRANSCODING_FPS } from '../server/initializers/constants' |
2 | import { getDurationFromVideoFile, getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '../server/helpers/ffmpeg-utils' | 5 | import { getDurationFromVideoFile, getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '../server/helpers/ffmpeg-utils' |
3 | import { getMaxBitrate } from '../shared/models/videos' | 6 | import { getMaxBitrate } from '../shared/models/videos' |
diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts index 83ad45b72..9e6653ca3 100755 --- a/scripts/parse-log.ts +++ b/scripts/parse-log.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../server/helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import * as program from 'commander' | 4 | import * as program from 'commander' |
2 | import { createReadStream, readdir } from 'fs-extra' | 5 | import { createReadStream, readdir } from 'fs-extra' |
3 | import { join } from 'path' | 6 | import { join } from 'path' |
diff --git a/scripts/plugin/install.ts b/scripts/plugin/install.ts index 5d7fe4ba0..54738f50f 100755 --- a/scripts/plugin/install.ts +++ b/scripts/plugin/install.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../../server/helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import { initDatabaseModels } from '../../server/initializers/database' | 4 | import { initDatabaseModels } from '../../server/initializers/database' |
2 | import * as program from 'commander' | 5 | import * as program from 'commander' |
3 | import { PluginManager } from '../../server/lib/plugins/plugin-manager' | 6 | import { PluginManager } from '../../server/lib/plugins/plugin-manager' |
diff --git a/scripts/plugin/uninstall.ts b/scripts/plugin/uninstall.ts index b5e1ddea2..c56f18466 100755 --- a/scripts/plugin/uninstall.ts +++ b/scripts/plugin/uninstall.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../../server/helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import { initDatabaseModels } from '../../server/initializers/database' | 4 | import { initDatabaseModels } from '../../server/initializers/database' |
2 | import * as program from 'commander' | 5 | import * as program from 'commander' |
3 | import { PluginManager } from '../../server/lib/plugins/plugin-manager' | 6 | import { PluginManager } from '../../server/lib/plugins/plugin-manager' |
@@ -19,6 +22,7 @@ run() | |||
19 | }) | 22 | }) |
20 | 23 | ||
21 | async function run () { | 24 | async function run () { |
25 | |||
22 | await initDatabaseModels(true) | 26 | await initDatabaseModels(true) |
23 | 27 | ||
24 | const toUninstall = program['npmName'] | 28 | const toUninstall = program['npmName'] |
diff --git a/scripts/prune-storage.ts b/scripts/prune-storage.ts index df4bdeebe..c8968013b 100755 --- a/scripts/prune-storage.ts +++ b/scripts/prune-storage.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../server/helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import * as prompt from 'prompt' | 4 | import * as prompt from 'prompt' |
2 | import { join } from 'path' | 5 | import { join } from 'path' |
3 | import { CONFIG } from '../server/initializers/config' | 6 | import { CONFIG } from '../server/initializers/config' |
diff --git a/scripts/reset-password.ts b/scripts/reset-password.ts index 4a9037280..6126c3cd0 100755 --- a/scripts/reset-password.ts +++ b/scripts/reset-password.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../server/helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import * as program from 'commander' | 4 | import * as program from 'commander' |
2 | import { initDatabaseModels } from '../server/initializers' | 5 | import { initDatabaseModels } from '../server/initializers' |
3 | import { UserModel } from '../server/models/account/user' | 6 | import { UserModel } from '../server/models/account/user' |
diff --git a/scripts/update-host.ts b/scripts/update-host.ts index 57919b998..a946d2e42 100755 --- a/scripts/update-host.ts +++ b/scripts/update-host.ts | |||
@@ -1,3 +1,6 @@ | |||
1 | import { registerTSPaths } from '../server/helpers/register-ts-paths' | ||
2 | registerTSPaths() | ||
3 | |||
1 | import { WEBSERVER } from '../server/initializers/constants' | 4 | import { WEBSERVER } from '../server/initializers/constants' |
2 | import { ActorFollowModel } from '../server/models/activitypub/actor-follow' | 5 | import { ActorFollowModel } from '../server/models/activitypub/actor-follow' |
3 | import { VideoModel } from '../server/models/video/video' | 6 | import { VideoModel } from '../server/models/video/video' |
@@ -1,13 +1,6 @@ | |||
1 | import { resolve } from 'path' | 1 | import { registerTSPaths } from './server/helpers/register-ts-paths' |
2 | 2 | ||
3 | const tsConfig = require('./tsconfig.json') | 3 | registerTSPaths() |
4 | const tsConfigPaths = require('tsconfig-paths') | ||
5 | |||
6 | // Thanks: https://github.com/dividab/tsconfig-paths/issues/75#issuecomment-458936883 | ||
7 | tsConfigPaths.register({ | ||
8 | baseUrl: resolve(tsConfig.compilerOptions.baseUrl || '', tsConfig.compilerOptions.outDir || ''), | ||
9 | paths: tsConfig.compilerOptions.paths | ||
10 | }) | ||
11 | 4 | ||
12 | // FIXME: https://github.com/nodejs/node/pull/16853 | 5 | // FIXME: https://github.com/nodejs/node/pull/16853 |
13 | require('tls').DEFAULT_ECDH_CURVE = 'auto' | 6 | require('tls').DEFAULT_ECDH_CURVE = 'auto' |
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, |