Restore yarnrc removal

code-asher · code-asher · commit d7ef9997c386 · 2021-11-04T22:02:18.000Z
I was getting module issues again. See #4 for details.
diff --git a/.yarnrc b/.yarnrc
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
@@ -134,7 +134,7 @@ const serverWithWebEntryPoints = [
 ];
 
 function getNodeVersion () {
-	// NOTE@coder: Fix version due to .yarnrc removal.
+	// NOTE@coder: Always use the current version to avoid native module errors.
 	return process.versions.node;
 
 	const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');
diff --git a/build/lib/node.js b/build/lib/node.js
@@ -7,9 +7,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
 const root = path.dirname(path.dirname(__dirname));
-const yarnrcPath = path.join(root, 'remote', '.yarnrc');
-const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
-const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)[1];
+// NOTE@coder: Always use the current version to avoid native module errors.
+// const yarnrcPath = path.join(root, 'remote', '.yarnrc');
+// const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
+// const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)[1];
+const version = process.versions.node;
 const platform = process.platform;
 const arch = platform === 'darwin' ? 'x64' : process.arch;
 const node = platform === 'win32' ? 'node.exe' : 'node';
diff --git a/build/lib/node.ts b/build/lib/node.ts
@@ -6,13 +6,13 @@
 import * as path from 'path';
 
 const root = path.dirname(path.dirname(__dirname));
-
-// NOTE@coder: Fix version due to .yarnrc removal.
+// NOTE@coder: Always use the current version to avoid native module errors.
+// const yarnrcPath = path.join(root, 'remote', '.yarnrc');
+// const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
+// const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)[1];
 const version = process.versions.node;
 const platform = process.platform;
 const arch = platform === 'darwin' ? 'x64' : process.arch;
-
 const node = platform === 'win32' ? 'node.exe' : 'node';
 const nodePath = path.join(root, '.build', 'node', `v${version}`, `${platform}-${arch}`, node);
-
 console.log(nodePath);
diff --git a/build/lib/util.js b/build/lib/util.js
@@ -269,6 +269,8 @@ function streamToPromise(stream) {
 }
 exports.streamToPromise = streamToPromise;
 function getElectronVersion() {
+    // NOTE@coder: Always use the current version to avoid native module errors.
+    return process.versions.node;
     const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
     const target = /^target "(.*)"$/m.exec(yarnrc)[1];
     return target;
diff --git a/build/lib/util.ts b/build/lib/util.ts
@@ -336,9 +336,8 @@ export function streamToPromise(stream: NodeJS.ReadWriteStream): Promise<void> {
 }
 
 export function getElectronVersion(): string {
-	// NOTE@coder: Fix version due to .yarnrc removal.
+	// NOTE@coder: Always use the current version to avoid native module errors.
 	return process.versions.node;
-
 	const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
 	const target = /^target "(.*)"$/m.exec(yarnrc)![1];
 	return target;
@@ -406,4 +405,3 @@ export function buildWebNodePaths(outDir: string) {
 	result.taskName = 'build-web-node-paths';
 	return result;
 }
-
diff --git a/remote/.yarnrc b/remote/.yarnrc

Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,8 @@ function streamToPromise(stream) {`
`269`	`269`	`}`
`270`	`270`	`exports.streamToPromise = streamToPromise;`
`271`	`271`	`function getElectronVersion() {`
	`272`	`+ // NOTE@coder: Always use the current version to avoid native module errors.`
	`273`	`+ return process.versions.node;`
`272`	`274`	`const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');`
`273`	`275`	`const target = /^target "(.*)"$/m.exec(yarnrc)[1];`
`274`	`276`	`return target;`
Original file line number	Diff line number	Diff line change
`@@ -336,9 +336,8 @@ export function streamToPromise(stream: NodeJS.ReadWriteStream): Promise<void> {`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`export function getElectronVersion(): string {`
`339`		`- // NOTE@coder: Fix version due to .yarnrc removal.`
	`339`	`+ // NOTE@coder: Always use the current version to avoid native module errors.`
`340`	`340`	`return process.versions.node;`
`341`		`-`
`342`	`341`	`const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');`
`343`	`342`	`const target = /^target "(.*)"$/m.exec(yarnrc)![1];`
`344`	`343`	`return target;`
`@@ -406,4 +405,3 @@ export function buildWebNodePaths(outDir: string) {`
`406`	`405`	`result.taskName = 'build-web-node-paths';`
`407`	`406`	`return result;`
`408`	`407`	`}`
`409`		`-`