Merge remote-tracking branch 'origin/main' into roblou/chat-agent-hover

Author: roblourens

.vscode/settings.json

@@ -168,7 +168,6 @@
 	"[github-issues]": {
 		"editor.wordWrap": "on"
 	},
-	"extensions.experimental.supportWorkspaceExtensions": true,
 	"css.format.spaceAroundSelectorSeparator": true,
 	"inlineChat.mode": "live",
 	"typescript.enablePromptUseWorkspaceTsdk": true,

build/gulpfile.js

@@ -7,6 +7,13 @@
 
 // Increase max listeners for event emitters
 require('events').EventEmitter.defaultMaxListeners = 100;
+const { gracefulify } = require('graceful-fs');
+const fs = require('fs');
+try {
+	gracefulify(fs);
+} catch (e) {
+	logger.log(`Error enabling graceful-fs: ${e}`);
+}
 
 const gulp = require('gulp');
 const util = require('./lib/util');

build/hygiene.js

@@ -256,7 +256,7 @@ function createGitIndexVinyls(paths) {
 
 				cp.exec(
 					process.platform === 'win32' ? `git show :${relativePath}` : `git show ':${relativePath}'`,
-					{ maxBuffer: 2000 * 1024, encoding: 'buffer' },
+					{ maxBuffer: stat.size, encoding: 'buffer' },
 					(err, out) => {
 						if (err) {
 							return e(err);

build/package.json

@@ -43,6 +43,7 @@
     "electron-osx-sign": "^0.4.16",
     "esbuild": "0.20.0",
     "extract-zip": "^2.0.1",
+    "graceful-fs": "^4.2.11",
     "gulp-merge-json": "^2.1.1",
     "gulp-shell": "^0.8.0",
     "jsonc-parser": "^2.3.0",

build/win32/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "inno_updater"
-version = "0.11.0"
+version = "0.11.1"
 authors = ["Microsoft <[email protected]>"]
 build = "build.rs"
 
@@ -9,7 +9,7 @@ byteorder = "1.4.3"
 crc = "3.0.1"
 slog = "2.7.0"
 slog-async = "2.7.0"
-slog-term = "2.9.0"
+slog-term = "2.9.1"
 
 [target.'cfg(windows)'.dependencies.windows-sys]
 version = "0.42"

build/win32/Cargo.toml

@@ -1563,6 +1563,11 @@ graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
   integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
 
+graceful-fs@^4.2.11:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"

build/win32/inno_updater.exe

@@ -86,7 +86,7 @@ impl ServiceManager for LaunchdService {
 		match capture_command_and_check_status("launchctl", &["stop", &get_service_label()]).await {
 			Ok(_) => {}
 			// status 3 == "no such process"
-			Err(CodeError::CommandFailed { code, .. }) if code == 3 => {}
+			Err(CodeError::CommandFailed { code: 3, .. }) => {}
 			Err(e) => return Err(wrap(e, "error stopping service").into()),
 		};