[vscode] don't require non existing plugin main

Signed-off-by: Sven Efftinge <sven.efftinge@typefox.io>
eclipse-theia · May 25, 2020 · 8bb713f · 8bb713f
1 parent ef77343
commit 8bb713f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/packages/plugin-ext/src/common/plugin-api-rpc.ts b/packages/plugin-ext/src/common/plugin-api-rpc.ts
@@ -84,7 +84,7 @@ export interface PreferenceData {
 }
 
 export interface Plugin {
-    pluginPath: string;
+    pluginPath: string | undefined;
     pluginFolder: string;
     model: PluginModel;
     rawModel: PluginPackage;

diff --git a/packages/plugin-ext/src/hosted/browser/worker/worker-main.ts b/packages/plugin-ext/src/hosted/browser/worker/worker-main.ts
@@ -65,10 +65,12 @@ const webviewExt = new WebviewsExtImpl(rpc, workspaceExt);
 const pluginManager = new PluginManagerExtImpl({
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     loadPlugin(plugin: Plugin): any {
-        if (isElectron()) {
-            ctx.importScripts(plugin.pluginPath);
-        } else {
-            ctx.importScripts('/hostedPlugin/' + getPluginId(plugin.model) + '/' + plugin.pluginPath);
+        if (plugin.pluginPath) {
+            if (isElectron()) {
+                ctx.importScripts(plugin.pluginPath);
+            } else {
+                ctx.importScripts('/hostedPlugin/' + getPluginId(plugin.model) + '/' + plugin.pluginPath);
+            }
         }
 
         if (plugin.lifecycle.frontendModuleName) {
@@ -107,7 +109,7 @@ const pluginManager = new PluginManagerExtImpl({
                 pluginsModulesNames.set(plugin.lifecycle.frontendModuleName!, plugin);
             } else {
                 foreign.push({
-                    pluginPath: pluginModel.entryPoint.backend!,
+                    pluginPath: pluginModel.entryPoint.backend,
                     pluginFolder: pluginModel.packagePath,
                     model: pluginModel,
                     lifecycle: pluginLifecycle,

diff --git a/packages/plugin-ext/src/hosted/node/plugin-host-rpc.ts b/packages/plugin-ext/src/hosted/node/plugin-host-rpc.ts
@@ -99,7 +99,8 @@ export class PluginHostRPC {
         const { extensionTestsPath } = process.env;
         const self = this;
         const pluginManager = new PluginManagerExtImpl({
-            loadPlugin(plugin: Plugin): void {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            loadPlugin(plugin: Plugin): any {
                 console.log('PLUGIN_HOST(' + process.pid + '): PluginManagerExtImpl/loadPlugin(' + plugin.pluginPath + ')');
                 try {
                     // cleaning the cache for all files of that plug-in.
@@ -137,7 +138,9 @@ export class PluginHostRPC {
                         }
 
                     });
-                    return require(plugin.pluginPath);
+                    if (plugin.pluginPath) {
+                        return require(plugin.pluginPath);
+                    }
                 } catch (e) {
                     console.error(e);
                 }