teacher tool: misc tidy stuff

.vscode/launch.json

@@ -1,6 +1,48 @@
 {
 	"version": "0.2.0",
 	"configurations": [
+		{
+			"name": "pxt ci (pxt-core)",
+			"type": "node",
+			"request": "launch",
+			"program": "${workspaceRoot}/built/pxt.js",
+			"stopOnEntry": false,
+			"args": [
+				"ci",
+			],
+			"cwd": "${workspaceRoot}",
+			"runtimeExecutable": null,
+			"runtimeArgs": [
+				"--nolazy"
+			],
+			"env": {
+				"NODE_ENV": "development"
+			},
+			"console": "integratedTerminal",
+			"sourceMaps": false,
+			"outFiles": []
+		},
+		{
+			"name": "pxt ci (microbit)",
+			"type": "node",
+			"request": "launch",
+			"program": "${workspaceRoot}/built/pxt.js",
+			"stopOnEntry": false,
+			"args": [
+				"ci",
+			],
+			"cwd": "${workspaceRoot}/../pxt-microbit",
+			"runtimeExecutable": null,
+			"runtimeArgs": [
+				"--nolazy"
+			],
+			"env": {
+				"NODE_ENV": "development"
+			},
+			"console": "integratedTerminal",
+			"sourceMaps": false,
+			"outFiles": []
+		},
 		{
 			"name": "pxt serve (microbit)",
 			"type": "node",

cli/cli.ts

@@ -2047,7 +2047,6 @@ async function buildSemanticUIAsync(parsed?: commandParser.ParsedCommand) {
         generateReactCommonCss("skillmap"),
         generateReactCommonCss("authcode"),
         generateReactCommonCss("multiplayer"),
-        generateReactCommonCss("teachertool")
     ]);
 
     // Run postcss with autoprefixer and rtlcss
@@ -2076,8 +2075,7 @@ async function buildSemanticUIAsync(parsed?: commandParser.ParsedCommand) {
         "blockly.css",
         "react-common-skillmap.css",
         "react-common-authcode.css",
-        "react-common-multiplayer.css",
-        "react-common-teachertool.css"
+        "react-common-multiplayer.css"
     ];
 
     for (const cssFile of files) {

cli/server.ts

@@ -1037,21 +1037,40 @@
         };
 
         const serveWebappFile = (webappName: string, webappPath: string) => {
-            const webappUri = url.parse(`http://localhost:3000/${webappPath}${uri.search || ""}`);
-            http.get(webappUri, r => {
+            const webappUri = url.parse(`http://127.0.0.1:3000/${webappPath}${uri.search || ""}`);
+            const request = http.get(webappUri, r => {
                 let body = "";
                 r.on("data", (chunk) => {
                     body += chunk;
                 });
                 r.on("end", () => {
+                    if (body.includes("<title>Error</title>")) { // CRA development server returns this for missing files
+                        res.writeHead(404, {
+                            'Content-Type': 'text/html; charset=utf8',
+                        });
+                        res.write(body);
+                        return res.end();
+                    }
                     if (!webappPath || webappPath === "index.html") {
                         body = expandWebappHtml(webappName, body);
                     }
-                    res.writeHead(200);
+                    if (webappPath) {
+                        res.writeHead(200, {
+                            'Content-Type': U.getMime(webappPath),
+                        });
+                    } else {
+                        res.writeHead(200, {
+                            'Content-Type': 'text/html; charset=utf8',
+                        });
+                    }
                     res.write(body);
                     res.end();
                 });
             });
+            request.on("error", (e) => {
+                console.error(`Error fetching ${webappUri.href} .. ${e.message}`);
+                error(500, e.message);
+            });
         };
 
         const webappIdx = webappNames.findIndex(s => new RegExp(`^-{0,3}${s}$`).test(elts[0] || ''));

teachertool/.gitignore

@@ -1,4 +1,3 @@
 .vscode
 build
 !package-lock.json
-src/Fonts.css

teachertool/package.json

@@ -31,6 +31,7 @@
     ]
   },
   "devDependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@types/react": "file:../node_modules/@types/react",
     "@types/react-dom": "file:../node_modules/@types/react-dom",
     "html-webpack-plugin": "^5.5.0",

teachertool/public/index.html

@@ -7,17 +7,16 @@
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
-      content="MakeCode Teacher Tool. Automatically analyze and evaluate projects."
+      content="MakeCode Project Insights. Designed to help teachers evaluate student projects using a rubric."
     />
     <link rel="stylesheet" data-rtl="/blb/rtlsemantic.css" href="/blb/semantic.css" type="text/css">
     <link rel="stylesheet" href="/blb/icons.css" type="text/css">
-    <link rel="stylesheet" href="/blb/react-common-teachertool.css" type="text/css">
     <!-- <link rel="apple-touch-icon" href="/teachertool-data/logo192.png" /> -->
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-    <link rel="manifest" href="/teachertool-data/manifest.json" />
+    <!-- <link rel="manifest" href="/teachertool-data/manifest.json" /> -->
     <title>MakeCode Teacher Tool</title>
     <script>
       // This line gets patched up by the cloud

teachertool/src/index.tsx

@@ -1,12 +1,10 @@
 // TODO: pxtcompiler type is only needed for a few compiler service types,
 // we should get rid of this somehow.
-/// <reference path="../../built/pxtcompiler.d.ts" />
 /// <reference path="../../built/pxtsim.d.ts" />
 /// <reference path="../../built/pxtlib.d.ts" />
 
 import React from "react";
 import ReactDOM from "react-dom";
-// eslint-disable-next-line import/no-unassigned-import
 import "./global.scss";
 import { App } from "./App";
 import { AppStateProvider } from "./state/appStateContext";
@@ -47,9 +45,6 @@ window.addEventListener("DOMContentLoaded", () => {
 
     enableAnalytics();
 
-    // prefetch worker on load
-    pxt.worker.getWorker(pxt.webConfig.workerjs);
-
     ReactDOM.render(
         <React.StrictMode>
             <AppStateProvider>