From c514cff3082ef3f0042e0f899d61a3baf4cd6b8d Mon Sep 17 00:00:00 2001
From: lin onetwo <linonetwo012@gmail.com>
Date: Fri, 9 Jul 2021 01:20:21 +0800
Subject: [PATCH] fix: provide browserViewMetaData prefix for every
 additionalArguments

this fixes https://github.com/tiddly-gittly/TiddlyGit-Desktop/issues/80
---
 src/services/view/index.ts                  | 2 --
 src/services/view/setupViewEventHandlers.ts | 7 +++++--
 src/services/windows/index.ts               | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/services/view/index.ts b/src/services/view/index.ts
index 73bf9a29..bac28907 100644
--- a/src/services/view/index.ts
+++ b/src/services/view/index.ts
@@ -231,9 +231,7 @@ export class View implements IViewService {
       session: sessionOfView,
       preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
       additionalArguments: [
-        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
         `${MetaDataChannel.browserViewMetaData}${WindowNames.view}`,
-        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
         `${MetaDataChannel.browserViewMetaData}${JSON.stringify(browserViewMetaData)}`,
       ],
     };
diff --git a/src/services/view/setupViewEventHandlers.ts b/src/services/view/setupViewEventHandlers.ts
index e6d3891e..a8018775 100644
--- a/src/services/view/setupViewEventHandlers.ts
+++ b/src/services/view/setupViewEventHandlers.ts
@@ -16,7 +16,7 @@ import type { IWorkspaceViewService } from '@services/workspacesView/interface';
 import type { IWindowService } from '@services/windows/interface';
 import { WindowNames, IBrowserViewMetaData } from '@services/windows/WindowProperties';
 import { container } from '@services/container';
-import { ViewChannel, WindowChannel } from '@/constants/channels';
+import { MetaDataChannel, ViewChannel, WindowChannel } from '@/constants/channels';
 import { logger } from '@services/libs/log';
 import { getLocalHostUrlWithActualIP } from '@services/libs/url';
 
@@ -299,7 +299,10 @@ async function handleNewWindow(
       ...(JSON.parse(sharedWebPreferences?.additionalArguments?.[1] ?? '{}') as IBrowserViewMetaData),
     };
     const metadataConfig = {
-      additionalArguments: [WindowNames.newWindow, JSON.stringify(browserViewMetaData)],
+      additionalArguments: [
+        `${MetaDataChannel.browserViewMetaData}${WindowNames.newWindow}`,
+        `${MetaDataChannel.browserViewMetaData}${JSON.stringify(browserViewMetaData)}`,
+      ],
       preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
     };
     const newOptions: BrowserWindowConstructorOptions = cmdClick
diff --git a/src/services/windows/index.ts b/src/services/windows/index.ts
index 8c039947..e21c5bdd 100644
--- a/src/services/windows/index.ts
+++ b/src/services/windows/index.ts
@@ -139,7 +139,7 @@ export class Window implements IWindowService {
         allowRunningInsecureContent: false,
         contextIsolation: true,
         preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
-        additionalArguments: [windowName, JSON.stringify(meta)],
+        additionalArguments: [`${MetaDataChannel.browserViewMetaData}${windowName}`, `${MetaDataChannel.browserViewMetaData}${JSON.stringify(meta)}`],
       },
       parent: isMainWindow || attachToMenubar ? undefined : this.get(WindowNames.main),
     };