Merge pull request #30 from adl-lang/timbod-use-proto

use proto and drop local setup

Author: timbod7

.github/workflows/deno-ci.yml

@@ -13,12 +13,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Setup Deno using local-setup script
-        run: |
-          source deno/local-setup.sh
-          # Make sure .local/bin is added to PATH for subsequent steps
-          echo "$PWD/.local/bin" >> $GITHUB_PATH
-          deno --version
+      - name: Setup tools using proto
+        uses: moonrepo/setup-toolchain@v0
+        with:
+          auto-install: true
 
       - name: Check formatting
         working-directory: ./deno
@@ -30,4 +28,4 @@ jobs:
 
       - name: Check types
         working-directory: ./deno
-        run: deno check local-setup.ts genadl.ts
+        run: deno check genadl.ts

.github/workflows/ts-ci.yml

@@ -13,12 +13,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Setup pnpm using local-setup script
-        run: |
-          source deno/local-setup.sh
-          # Make sure .local/bin is added to PATH for subsequent steps
-          echo "$PWD/.local/bin" >> $GITHUB_PATH
-          deno --version
+      - name: Setup tools using proto
+        uses: moonrepo/setup-toolchain@v0
+        with:
+          auto-install: true
 
       - name: Install deps
         working-directory: ./ts

.prototools

@@ -0,0 +1,7 @@
+node = "20.7.0"
+pnpm = "10.6.5"
+deno = "2.2.5"
+adlc = "1.3.0"
+
+[plugins]
+adlc = "https://raw.githubusercontent.com/adl-lang/proto-toml-plugins/main/adlc/plugin.toml"

.vscode/.zshrc

@@ -5,8 +5,3 @@ fi
 
 # Keep history in the normal location
 export HISTFILE="$HOME/.zsh_history"
-
-# Source the local setup script
-if [ -f "$PWD/deno/local-setup.sh" ]; then
-  . "$PWD/deno/local-setup.sh"
-fi 

.vscode/settings.json

@@ -3,18 +3,5 @@
   "deno.enablePaths": ["deno"],
   "deno.path": "./.local/bin/deno",
   "deno.importMap": "./deno.json",
-  "typescript.preferences.importModuleSpecifier": "non-relative",
-  "terminal.integrated.profiles.osx": {
-    "zsh (local-setup)": {
-      "path": "zsh",
-      "args": ["-i"],
-      "env": {
-        "ZDOTDIR": "${workspaceFolder}/.vscode",
-        "ZSH_COMPDUMP": "${workspaceFolder}/.vscode/.zshcompdump",
-      },
-      "icon": "terminal-bash"
-    }
-  },
-  "terminal.integrated.defaultProfile.osx": "zsh (local-setup)",
-  "terminal.integrated.shellIntegration.enabled": true
+  "typescript.preferences.importModuleSpecifier": "non-relative"
 }

README.md

@@ -93,11 +93,12 @@ current user are shown.
 
 Currently linux and macos are supported.
 
-Install docker and rust/cargo for your platform. Then install deno, node, pnpm, and adl into a repo
-local directory by sourcing the local setup script:
+Install docker and rust/cargo for your platform. Then install the appropriate versions of deno, node, pnpm, and
+adl locally using the [proto](https://moonrepo.dev/proto) tool.
 
-```bash
-. deno/local-setup.sh
+```
+cd <repo root>
+proto install
 ```
 
 Check installed tool versions with:
@@ -173,7 +174,6 @@ cargo run --bin protoapp-tools -- create-user --is-admin sarah@test.com Sarah ab
 ```bash
 (
 cd ts/ui
-# note pnpm is installed by local-setup.sh
 pnpm install
 pnpm run dev
 )
@@ -183,7 +183,6 @@ pnpm run dev
 ```bash
 (
 cd ts/api-workbench
-# note pnpm is installed by local-setup.sh
 pnpm install
 pnpm run dev
 )

deno.json

@@ -6,7 +6,6 @@
       "build-ui-image": "cd ts/ui && docker build --file Dockerfile --tag protoapp-ui:latest .."
     },
     "imports": {
-      "@adllang/local-setup": "jsr:@adllang/local-setup@^0.16.0",
       "@adllang/adl-runtime": "jsr:@adllang/adl-runtime@^0.1.0",
       "@adllang/adlc-tools": "jsr:@adllang/adlc-tools@^0.2.2",
       "@mesqueeb/case-anything": "jsr:@mesqueeb/case-anything@^3.1.0",