diff options
author | Chocobozzz <me@florianbigard.com> | 2021-12-24 10:40:51 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-12-24 10:40:51 +0100 |
commit | c7cdac440970525d78d257a055899c26f6899a82 (patch) | |
tree | 531af934a361aeca81d8f1eacf47036f56eafb1b /client | |
parent | d17c7b4e8c52317bdc874917387b7a49f6cf8b01 (diff) | |
download | PeerTube-c7cdac440970525d78d257a055899c26f6899a82.tar.gz PeerTube-c7cdac440970525d78d257a055899c26f6899a82.tar.zst PeerTube-c7cdac440970525d78d257a055899c26f6899a82.zip |
Fix type conflict
Diffstat (limited to 'client')
-rw-r--r-- | client/src/root-helpers/plugins-manager.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/client/src/root-helpers/plugins-manager.ts b/client/src/root-helpers/plugins-manager.ts index e574e75a3..1157a274e 100644 --- a/client/src/root-helpers/plugins-manager.ts +++ b/client/src/root-helpers/plugins-manager.ts | |||
@@ -7,7 +7,7 @@ import { getHookType, internalRunHook } from '@shared/core-utils/plugins/hooks' | |||
7 | import { | 7 | import { |
8 | ClientHookName, | 8 | ClientHookName, |
9 | clientHookObject, | 9 | clientHookObject, |
10 | ClientScript, | 10 | ClientScriptJSON, |
11 | HTMLServerConfig, | 11 | HTMLServerConfig, |
12 | PluginClientScope, | 12 | PluginClientScope, |
13 | PluginType, | 13 | PluginType, |
@@ -18,20 +18,20 @@ import { | |||
18 | RegisterClientVideoFieldOptions, | 18 | RegisterClientVideoFieldOptions, |
19 | RegisteredExternalAuthConfig, | 19 | RegisteredExternalAuthConfig, |
20 | ServerConfigPlugin | 20 | ServerConfigPlugin |
21 | } from '../../../shared/models' | 21 | } from '@shared/models' |
22 | import { environment } from '../environments/environment' | 22 | import { environment } from '../environments/environment' |
23 | import { ClientScript as ClientScriptModule } from '../types/client-script.model' | 23 | import { ClientScript } from '../types' |
24 | 24 | ||
25 | interface HookStructValue extends RegisterClientHookOptions { | 25 | interface HookStructValue extends RegisterClientHookOptions { |
26 | plugin: ServerConfigPlugin | 26 | plugin: ServerConfigPlugin |
27 | clientScript: ClientScript | 27 | clientScript: ClientScriptJSON |
28 | } | 28 | } |
29 | 29 | ||
30 | type Hooks = { [ name: string ]: HookStructValue[] } | 30 | type Hooks = { [ name: string ]: HookStructValue[] } |
31 | 31 | ||
32 | type PluginInfo = { | 32 | type PluginInfo = { |
33 | plugin: ServerConfigPlugin | 33 | plugin: ServerConfigPlugin |
34 | clientScript: ClientScript | 34 | clientScript: ClientScriptJSON |
35 | pluginType: PluginType | 35 | pluginType: PluginType |
36 | isTheme: boolean | 36 | isTheme: boolean |
37 | } | 37 | } |
@@ -248,7 +248,7 @@ class PluginsManager { | |||
248 | 248 | ||
249 | const absURL = (environment.apiUrl || window.location.origin) + clientScript.script | 249 | const absURL = (environment.apiUrl || window.location.origin) + clientScript.script |
250 | return dynamicImport(absURL) | 250 | return dynamicImport(absURL) |
251 | .then((script: ClientScriptModule) => { | 251 | .then((script: ClientScript) => { |
252 | return script.register({ | 252 | return script.register({ |
253 | registerHook, | 253 | registerHook, |
254 | registerVideoField, | 254 | registerVideoField, |