From c424ad6758b908cc526cb3bb64482c52f39d462a Mon Sep 17 00:00:00 2001
From: Simon Knott <info@simonknott.de>
Date: Mon, 4 Nov 2024 16:48:12 +0100
Subject: [PATCH] remove settings.ts file

---
 packages/trace-viewer/src/settings.ts          | 18 ------------------
 packages/trace-viewer/src/ui/DEPS.list         |  1 -
 .../trace-viewer/src/ui/uiModeTraceView.tsx    |  2 +-
 packages/trace-viewer/src/ui/uiModeView.tsx    |  5 +++--
 4 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 packages/trace-viewer/src/settings.ts

diff --git a/packages/trace-viewer/src/settings.ts b/packages/trace-viewer/src/settings.ts
deleted file mode 100644
index 82ffe768ed..0000000000
--- a/packages/trace-viewer/src/settings.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export const testServerBaseURL = new URL(window.location.href);
-testServerBaseURL.port = testServerBaseURL.searchParams.get('testServerPort') ?? testServerBaseURL.port;
diff --git a/packages/trace-viewer/src/ui/DEPS.list b/packages/trace-viewer/src/ui/DEPS.list
index 6cbc852992..0056375c05 100644
--- a/packages/trace-viewer/src/ui/DEPS.list
+++ b/packages/trace-viewer/src/ui/DEPS.list
@@ -4,7 +4,6 @@
 @trace/**
 @web/**
 ../entries.ts
-../settings.ts
 ../geometry.ts
 ../../../playwright/src/isomorphic/**
 ../third_party/devtools.ts
diff --git a/packages/trace-viewer/src/ui/uiModeTraceView.tsx b/packages/trace-viewer/src/ui/uiModeTraceView.tsx
index b8586f3145..2b592ab6a6 100644
--- a/packages/trace-viewer/src/ui/uiModeTraceView.tsx
+++ b/packages/trace-viewer/src/ui/uiModeTraceView.tsx
@@ -24,7 +24,7 @@ import type { ContextEntry } from '../types/entries';
 import type { SourceLocation } from './modelUtil';
 import { MultiTraceModel } from './modelUtil';
 import { Workbench } from './workbench';
-import { testServerBaseURL } from '../settings';
+import { testServerBaseURL } from './uiModeView';
 
 export const TraceView: React.FC<{
   item: { treeItem?: TreeItem, testFile?: SourceLocation, testCase?: reporterTypes.TestCase },
diff --git a/packages/trace-viewer/src/ui/uiModeView.tsx b/packages/trace-viewer/src/ui/uiModeView.tsx
index 3a527ec563..bffa3fc51a 100644
--- a/packages/trace-viewer/src/ui/uiModeView.tsx
+++ b/packages/trace-viewer/src/ui/uiModeView.tsx
@@ -37,7 +37,6 @@ import { FiltersView } from './uiModeFiltersView';
 import { TestListView } from './uiModeTestListView';
 import { TraceView } from './uiModeTraceView';
 import { SettingsView } from './settingsView';
-import { testServerBaseURL } from '../settings';
 
 let xtermSize = { cols: 80, rows: 24 };
 const xtermDataSource: XtermDataSource = {
@@ -47,7 +46,9 @@ const xtermDataSource: XtermDataSource = {
   resize: () => {},
 };
 
-const searchParams = new URLSearchParams(window.location.search);
+export const testServerBaseURL = new URL(window.location.href);
+const searchParams = testServerBaseURL.searchParams;
+testServerBaseURL.port = searchParams.get('testServerPort') ?? testServerBaseURL.port;
 const wsURL = new URL(`/${searchParams.get('ws')}`, testServerBaseURL);
 wsURL.protocol = (window.location.protocol === 'https:' ? 'wss:' : 'ws:');
 const queryParams = {