From 714fc04db897adda35d9b77bd788612cb587b501 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Mon, 19 Aug 2024 09:00:22 -0400 Subject: [PATCH 1/2] Implement lookup from PR 308 of zlux-app-server Signed-off-by: 1000TurquoisePogs --- base/src/plugin-manager/plugin.ts | 16 ++++++++++++++++ interface/src/index.d.ts | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/base/src/plugin-manager/plugin.ts b/base/src/plugin-manager/plugin.ts index 9f3174b..b65af8b 100644 --- a/base/src/plugin-manager/plugin.ts +++ b/base/src/plugin-manager/plugin.ts @@ -171,6 +171,22 @@ class Plugin_2 extends Plugin_1 { super(definition); } + getWebEntrypoint():string|undefined { + let entryPoints = this.webContent?.entryPoints; + if (entryPoints) { + const searchParams = new URLSearchParams(window.location.search); + const useV2Desktop = searchParams.has("use-v2-desktop") && (searchParams.get("use-v2-desktop") == '1'); + if (useV2Desktop || !entryPoints['3.0']) { + return 'main.js'; + } else { + return ''+entryPoints['3.0']; + } + } else if (this.webContent) { + return 'main.js'; + } + return undefined; + } + } diff --git a/interface/src/index.d.ts b/interface/src/index.d.ts index e27bb02..bc60345 100644 --- a/interface/src/index.d.ts +++ b/interface/src/index.d.ts @@ -299,6 +299,10 @@ declare namespace ZLUX { getBasePlugin(): any; } + interface PluginV2 extends Plugin { + getWebEntryPoint():string|undefined; + } + interface ContainerPluginDefinition { getBasePlugin():Plugin; } From 898decf636367996338035d60f5cea63a210c66f Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Wed, 28 Aug 2024 02:05:17 +0200 Subject: [PATCH 2/2] Update plugin.ts Signed-off-by: 1000TurquoisePogs --- base/src/plugin-manager/plugin.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/src/plugin-manager/plugin.ts b/base/src/plugin-manager/plugin.ts index b65af8b..8ec0a24 100644 --- a/base/src/plugin-manager/plugin.ts +++ b/base/src/plugin-manager/plugin.ts @@ -172,14 +172,14 @@ class Plugin_2 extends Plugin_1 { } getWebEntrypoint():string|undefined { - let entryPoints = this.webContent?.entryPoints; - if (entryPoints) { + let entryPoint = this.webContent?.entryPoint; + if (entryPoint) { const searchParams = new URLSearchParams(window.location.search); - const useV2Desktop = searchParams.has("use-v2-desktop") && (searchParams.get("use-v2-desktop") == '1'); - if (useV2Desktop || !entryPoints['3.0']) { + const useV2Desktop = searchParams.has("use-v2-desktop") && (searchParams.get("use-v2-desktop") == 'true'); + if (useV2Desktop || !entryPoint['3.0']) { return 'main.js'; } else { - return ''+entryPoints['3.0']; + return ''+entryPoint['3.0']; } } else if (this.webContent) { return 'main.js';