From 2b36e477bfc5f6b28fe7491ec9d2e6eb1337838b Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 30 Aug 2021 14:13:31 +0200 Subject: [PATCH] Add import polyfill --- client/src/root-helpers/plugins-manager.ts | 45 +++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/client/src/root-helpers/plugins-manager.ts b/client/src/root-helpers/plugins-manager.ts index f1687d91d..a1b763ff2 100644 --- a/client/src/root-helpers/plugins-manager.ts +++ b/client/src/root-helpers/plugins-manager.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-implied-eval */ import * as debug from 'debug' import { firstValueFrom, ReplaySubject } from 'rxjs' import { first, shareReplay } from 'rxjs/operators' @@ -227,7 +228,7 @@ class PluginsManager { console.log('Loading script %s of plugin %s.', clientScript.script, plugin.name) const absURL = (environment.apiUrl || window.location.origin) + clientScript.script - return import(/* webpackIgnore: true */ absURL) + return dynamicImport(absURL) .then((script: ClientScriptModule) => script.register({ registerHook, registerVideoField, registerSettingsScript, peertubeHelpers })) .then(() => this.sortHooksByPriority()) .catch(err => console.error('Cannot import or register plugin %s.', pluginInfo.plugin.name, err)) @@ -250,3 +251,45 @@ export { OnFormFields, OnSettingsScripts } + +// --------------------------------------------------------------------------- + +async function dynamicImport (url: string) { + try { + // eslint-disable-next-line no-new-func + return new Function(`return import('${url}')`)() + } catch { + console.log('Fallback to import polyfill') + + return new Promise((resolve, reject) => { + const vector = '$importModule$' + Math.random().toString(32).slice(2) + const script = document.createElement('script') + + const destructor = () => { + delete window[vector] + script.onerror = null + script.onload = null + script.remove() + URL.revokeObjectURL(script.src) + script.src = '' + } + + script.defer = true + script.type = 'module' + + script.onerror = () => { + reject(new Error(`Failed to import: ${url}`)) + destructor() + } + script.onload = () => { + resolve(window[vector]) + destructor() + } + const loader = `import * as m from "${url}"; window.${vector} = m;` // export Module + const blob = new Blob([ loader ], { type: 'text/javascript' }) + script.src = URL.createObjectURL(blob) + + document.head.appendChild(script) + }) + } +} -- 2.41.0