Merge branch 'main' into im-coder-lg-code-server-coder-diff

code-asher · web-flow · commit f25768a6c21c · 2021-11-08T10:14:23.000-06:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -60,7 +60,7 @@ jobs:
     name: Run audit-ci
     needs: prebuild
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 15
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -378,9 +378,6 @@ jobs:
         with:
           node-version: "14"
 
-      - name: Install playwright OS dependencies
-        run: npx playwright install-deps
-
       - name: Fetch dependencies from cache
         id: cache-yarn
         uses: actions/cache@v2
@@ -406,14 +403,10 @@ jobs:
         if: steps.cache-yarn.outputs.cache-hit != 'true'
         run: yarn --frozen-lockfile
 
-      # HACK: this shouldn't need to exist, but put it here anyway
-      # in an attempt to solve Playwright cache failures.
-      - name: Reinstall playwright
-        if: steps.cache-yarn.outputs.cache-hit == 'true'
+      - name: Install Playwright OS dependencies
         run: |
-          cd test/
-          rm -r node_modules/playwright
-          yarn install --check-files
+          ./test/node_modules/.bin/playwright install-deps
+          ./test/node_modules/.bin/playwright install
 
       - name: Run end-to-end tests
         run: yarn test:e2e
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
   release:
-    types: [published]
+    types: [released]
 
 jobs:
   docker-images:
diff --git a/.github/workflows/npm-brew.yaml b/.github/workflows/npm-brew.yaml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
   release:
-    types: [published]
+    types: [released]
 
 jobs:
   # NOTE: this job requires curl, jq and yarn
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,6 @@ vendor/modules
 node-*
 /plugins
 /lib/coder-cloud-agent
-/lib/linkup
 .home
 coverage
 **/.DS_Store
diff --git a/ci/build/build-code-server.sh b/ci/build/build-code-server.sh
@@ -30,15 +30,6 @@ main() {
     chmod +x ./lib/coder-cloud-agent
     set -e
   fi
-
-  if ! [ -f ./lib/linkup ]; then
-    echo "Downloading Link agent..."
-
-    set +e
-    curl -fsSL "https://storage.googleapis.com/coder-link-releases/latest/linkup-$OS-$ARCH" -o ./lib/linkup
-    chmod +x ./lib/linkup
-    set -e
-  fi
 }
 
 main "$@"
diff --git a/ci/build/build-release.sh b/ci/build/build-release.sh
@@ -61,7 +61,6 @@ EOF
     rsync node_modules/ "$RELEASE_PATH/node_modules"
     mkdir -p "$RELEASE_PATH/lib"
     rsync ./lib/coder-cloud-agent "$RELEASE_PATH/lib"
-    rsync ./lib/linkup "$RELEASE_PATH/lib"
   fi
 }
 
diff --git a/ci/build/npm-postinstall.sh b/ci/build/npm-postinstall.sh
@@ -66,12 +66,6 @@ main() {
     echo "Failed to download cloud agent; --link will not work"
   fi
 
-  if curl -fsSL "https://storage.googleapis.com/coder-link-releases/latest/linkup-$OS-$ARCH" -o ./lib/linkup; then
-    chmod +x ./lib/linkup
-  else
-    echo "Failed to download Link agent; the Link extension will not work"
-  fi
-
   if ! vscode_yarn; then
     echo "You may not have the required dependencies to build the native modules."
     echo "Please see https://github.com/cdr/code-server/blob/master/docs/npm.md"
diff --git a/ci/dev/postinstall.sh b/ci/dev/postinstall.sh
@@ -6,27 +6,28 @@ main() {
 
   echo "Installing code-server test dependencies..."
 
+  local args=(install)
+  if [[ ${CI-} ]]; then
+    args+=(--frozen-lockfile)
+  fi
+
   cd test
-  yarn install
+  yarn "${args[@]}"
   cd ..
 
   cd vendor
   echo "Installing vendor dependencies..."
 
-  # * We install in 'modules' instead of 'node_modules' because VS Code's extensions
-  # use a webpack config which cannot differentiate between its own node_modules
-  # and itself being in a directory with the same name.
-  #
-  # * We ignore scripts because NPM/Yarn's default behavior is to assume that
-  # devDependencies are not needed, and that even git repo based packages are
-  # assumed to be compiled. Because the default behavior for VS Code's `postinstall`
-  # assumes we're also compiled, this needs to be ignored.
+  # We install in 'modules' instead of 'node_modules' because VS Code's
+  # extensions use a webpack config which cannot differentiate between its own
+  # node_modules and itself being in a directory with the same name.
+  args+=(--modules-folder modules)
 
-  local args=(install --modules-folder modules --ignore-scripts)
-
-  if [[ ${CI-} ]]; then
-    args+=("--frozen-lockfile")
-  fi
+  # We ignore scripts because NPM/Yarn's default behavior is to assume that
+  # devDependencies are not needed, and that even git repo based packages are
+  # assumed to be compiled. Because the default behavior for VS Code's
+  # `postinstall` assumes we're also compiled, this needs to be ignored.
+  args+=(--ignore-scripts)
 
   yarn "${args[@]}"
 
diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml
@@ -28,14 +28,6 @@ podAnnotations: {}
 podSecurityContext: {}
   # fsGroup: 2000
 
-securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
 service:
   type: ClusterIP
   port: 8080
@@ -127,10 +119,6 @@ persistence:
   # existingClaim: ""
   # hostPath: /data
 
-serviceAccount:
-  create: true
-  name:
-
 ## Enable an Specify container in extraContainers.
 ## This is meant to allow adding code-server dependencies, like docker-dind.
 extraContainers: |
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
@@ -3,6 +3,7 @@
 # Contributing
 
 - [Requirements](#requirements)
+  - [Linux-specific requirements](#linux-specific-requirements)
 - [Creating pull requests](#creating-pull-requests)
   - [Commits and commit history](#commits-and-commit-history)
 - [Development workflow](#development-workflow)
@@ -42,13 +43,21 @@ Here is what is needed:
     signature
     verification](https://docs.github.com/en/github/authenticating-to-github/managing-commit-signature-verification)
     or follow [this tutorial](https://joeprevite.com/verify-commits-on-github)
-- `build-essential` (Linux only - used by VS Code)
-  - Get this by running `apt-get install -y build-essential`
 - `rsync` and `unzip`
   - Used for code-server releases
 - `bats`
   - Used to run script unit tests
 
+### Linux-specific requirements
+
+If you're developing code-server on Linux, make sure you have installed or install the following dependencies:
+
+```shell
+sudo apt-get install build-essential g++ libx11-dev libxkbfile-dev libsecret-1-dev python-is-python3
+```
+
+These are required by VS Code. See [their Wiki](https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites) for more information.
+
 ## Creating pull requests
 
 Please create a [GitHub Issue](https://github.com/cdr/code-server/issues) that
diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
     "@types/ws": "^8.0.0",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
-    "audit-ci": "^4.0.0",
+    "audit-ci": "^5.0.0",
     "codecov": "^3.8.3",
     "doctoc": "^2.0.0",
     "eslint": "^7.7.0",
@@ -75,8 +75,9 @@
     "browserslist": "^4.16.5",
     "safe-buffer": "^5.1.1",
     "vfile-message": "^2.0.2",
-    "argon2/@mapbox/node-pre-gyp/tar": "^6.1.9",
-    "path-parse": "^1.0.7"
+    "tar": "^6.1.9",
+    "path-parse": "^1.0.7",
+    "vm2": "^3.9.4"
   },
   "dependencies": {
     "@coder/logger": "1.1.16",
@@ -93,7 +94,7 @@
     "proxy-agent": "^5.0.0",
     "proxy-from-env": "^1.1.0",
     "qs": "6.10.1",
-    "rotating-file-stream": "^2.1.1",
+    "rotating-file-stream": "^3.0.0",
     "safe-buffer": "^5.1.1",
     "safe-compare": "^1.1.4",
     "semver": "^7.1.3",
diff --git a/src/node/link.ts b/src/node/link.ts
diff --git a/src/node/main.ts b/src/node/main.ts
@@ -1,14 +1,12 @@
 import { field, logger } from "@coder/logger"
-import { ChildProcessWithoutNullStreams } from "child_process"
 import http from "http"
 import path from "path"
 import { Disposable } from "../common/emitter"
-import { plural, logError } from "../common/util"
+import { plural } from "../common/util"
 import { createApp, ensureAddress } from "./app"
 import { AuthType, DefaultedArgs, Feature } from "./cli"
 import { coderCloudBind } from "./coder_cloud"
 import { commit, version, vsRootPath } from "./constants"
-import { startLink } from "./link"
 import { register } from "./routes"
 import { humanPath, isFile, loadAMDModule, open } from "./util"
 
@@ -156,19 +154,6 @@ export const runCodeServer = async (
     logger.info("  - Connected to cloud agent")
   }
 
-  let linkAgent: undefined | ChildProcessWithoutNullStreams
-  try {
-    linkAgent = startLink(serverAddress)
-    linkAgent.on("error", (error) => {
-      logError(logger, "link daemon", error)
-    })
-    linkAgent.on("close", (code) => {
-      logger.debug("link daemon closed", field("code", code))
-    })
-  } catch (error) {
-    logError(logger, "link daemon", error)
-  }
-
   if (args.enable && args.enable.length > 0) {
     logger.info("Enabling the following experimental features:")
     args.enable.forEach((feature) => {
@@ -196,7 +181,6 @@ export const runCodeServer = async (
   return {
     server: app.server,
     dispose: async () => {
-      linkAgent?.kill()
       disposeRoutes()
       await app.dispose()
     },
diff --git a/test/package.json b/test/package.json
@@ -2,7 +2,7 @@
   "license": "MIT",
   "#": "We must put jest in a sub-directory otherwise VS Code somehow picks up the types and generates conflicts with mocha.",
   "devDependencies": {
-    "@playwright/test": "^1.12.1",
+    "@playwright/test": "^1.16.3",
     "@types/jest": "^27.0.2",
     "@types/jsdom": "^16.2.13",
     "@types/node-fetch": "^2.5.8",
@@ -13,7 +13,7 @@
     "jest-fetch-mock": "^3.0.3",
     "jsdom": "^16.4.0",
     "node-fetch": "^2.6.1",
-    "playwright": "^1.12.1",
+    "playwright": "^1.16.3",
     "supertest": "^6.1.6",
     "ts-jest": "^27.0.7",
     "wtfnode": "^0.9.1"
@@ -22,6 +22,7 @@
     "ansi-regex": "^5.0.1",
     "argon2/@mapbox/node-pre-gyp/tar": "^6.1.9",
     "set-value": "^4.0.1",
-    "tmpl": "^1.0.5"
+    "tmpl": "^1.0.5",
+    "path-parse": "^1.0.7"
   }
 }
diff --git a/test/yarn.lock b/test/yarn.lock
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ EOF`
`61`	`61`	`rsync node_modules/ "$RELEASE_PATH/node_modules"`
`62`	`62`	`mkdir -p "$RELEASE_PATH/lib"`
`63`	`63`	`rsync ./lib/coder-cloud-agent "$RELEASE_PATH/lib"`
`64`		`- rsync ./lib/linkup "$RELEASE_PATH/lib"`
`65`	`64`	`fi`
`66`	`65`	`}`
`67`	`66`