Merge branch 'main' into issue-4355

Author: code-asher

.github/workflows/ci.yaml

@@ -404,7 +404,9 @@ jobs:
         run: yarn --frozen-lockfile
 
       - name: Install Playwright OS dependencies
-        run: ./test/node_modules/.bin/playwright install-deps
+        run: |
+          ./test/node_modules/.bin/playwright install-deps
+          ./test/node_modules/.bin/playwright install
 
       - name: Run end-to-end tests
         run: yarn test:e2e

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[@]}"
 

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: |

package.json

@@ -94,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",

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"