feat: new vscode version, better extension

.github/workflows/build-depoy.yml

@@ -10,17 +10,17 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
       - name: Install deps
         run: sudo apt-get install -y libkrb5-dev g++ gcc make pkg-config libx11-dev libxkbfile-dev libsecret-1-dev
       - name: Install
-        run: yarn install
+        run: npm install
       - name: Install provider
-        run: cd drd-fsprovider && yarn install
+        run: cd drd-fs && npm install
       - name: Build
-        run: yarn build
+        run: npm run build
       - name: Copy files into final directory
-        run: yarn prepare-start
+        run: npm run prepare-start
       - name: Deploy
         uses: cloudflare/wrangler-action@v3
         with:

.github/workflows/pr.yml

@@ -1,22 +1,40 @@
 name: Cloudflare Preview Deployment
 on:
-  push:
-    branches-ignore:
+  pull_request:
+    types: [opened, synchronize, reopened]
+    branches:
       - main
 jobs:
   Deploy-Preview:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Install Vercel CLI
-        run: npm install --global vercel@latest
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+      - name: Install deps
+        run: sudo apt-get install -y libkrb5-dev g++ gcc make pkg-config libx11-dev libxkbfile-dev libsecret-1-dev
+      #      - name: Setup upterm session
+      #        uses: owenthereal/action-upterm@v1
       - name: Install
-        run: yarn install
+        run: npm install
       - name: Install provider
-        run: cd drd-fsprovider && yarn install
+        run: cd drd-fs && npm install
       - name: Build
-        run: yarn build
+        run: npm run build
       - name: Copy files into final directory
-        run: yarn prepare-start
-      #- name: Deploy Project Artifacts to Vercel
-      #  run: vercel deploy drd-vscode --token=${{ secrets.VERCEL_TOKEN }}
+        run: npm run prepare-start
+      - name: Deploy
+        id: deploy
+        uses: cloudflare/wrangler-action@v3
+        with:
+          wranglerVersion: "4.35.0"
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          command: versions upload --preview-alias pr-${{ github.event.number }}
+      - name: 📬 Update deployment status
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          append: true
+          # Only `deployment-url` is available
+          message: |
+            | ${{ matrix.name }} | ${{ steps.deploy.outputs.deployment-url }} |

.gitignore

@@ -107,11 +107,9 @@ vscode
 vscode/*
 vscode-web
 dist
-drd-vscode/static
-drd-vscode/code-*
-drd-vscode/favicon.ico
-drd-vscode/manifest.json
-drd-vscode/playground.js
 
 .vscode-test-web
 .wrangler
+
+DavLock
+.DS_Store

.nvmrc

@@ -0,0 +1 @@
+v22

build.js

@@ -2,34 +2,89 @@ const process = require("process");
 const child_process = require("child_process");
 const fs = require("fs");
 const fse = require("fs-extra");
+const { version } = require("./package.json");
 
-const vscodeVersion = "1.87.2";
+const vscodeVersion = version.split("-")[0];
+
+function error(msg) {
+  console.info("\x1b[31merror %s\x1b[0m", msg);
+}
+function ok(msg) {
+  console.info("\x1b[32m%s\x1b[0m", msg);
+}
+function note(msg) {
+  console.info("\x1b[90m%s\x1b[0m", msg);
+}
+function exec(cmd, opts) {
+  console.info("\x1b[36m%s\x1b[0m", cmd);
+  return child_process.execSync(cmd, opts);
+}
+
+const requiredTools = ["node", "npm", "git", "python"];
+note(`required tools ${JSON.stringify(requiredTools)}`);
+for (const tool of requiredTools) {
+  try {
+    child_process.execSync(`${tool} --version`, { stdio: "ignore" });
+  } catch (e) {
+    error(`"${tool}" is not available.`);
+    //process.exit(1);
+  }
+}
+ok("required tools installed");
+
+const node_version_out = child_process.execSync(`node -v`);
+const node_version = node_version_out.toString().trim();
+if (node_version < "v20.0") {
+  error(`Want node > 20. Got "${node_version}"`);
+  process.exit(1);
+}
 
 if (!fs.existsSync("vscode")) {
-  child_process.execSync(
+  note("cloning vscode");
+  exec(
     `git clone --depth 1 https://github.com/microsoft/vscode.git -b ${vscodeVersion}`,
     {
       stdio: "inherit",
     }
   );
+} else {
+  ok("vscode already installed");
+  note("delete vscode folder to clone again");
 }
+
+//replace max-old-space-size=8192 with 4096 in package.json (hack for gh actions)
+const vscodePackagePath = "vscode/package.json";
+let packageContent = fs.readFileSync(vscodePackagePath).toString();
+packageContent = packageContent.replace(
+  /max-old-space-size=8192/g,
+  "max-old-space-size=4096"
+);
+fs.writeFileSync(vscodePackagePath, packageContent);
+
+note("changing directory to vscode");
 process.chdir("vscode");
 
 if (!fs.existsSync("node_modules")) {
-  child_process.execSync("yarn", { stdio: "inherit" });
+  exec("npm install", {
+    stdio: "inherit",
+    env: {
+      ...process.env,
+      ELECTRON_SKIP_BINARY_DOWNLOAD: 1,
+      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1,
+    },
+  });
+} else {
+  ok("node_modules exists. Skipping npm install");
 }
+
 // Use simple workbench
-fs.copyFileSync(
+note("copying workbench file");
+/*fs.copyFileSync(
   "../workbench.ts",
   "src/vs/code/browser/workbench/workbench.ts"
-);
+);*/
 
 // Compile
-child_process.execSync("yarn gulp vscode-web-min", { stdio: "inherit" });
-
-// Extract compiled files
-if (fs.existsSync("../dist")) {
-  fs.rmdirSync("../dist", { recursive: true });
-}
-fs.mkdirSync("../dist");
-fse.copySync("../vscode-web", "../dist");
+note("starting compile");
+exec("npm run gulp vscode-web-min", { stdio: "inherit" });
+ok("compile completed");

drd-fs/.gitignore

@@ -0,0 +1,6 @@
+out
+dist
+node_modules
+.vscode-test-web/
+*.vsix
+.env

drd-fs/.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+	// See http://go.microsoft.com/fwlink/?LinkId=827846
+	// for the documentation about the extensions.json format
+	"recommendations": [
+		"dbaeumer.vscode-eslint",
+		"amodio.tsl-problem-matcher"
+	]
+}

drd-fsprovider/.vscode/launch.json → drd-fs/.vscode/launch.json

@@ -7,7 +7,7 @@
 	"configurations": [
 		{
 			"name": "Run Web Extension ",
-			"type": "pwa-extensionHost",
+			"type": "extensionHost",
 			"debugWebWorkerHost": true,
 			"request": "launch",
 			"args": [
@@ -17,7 +17,7 @@
 			"outFiles": [
 				"${workspaceFolder}/dist/web/**/*.js"
 			],
-			"preLaunchTask": "npm: watch-web"
+			"preLaunchTask": "${defaultBuildTask}"
 		},
 		{
 			"name": "Extension Tests",
@@ -32,7 +32,7 @@
 			"outFiles": [
 				"${workspaceFolder}/dist/web/**/*.js"
 			],
-			"preLaunchTask": "npm: watch-web"
+			"preLaunchTask": "${defaultBuildTask}"
 		}
 	]
 }

drd-fsprovider/.vscode/settings.json → drd-fs/.vscode/settings.json

@@ -1,10 +1,10 @@
 // Place your settings in this file to overwrite default and user settings.
 {
 	"files.exclude": {
-		"out": false // set this to true to hide the "out" folder with the compiled JS files
+		"dist": false // set this to true to hide the "dist" folder with the compiled JS files
 	},
 	"search.exclude": {
-		"out": true // set this to false to include "out" folder in search results
+		"dist": true // set this to false to include "dist" folder in search results
 	},
 	// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
 	"typescript.tsc.autoDetect": "off"

drd-fsprovider/.vscodeignore → drd-fs/.vscodeignore

@@ -3,12 +3,14 @@
 src/**
 out/**
 node_modules/**
+dist/**/test/**
 .gitignore
 vsc-extension-quickstart.md
 webpack.config.js
+esbuild.js
 .yarnrc
 **/tsconfig.json
-**/.eslintrc.json
+**/eslint.config.mjs
 **/*.map
 **/*.ts
 **/.vscode-test.*

drd-fsprovider/CHANGELOG.md → drd-fs/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-All notable changes to the "drd-fsprovider" extension will be documented in this file.
+All notable changes to the "drd-fs" extension will be documented in this file.
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 

drd-fsprovider/README.md → drd-fs/README.md

@@ -1,6 +1,6 @@
-# drd-fsprovider README
+# drd-fs README
 
-This is the README for your extension "drd-fsprovider". After writing up a brief description, we recommend including the following sections.
+This is the README for your extension "drd-fs". After writing up a brief description, we recommend including the following sections.
 
 ## Features
 

drd-fs/eslint.config.mjs

@@ -0,0 +1,28 @@
+import typescriptEslint from "@typescript-eslint/eslint-plugin";
+import tsParser from "@typescript-eslint/parser";
+
+export default [{
+    files: ["**/*.ts"],
+}, {
+    plugins: {
+        "@typescript-eslint": typescriptEslint,
+    },
+
+    languageOptions: {
+        parser: tsParser,
+        ecmaVersion: 2022,
+        sourceType: "module",
+    },
+
+    rules: {
+        "@typescript-eslint/naming-convention": ["warn", {
+            selector: "import",
+            format: ["camelCase", "PascalCase"],
+        }],
+
+        curly: "warn",
+        eqeqeq: "warn",
+        "no-throw-literal": "warn",
+        semi: "warn",
+    },
+}];