Fixes

Tool: gitpod/catfood.gitpod.cloud

Author: jeanp413

.gitpod.Dockerfile

@@ -19,6 +19,3 @@ RUN sudo apt-get update \
         libasound2 libgbm1 xfonts-base xfonts-terminus fonts-noto fonts-wqy-microhei \
         fonts-droid-fallback vim-tiny nano libgconf2-dev libgtk-3-dev twm \
     && sudo apt-get clean && sudo rm -rf /var/cache/apt/* && sudo rm -rf /var/lib/apt/lists/* && sudo rm -rf /tmp/*
-
-# Disable v8 cache used by yarn v1.x, refs https://github.com/nodejs/node/issues/51555
-ENV DISABLE_V8_COMPILE_CACHE=1

package-lock.json

@@ -71,7 +71,6 @@
     "unlink:gitpod-web": "rm extensions/gitpod-web"
   },
   "dependencies": {
-    "@bpasero/watcher": "https://github.com/bpasero/watcher.git#3e5e50c275590703f3eb46fac777b720e515d0d5",
     "@gitpod/gitpod-protocol": "main-gha",
     "@gitpod/ide-metrics-api-grpcweb": "main-gha",
     "@gitpod/local-app-api-grpcweb": "^0.1.5-hw-fix-code-nightly-gha.29105",

package.json

@@ -3,7 +3,6 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@bpasero/watcher": "https://github.com/bpasero/watcher.git#3e5e50c275590703f3eb46fac777b720e515d0d5",
     "@gitpod/gitpod-protocol": "main-gha",
     "@gitpod/ide-metrics-api-grpcweb": "main-gha",
     "@gitpod/supervisor-api-grpc": "main-gha",

remote/package-lock.json

@@ -11,9 +11,9 @@ import type { IDEMetric } from '@gitpod/ide-metrics-api-grpcweb';
 import type { ErrorEvent } from '../../platform/telemetry/common/errorTelemetry.js';
 import { IGitpodPreviewConfiguration } from '../../base/common/product.js';
 import { filter } from '../../base/common/objects.js';
-// eslint-disable-next-line local/code-amd-node-module
 import type { Analytics, AnalyticsSettings } from '@jeanp413/analytics-node-umd';
 import { importAMDNodeModule } from '../../amdX.js';
+import { mainWindow } from '../../base/browser/window.js';
 
 const segmentResolver = importAMDNodeModule<typeof import('@jeanp413/analytics-node-umd')>('@jeanp413/analytics-node-umd', 'dist/umd/index.js');
 
@@ -153,7 +153,7 @@ export class GitpodInsightsAppender implements ITelemetryAppender {
 		const params: ReportErrorParam = {
 			workspaceId: gitpodWsInfo.workspaceId,
 			instanceId: gitpodWsInfo.instanceId,
-			userId: window.gitpod.loggedUserID || gitpodWsInfo.ownerId,
+			userId: mainWindow.gitpod.loggedUserID || gitpodWsInfo.ownerId,
 			errorStack: error.callstack,
 			component: 'vscode-web',
 			version: this.productVersion,
@@ -191,7 +191,6 @@ export class GitpodInsightsAppender implements ITelemetryAppender {
 				}
 				// load grpc-web before see https://github.com/gitpod-io/gitpod/issues/4448
 				await importAMDNodeModule<typeof import('@improbable-eng/grpc-web')>('@improbable-eng/grpc-web', 'dist/grpc-web-client.umd.js');
-				// eslint-disable-next-line local/code-amd-node-module
 
 				const MetricsServiceClient = (await importAMDNodeModule<typeof import('@gitpod/ide-metrics-api-grpcweb')>('@gitpod/ide-metrics-api-grpcweb', 'lib/idemetrics_grpc_web_pb.js')).MetricsServiceClient;
 				const sendMetrics = (await importAMDNodeModule<typeof import('@gitpod/ide-metrics-api-grpcweb')>('@gitpod/ide-metrics-api-grpcweb', 'lib/index.js')).sendMetrics;
@@ -211,7 +210,7 @@ export class GitpodInsightsAppender implements ITelemetryAppender {
 	private async getWorkspaceInfo() {
 		if (!this._workspaceInfo) {
 			this._workspaceInfo = (async () => {
-				const infoResponse = await fetch(window.location.protocol + '//' + window.location.host + '/_supervisor/v1/info/workspace', {
+				const infoResponse = await fetch(mainWindow.location.protocol + '//' + mainWindow.location.host + '/_supervisor/v1/info/workspace', {
 					credentials: 'include'
 				});
 				if (!infoResponse.ok) {