Merge remote-tracking branch 'origin/main' into feat/signed-transactions-merge

Author: Gozala

.github/workflows/jumble.yml

@@ -2,7 +2,7 @@ name: Jumble CI
 
 on:
   push:
-    branches: [main]
+    branches: [main, denoify]
   pull_request:
     branches: [main]
 
@@ -13,25 +13,23 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-        with:
-          version: 10.0.0
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "20.11.0"
-          cache: "pnpm"
-          cache-dependency-path: "./typescript/packages/pnpm-lock.yaml"
 
-      - name: Install Dependencies
-        working-directory: ./typescript/packages
-        run: pnpm install --frozen-lockfile
+      - name: Setup Deno
+        uses: denoland/setup-deno@v2
+        with:
+          deno-version: "2.2.2"
 
       - name: Build
         working-directory: ./typescript/packages/jumble
-        run: pnpm run build
+        run: deno task build
         env:
           VITE_STORAGE_TYPE: "remote"
           TOOLSHED_API_URL: ${{ secrets.TOOLSHED_API_URL }}
+          VITE_TOOLSHED_API_URL: ${{ secrets.TOOLSHED_API_URL }}
+
+      - name: Tarballify dist
+        working-directory: ./typescript/packages/jumble
+        run: tar -czvf dist.tar.gz dist
 
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/toolshed.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Setup Deno
         uses: denoland/setup-deno@v2
         with:
-          deno-version: "2.1.9"
+          deno-version: "2.2.2"
 
       - name: Cache dependencies
         uses: actions/cache@v3

.github/workflows/ui-tests.yml

@@ -1,11 +1,13 @@
 name: UI Tests
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
+
+# DISABLED until browser tests working again
+#on:
+#  push:
+#    branches:
+#      - main
+#  pull_request:
+#    branches:
+#      - main
 
 jobs:
   test:
@@ -14,30 +16,29 @@ jobs:
       matrix:
         node-version: [22]
     steps:
-    - name: Install test dependencies
-      run: |
-        sudo apt update
-        sudo apt-get install -y xvfb x11-xserver-utils
-    - uses: actions/checkout@v4
-    - name: Install pnpm
-      uses: pnpm/action-setup@v4
-      with:
-        version: 10
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache-dependency-path: typescript/packages/pnpm-lock.yaml
-    - name: Install dependencies
-      run: |
-        cd typescript/packages
-        pnpm install
-    - name: UI Tests
-      run: |
-        cd typescript/packages/common-iframe-sandbox
-        pnpm test
-        cd -
-        cd typescript/packages/common-identity
-        pnpm test
-        cd -
-
+      - name: Install test dependencies
+        run: |
+          sudo apt update
+          sudo apt-get install -y xvfb x11-xserver-utils
+      - uses: actions/checkout@v4
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache-dependency-path: typescript/packages/pnpm-lock.yaml
+      - name: Install dependencies
+        run: |
+          cd typescript/packages
+          pnpm install
+      - name: UI Tests
+        run: |
+          cd typescript/packages/common-iframe-sandbox
+          pnpm test
+          cd -
+          cd typescript/packages/common-identity
+          pnpm test
+          cd -

.github/workflows/unit-tests.yml

@@ -0,0 +1,33 @@
+name: Unit Tests
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    defaults:
+      run:
+        working-directory: ./typescript/packages
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Deno
+        uses: denoland/setup-deno@v2
+        with:
+          deno-version: "2.2.2"
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.deno
+            ~/.cache/deno
+          key: ${{ runner.os }}-deno-${{ hashFiles('**/deno.json') }}
+      - name: Run tests
+        working-directory: typescript/packages
+        run: deno task test-all

.vscode/settings.json

@@ -1,6 +1,5 @@
 {
   "editor.formatOnSave": true,
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "deno.enable": true,
-  "deno.enablePaths": ["typescript/packages/common-memory", "typescript/packages/toolshed"]
+  "editor.defaultFormatter": "denoland.vscode-deno",
+  "deno.enable": true
 }

typescript/packages/.prettierignore

@@ -0,0 +1,7 @@
+{
+  "name": "@commontools/builder",
+  "exports": "./src/index.ts",
+  "tasks": {
+    "test": "deno test"
+  }
+}

typescript/packages/common-builder/deno.json

@@ -1,5 +1,5 @@
-import { createNodeFactory, lift } from "./module.js";
-import type { NodeFactory, Opaque, OpaqueRef } from "./types.js";
+import { createNodeFactory, lift } from "./module.ts";
+import type { NodeFactory, Opaque, OpaqueRef } from "./types.ts";
 
 export const llm = createNodeFactory({
   type: "ref",
@@ -65,14 +65,21 @@ export const navigateTo = createNodeFactory({
 // str`Hello, ${name}!`
 //
 // TODO: This should be a built-in module
-export function str(strings: TemplateStringsArray, ...values: any[]): OpaqueRef<string> {
+export function str(
+  strings: TemplateStringsArray,
+  ...values: any[]
+): OpaqueRef<string> {
   const interpolatedString = ({
     strings,
     values,
   }: {
     strings: TemplateStringsArray;
     values: any[];
-  }) => strings.reduce((result, str, i) => result + str + (i < values.length ? values[i] : ""), "");
+  }) =>
+    strings.reduce(
+      (result, str, i) => result + str + (i < values.length ? values[i] : ""),
+      "",
+    );
 
   return lift(interpolatedString)({ strings, values });
 }

typescript/packages/common-builder/package.json

@@ -1,15 +1,30 @@
-export { opaqueRef as cell, stream } from "./opaque-ref.js";
-export { $, event, select, Spell } from "./spell.js";
-export { byRef, compute, createNodeFactory, derive, handler, lift, render } from "./module.js";
+export { opaqueRef as cell, stream } from "./opaque-ref.ts";
+export { $, event, select, Spell } from "./spell.ts";
+export {
+  byRef,
+  compute,
+  createNodeFactory,
+  derive,
+  handler,
+  lift,
+  render,
+} from "./module.ts";
 export {
   getTopFrame,
   popFrame,
   pushFrame,
   pushFrameFromCause,
   recipe,
   recipeFromFrame,
-} from "./recipe.js";
-export { fetchData, ifElse, llm, navigateTo, str, streamData } from "./built-in.js";
+} from "./recipe.ts";
+export {
+  fetchData,
+  ifElse,
+  llm,
+  navigateTo,
+  str,
+  streamData,
+} from "./built-in.ts";
 export {
   type Alias,
   type Frame,
@@ -42,7 +57,12 @@ export {
   unsafe_originalRecipe,
   unsafe_parentRecipe,
   type UnsafeBinding,
-} from "./types.js";
+} from "./types.ts";
 
 // This should be a separate package, but for now it's easier to keep it here.
-export { createJsonSchema, deepEqual, getValueAtPath, setValueAtPath } from "./utils.js";
+export {
+  createJsonSchema,
+  deepEqual,
+  getValueAtPath,
+  setValueAtPath,
+} from "./utils.ts";