Merge pull request quadratichq#2829 from quadratichq/qa

Author: warpbuild-benchmark-bot[bot]

.env.docker

@@ -109,7 +109,8 @@ AWS_S3_ACCESS_KEY_ID=AWS_S3_ACCESS_KEY_ID
 AWS_S3_SECRET_ACCESS_KEY=AWS_S3_SECRET_ACCESS_KEY
 
 # gcp
-GCP_REGION=us-east5
+GCP_REGION=us-central1
+GCP_REGION_ANTHROPIC=us-east5
 GCP_PROJECT_ID=GCP_PROJECT_ID
 GCP_CLIENT_EMAIL=GCP_CLIENT_EMAIL
 GCP_PRIVATE_KEY=GCP_PRIVATE_KEY
@@ -127,4 +128,4 @@ ECR_OR_BUILD=build
 CLIENT_DEV=false
 
 ECR_URL=public.ecr.aws/z7e3d4w1
-IMAGE_TAG=latest
+IMAGE_TAG=latest

.vscode/settings.json

@@ -191,6 +191,10 @@
   "jest.rootPath": "quadratic-client",
   "typescript.preferences.importModuleSpecifier": "non-relative",
   "typescript.preferences.preferTypeOnlyAutoImports": true,
+  "typescript.preferences.autoImportFileExcludePatterns": [
+    "**/node_modules/@mui/**",
+    "**/node_modules/@radix-ui/**"
+  ],
   "editor.defaultFormatter": null,
   "[rust]": {
     "editor.defaultFormatter": "rust-lang.rust-analyzer",

VERSION

@@ -1 +1 @@
-0.7.1
+0.8.0

dev/cli.js

@@ -12,9 +12,10 @@ export class CLI {
             .option("-m, --multiplayer", "Watch the quadratic-multiplayer directory")
             .option("-f, --files", "Watch the quadratic-files directory")
             .option("-n, --connection", "Watch the quadratic-connection directory")
+            .option("-s, --shared", "Watch the quadratic-shared directory")
             .option("-y, --python", "Watch the quadratic-kernels/python-wasm directory")
             .option("-l, --all", "Watch all directories")
-            .option("-s, --skipTypes", "Skip WASM types compilation")
+            .option("-t, --skipTypes", "Skip WASM types compilation")
             .option("-p, --perf", "Run quadratic-core in perf mode (slower to link but faster runtime)")
             .option("-R, --hideReact", "Hide React output")
             .option("-A, --hideAPI", "Hide React output")
@@ -25,6 +26,7 @@ export class CLI {
             .option("-N, --hideConnection", "Hide Connection output")
             .option("-Y, --hidePython", "Hide Python output")
             .option("-E, --hideRustClient", "Hide RustClient")
+            .option("-S, --hideShared", "Hide Shared output")
             .option("-L, --servicesLocal", "Set Redis & Postgres as running locally")
             .option("-D, --dockerDev", "Run dev in docker")
             .option("-d, --dark", "Use dark theme")
@@ -39,6 +41,7 @@ export class CLI {
             this.options.files = true;
             this.options.connection = true;
             this.options.python = true;
+            this.options.shared = true;
         }
     }
 }

dev/cli.ts

@@ -9,6 +9,7 @@ export class CLI {
     files: boolean;
     connection: boolean;
     python: boolean;
+    shared: boolean;
     skipTypes: boolean;
     all: boolean;
     perf: boolean;
@@ -20,6 +21,7 @@ export class CLI {
     hideFiles: boolean;
     hideConnection: boolean;
     hidePython: boolean;
+    hideShared: boolean;
     servicesLocal: boolean;
     dockerDev: boolean;
     dark: boolean;
@@ -30,23 +32,24 @@ export class CLI {
     program
       .name("node dev")
       .description(
-        "Runs the Quadratic dev server. By default, only React runs in watch mode."
+        "Runs the Quadratic dev server. By default, only React runs in watch mode.",
       )
       .option("-a, --api", "Watch the quadratic-api directory")
       .option("-r, --react", "Do NOT watch quadratic-client (React)")
       .option("-c, --core", "Watch the quadratic-core directory")
       .option("-m, --multiplayer", "Watch the quadratic-multiplayer directory")
       .option("-f, --files", "Watch the quadratic-files directory")
       .option("-n, --connection", "Watch the quadratic-connection directory")
+      .option("-s, --shared", "Watch the quadratic-shared directory")
       .option(
         "-y, --python",
-        "Watch the quadratic-kernels/python-wasm directory"
+        "Watch the quadratic-kernels/python-wasm directory",
       )
       .option("-l, --all", "Watch all directories")
-      .option("-s, --skipTypes", "Skip WASM types compilation")
+      .option("-t, --skipTypes", "Skip WASM types compilation")
       .option(
         "-p, --perf",
-        "Run quadratic-core in perf mode (slower to link but faster runtime)"
+        "Run quadratic-core in perf mode (slower to link but faster runtime)",
       )
       .option("-R, --hideReact", "Hide React output")
       .option("-A, --hideAPI", "Hide React output")
@@ -57,6 +60,7 @@ export class CLI {
       .option("-N, --hideConnection", "Hide Connection output")
       .option("-Y, --hidePython", "Hide Python output")
       .option("-E, --hideRustClient", "Hide RustClient")
+      .option("-S, --hideShared", "Hide Shared output")
       .option("-L, --servicesLocal", "Set Redis & Postgres as running locally")
       .option("-D, --dockerDev", "Run dev in docker")
       .option("-d, --dark", "Use dark theme")
@@ -72,6 +76,7 @@ export class CLI {
       this.options.files = true;
       this.options.connection = true;
       this.options.python = true;
+      this.options.shared = true;
     }
   }
 }

dev/constants.js

@@ -53,6 +53,12 @@ export const COMPONENTS = {
         dark: "gray",
         name: "Redis",
     },
+    shared: {
+        color: "gray",
+        dark: 'gray',
+        shortcut: 's',
+        name: 'Shared',
+    }
 };
 export const SPACE = "     ";
 export const DONE = "✓";

dev/constants.ts

@@ -53,6 +53,12 @@ export const COMPONENTS = {
     dark: "gray",
     name: "Redis",
   },
+  shared: {
+    color: "gray",
+    dark: 'gray',
+    shortcut: 's',
+    name: 'Shared',
+  }
 };
 
 export const SPACE = "     ";

dev/control.js

@@ -16,6 +16,7 @@ export class Control {
     db;
     npm;
     rust;
+    shared;
     signals = {};
     status = {
         client: false,
@@ -30,6 +31,7 @@ export class Control {
         npm: false,
         postgres: false,
         redis: false,
+        shared: false,
     };
     constructor(cli) {
         this.cli = cli;
@@ -48,6 +50,7 @@ export class Control {
             this.kill("files"),
             this.kill("connection"),
             this.kill("python"),
+            this.kill("shared"),
         ]);
         process.exit(0);
     }
@@ -153,7 +156,7 @@ export class Control {
         this.status.types = false;
         await this.kill("types");
         if (!this.cli.options.skipTypes || restart) {
-            this.types = spawn("npm run compile --workspace=quadratic-shared && npm run build:wasm:types", { shell: true });
+            this.types = spawn("npm run build:wasm:types", { shell: true });
             this.ui.printOutput("types", (data) => {
                 this.handleResponse("types", data, {
                     success: "Running ",
@@ -287,11 +290,7 @@ export class Control {
         this.signals.multiplayer = new AbortController();
         this.ui.print("multiplayer");
         this.multiplayer = spawn("cargo", this.cli.options.multiplayer
-            ? [
-                "watch",
-                "-x",
-                "run -p quadratic-multiplayer --target-dir=target",
-            ]
+            ? ["watch", "-x", "run -p quadratic-multiplayer --target-dir=target"]
             : ["run", "-p", "quadratic-multiplayer", "--target-dir=target"], {
             signal: this.signals.multiplayer.signal,
             cwd: "quadratic-multiplayer",
@@ -325,11 +324,7 @@ export class Control {
         catch (e) { }
         this.signals.files = new AbortController();
         this.files = spawn("cargo", this.cli.options.files
-            ? [
-                "watch",
-                "-x",
-                "run -p quadratic-files --target-dir=target",
-            ]
+            ? ["watch", "-x", "run -p quadratic-files --target-dir=target"]
             : ["run", "-p", "quadratic-files", "--target-dir=target"], {
             signal: this.signals.files.signal,
             cwd: "quadratic-files",
@@ -363,6 +358,55 @@ export class Control {
             this.status.files = "killed";
         }
     }
+    async runShared(restart) {
+        if (this.quitting)
+            return;
+        if (this.status.shared === "killed")
+            return;
+        this.status.shared = false;
+        this.ui.print("shared");
+        await this.kill("shared");
+        let firstRun = true;
+        this.signals.shared = new AbortController();
+        this.shared = spawn(`npm run ${this.cli.options.shared ? "watch" : "compile"} --workspace=quadratic-shared`, {
+            signal: this.signals.shared.signal,
+            shell: true,
+        });
+        this.ui.printOutput("shared", (data) => {
+            this.handleResponse("shared", data, {
+                success: [" 0 errors.", "successfully"],
+                error: ["error"],
+                start: "Starting",
+            }, () => {
+                if (firstRun && !restart) {
+                    firstRun = false;
+                    if (this.status.db !== "killed" && !this.db) {
+                        this.runDb();
+                    }
+                }
+            });
+        });
+    }
+    async restartShared() {
+        this.cli.options.shared = !this.cli.options.shared;
+        if (this.shared) {
+            this.runShared(true);
+        }
+    }
+    async killShared() {
+        if (this.status.shared === "killed") {
+            this.status.shared = false;
+            this.ui.print("shared", "restarting...");
+            this.runShared();
+        }
+        else {
+            if (this.shared) {
+                await this.kill("shared");
+                this.ui.print("shared", "killed", "red");
+            }
+            this.status.shared = "killed";
+        }
+    }
     async runConnection() {
         if (this.quitting)
             return;
@@ -379,11 +423,7 @@ export class Control {
         catch (e) { }
         this.signals.connection = new AbortController();
         this.connection = spawn("cargo", this.cli.options.connection
-            ? [
-                "watch",
-                "-x",
-                "run -p quadratic-connection --target-dir=target",
-            ]
+            ? ["watch", "-x", "run -p quadratic-connection --target-dir=target"]
             : ["run", "-p", "quadratic-connection", "--target-dir=target"], {
             signal: this.signals.connection.signal,
             cwd: "quadratic-connection",
@@ -543,7 +583,7 @@ export class Control {
         this.ui = ui;
         this.checkServices();
         this.runRust();
-        this.runDb();
         this.runPython();
+        this.runShared();
     }
 }