fix(testing): revert change & fix playwright tests

ci/build/build-code-server.sh

@@ -20,6 +20,8 @@ main() {
   source ./ci/lib.sh
   OS="$(uname | tr '[:upper:]' '[:lower:]')"
 
+  mkdir -p ./lib
+
   if ! [ -f ./lib/coder-cloud-agent ]; then
     echo "Downloading the cloud agent..."
 

ci/build/build-release.sh

@@ -68,7 +68,7 @@ EOF
 bundle_vscode() {
   mkdir -p "$VSCODE_OUT_PATH"
   rsync "$VSCODE_SRC_PATH/yarn.lock" "$VSCODE_OUT_PATH"
-  rsync "$VSCODE_SRC_PATH/out-vscode${MINIFY:+-min}/" "$VSCODE_OUT_PATH/out"
+  rsync "$VSCODE_SRC_PATH/out-vscode-server${MINIFY:+-min}/" "$VSCODE_OUT_PATH/out"
 
   rsync "$VSCODE_SRC_PATH/.build/extensions/" "$VSCODE_OUT_PATH/extensions"
   if [ "$KEEP_MODULES" = 0 ]; then

ci/build/build-vscode.sh

@@ -11,12 +11,10 @@ main() {
 
   cd vendor/modules/code-oss-dev
 
-  yarn gulp compile-build compile-extensions-build compile-extension-media compile-web
-
-  yarn gulp optimize --gulpfile ./coder.js
-
   if [[ $MINIFY ]]; then
-    yarn gulp minify --gulpfile ./coder.js
+    yarn compile-server-min
+  else
+    yarn compile-server
   fi
 }
 

ci/build/npm-postinstall.sh

@@ -57,6 +57,9 @@ main() {
   esac
 
   OS="$(uname | tr '[:upper:]' '[:lower:]')"
+
+  mkdir -p ./lib
+
   if curl -fsSL "https://github.com/cdr/cloud-agent/releases/latest/download/cloud-agent-$OS-$ARCH" -o ./lib/coder-cloud-agent; then
     chmod +x ./lib/coder-cloud-agent
   else

ci/dev/test-e2e.sh

@@ -1,6 +1,13 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+help() {
+  echo >&2 "  You can build with 'yarn watch' or you can build a release"
+  echo >&2 "  For example: 'yarn build && yarn build:vscode && KEEP_MODULES=1 yarn release'"
+  echo >&2 "  Then 'CODE_SERVER_TEST_ENTRY=./release yarn test:e2e'"
+  echo >&2 "  You can manually run that release with 'node ./release'"
+}
+
 main() {
   cd "$(dirname "$0")/../.."
 
@@ -21,13 +28,13 @@ main() {
   # wrong (native modules version issues, incomplete build, etc).
   if [[ ! -d $dir/out ]]; then
     echo >&2 "No code-server build detected"
-    echo >&2 "You can build it with 'yarn build' or 'yarn watch'"
+    help
     exit 1
   fi
 
   if [[ ! -d $dir/vendor/modules/code-oss-dev/out ]]; then
     echo >&2 "No VS Code build detected"
-    echo >&2 "You can build it with 'yarn build:vscode' or 'yarn watch'"
+    help
     exit 1
   fi
 

src/common/http.ts

@@ -18,3 +18,12 @@ export class HttpError extends Error {
     this.name = this.constructor.name
   }
 }
+
+/**
+ * Base options included on every page.
+ */
+export interface ClientConfiguration {
+  codeServerVersion: string
+  base: string
+  csStaticBase: string
+}

src/common/util.ts

@@ -1,3 +1,5 @@
+import { ClientConfiguration } from "./http"
+
 /**
  * Split a string up to the delimiter. If the delimiter doesn't exist the first
  * item will have all the text and the second item will be an empty string.
@@ -53,7 +55,7 @@ export const resolveBase = (base?: string): string => {
 /**
  * Get client-side configuration embedded in the HTML or query params.
  */
-export const getClientConfiguration = <T extends CodeServerLib.ClientConfiguration>(): T => {
+export const getClientConfiguration = <T extends ClientConfiguration>(): T => {
   let config: T
   try {
     config = JSON.parse(document.getElementById("coder-options")!.getAttribute("data-settings")!)

src/node/constants.ts

@@ -1,5 +1,5 @@
 import { logger } from "@coder/logger"
-import { JSONSchemaForNPMPackageJsonFiles } from "@schemastore/package"
+import type { JSONSchemaForNPMPackageJsonFiles } from "@schemastore/package"
 import * as os from "os"
 import * as path from "path"
 

src/node/http.ts

@@ -3,7 +3,7 @@ import * as express from "express"
 import * as expressCore from "express-serve-static-core"
 import path from "path"
 import qs from "qs"
-import { HttpCode, HttpError } from "../common/http"
+import { ClientConfiguration, HttpCode, HttpError } from "../common/http"
 import { normalize } from "../common/util"
 import { AuthType, DefaultedArgs } from "./cli"
 import { version as codeServerVersion } from "./constants"
@@ -20,7 +20,7 @@ declare global {
   }
 }
 
-export const createClientConfiguration = (req: express.Request): CodeServerLib.ClientConfiguration => {
+export const createClientConfiguration = (req: express.Request): ClientConfiguration => {
   const base = relativeRoot(req)
 
   return {
@@ -38,7 +38,7 @@ export const replaceTemplates = <T extends object>(
   content: string,
   extraOpts?: Omit<T, "base" | "csStaticBase" | "logLevel">,
 ): string => {
-  const serverOptions: CodeServerLib.ClientConfiguration = {
+  const serverOptions: ClientConfiguration = {
     ...createClientConfiguration(req),
     ...extraOpts,
   }

src/node/routes/vscode.ts

@@ -3,7 +3,7 @@ import { Server } from "http"
 import path from "path"
 import { AuthType, DefaultedArgs } from "../cli"
 import { version as codeServerVersion, vsRootPath } from "../constants"
-import { ensureAuthenticated } from "../http"
+import { ensureAuthenticated, authenticated, redirect } from "../http"
 import { loadAMDModule } from "../util"
 import { Router as WsRouter, WebsocketRouter } from "../wsRouter"
 import { errorHandler } from "./errors"
@@ -53,6 +53,17 @@ export const createVSServerRouter = async (args: DefaultedArgs): Promise<VSServe
   const router = express.Router()
   const wsRouter = WsRouter()
 
+  router.get("/", async (req, res, next) => {
+    const isAuthenticated = await authenticated(req)
+    if (!isAuthenticated) {
+      return redirect(req, res, "login", {
+        // req.baseUrl can be blank if already at the root.
+        to: req.baseUrl && req.baseUrl !== "/" ? req.baseUrl : undefined,
+      })
+    }
+    next()
+  })
+
   router.all("*", ensureAuthenticated, (req, res, next) => {
     req.on("error", (error) => errorHandler(error, req, res, next))
 

test/playwright.config.ts

@@ -2,7 +2,12 @@ import { PlaywrightTestConfig } from "@playwright/test"
 
 import path from "path"
 
-// Run tests in three browsers.
+// The default configuration runs all tests in three browsers with workers equal
+// to half the available threads. See 'yarn test:e2e --help' to customize from
+// the command line. For example:
+//   yarn test:e2e --workers 1        # Run with one worker
+//   yarn test:e2e --project Chromium # Only run on Chromium
+//   yarn test:e2e --grep login       # Run tests matching "login"
 const config: PlaywrightTestConfig = {
   testDir: path.join(__dirname, "e2e"), // Search for tests in this directory.
   timeout: 60000, // Each test is given 60 seconds.

vendor/package.json

@@ -7,6 +7,6 @@
     "postinstall": "./postinstall.sh"
   },
   "devDependencies": {
-    "code-oss-dev": "cdr/vscode#65b2462c212d415fbf521489307e58e5b691818b"
+    "code-oss-dev": "cdr/vscode#c545b85566f30f79afa006edbfc3d50f305966a2"
   }
 }

vendor/yarn.lock

@@ -296,9 +296,9 @@ clone-response@^1.0.2:
   dependencies:
     mimic-response "^1.0.0"
 
-code-oss-dev@cdr/vscode#65b2462c212d415fbf521489307e58e5b691818b:
+code-oss-dev@cdr/vscode#c545b85566f30f79afa006edbfc3d50f305966a2:
   version "1.60.2"
-  resolved "https://codeload.github.com/cdr/vscode/tar.gz/65b2462c212d415fbf521489307e58e5b691818b"
+  resolved "https://codeload.github.com/cdr/vscode/tar.gz/c545b85566f30f79afa006edbfc3d50f305966a2"
   dependencies:
     "@microsoft/applicationinsights-web" "^2.6.4"
     "@vscode/sqlite3" "4.0.12"