From 7f99658bf615fc26c5047804f23ee510f7ff688c Mon Sep 17 00:00:00 2001
From: sharon <sharon-wang@users.noreply.github.com>
Date: Fri, 20 Sep 2024 09:12:22 -0400
Subject: [PATCH] run `git add --renormalize` on the generated
 reh-web/package.json file (#4764)

This should finally actually legitimately resolve the CRLF issue on
Windows.

### QA Notes

Running `yarn` on Windows should no longer create the extra task of
having to stage the generated reh-web package.json file just to get rid
of "invisible" EOL changes.

Co-authored-by: sharon wang <25834218+sharon-wang@users.noreply.github.com>
---
 build/npm/postinstall.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index 2946d25245b..9c404552356 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -78,11 +78,14 @@ function generateRehWebPackageJson() {
 	// `build` a while before `remote/reh-web` due to the array order of `dirs`).
 	const mergeJson = require('gulp-merge-json');
 
+	const remoteDir = path.join(__dirname, '..', '..', 'remote');
+	const packageJsonDirPath = path.join(remoteDir, 'reh-web');
+
 	// If both package.json files contain the same dependency, the one from remote/web will be used
 	// because it is the last one in the stream.
 	gulp.src([
-		path.join(__dirname, '..', '..', 'remote', 'package.json'),
-		path.join(__dirname, '..', '..', 'remote', 'web', 'package.json'),
+		path.join(remoteDir, 'package.json'),
+		path.join(remoteDir, 'web', 'package.json'),
 	])
 		// Merge the package.json files
 		.pipe(
@@ -109,7 +112,12 @@ function generateRehWebPackageJson() {
 			})
 		)
 		// Write the merged package.json file to remote/reh-web
-		.pipe(gulp.dest(path.join(__dirname, '..', '..', 'remote', 'reh-web')));
+		.pipe(gulp.dest(packageJsonDirPath))
+		// `git add` the files in remote/reh-web so that line normalization is handled on Windows
+		.on('end', () => {
+			const packageJsonPath = path.join(packageJsonDirPath, 'package.json');
+			cp.execSync(`git add --renormalize ${packageJsonPath}`);
+		});
 }
 // --- End Positron ---
 
@@ -147,7 +155,7 @@ for (let dir of dirs) {
 	const isRehWebDir = /^(.build\/distro\/npm\/)?remote\/reh-web$/.test(dir);
 
 	if (/^(.build\/distro\/npm\/)?remote$/.test(dir) || isRehWebDir) {
-	// --- End Positron ---
+		// --- End Positron ---
 		// node modules used by vscode server
 		const env = { ...process.env };
 		if (process.env['VSCODE_REMOTE_CC']) {