Replace jq with some JavaScript

code-asher · code-asher · commit f51751ad21e7 · 2019-07-18T18:08:31.000-05:00
diff --git a/scripts/merge.js b/scripts/merge.js
@@ -0,0 +1,18 @@
+const fs = require("fs");
+
+const a = process.argv[2];
+const b = process.argv[3];
+const out = process.argv[4];
+
+const aJson = JSON.parse(fs.readFileSync(a));
+const bJson = JSON.parse(fs.readFileSync(b));
+
+delete aJson.scripts;
+delete aJson.dependencies;
+delete aJson.devDependencies;
+delete aJson.optionalDependencies;
+
+fs.writeFileSync(out, JSON.stringify({
+	...aJson,
+	...bJson,
+}, null, 2));
diff --git a/scripts/package.json b/scripts/package.json
@@ -1,3 +1,5 @@
 {
-  "name": "code-server"
+  "name": "code-server",
+  "main": "out/vs/server/main",
+  "desktopName": "code-server-url-handler.desktop"
 }
diff --git a/scripts/tasks.bash b/scripts/tasks.bash
@@ -68,8 +68,8 @@ function build-code-server() {
 	mkdir -p "${codeServerBuildPath}"
 
 	cp -r "${vscodeBuildPath}/resources/app/extensions" "${codeServerBuildPath}"
-	jq -s '.[0] * .[1]' "${vscodeBuildPath}/resources/app/package.json" "${rootPath}/scripts/package.json" > "${codeServerBuildPath}/package.json"
-	jq -s '.[0] * .[1]' "${vscodeBuildPath}/resources/app/product.json" "${rootPath}/scripts/product.json" > "${codeServerBuildPath}/product.json"
+	node "${rootPath}/scripts/merge.js" "${vscodeBuildPath}/resources/app/package.json" "${rootPath}/scripts/package.json" "${codeServerBuildPath}/package.json"
+	node "${rootPath}/scripts/merge.js" "${vscodeBuildPath}/resources/app/product.json" "${rootPath}/scripts/product.json" "${codeServerBuildPath}/product.json"
 	cp -r "${vscodeSourcePath}/out" "${codeServerBuildPath}"
 	rm -rf "${codeServerBuildPath}/out/vs/server/node_modules"
 	cp -r "${vscodeSourcePath}/remote/node_modules" "${codeServerBuildPath}"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "code-server"`
	`2`	`+ "name": "code-server",`
	`3`	`+ "main": "out/vs/server/main",`
	`4`	`+ "desktopName": "code-server-url-handler.desktop"`
`3`	`5`	`}`