watcher - update to latest version (#286484)

bpasero · web-flow · commit fe665a91f621 · 2026-01-09T07:07:37.000+01:00
diff --git a/build/.moduleignore b/build/.moduleignore
@@ -112,11 +112,11 @@ node-pty/third_party/**
 !node-pty/build/Release/conpty/conpty.dll
 !node-pty/build/Release/conpty/OpenConsole.exe
 
-@vscode/watcher/binding.gyp
-@vscode/watcher/build/**
-@vscode/watcher/prebuilds/**
-@vscode/watcher/src/**
-!@vscode/watcher/build/Release/*.node
+@parcel/watcher/binding.gyp
+@parcel/watcher/build/**
+@parcel/watcher/prebuilds/**
+@parcel/watcher/src/**
+!@parcel/watcher/build/Release/*.node
 
 vsda/**
 !vsda/index.js
diff --git a/build/azure-pipelines/linux/verify-glibc-requirements.sh b/build/azure-pipelines/linux/verify-glibc-requirements.sh
@@ -10,7 +10,7 @@ elif [ "$VSCODE_ARCH" == "armhf" ]; then
 fi
 
 # Get all files with .node extension from server folder
-files=$(find $SEARCH_PATH -name "*.node" -not -path "*prebuilds*" -not -path "*extensions/node_modules/@vscode/watcher*" -o -type f -executable -name "node")
+files=$(find $SEARCH_PATH -name "*.node" -not -path "*prebuilds*" -not -path "*extensions/node_modules/@parcel/watcher*" -o -type f -executable -name "node")
 
 echo "Verifying requirements for files: $files"
 
diff --git a/build/darwin/create-universal-app.ts b/build/darwin/create-universal-app.ts
@@ -29,8 +29,6 @@ async function main(buildDir?: string) {
 		'**/CodeResources',
 		'**/Credits.rtf',
 		'**/policies/{*.mobileconfig,**/*.plist}',
-		// TODO: Should we consider expanding this to other files in this area?
-		'**/node_modules/@vscode/node-addon-api/nothing.target.mk',
 	];
 
 	await makeUniversalApp({
diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts
@@ -470,7 +470,7 @@ function patchWin32DependenciesTask(destinationFolderName: string) {
 	const cwd = path.join(path.dirname(root), destinationFolderName);
 
 	return async () => {
-		const deps = await glob('**/*.node', { cwd, ignore: 'extensions/node_modules/@vscode/watcher/**' });
+		const deps = await glob('**/*.node', { cwd, ignore: 'extensions/node_modules/@parcel/watcher/**' });
 		const packageJson = JSON.parse(await fs.promises.readFile(path.join(cwd, versionedResourcesFolder, 'resources', 'app', 'package.json'), 'utf8'));
 		const product = JSON.parse(await fs.promises.readFile(path.join(cwd, versionedResourcesFolder, 'resources', 'app', 'product.json'), 'utf8'));
 		const baseVersion = packageJson.version.replace(/-.*$/, '');
diff --git a/build/npm/postinstall.ts b/build/npm/postinstall.ts
@@ -110,7 +110,7 @@ function setNpmrcConfig(dir: string, env: NodeJS.ProcessEnv) {
 }
 
 function removeParcelWatcherPrebuild(dir: string) {
-	const parcelModuleFolder = path.join(root, dir, 'node_modules', '@vscode');
+	const parcelModuleFolder = path.join(root, dir, 'node_modules', '@parcel');
 	if (!fs.existsSync(parcelModuleFolder)) {
 		return;
 	}
@@ -120,7 +120,7 @@ function removeParcelWatcherPrebuild(dir: string) {
 		if (moduleName.startsWith('watcher-')) {
 			const modulePath = path.join(parcelModuleFolder, moduleName);
 			fs.rmSync(modulePath, { recursive: true, force: true });
-			log(dir, `Removed @vscode/watcher prebuilt module ${modulePath}`);
+			log(dir, `Removed @parcel/watcher prebuilt module ${modulePath}`);
 		}
 	}
 }
diff --git a/eslint.config.js b/eslint.config.js
@@ -1439,7 +1439,7 @@ export default tseslint.config(
 					// - electron-main
 					'when': 'hasNode',
 					'allow': [
-						'@vscode/watcher',
+						'@parcel/watcher',
 						'@vscode/sqlite3',
 						'@vscode/vscode-languagedetection',
 						'@vscode/ripgrep',
@@ -1930,6 +1930,7 @@ export default tseslint.config(
 						'test/automation',
 						'test/smoke/**',
 						'@vscode/*',
+						'@parcel/*',
 						'@playwright/*',
 						'*' // node modules
 					]
@@ -1939,6 +1940,7 @@ export default tseslint.config(
 					'restrictions': [
 						'test/automation/**',
 						'@vscode/*',
+						'@parcel/*',
 						'playwright-core/**',
 						'@playwright/*',
 						'*' // node modules
@@ -1949,6 +1951,7 @@ export default tseslint.config(
 					'restrictions': [
 						'test/integration/**',
 						'@vscode/*',
+						'@parcel/*',
 						'@playwright/*',
 						'*' // node modules
 					]
@@ -1958,6 +1961,7 @@ export default tseslint.config(
 					'restrictions': [
 						'test/monaco/**',
 						'@vscode/*',
+						'@parcel/*',
 						'@playwright/*',
 						'*' // node modules
 					]
@@ -1968,6 +1972,7 @@ export default tseslint.config(
 						'test/automation',
 						'test/mcp/**',
 						'@vscode/*',
+						'@parcel/*',
 						'@playwright/*',
 						'@modelcontextprotocol/sdk/**/*',
 						'*' // node modules
diff --git a/extensions/esbuild-webview-common.mjs b/extensions/esbuild-webview-common.mjs
@@ -82,7 +82,7 @@ export async function run(config, args, didBuild) {
 	const isWatch = args.indexOf('--watch') >= 0;
 	if (isWatch) {
 		await tryBuild(resolvedOptions, didBuild);
-		const watcher = await import('@vscode/watcher');
+		const watcher = await import('@parcel/watcher');
 		watcher.subscribe(config.srcDir, () => tryBuild(resolvedOptions, didBuild));
 	} else {
 		return build(resolvedOptions, didBuild).catch(() => process.exit(1));
diff --git a/extensions/package-lock.json b/extensions/package-lock.json
diff --git a/extensions/package.json b/extensions/package.json
@@ -10,7 +10,7 @@
     "postinstall": "node ./postinstall.mjs"
   },
   "devDependencies": {
-    "@vscode/watcher": "bpasero/watcher#8ecffb4a57df24ac3e6946aa095b9b1f14f8bba9",
+    "@parcel/watcher": "parcel-bundler/watcher#f503c6eb8df1e883f6989f11743232e43ccb90f6",
     "esbuild": "0.25.0",
     "vscode-grammar-updater": "^1.1.0"
   },
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -74,6 +74,7 @@
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
+    "@parcel/watcher": "parcel-bundler/watcher#f503c6eb8df1e883f6989f11743232e43ccb90f6",
     "@types/semver": "^7.5.8",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.1",
@@ -85,7 +86,6 @@
     "@vscode/sudo-prompt": "9.3.2",
     "@vscode/tree-sitter-wasm": "^0.3.0",
     "@vscode/vscode-languagedetection": "1.0.21",
-    "@vscode/watcher": "bpasero/watcher#8ecffb4a57df24ac3e6946aa095b9b1f14f8bba9",
     "@vscode/windows-mutex": "^0.5.0",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
diff --git a/remote/package-lock.json b/remote/package-lock.json
diff --git a/remote/package.json b/remote/package.json
@@ -5,14 +5,14 @@
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
+    "@parcel/watcher": "parcel-bundler/watcher#f503c6eb8df1e883f6989f11743232e43ccb90f6",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/proxy-agent": "^0.36.0",
     "@vscode/ripgrep": "^1.15.13",
     "@vscode/spdlog": "^0.15.2",
     "@vscode/tree-sitter-wasm": "^0.3.0",
     "@vscode/vscode-languagedetection": "1.0.21",
-    "@vscode/watcher": "bpasero/watcher#8ecffb4a57df24ac3e6946aa095b9b1f14f8bba9",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.3.0-beta.91",
diff --git a/scripts/playground-server.ts b/scripts/playground-server.ts
@@ -6,7 +6,7 @@
 import * as fsPromise from 'fs/promises';
 import path from 'path';
 import * as http from 'http';
-import * as parcelWatcher from '@vscode/watcher';
+import * as parcelWatcher from '@parcel/watcher';
 
 /**
  * Launches the server for the monaco editor playground
diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
@@ -76,9 +76,9 @@ flakySuite('Native Modules (all platforms)', () => {
 		assert.ok(typeof spdlog.version === 'number', testErrorMessage('@vscode/spdlog'));
 	});
 
-	test('@vscode/watcher', async () => {
-		const parcelWatcher = await import('@vscode/watcher');
-		assert.ok(typeof parcelWatcher.subscribe === 'function', testErrorMessage('@vscode/watcher'));
+	test('@parcel/watcher', async () => {
+		const parcelWatcher = await import('@parcel/watcher');
+		assert.ok(typeof parcelWatcher.subscribe === 'function', testErrorMessage('@parcel/watcher'));
 	});
 
 	test('@vscode/deviceid', async () => {
diff --git a/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts b/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import parcelWatcher from '@vscode/watcher';
+import parcelWatcher from '@parcel/watcher';
 import { promises } from 'fs';
 import { tmpdir, homedir } from 'os';
 import { URI } from '../../../../../base/common/uri.js';

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ function setNpmrcConfig(dir: string, env: NodeJS.ProcessEnv) {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`function removeParcelWatcherPrebuild(dir: string) {`
`113`		`- const parcelModuleFolder = path.join(root, dir, 'node_modules', '@vscode');`
	`113`	`+ const parcelModuleFolder = path.join(root, dir, 'node_modules', '@parcel');`
`114`	`114`	`if (!fs.existsSync(parcelModuleFolder)) {`
`115`	`115`	`return;`
`116`	`116`	`}`
`@@ -120,7 +120,7 @@ function removeParcelWatcherPrebuild(dir: string) {`
`120`	`120`	`if (moduleName.startsWith('watcher-')) {`
`121`	`121`	`const modulePath = path.join(parcelModuleFolder, moduleName);`
`122`	`122`	`fs.rmSync(modulePath, { recursive: true, force: true });`
`123`		- log(dir, `Removed @vscode/watcher prebuilt module ${modulePath}`);
	`123`	+ log(dir, `Removed @parcel/watcher prebuilt module ${modulePath}`);
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`	`}`