diff --git a/build/.moduleignore b/build/.moduleignore index 0459b46f743..fc7c538c6cc 100644 --- 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 -@parcel/watcher/binding.gyp -@parcel/watcher/build/** -@parcel/watcher/prebuilds/** -@parcel/watcher/src/** -!@parcel/watcher/build/Release/*.node +@vscode/watcher/binding.gyp +@vscode/watcher/build/** +@vscode/watcher/prebuilds/** +@vscode/watcher/src/** +!@vscode/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 index 529417761f9..3db90471faa 100755 --- 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/@parcel/watcher*" -o -type f -executable -name "node") +files=$(find $SEARCH_PATH -name "*.node" -not -path "*prebuilds*" -not -path "*extensions/node_modules/@vscode/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 index 4faa838f924..6bda47add71 100644 --- a/build/darwin/create-universal-app.ts +++ b/build/darwin/create-universal-app.ts @@ -30,7 +30,7 @@ async function main(buildDir?: string) { '**/Credits.rtf', '**/policies/{*.mobileconfig,**/*.plist}', // TODO: Should we consider expanding this to other files in this area? - '**/node_modules/@parcel/node-addon-api/nothing.target.mk', + '**/node_modules/@vscode/node-addon-api/nothing.target.mk', ]; await makeUniversalApp({ diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts index d3ab651ef2e..ac70ecbd57f 100644 --- 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/@parcel/watcher/**' }); + const deps = await glob('**/*.node', { cwd, ignore: 'extensions/node_modules/@vscode/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 index c4bbbf52960..3e260853a53 100644 --- 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', '@parcel'); + const parcelModuleFolder = path.join(root, dir, 'node_modules', '@vscode'); 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 @parcel/watcher prebuilt module ${modulePath}`); + log(dir, `Removed @vscode/watcher prebuilt module ${modulePath}`); } } } diff --git a/eslint.config.js b/eslint.config.js index 10a2fa9ee0b..2955c68a9e4 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1439,7 +1439,7 @@ export default tseslint.config( // - electron-main 'when': 'hasNode', 'allow': [ - '@parcel/watcher', + '@vscode/watcher', '@vscode/sqlite3', '@vscode/vscode-languagedetection', '@vscode/ripgrep', @@ -1930,7 +1930,6 @@ export default tseslint.config( 'test/automation', 'test/smoke/**', '@vscode/*', - '@parcel/*', '@playwright/*', '*' // node modules ] @@ -1940,7 +1939,6 @@ export default tseslint.config( 'restrictions': [ 'test/automation/**', '@vscode/*', - '@parcel/*', 'playwright-core/**', '@playwright/*', '*' // node modules @@ -1951,7 +1949,6 @@ export default tseslint.config( 'restrictions': [ 'test/integration/**', '@vscode/*', - '@parcel/*', '@playwright/*', '*' // node modules ] @@ -1961,7 +1958,6 @@ export default tseslint.config( 'restrictions': [ 'test/monaco/**', '@vscode/*', - '@parcel/*', '@playwright/*', '*' // node modules ] @@ -1972,7 +1968,6 @@ 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 index 76d03abad7d..7b704b3b7f3 100644 --- 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('@parcel/watcher'); + const watcher = await import('@vscode/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 index acaba35fbf0..d315b71a7fe 100644 --- a/extensions/package-lock.json +++ b/extensions/package-lock.json @@ -13,7 +13,7 @@ "typescript": "^5.9.3" }, "devDependencies": { - "@parcel/watcher": "parcel-bundler/watcher#1ca032aa8339260a8a3bcf825c3a1a71e3e43542", + "@vscode/watcher": "bpasero/watcher#8ecffb4a57df24ac3e6946aa095b9b1f14f8bba9", "esbuild": "0.25.0", "vscode-grammar-updater": "^1.1.0" } @@ -443,10 +443,10 @@ "node": ">=18" } }, - "node_modules/@parcel/watcher": { - "version": "2.5.1", - "resolved": "git+ssh://git@github.com/parcel-bundler/watcher.git#1ca032aa8339260a8a3bcf825c3a1a71e3e43542", - "integrity": "sha512-Z0lk8pM5vwuOJU6pfheRXHrOpQYIIEnVl/z8DY6370D4+ZnrOTvFa5BUdf3pGxahT5ILbPWwQSm2Wthy4q1OTg==", + "node_modules/@vscode/watcher": { + "version": "2.5.1-vscode", + "resolved": "git+ssh://git@github.com/bpasero/watcher.git#8ecffb4a57df24ac3e6946aa095b9b1f14f8bba9", + "integrity": "sha512-7F4REbtMh5JAtdPpBCyPq7yLgcqnZV5L+uzuT4IDaZUyCKvIqi9gDiNPyoKpvCtrw6funLmrAncFHHWoDI+S4g==", "dev": true, "hasInstallScript": true, "license": "MIT", diff --git a/extensions/package.json b/extensions/package.json index 7b1d8defa3e..28f88ed4db3 100644 --- a/extensions/package.json +++ b/extensions/package.json @@ -10,7 +10,7 @@ "postinstall": "node ./postinstall.mjs" }, "devDependencies": { - "@parcel/watcher": "parcel-bundler/watcher#1ca032aa8339260a8a3bcf825c3a1a71e3e43542", + "@vscode/watcher": "bpasero/watcher#8ecffb4a57df24ac3e6946aa095b9b1f14f8bba9", "esbuild": "0.25.0", "vscode-grammar-updater": "^1.1.0" }, diff --git a/package-lock.json b/package-lock.json index 3ba14f22185..24c68971a73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,6 @@ "dependencies": { "@microsoft/1ds-core-js": "^3.2.13", "@microsoft/1ds-post-js": "^3.2.13", - "@parcel/watcher": "parcel-bundler/watcher#1ca032aa8339260a8a3bcf825c3a1a71e3e43542", "@types/semver": "^7.5.8", "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.1", @@ -24,6 +23,7 @@ "@vscode/sudo-prompt": "9.3.1", "@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", @@ -1649,26 +1649,6 @@ "node": ">=8.0.0" } }, - "node_modules/@parcel/watcher": { - "version": "2.5.1", - "resolved": "git+ssh://git@github.com/parcel-bundler/watcher.git#1ca032aa8339260a8a3bcf825c3a1a71e3e43542", - "integrity": "sha512-Z0lk8pM5vwuOJU6pfheRXHrOpQYIIEnVl/z8DY6370D4+ZnrOTvFa5BUdf3pGxahT5ILbPWwQSm2Wthy4q1OTg==", - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "detect-libc": "^2.0.3", - "is-glob": "^4.0.3", - "micromatch": "^4.0.5", - "node-addon-api": "^7.0.0" - }, - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -3246,6 +3226,26 @@ "node": ">= 16" } }, + "node_modules/@vscode/watcher": { + "version": "2.5.1-vscode", + "resolved": "git+ssh://git@github.com/bpasero/watcher.git#8ecffb4a57df24ac3e6946aa095b9b1f14f8bba9", + "integrity": "sha512-7F4REbtMh5JAtdPpBCyPq7yLgcqnZV5L+uzuT4IDaZUyCKvIqi9gDiNPyoKpvCtrw6funLmrAncFHHWoDI+S4g==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "detect-libc": "^2.0.3", + "is-glob": "^4.0.3", + "micromatch": "^4.0.5", + "node-addon-api": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, "node_modules/@vscode/windows-ca-certs": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.3.tgz", diff --git a/package.json b/package.json index bf7eabcddc4..f753ccba0eb 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,6 @@ "dependencies": { "@microsoft/1ds-core-js": "^3.2.13", "@microsoft/1ds-post-js": "^3.2.13", - "@parcel/watcher": "parcel-bundler/watcher#1ca032aa8339260a8a3bcf825c3a1a71e3e43542", "@types/semver": "^7.5.8", "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.1", @@ -86,6 +85,7 @@ "@vscode/sudo-prompt": "9.3.1", "@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 index 4a4ef0705a7..51517c1a1b0 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -10,7 +10,6 @@ "dependencies": { "@microsoft/1ds-core-js": "^3.2.13", "@microsoft/1ds-post-js": "^3.2.13", - "@parcel/watcher": "parcel-bundler/watcher#1ca032aa8339260a8a3bcf825c3a1a71e3e43542", "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.1", "@vscode/proxy-agent": "^0.36.0", @@ -18,6 +17,7 @@ "@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.22", @@ -89,26 +89,6 @@ "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.9.tgz", "integrity": "sha512-n1VPsljTSkthsAFYdiWfC+DKzK2WwcRp83Y1YAqdX552BstvsDjft9YXppjUzp11BPsapDoO1LDgrDB0XVsfNQ==" }, - "node_modules/@parcel/watcher": { - "version": "2.5.1", - "resolved": "git+ssh://git@github.com/parcel-bundler/watcher.git#1ca032aa8339260a8a3bcf825c3a1a71e3e43542", - "integrity": "sha512-Z0lk8pM5vwuOJU6pfheRXHrOpQYIIEnVl/z8DY6370D4+ZnrOTvFa5BUdf3pGxahT5ILbPWwQSm2Wthy4q1OTg==", - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "detect-libc": "^2.0.3", - "is-glob": "^4.0.3", - "micromatch": "^4.0.5", - "node-addon-api": "^7.0.0" - }, - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, "node_modules/@tootallnate/once": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-3.0.0.tgz", @@ -201,6 +181,26 @@ "vscode-languagedetection": "cli/index.js" } }, + "node_modules/@vscode/watcher": { + "version": "2.5.1-vscode", + "resolved": "git+ssh://git@github.com/bpasero/watcher.git#8ecffb4a57df24ac3e6946aa095b9b1f14f8bba9", + "integrity": "sha512-7F4REbtMh5JAtdPpBCyPq7yLgcqnZV5L+uzuT4IDaZUyCKvIqi9gDiNPyoKpvCtrw6funLmrAncFHHWoDI+S4g==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "detect-libc": "^2.0.3", + "is-glob": "^4.0.3", + "micromatch": "^4.0.5", + "node-addon-api": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, "node_modules/@vscode/windows-ca-certs": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.3.tgz", diff --git a/remote/package.json b/remote/package.json index ca3c6341069..00092730ed9 100644 --- a/remote/package.json +++ b/remote/package.json @@ -5,7 +5,6 @@ "dependencies": { "@microsoft/1ds-core-js": "^3.2.13", "@microsoft/1ds-post-js": "^3.2.13", - "@parcel/watcher": "parcel-bundler/watcher#1ca032aa8339260a8a3bcf825c3a1a71e3e43542", "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.1", "@vscode/proxy-agent": "^0.36.0", @@ -13,6 +12,7 @@ "@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.22", diff --git a/scripts/playground-server.ts b/scripts/playground-server.ts index e28a20488d9..0b8848af3b3 100644 --- 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 '@parcel/watcher'; +import * as parcelWatcher from '@vscode/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 index 50999154d16..d4ce18aad91 100644 --- 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('@parcel/watcher', async () => { - const parcelWatcher = await import('@parcel/watcher'); - assert.ok(typeof parcelWatcher.subscribe === 'function', testErrorMessage('@parcel/watcher')); + test('@vscode/watcher', async () => { + const parcelWatcher = await import('@vscode/watcher'); + assert.ok(typeof parcelWatcher.subscribe === 'function', testErrorMessage('@vscode/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 index b375d171c42..7d14f3bb364 100644 --- 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 '@parcel/watcher'; +import parcelWatcher from '@vscode/watcher'; import { promises } from 'fs'; import { tmpdir, homedir } from 'os'; import { URI } from '../../../../../base/common/uri.js';