Merge branch 'main' into mcq-ui

Author: shirsho-12

.github/workflows/check.yml

@@ -14,7 +14,7 @@ jobs:
           node-version: 20
           cache: yarn
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
       - name: Lint
         # TODO: Add proper linting command
         run: yarn format
@@ -31,6 +31,6 @@ jobs:
           node-version: 20
           cache: yarn
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
       - name: Test
         run: yarn test

.github/workflows/publish.yml

@@ -41,7 +41,7 @@ jobs:
           node-version: 20
           cache: yarn
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
 
       - name: Package
         run: yarn run package

.gitignore

@@ -1,16 +1,27 @@
 # Flakes
 .direnv/
 
-# Node dependencies
-node_modules/
+# Yarn Berry
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+# Intermediate files
+syntaxes/source.tmLanguage.json
 
 # Build artifacts
 out/
 *.vsix
-syntaxes/source.tmLanguage.json
 
 # Logs
 yarn-error.log
 
 # Misc
 .DS_Store
+
+# No longer needed
+node_modules/

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

flake.lock

@@ -1,35 +1,25 @@
 {
-  description = "Template for a direnv shell, with NodeJS";
+  description = "nix-direnv shell for developing Source Academy's VS Code extension";
 
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/23.11";
-  };
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
 
-  outputs = { self, nixpkgs }:
-  let
-    system = "x86_64-linux";
-    pkgs = import nixpkgs { inherit system; config.allowUnfree = true; };
-  in
-  {
-    devShells.${system}.default = pkgs.mkShell {
-      packages = with pkgs; [
-        nodejs_20
-        (yarn.override {
-          nodejs = nodejs_20;
-        })
-
-        # The following is only needed by js-slang, to remove in the future
-        # Additional libs needed by yarn when installing
-        pkg-config
-        xorg.libX11
-        xorg.libXi
-        libGL
-
-        python310
-        xorg.libXext
-
-        gcc11
-      ];
-    };
-  };
+  outputs = {
+    nixpkgs,
+    flake-utils,
+    ...
+  }:
+    flake-utils.lib.eachDefaultSystem (
+      system: let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in {
+        devShells.default = pkgs.mkShell {
+          packages = with pkgs; [
+            # For dev ease of use, follow NodeJS version in source-academy/frontend
+            nodejs_20
+            (yarn-berry.override {nodejs = nodejs_20;})
+          ];
+        };
+      }
+    );
 }

flake.nix

@@ -85,7 +85,7 @@
     "download-lsp": "node scripts/lsp.js",
     "format": "yarn prettier . --write",
     "vscode:prepublish": "yarn run download-lsp && yarn run build",
-    "package": "vsce package",
+    "package": "vsce package --no-dependencies",
     "test:syntax": "yarn run build:syntax && vscode-tmgrammar-test ./tests/syntaxes/*",
     "test": "yarn test:syntax"
   },

package.json

@@ -85,10 +85,7 @@ export class MessageHandler {
 
           break;
         }
-        case MessageTypeNames.MCQAnswer:
-          console.log(`Received MCQ answer: ${message.choice}`);
-          sendToFrontend(this.panel, message);
-          break;
+
         case MessageTypeNames.NewEditor:
           this.activeEditor = await Editor.create(
             message.workspaceLocation,

src/utils/messageHandler.tsx

@@ -1,5 +1,6 @@
 import React, { useState } from "react";
 import Messages, { sendToWebview } from "../../utils/messages";
+import { sendToFrontendWrapped } from "../../commands/showPanel";
 
 export interface McqData {
   assessmentName: string;
@@ -31,7 +32,7 @@ const McqPanel: React.FC<McqPanelProps> = ({ data, onAnswer }) => {
                 checked={selected === idx}
                 onChange={() => {
                   setSelected(idx);
-                  onAnswer(idx);
+                  const wsLoc = data.workspaceLocation ?? "assessment";
                 }}
                 style={{ marginRight: "0.5rem" }}
               />