Skip to content

Commit dc632ac

Browse files
committed
Remove .yarnrc from lib/vscode
1 parent c0d6eb4 commit dc632ac

File tree

1 file changed

+87
-6
lines changed

1 file changed

+87
-6
lines changed

ci/dev/vscode.patch

+87-6
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,88 @@ index e73dd4d9e8..e3192b3a0d 100644
1111
build/node_modules
1212
coverage/
1313
diff --git a/.yarnrc b/.yarnrc
14-
index d86b284e83..a7300dbfb9 100644
14+
deleted file mode 100644
15+
index d86b284e83..0000000000
1516
--- a/.yarnrc
16-
+++ b/.yarnrc
17-
@@ -1,3 +1,3 @@
17+
+++ /dev/null
18+
@@ -1,3 +0,0 @@
1819
-disturl "https://atom.io/download/electron"
1920
-target "7.2.4"
2021
-runtime "electron"
21-
+disturl "http://nodejs.org/dist"
22-
+target "12.16.3"
23-
+runtime "node"
22+
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
23+
index f2ea1bd370..2dc6da34fb 100644
24+
--- a/build/gulpfile.reh.js
25+
+++ b/build/gulpfile.reh.js
26+
@@ -52,6 +52,7 @@ gulp.task('vscode-reh-web-linux-x64-min', noop);
27+
gulp.task('vscode-reh-web-linux-alpine-min', noop);
28+
29+
function getNodeVersion() {
30+
+ return process.versions.node
31+
const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');
32+
const target = /^target "(.*)"$/m.exec(yarnrc)[1];
33+
return target;
34+
diff --git a/build/lib/electron.js b/build/lib/electron.js
35+
index abf6baab41..8a1d1bad13 100644
36+
--- a/build/lib/electron.js
37+
+++ b/build/lib/electron.js
38+
@@ -17,6 +17,7 @@ const root = path.dirname(path.dirname(__dirname));
39+
const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
40+
const commit = util.getVersion(root);
41+
function getElectronVersion() {
42+
+ return process.versions.node;
43+
const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
44+
const target = /^target "(.*)"$/m.exec(yarnrc)[1];
45+
return target;
46+
diff --git a/build/lib/electron.ts b/build/lib/electron.ts
47+
index 86c7afcf31..0663b4c28d 100644
48+
--- a/build/lib/electron.ts
49+
+++ b/build/lib/electron.ts
50+
@@ -20,6 +20,7 @@ const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf
51+
const commit = util.getVersion(root);
52+
53+
export function getElectronVersion(): string {
54+
+ return process.versions.node
55+
const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
56+
const target = /^target "(.*)"$/m.exec(yarnrc)![1];
57+
return target;
58+
diff --git a/build/lib/node.js b/build/lib/node.js
59+
index 403ae3d965..738ee8cee0 100644
60+
--- a/build/lib/node.js
61+
+++ b/build/lib/node.js
62+
@@ -5,11 +5,8 @@
63+
*--------------------------------------------------------------------------------------------*/
64+
Object.defineProperty(exports, "__esModule", { value: true });
65+
const path = require("path");
66+
-const fs = require("fs");
67+
const root = path.dirname(path.dirname(__dirname));
68+
-const yarnrcPath = path.join(root, 'remote', '.yarnrc');
69+
-const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
70+
-const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)[1];
71+
+const version = process.versions.node;
72+
const node = process.platform === 'win32' ? 'node.exe' : 'node';
73+
const nodePath = path.join(root, '.build', 'node', `v${version}`, `${process.platform}-${process.arch}`, node);
74+
console.log(nodePath);
75+
diff --git a/build/lib/node.ts b/build/lib/node.ts
76+
index 6439703446..c53dccf4dc 100644
77+
--- a/build/lib/node.ts
78+
+++ b/build/lib/node.ts
79+
@@ -4,13 +4,10 @@
80+
*--------------------------------------------------------------------------------------------*/
81+
82+
import * as path from 'path';
83+
-import * as fs from 'fs';
84+
85+
const root = path.dirname(path.dirname(__dirname));
86+
-const yarnrcPath = path.join(root, 'remote', '.yarnrc');
87+
-const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
88+
-const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)![1];
89+
+const version = process.versions.node;
90+
const node = process.platform === 'win32' ? 'node.exe' : 'node';
91+
const nodePath = path.join(root, '.build', 'node', `v${version}`, `${process.platform}-${process.arch}`, node);
92+
93+
-console.log(nodePath);
94+
\ No newline at end of file
95+
+console.log(nodePath);
2496
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
2597
index 7a2320d828..5768890636 100644
2698
--- a/build/npm/postinstall.js
@@ -166,6 +238,15 @@ index 91b3b92678..f76f2c1548 100644
166238
"urlProtocol": "code-oss",
167239
"extensionAllowedProposedApi": [
168240
"ms-vscode.vscode-js-profile-table",
241+
diff --git a/remote/.yarnrc b/remote/.yarnrc
242+
deleted file mode 100644
243+
index 1e16cde724..0000000000
244+
--- a/remote/.yarnrc
245+
+++ /dev/null
246+
@@ -1,3 +0,0 @@
247+
-disturl "http://nodejs.org/dist"
248+
-target "12.4.0"
249+
-runtime "node"
169250
diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts
170251
index e4546b2cf6..9df12239fb 100644
171252
--- a/src/vs/base/common/network.ts

0 commit comments

Comments
 (0)