Code server 1.57.1 cleanup

.eslintignore

@@ -16,3 +16,8 @@
 **/extensions/markdown-language-features/notebook-out/**
 **/extensions/typescript-basics/test/colorize-fixtures/**
 **/extensions/**/dist/**
+# These are code-server code symlinks.
+src/vs/base/common/util.ts
+src/vs/base/common/ipc.d.ts
+src/vs/base/node/proxy_agent.ts
+src/vs/server/uriTransformer.ts

.eslintrc.json

@@ -802,10 +802,12 @@
 				"target": "**/vs/server/**",
 				"restrictions": [
 					"vs/nls",
+					"**/vs/code/**/{common,server,browser,node,electron-sandbox,electron-browser}/**",
 					"**/vs/base/**/{common,node}/**",
 					"**/vs/base/parts/**/{common,node}/**",
 					"**/vs/platform/**/{common,node}/**",
 					"**/vs/workbench/**/{common,node}/**",
+					"**/vs/workbench/workbench.web.api",
 					"**/vs/server/**",
 					"*" // node modules
 				]

.gitignore

@@ -7,7 +7,8 @@ node_modules/
 extensions/**/dist/
 /out*/
 /extensions/**/out/
-src/vs/server
+# NOTE@coder: remove to provide our own server
+# src/vs/server
 resources/server
 build/node_modules
 coverage/

.vscode/settings.json

@@ -84,6 +84,12 @@
 		"editor.defaultFormatter": "vscode.typescript-language-features",
 		"editor.formatOnSave": true,
 	},
+	"typescript.format.insertSpaceAfterConstructor": false,
+	"javascript.format.insertSpaceAfterConstructor": false,
+	"javascript.format.insertSpaceBeforeFunctionParenthesis": false,
+	"typescript.format.insertSpaceBeforeFunctionParenthesis": false,
+	"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
+	"javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
 	"typescript.tsc.autoDetect": "off",
 	"notebook.experimental.useMarkdownRenderer": true,
 	"testing.autoRun.mode": "rerun",

.yarnrc

@@ -1,3 +1,3 @@
 disturl "https://electronjs.org/headers"
-target "12.0.9"
+target "12.0.7"
 runtime "electron"

build/gulpfile.reh.js

@@ -42,6 +42,8 @@ BUILD_TARGETS.forEach(({ platform, arch }) => {
 });
 
 function getNodeVersion() {
+	// NOTE@coder: Fix version due to .yarnrc removal.
+	return process.versions.node;
 	const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');
 	const target = /^target "(.*)"$/m.exec(yarnrc)[1];
 	return target;

build/hygiene.js

@@ -19,6 +19,18 @@ const copyrightHeaderLines = [
 	' *--------------------------------------------------------------------------------------------*/',
 ];
 
+/**
+ * @remark While this helps delineate Coder's additions to the upstream project,
+ * this notice should be examined within the context of the application.
+ * Code from both maintainers often overlaps.
+ */
+const coderCopyrightHeaderLines = [
+	'/*---------------------------------------------------------------------------------------------',
+	' *  Copyright (c) Coder Technologies. All rights reserved.',
+	' *  Licensed under the MIT License. See License.txt in the project root for license information.',
+	' *--------------------------------------------------------------------------------------------*/',
+];
+
 function hygiene(some, linting = true) {
 	const gulpeslint = require('gulp-eslint');
 	const tsfmt = require('typescript-formatter');
@@ -62,7 +74,7 @@ function hygiene(some, linting = true) {
 		const lines = file.__lines;
 
 		for (let i = 0; i < copyrightHeaderLines.length; i++) {
-			if (lines[i] !== copyrightHeaderLines[i]) {
+			if (lines[i] !== copyrightHeaderLines[i] && lines[i] !== coderCopyrightHeaderLines[i]) {
 				console.error(file.relative + ': Missing or bad copyright statement');
 				errorCount++;
 				break;

build/lib/extensions.ts

@@ -67,7 +67,7 @@ function fromLocal(extensionPath: string, forWeb: boolean): Stream {
 	if (isWebPacked) {
 		input = updateExtensionPackageJSON(input, (data: any) => {
 			delete data.scripts;
-			delete data.dependencies;
+			// https://github.com/cdr/code-server/pull/2041#issuecomment-685910322
 			delete data.devDependencies;
 			if (data.main) {
 				data.main = data.main.replace('/out/', /dist/);

build/lib/node.js

@@ -8,8 +8,8 @@ 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: Fix version due to .yarnrc removal.
+const version = process.versions.node;
 const platform = process.platform;
 const arch = platform === 'darwin' ? 'x64' : process.arch;
 const node = platform === 'win32' ? 'node.exe' : 'node';

build/lib/node.ts

@@ -4,13 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as path from 'path';
-import * as fs from '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: Fix version due to .yarnrc removal.
+const version = process.versions.node;
 const platform = process.platform;
 const arch = platform === 'darwin' ? 'x64' : process.arch;
 

build/lib/util.js

@@ -269,6 +269,8 @@ function streamToPromise(stream) {
 }
 exports.streamToPromise = streamToPromise;
 function getElectronVersion() {
+    // NOTE@coder: Fix version due to .yarnrc removal.
+    return process.versions.node;
     const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
     const target = /^target "(.*)"$/m.exec(yarnrc)[1];
     return target;

build/lib/util.ts

@@ -336,7 +336,6 @@ export function streamToPromise(stream: NodeJS.ReadWriteStream): Promise<void> {
 }
 
 export function getElectronVersion(): string {
-	const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
-	const target = /^target "(.*)"$/m.exec(yarnrc)![1];
-	return target;
+	// NOTE@coder: Fix version due to .yarnrc removal.
+	return process.versions.node;
 }

build/npm/update-localization-extension.js

@@ -25,7 +25,7 @@ function update(options) {
 		throw new Error(`${location} doesn't exist.`);
 	}
 	let locExtFolder = idOrPath;
-	if (/^\w{2}(-\w+)?$/.test(idOrPath)) {
+	if (/^\w{2,3}(-\w+)?$/.test(idOrPath)) {
 		locExtFolder = path.join('..', 'vscode-loc', 'i18n', `vscode-language-pack-${idOrPath}`);
 	}
 	let locExtStat = fs.statSync(locExtFolder);

build/package.json

@@ -3,8 +3,6 @@
   "version": "1.0.0",
   "license": "MIT",
   "devDependencies": {
-    "@azure/cosmos": "^3.9.3",
-    "@azure/storage-blob": "^12.4.0",
     "@types/ansi-colors": "^3.2.0",
     "@types/azure": "0.9.19",
     "@types/byline": "^4.2.32",
@@ -37,11 +35,9 @@
     "@typescript-eslint/experimental-utils": "~2.13.0",
     "@typescript-eslint/parser": "^3.3.0",
     "applicationinsights": "1.0.8",
-    "azure-storage": "^2.1.0",
     "byline": "^5.0.0",
     "colors": "^1.4.0",
     "commander": "^7.0.0",
-    "electron-osx-sign": "^0.4.16",
     "esbuild": "^0.12.6",
     "fs-extra": "^9.1.0",
     "got": "11.8.1",
@@ -50,10 +46,9 @@
     "mime": "^1.4.1",
     "mkdirp": "^1.0.4",
     "p-limit": "^3.1.0",
-    "plist": "^3.0.1",
     "source-map": "0.6.1",
     "typescript": "^4.4.0-dev.20210528",
-    "vsce": "1.48.0",
+    "vsce": "1.88.0",
     "vscode-universal": "deepak1556/universal#61454d96223b774c53cda10f72c2098c0ce02d58"
   },
   "scripts": {