Bump windows-mutex to 0.4.4 (microsoft#184366)

rzhao271 · web-flow · commit 06ae4b61c2d6 · 2023-06-09T09:40:10.000-07:00
Also adds OS-specific .moduleignore files
diff --git a/build/.moduleignore.darwin b/build/.moduleignore.darwin
@@ -0,0 +1,4 @@
+@vscode/windows-mutex/index.js
+@vscode/windows-mutex/**/*.node
+@vscode/windows-mutex/*.md
+@vscode/windows-mutex/package.json
diff --git a/build/.moduleignore.linux b/build/.moduleignore.linux
@@ -0,0 +1,4 @@
+@vscode/windows-mutex/index.js
+@vscode/windows-mutex/**/*.node
+@vscode/windows-mutex/*.md
+@vscode/windows-mutex/package.json
diff --git a/build/.moduleignore.win32 b/build/.moduleignore.win32
diff --git a/build/azure-pipelines/upload-sourcemaps.js b/build/azure-pipelines/upload-sourcemaps.js
diff --git a/build/azure-pipelines/upload-sourcemaps.ts b/build/azure-pipelines/upload-sourcemaps.ts
@@ -39,7 +39,8 @@ function main(): Promise<void> {
 		const productionDependencies: { name: string; path: string; version: string }[] = deps.getProductionDependencies(root);
 		const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => `./${d}/**/*.map`);
 		const nodeModules = vfs.src(productionDependenciesSrc, { base: '.' })
-			.pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore')));
+			.pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore')))
+			.pipe(util.cleanNodeModules(path.join(root, 'build', `.moduleignore.${process.platform}`)));
 		sources.push(nodeModules);
 
 		const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
@@ -269,6 +269,7 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 			// filter out unnecessary files, no source maps in server build
 			.pipe(filter(['**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map']))
 			.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')))
+			.pipe(util.cleanNodeModules(path.join(__dirname, `.moduleignore.${process.platform}`)))
 			.pipe(jsFilter)
 			.pipe(util.stripSourceMappingURL())
 			.pipe(jsFilter.restore);
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
@@ -276,6 +276,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		const deps = gulp.src(dependenciesSrc, { base: '.', dot: true })
 			.pipe(filter(['**', `!**/${config.version}/**`, '!**/bin/darwin-arm64-87/**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map']))
 			.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')))
+			.pipe(util.cleanNodeModules(path.join(__dirname, `.moduleignore.${process.platform}`)))
 			.pipe(jsFilter)
 			.pipe(util.rewriteSourceMappingURL(sourceMappingURLBase))
 			.pipe(jsFilter.restore)
diff --git a/build/lib/extensions.js b/build/lib/extensions.js
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
@@ -364,7 +364,8 @@ export function packageLocalExtensionsStream(forWeb: boolean, disableMangle: boo
 		result = es.merge(
 			localExtensionsStream,
 			gulp.src(dependenciesSrc, { base: '.' })
-				.pipe(util2.cleanNodeModules(path.join(root, 'build', '.moduleignore'))));
+				.pipe(util2.cleanNodeModules(path.join(root, 'build', '.moduleignore')))
+				.pipe(util2.cleanNodeModules(path.join(root, 'build', `.moduleignore.${process.platform}`))));
 	}
 
 	return (
diff --git a/package.json b/package.json
@@ -74,6 +74,7 @@
     "@vscode/sqlite3": "5.1.4-vscode",
     "@vscode/sudo-prompt": "9.3.1",
     "@vscode/vscode-languagedetection": "1.0.21",
+    "@vscode/windows-mutex": "^0.4.4",
     "graceful-fs": "4.2.8",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.3",
@@ -225,7 +226,6 @@
     "url": "https://github.com/microsoft/vscode/issues"
   },
   "optionalDependencies": {
-    "@vscode/windows-mutex": "0.4.2",
     "@vscode/windows-process-tree": "0.4.2",
     "@vscode/windows-registry": "1.0.10",
     "windows-foreground-love": "0.5.0"
diff --git a/src/typings/windows-mutex.d.ts b/src/typings/windows-mutex.d.ts
diff --git a/yarn.lock b/yarn.lock
@@ -1392,13 +1392,13 @@
   dependencies:
     node-addon-api "^3.0.2"
 
-"@vscode/windows-mutex@0.4.2":
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/@vscode/windows-mutex/-/windows-mutex-0.4.2.tgz#3f796896c3bc2cf32bfe7148e608edb0cb7247db"
-  integrity sha512-7MSBH22cI7OwxXImjJ3VJ7QeHrEbumtyi/xqTgv6xqZCIZfUk/eu5MMBD2Vkehut8dGZU4xIjqt5AGdm0uPixQ==
+"@vscode/windows-mutex@^0.4.4":
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/@vscode/windows-mutex/-/windows-mutex-0.4.4.tgz#260eb900721a71122f37127c5250f6931bb99ad4"
+  integrity sha512-zPPbXuRJj35iv73+J7oZPfWZHht8A2qF96E6t/aCebI7d7RsNJuflLtDVuZqks3ZtgIdy77ht/lNrMxoTQMAPA==
   dependencies:
     bindings "^1.2.1"
-    nan "^2.14.0"
+    nan "^2.17.0"
 
 "@vscode/windows-process-tree@0.4.2":
   version "0.4.2"
@@ -6824,7 +6824,7 @@ nan@^2.12.1:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
   integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
 
-nan@^2.14.0, nan@^2.17.0:
+nan@^2.17.0:
   version "2.17.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
   integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==

Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,8 @@ export function packageLocalExtensionsStream(forWeb: boolean, disableMangle: boo`
`364`	`364`	`result = es.merge(`
`365`	`365`	`localExtensionsStream,`
`366`	`366`	`gulp.src(dependenciesSrc, { base: '.' })`
`367`		`- .pipe(util2.cleanNodeModules(path.join(root, 'build', '.moduleignore'))));`
	`367`	`+ .pipe(util2.cleanNodeModules(path.join(root, 'build', '.moduleignore')))`
	`368`	+ .pipe(util2.cleanNodeModules(path.join(root, 'build', `.moduleignore.${process.platform}`))));
`368`	`369`	`}`
`369`	`370`
`370`	`371`	`return (`