Flesh out lib/vscode migration. WIP

Fix issues surrounding IPC interfaces. Update names.

Fix spacing. Add missing property.

Flesh out web socket cleanup.

Flesh out web socket migration. WIP.

Fix issues surrounding web socket frames.

Touch up.

Combine web command with server. Allow JS interop.

Fix issues surrounding built in extensions.

WIP Fix issues surrounding net socket lifecycle, and frequent restarts.

Clean up socket lifecycle. Remove unused socket wrappers.

Fix issues where logger is defined before ready. Clean up extension lifecycle.

Author: GirlBossRush

.eslintrc.json

@@ -825,10 +825,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
+# @coder: The server directory is omitted upstream.
+# 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",

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/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/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,7 +35,6 @@
     "@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",
@@ -50,7 +47,6 @@
     "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.20210607",
     "vsce": "1.48.0",