Fix extension paths

.prettierrc

@@ -1,3 +1,4 @@
 {
-  "semi": true
-}
+  "semi": true,
+  "printWidth": 120
+}

build.mjs

@@ -1,27 +1,26 @@
-import { build } from 'esbuild';
-import { cp } from 'fs/promises';
-
+import { build } from "esbuild";
+import { cp } from "fs/promises";
 
 // "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node",
-await cp("./node_modules/five-server/public", "./dist/public", { recursive: true });
-await cp("./node_modules/five-server/client", "./dist/client", { recursive: true });
+await cp("./node_modules/five-server/public", "./dist/bundle/public", { recursive: true });
+await cp("./node_modules/five-server/client", "./dist/bundle/client", { recursive: true });
 
 await build({
-  entryPoints: ['src/extension.ts'],
+  entryPoints: ["src/extension.ts"],
   bundle: true,
-  outfile: "dist/bundle/main.js",
+  outfile: "dist/bundle/subdir/main.js",
   external: ["vscode", "@yandeu/open-cjs", "fsevents"],
   format: "cjs",
   platform: "node",
-  minify: true
+  minify: true,
 });
 
 await build({
-  entryPoints: ['node_modules/five-server/lib/workers/parseBody.js'],
+  entryPoints: ["node_modules/five-server/lib/workers/parseBody.js"],
   bundle: true,
-  outfile: "dist/bundle/parseBody.js",
+  outfile: "dist/bundle/subdir/parseBody.js",
   external: ["vscode"],
   format: "cjs",
   platform: "node",
-  minify: true
-});
+  minify: true,
+});

package.json

@@ -55,7 +55,7 @@
   "activationEvents": [
     "onStartupFinished"
   ],
-  "main": "./dist/bundle/main.js",
+  "main": "./dist/bundle/subdir/main.js",
   "contributes": {
     "commands": [
       {

src/decorator.ts

@@ -24,7 +24,7 @@ export const decorate = (
     text: string;
     line: number;
   }[],
-  color: string
+  color: string,
 ) => {
   const hash = strToHash(fileName);
 
@@ -36,10 +36,7 @@ export const decorate = (
 
     decorations[hash].push({
       renderOptions: { after: { contentText: text, color } },
-      range: new Range(
-        new Position(line - 1, 1024),
-        new Position(line - 1, 1024)
-      ),
+      range: new Range(new Position(line - 1, 1024), new Position(line - 1, 1024)),
     });
   });
 
@@ -50,10 +47,7 @@ const decorationType = window.createTextEditorDecorationType({
   after: { margin: "0 0 0 1rem" },
 });
 
-export const refreshDecorations = (
-  fileName: string | undefined,
-  options: { delay?: number; force?: boolean } = {}
-) => {
+export const refreshDecorations = (fileName: string | undefined, options: { delay?: number; force?: boolean } = {}) => {
   if (!fileName) return;
 
   const { delay = 250, force = false } = options;
@@ -73,9 +67,7 @@ export const refreshDecorations = (
 };
 
 const getEditors = (fileName: string) => {
-  return window.visibleTextEditors.filter(
-    (editor) => editor.document.fileName === fileName
-  );
+  return window.visibleTextEditors.filter((editor) => editor.document.fileName === fileName);
 };
 
 export const clearDecorations = () => {

src/extension.ts

@@ -13,12 +13,7 @@ import { message } from "five-server/lib/msg";
 import { PTY } from "./pty";
 import { join, extname, basename } from "path";
 import { decorate, refreshDecorations } from "./decorator";
-import {
-  assignVSCodeConfiguration,
-  colors,
-  getConfig,
-  namespace,
-} from "./helpers";
+import { assignVSCodeConfiguration, colors, getConfig, namespace } from "./helpers";
 
 let openURL = "";
 let pty: PTY;
@@ -187,7 +182,7 @@ export function activate(context: vscode.ExtensionContext) {
       fileName,
       page.current.text,
       shouldHighlight(fileName),
-      vscode.window.activeTextEditor?.selection.active
+      vscode.window.activeTextEditor?.selection.active,
     );
   };
 
@@ -284,20 +279,15 @@ export function activate(context: vscode.ExtensionContext) {
       rootAbsolute = join(workspace, root);
 
       if (debug) {
-        pty.write(
-          "DEBUG:",
-          '"workspace", "root" and "open" will be passed to fiveServer.start()'
-        );
+        pty.write("DEBUG:", '"workspace", "root" and "open" will be passed to fiveServer.start()');
         pty.write("Workspace:", workspace);
         pty.write("Root:", root);
         pty.write("Absolute (workspace + root):", rootAbsolute);
         pty.write("File:", uri?.fsPath);
       }
 
       if (uri?.fsPath) {
-        let file = uri.fsPath
-          .replace(rootAbsolute, "")
-          .replace(/^\\|^\//gm, "");
+        let file = uri.fsPath.replace(rootAbsolute, "").replace(/^\\|^\//gm, "");
 
         const isFile = extname(file) !== "";
 
@@ -323,8 +313,7 @@ export function activate(context: vscode.ExtensionContext) {
 
         // get current open file
         const fileName = vscode.window.activeTextEditor?.document.fileName;
-        if (fileName)
-          file = fileName.replace(rootAbsolute, "").replace(/^\\|^\//gm, "");
+        if (fileName) file = fileName.replace(rootAbsolute, "").replace(/^\\|^\//gm, "");
 
         if (debug) pty.write("Open:", file);
 
@@ -342,10 +331,9 @@ export function activate(context: vscode.ExtensionContext) {
     else if (!workspace) {
       // no workspace?
       // the user opened probably only a single file instead of a folder
-      message.pretty(
-        'No Workspace found! You probably opened a "single file" instead of a "folder".',
-        { id: "vscode" }
-      );
+      message.pretty('No Workspace found! You probably opened a "single file" instead of a "folder".', {
+        id: "vscode",
+      });
 
       // we get the path and filename from the window
       const fileName = vscode.window.activeTextEditor?.document.fileName;
@@ -396,7 +384,7 @@ export function activate(context: vscode.ExtensionContext) {
             htmlErrors.map((e: any) => {
               return { text: `// ${e.message}`, line: e.line };
             }),
-            colors.yellow
+            colors.yellow,
           );
         }
       });
@@ -441,27 +429,14 @@ export function activate(context: vscode.ExtensionContext) {
     else if (_state === "off") vscode.commands.executeCommand(startCommand);
   };
 
-  context.subscriptions.push(
-    vscode.commands.registerCommand(startCommand, startServer)
-  );
-  context.subscriptions.push(
-    vscode.commands.registerCommand(openCommand, startServer)
-  );
-  context.subscriptions.push(
-    vscode.commands.registerCommand(openRootCommand, startServer)
-  );
-  context.subscriptions.push(
-    vscode.commands.registerCommand(closeCommand, closeServer)
-  );
-  context.subscriptions.push(
-    vscode.commands.registerCommand(statusBarItemCommand, toggleServer)
-  );
+  context.subscriptions.push(vscode.commands.registerCommand(startCommand, startServer));
+  context.subscriptions.push(vscode.commands.registerCommand(openCommand, startServer));
+  context.subscriptions.push(vscode.commands.registerCommand(openRootCommand, startServer));
+  context.subscriptions.push(vscode.commands.registerCommand(closeCommand, closeServer));
+  context.subscriptions.push(vscode.commands.registerCommand(statusBarItemCommand, toggleServer));
 
   // create a new status bar item that we can now manage
-  myStatusBarItem = vscode.window.createStatusBarItem(
-    vscode.StatusBarAlignment.Right,
-    0
-  );
+  myStatusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 0);
   myStatusBarItem.command = statusBarItemCommand;
   updateStatusBarItem("off");
   context.subscriptions.push(myStatusBarItem);

src/pty.ts

@@ -25,8 +25,7 @@ export class PTY {
       close: () => {
         this.writeEmitter.dispose();
       },
-      handleInput: (data) =>
-        this.writeEmitter.fire(data === "\r" ? "\r\n" : data + "\r\n"),
+      handleInput: (data) => this.writeEmitter.fire(data === "\r" ? "\r\n" : data + "\r\n"),
     };
 
     this.terminal = vscode.window.createTerminal({ name: "Five Server", pty });

src/test/runTest.ts

@@ -1,32 +1,21 @@
 import * as path from "path";
 import * as cp from "child_process";
 
-import {
-  downloadAndUnzipVSCode,
-  resolveCliArgsFromVSCodeExecutablePath,
-  runTests,
-} from "@vscode/test-electron";
+import { downloadAndUnzipVSCode, resolveCliArgsFromVSCodeExecutablePath, runTests } from "@vscode/test-electron";
 import { readFile } from "fs/promises";
 
 async function main() {
   try {
     const extensionDevelopmentPath = path.resolve(__dirname, "../../");
     const extensionTestsPath = path.resolve(__dirname, "./suite/index");
-    const testWorkspace = path.resolve(
-      __dirname,
-      "../../test-fixtures/workspace"
-    );
+    const testWorkspace = path.resolve(__dirname, "../../test-fixtures/workspace");
     console.log(path.resolve(__dirname, "../../package.json"));
-    const pkg = await readFile(
-      path.resolve(__dirname, "../../package.json"),
-      "utf-8"
-    );
+    const pkg = await readFile(path.resolve(__dirname, "../../package.json"), "utf-8");
     const version = JSON.parse(pkg).version;
 
     // Test the vsix package
     const vscodeExecutablePath = await downloadAndUnzipVSCode(undefined);
-    const [cliPath, ...args] =
-      resolveCliArgsFromVSCodeExecutablePath(vscodeExecutablePath);
+    const [cliPath, ...args] = resolveCliArgsFromVSCodeExecutablePath(vscodeExecutablePath);
 
     // Use cp.spawn / cp.exec for custom setup
     cp.spawnSync(cliPath, [...args, "--list-extensions"], {
@@ -35,27 +24,19 @@ async function main() {
     });
 
     // Use cp.spawn / cp.exec for custom setup
-    cp.spawnSync(
-      cliPath,
-      [...args, "--uninstall-extension", "yandeu.five-server"],
-      {
-        encoding: "utf-8",
-        stdio: "inherit",
-      }
-    );
+    cp.spawnSync(cliPath, [...args, "--uninstall-extension", "yandeu.five-server"], {
+      encoding: "utf-8",
+      stdio: "inherit",
+    });
 
     // Use cp.spawn / cp.exec for custom setup
     cp.spawnSync(
       cliPath,
-      [
-        ...args,
-        "--install-extension",
-        path.resolve(__dirname, `../../five-server-${version}.vsix`),
-      ],
+      [...args, "--install-extension", path.resolve(__dirname, `../../five-server-${version}.vsix`)],
       {
         encoding: "utf-8",
         stdio: "inherit",
-      }
+      },
     );
 
     // Run the extension test

src/test/suite/extension.test.ts

@@ -15,9 +15,7 @@ const pause = (ms: number): Promise<void> => {
 
 suite("Extension Test Suite", () => {
   test("init testing", async () => {
-    vscode.window.showInformationMessage(
-      "Start all tests. Wait for onStartupFinished event."
-    );
+    vscode.window.showInformationMessage("Start all tests. Wait for onStartupFinished event.");
     return pause(5000);
   });