Merge/1.102.0 log location (#8796)

Merges latest changes from upstream `vscode-server`. This is to mainly
pull in the change for using XDG_STATE_HOME for logs but has a minor
update to the update Workbench workflow action and resolving the require
on `compileBuildWithoutManglingTask`.

---------

Co-authored-by: positron-bot[bot] <173392469+positron-bot[bot]@users.noreply.github.com>

Author: timtmok

.github/workflows/update-workbench-version.yml

@@ -40,7 +40,7 @@ jobs:
           git config user.email "[email protected]"
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ env.TOKEN }}
           commit-message: "Update PWB Code Server version to ${{ env.VERSION }}"

build/gulpfile.reh.js

@@ -31,6 +31,9 @@ const { positronBuildNumber } = require('./utils');
 const { copyExtensionBinariesTask } = require('./gulpfile.extensions');
 // --- End Positron ---
 const { compileBuildWithManglingTask } = require('./gulpfile.compile');
+// --- Start PWB ---
+const { compileBuildWithoutManglingTask } = require('./gulpfile.compile');
+// --- End PWB ---
 const { cleanExtensionsBuildTask, compileNonNativeExtensionsBuildTask, compileNativeExtensionsBuildTask, compileExtensionMediaBuildTask } = require('./gulpfile.extensions');
 const { vscodeWebResourceIncludes, createVSCodeWebFileContentMapper } = require('./gulpfile.vscode.web');
 const cp = require('child_process');
@@ -42,7 +45,6 @@ const commit = getVersion(REPO_ROOT);
 const BUILD_ROOT = path.dirname(REPO_ROOT);
 const REMOTE_FOLDER = path.join(REPO_ROOT, 'remote');
 // --- Start Positron ---
-const { compileBuildWithoutManglingTask } = require('./gulpfile.compile');
 const REMOTE_REH_WEB_FOLDER = path.join(REPO_ROOT, 'remote', 'reh-web');
 // --- End Positron ---
 

build/secrets/.secrets.baseline

@@ -94,6 +94,10 @@
       "path": "detect_secrets.filters.common.is_baseline_file",
       "filename": "build/secrets/.secrets.baseline"
     },
+    {
+      "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
+      "min_level": 2
+    },
     {
       "path": "detect_secrets.filters.heuristic.is_indirect_reference"
     },
@@ -1649,16 +1653,6 @@
         "is_secret": false
       }
     ],
-    "src/vs/workbench/api/node/loopbackServer.ts": [
-      {
-        "type": "AWS Access Key",
-        "filename": "src/vs/workbench/api/node/loopbackServer.ts",
-        "hashed_secret": "094ab4147707513f945937285ac0a6ef8472a356",
-        "is_verified": false,
-        "line_number": 184,
-        "is_secret": false
-      }
-    ],
     "src/vs/workbench/api/test/browser/extHostTelemetry.test.ts": [
       {
         "type": "Secret Keyword",
@@ -1727,16 +1721,6 @@
         "is_secret": false
       }
     ],
-    "src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts": [
-      {
-        "type": "IBM Cloud IAM Key",
-        "filename": "src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts",
-        "hashed_secret": "0d43d6e259826e4ecbda1644424b26de54faa665",
-        "is_verified": false,
-        "line_number": 96,
-        "is_secret": false
-      }
-    ],
     "src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html": [
       {
         "type": "Base64 High Entropy String",

src/vs/platform/environment/common/environmentService.ts

@@ -73,7 +73,16 @@ export abstract class AbstractNativeEnvironmentService implements INativeEnviron
 	get logsHome(): URI {
 		if (!this.args.logsPath) {
 			const key = toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, '');
-			this.args.logsPath = join(this.userDataPath, 'logs', key);
+			// --- Start PWB ---
+			// Change this.args.logsPath from userDataPath to XDG_STATE_HOME if available, otherwise use ~/.local/state for logs
+			const userStatePath = process.env['XDG_STATE_HOME'];
+			const productName = this.productService.applicationName;
+			if (userStatePath) {
+				this.args.logsPath = join(userStatePath, productName, 'logs', key);
+			} else {
+				this.args.logsPath = join(this.paths.homeDir, '.local', 'state', productName, 'logs', key);
+			}
+			// --- End PWB ---
 		}
 
 		return URI.file(this.args.logsPath);