Skip to content

Commit ce1a8c8

Browse files
committed
fix: postinstall.js conflicts
Again, hope this was correct. It looks like they moved around a few lines here. If there are issues with dependencies not installing, check here.
1 parent 9e61540 commit ce1a8c8

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

lib/vscode/build/npm/postinstall.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,11 @@ function yarnInstall(location, opts) {
3838

3939
for (let dir of dirs) {
4040

41-
<<<<<<< HEAD
4241
// NOTE@coder: Skip these dependencies since we don't use them.
4342
// if (!(process.platform === 'win32' && (process.arch === 'arm64' || process.env['npm_config_arch'] === 'arm64'))) {
4443
// yarnInstall('remote'); // node modules used by vscode server
4544
// yarnInstall('remote/web'); // node modules used by vscode web
4645
// }
47-
=======
4846
if (dir === '') {
4947
// `yarn` already executed in root
5048
continue;
@@ -54,7 +52,6 @@ for (let dir of dirs) {
5452
// windows arm: do not execute `yarn` on remote folder
5553
continue;
5654
}
57-
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
5855

5956
if (dir === 'build/lib/watch') {
6057
// node modules for watching, specific to host node version, not electron
@@ -96,13 +93,4 @@ runtime "${runtime}"`;
9693
yarnInstall(watchPath);
9794
}
9895

99-
<<<<<<< HEAD
100-
yarnInstall(`build`); // node modules required for build
101-
// yarnInstall('test/automation'); // node modules required for smoketest
102-
// yarnInstall('test/smoke'); // node modules required for smoketest
103-
// yarnInstall('test/integration/browser'); // node modules required for integration
104-
yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron
105-
106-
=======
107-
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
10896
cp.execSync('git config pull.rebase true');

0 commit comments

Comments
 (0)