fix code-server

Author: azahnen

.woodpecker/snapshot.yml

@@ -20,6 +20,8 @@ steps:
       tags_file: .tags
       force_tag: true
       pull_image: true
+      build_args:
+        VSIX_VERSION: snapshot
       platforms:
         - linux/amd64
         - linux/arm64

Dockerfile

@@ -1,10 +1,12 @@
-FROM node:20-alpine as extension
+FROM node:20-alpine AS extension
+
+ARG VSIX_VERSION=""
 
 COPY . /src/
-RUN cd /src && npm run install:all && npm test && npm run package:web
+RUN cd /src && npm run install:all && npm test && VSIX_VERSION=${VSIX_VERSION} npm run package:web
 
 
-FROM ghcr.io/ldproxy/xtracfg:4.3.5 as xtracfg
+FROM ghcr.io/ldproxy/xtracfg:4.3.5 AS xtracfg
 
 
 FROM codercom/code-server:4.107.1

package.json

@@ -66,6 +66,7 @@
     "prepackage:web": "VITE_DEV=false npm run build:ui && npm run build:web  && node vsix.mjs web",
     "package:web": "cd dist/web && vsce package -o ../vsix -t web --pre-release",
     "publish": "vsce publish --packagePath dist/vsix/ldproxy-editor-*.vsix",
+    "docker": "docker build -t editor:local-dev --no-cache --progress plain --build-arg VSIX_VERSION=snapshot .",
     "test": "jest",
     "lint": "eslint ./ --ext ts"
   },

vsix.mjs

@@ -6,27 +6,40 @@ const target = process.argv[2];
 const platform = process.argv[3];
 
 if (!target) {
-    throw new Error("Missing target");
+  throw new Error("Missing target");
 }
 
-const {browser,main,scripts,dependencies,devDependencies,...rest} = pkg;
+const { browser, main, scripts, dependencies, devDependencies, version, ...rest } = pkg;
 
 const vsixPkg = {
-    ...rest,
-    [target === "web" ? "browser" : "main"]: "./extension.js",
+  ...rest,
+  version:
+    process.env.VSIX_VERSION === "snapshot"
+      ? version +
+        "-snapshot." +
+        new Date()
+          .toISOString()
+          .substring(0, 19)
+          .replace("T", "")
+          .replaceAll("-", "")
+          .replaceAll(":", "")
+      : version,
+  [target === "web" ? "browser" : "main"]: "./extension.js",
 };
 
-
 mkdirSync("dist/vsix", { recursive: true });
 mkdirSync(`dist/${target}`, { recursive: true });
 
 writeFileSync(`dist/${target}/package.json`, JSON.stringify(vsixPkg, null, 2));
 
 if (target === "native") {
-writeFileSync(`dist/${target}/.vscodeignore`, `
+  writeFileSync(
+    `dist/${target}/.vscodeignore`,
+    `
 prebuilds/**
 !prebuilds/${platform}
-`);
+`
+  );
 }
 
 copySync("LICENSE", `dist/${target}/LICENSE`);

web/index.ts

@@ -16,8 +16,8 @@ export function deactivate() {
 // for some reason, the location is not set in the web worker as it should be (see https://developer.mozilla.org/en-US/docs/Web/API/WorkerLocation)
 // so we need to retrieve it manually so that the xtracfg websocket client can connect to the correct location
 const getLocation = () => {
+  // set from environment variable BASE_URL
   const baseUrl = workspace.getConfiguration("ldproxy-editor").get<string>("baseUrl");
-  console.log("BASE URL", baseUrl);
 
   if (baseUrl) {
     const url = new URL(baseUrl);
@@ -30,8 +30,8 @@ const getLocation = () => {
     return location;
   }
 
+  // default from VSCode file root, ignore pathname (use BASE_URL if needed)
   const vscodeFileRoot = (self as any)._VSCODE_FILE_ROOT;
-  console.log("VSCODE FILE ROOT", vscodeFileRoot);
 
   if (vscodeFileRoot) {
     const url = new URL(vscodeFileRoot);
@@ -44,6 +44,7 @@ const getLocation = () => {
     return location;
   }
 
+  // fallback to self location
   return self.location;
 };
 
@@ -53,7 +54,6 @@ const getUrl = () => {
   }
 
   const location = getLocation();
-  console.log("LOCATION", location);
   const protocol = location.protocol === "https:" ? "wss" : "ws";
   const path = location.pathname.endsWith("/")
     ? location.pathname.substring(0, location.pathname.length - 1)