Merge branch 'development'

Author: alexjpwalker

.circleci/config.yml

@@ -100,6 +100,8 @@ commands:
     parameters:
       target-arch:
         type: string
+      target-triple:
+        type: string
     steps:
       - run: |
           export DEPLOY_ARTIFACT_USERNAME=$REPO_TYPEDB_USERNAME
@@ -110,13 +112,18 @@ commands:
           corepack enable
           corepack prepare [email protected] --activate
           pnpm build
-          npx tauri build
-          bazel run //:deploy-mac-<<parameters.target-arch>>-dmg -- snapshot
+          rustup target add <<parameters.target-triple>> 
+          npx tauri build --target <<parameters.target-triple>>
+          # --define version doesn't seem to work, so we just write it into the VERSION file.
+          git rev-parse HEAD > VERSION
+          bazel run --define version=$(git rev-parse HEAD) //:deploy-mac-<<parameters.target-arch>>-dmg -- snapshot
 
   deploy-mac-release:
     parameters:
       target-arch:
         type: string
+      target-triple:
+        type: string
     steps:
       - run: |
           export DEPLOY_ARTIFACT_USERNAME=$REPO_TYPEDB_USERNAME
@@ -127,7 +134,8 @@ commands:
           corepack enable
           corepack prepare [email protected] --activate
           pnpm build
-          npx tauri build
+          rustup target add <<parameters.target-triple>>
+          npx tauri build --target <<parameters.target-triple>>
           bazel run //:deploy-mac-<<parameters.target-arch>>-dmg -- release
 
   deploy-linux-snapshot:
@@ -155,7 +163,9 @@ commands:
           sudo ln -sf /usr/bin/python3.8 /usr/bin/python3
           export PATH="/usr/bin:$PATH"
           npx tauri build
-          bazel run //:deploy-linux-<<parameters.target-arch>>-deb --compilation_mode=opt -- snapshot
+          # --define version doesn't seem to work, so we just write it into the VERSION file.
+          git rev-parse HEAD > VERSION
+          bazel run --define version=$(git rev-parse HEAD) //:deploy-linux-<<parameters.target-arch>>-deb --compilation_mode=opt -- snapshot
 
   deploy-linux-release:
     parameters:
@@ -250,6 +260,7 @@ jobs:
       - install-rust
       - deploy-mac-snapshot:
           target-arch: arm64
+          target-triple: aarch64-apple-darwin
 
   deploy-mac-x86_64-snapshot:
     executor: mac-arm64
@@ -264,6 +275,7 @@ jobs:
       - install-rust
       - deploy-mac-snapshot:
           target-arch: x86_64
+          target-triple: x86_64-apple-darwin
 
   deploy-linux-arm64-snapshot:
     executor: linux-arm64
@@ -331,6 +343,7 @@ jobs:
       - install-rust
       - deploy-mac-release:
           target-arch: arm64
+          target-triple: aarch64-apple-darwin
 
   deploy-mac-x86_64-release:
     executor: mac-arm64
@@ -345,6 +358,7 @@ jobs:
       - install-rust
       - deploy-mac-release:
           target-arch: x86_64
+          target-triple: x86_64-apple-darwin
 
   deploy-linux-arm64-release:
     executor: linux-arm64

.circleci/windows/deploy_snapshot.bat

@@ -10,6 +10,9 @@ ECHO Building Windows installer...
 
 SET DEPLOY_ARTIFACT_USERNAME=%REPO_TYPEDB_USERNAME%
 SET DEPLOY_ARTIFACT_PASSWORD=%REPO_TYPEDB_PASSWORD%
-
-bazel --output_user_root=C:/b run //:deploy-windows-x86_64-msi --compilation_mode=opt -- snapshot
+git rev-parse HEAD > version_snapshot.txt
+set /p VER=<version_snapshot.txt
+# --define version doesn't seem to work, so we just write it into the VERSION file.
+git rev-parse HEAD > VERSION
+bazel --output_user_root=C:/b run --define version=%VER% //:deploy-windows-x86_64-msi --compilation_mode=opt -- snapshot
 IF %errorlevel% NEQ 0 EXIT /b %errorlevel%

BUILD

@@ -19,27 +19,27 @@ exports_files(["VERSION"])
 
 genrule(
     name = "native-artifact-mac-x86_64-dmg",
-    outs = ["typedb-studio_3.4.0-rc1_amd64.dmg"],
+    outs = ["typedb-studio-amd64.dmg"],
     cmd = """
-        cp src-tauri/target/release/bundle/dmg/*.dmg "$(OUTS)"
+        cp src-tauri/target/x86_64-apple-darwin/release/bundle/dmg/*.dmg "$(OUTS)"
     """,
     tags = ["local"],
     target_compatible_with = constraint_mac_x86_64,
 )
 
 genrule(
     name = "native-artifact-mac-arm64-dmg",
-    outs = ["typedb-studio_3.4.0-rc1_aarch64.dmg"],
+    outs = ["typedb-studio-aarch64.dmg"],
     cmd = """
-        cp src-tauri/target/release/bundle/dmg/*.dmg "$(OUTS)"
+        cp src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/*.dmg "$(OUTS)"
     """,
     tags = ["local"],
     target_compatible_with = constraint_mac_arm64,
 )
 
 genrule(
     name = "native-artifact-linux-arm64-deb",
-    outs = ["typedb-studio_3.4.0-rc1_arm64.deb"],
+    outs = ["typedb-studio-arm64.deb"],
     cmd = """
         cp src-tauri/target/release/bundle/deb/*.deb "$(OUTS)"
     """,
@@ -49,7 +49,7 @@ genrule(
 
 genrule(
     name = "native-artifact-linux-x86_64-deb",
-    outs = ["typedb-studio_3.4.0-rc1_amd64.deb"],
+    outs = ["typedb-studio-amd64.deb"],
     cmd = """
         cp src-tauri/target/release/bundle/deb/*.deb "$(OUTS)"
     """,
@@ -59,7 +59,7 @@ genrule(
 
 genrule(
     name = "native-artifact-windows-x86_64-msi",
-    outs = ["typedb-studio_3.4.0-rc1_amd64.msi"],
+    outs = ["typedb-studio-amd64.msi"],
     cmd = """
         cp src-tauri/target/release/bundle/msi/*.msi "$(OUTS)"
     """,

README.md

@@ -12,7 +12,7 @@ all within a unified environment.
 
 - [Install TypeDB Studio Desktop](https://typedb.com/docs/home/install-tools#_studio)
 - [Open studio.typedb.com](https://studio.typedb.com)
-- [Read docs](https://typedb.com/docs/manual/tools/studio)
+- [Read docs](https://typedb.com/docs/tools/studio)
 
 ## Quickstart
 

VERSION

@@ -1 +1 @@
-3.5.9
+3.6.0

angular.json

@@ -59,6 +59,17 @@
               "outputHashing": "all"
             },
             "development": {
+              "optimization": false,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.dev.ts"
+                }
+              ]
+            },
+            "local": {
               "optimization": false,
               "extractLicenses": false,
               "sourceMap": true
@@ -77,9 +88,12 @@
             },
             "development": {
               "buildTarget": "typedb-studio:build:development"
+            },
+            "local": {
+              "buildTarget": "typedb-studio:build:local"
             }
           },
-          "defaultConfiguration": "development"
+          "defaultConfiguration": "local"
         }
       }
     }

netlify.toml

@@ -1,7 +1,15 @@
 [build]
-command = "pnpm run build"
 publish = "dist/typedb-studio/browser"
 
+[context.development]
+command = "pnpm run build:dev"
+
+[context.production]
+command = "pnpm run build:prod"
+
+[context.deploy-preview]
+command = "pnpm run build:dev"
+
 [build.environment]
 DISCORD_WEBHOOK_URL = "https://discord.com/api/webhooks/1317118973443309649/CqydmmRN9Ao1G49fg6QWroNujeoLJm7Qx__bO6gn1yHX9jKHWbQwyV3GMdD9GxzW9FnX"
 

package.json

@@ -1,11 +1,13 @@
 {
   "name": "typedb-studio",
-  "version": "3.5.9",
+  "version": "3.6.0",
   "scripts": {
     "ng": "ng",
     "generate-grammar": "lezer-generator --typeScript src/framework/codemirror-lang-typeql/typeql.grammar -o src/framework/codemirror-lang-typeql/generated/typeql.grammar.generated",
     "start": "ng serve",
     "build": "ng build",
+    "build:dev": "ng build -c development",
+    "build:prod": "ng build -c production",
     "watch": "ng build --watch --configuration development",
     "tauri": "tauri"
   },
@@ -38,7 +40,8 @@
     "graphology-layout-force": "0.2.4",
     "graphology-layout-forceatlas2": "0.10.1",
     "graphology-layout-noverlap": "0.4.2",
-    "posthog-js": "1.187.2",
+    "ngx-markdown": "20.1.0",
+    "posthog-js": "1.268.8",
     "prismjs": "1.29.0",
     "rxjs": "~7.8.0",
     "sigma": "3.0.1",