cubetiq/code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: postinstall.js conflicts

Browse Source 
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.
This commit is contained in:
Joe Previte 2021-02-25 11:57:35 -07:00
parent 9e61540840
commit ce1a8c89dd
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/vscode/build/npm/postinstall.js
View File

@ -38,13 +38,11 @@ function yarnInstall(location, opts) {
for (let dir of dirs) { for (let dir of dirs) {
<<<<<<< HEAD
// NOTE@coder: Skip these dependencies since we don't use them. // NOTE@coder: Skip these dependencies since we don't use them.
// if (!(process.platform === 'win32' && (process.arch === 'arm64' || process.env['npm_config_arch'] === 'arm64'))) { // if (!(process.platform === 'win32' && (process.arch === 'arm64' || process.env['npm_config_arch'] === 'arm64'))) {
// yarnInstall('remote'); // node modules used by vscode server // yarnInstall('remote'); // node modules used by vscode server
// yarnInstall('remote/web'); // node modules used by vscode web // yarnInstall('remote/web'); // node modules used by vscode web
// } // }
=======
if (dir === '') { if (dir === '') {
// `yarn` already executed in root // `yarn` already executed in root
continue; continue;
@ -54,7 +52,6 @@ for (let dir of dirs) {
// windows arm: do not execute `yarn` on remote folder // windows arm: do not execute `yarn` on remote folder
continue; continue;
} }
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
if (dir === 'build/lib/watch') { if (dir === 'build/lib/watch') {
// node modules for watching, specific to host node version, not electron // node modules for watching, specific to host node version, not electron
@ -96,13 +93,4 @@ runtime "${runtime}"`;
yarnInstall(watchPath); yarnInstall(watchPath);
} }
<<<<<<< HEAD
yarnInstall(`build`); // node modules required for build
// yarnInstall('test/automation'); // node modules required for smoketest
// yarnInstall('test/smoke'); // node modules required for smoketest
// yarnInstall('test/integration/browser'); // node modules required for integration
yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron
=======
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
cp.execSync('git config pull.rebase true'); cp.execSync('git config pull.rebase true');