Merge pull request #6 from zigtools/0.14.0

Author: techatrix

.github/workflows/deploy.yml

@@ -2,7 +2,7 @@ name: Deploy
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   workflow_dispatch:
 
 permissions:
@@ -15,27 +15,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - run: wget https://zig.pm/zls/downloads/wasm32-wasi/bin/zls.wasm -O src/zls.wasm
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
 
       - run: |
-          mkdir zigarchive
-          cd zigarchive
-          curl $(curl https://ziglang.org/download/index.json | jq .master.src.tarball -r) | xz -d | tar -xvf - --strip-components=1
-          cd ..
-          tar -cz zigarchive/lib/std > src/zig.tar.gz
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
+          npm ci
+          npx parcel build 404.html
 
-      - run: npm ci
-      
-      - run: ./node_modules/.bin/parcel build 404.html
-      
-      - uses: actions/upload-pages-artifact@v1.0.7
+      - uses: actions/upload-pages-artifact@v3
         with:
           path: "dist/"
 
-      - uses: actions/deploy-pages@v1.2.3
+      - uses: actions/deploy-pages@v4

.gitignore

@@ -1,7 +1,5 @@
 node_modules
 dist
 .parcel-cache
-zig.tar.gz
-zls.wasm
-zig_debug.wasm
 .env
+repos

README.md

@@ -1,15 +1,13 @@
-# zls in the browser
+# Zig and ZLS in the browser
 
 Works pretty well in a bunch of browsers, but note the required security headers.
 
 ## Installing
 
-* Compile zls for `wasm32-wasi` and place `zls.wasm` in `src`
-* Additionally, place `zig.tar.gz` (make sure that the name matches) from the website in `src`
-  * If you've downloaded Zig and built from source following `ZIG_WASM.md`, you can also use this command:
-    ```bash
-    tar -C /path/to/zig -cz lib/std >src/zig.tar.gz
-    ```
+You can either:
+
+- Use it online: https://playground.zigtools.org/
+- Run it locally:
 
 ```bash
 npm install
@@ -18,6 +16,24 @@ npm run serve
 
 Enjoy!
 
+### Update artifacts
+
+For the time being, the following artifacts have been commited to source control:
+
+- `src/zls.wasm` - A build of [ZLS](https://github.com/zigtools/zls) (ReleaseSmall, wasm32-wasi, VERSION_TBA)
+- `src/zig.wasm` - A build of [Zig](https://github.com/ziglang/zig) (ReleaseSmall, wasm32-wasi, 0.14.0 with `./zig.patch` applied)
+- `src/zig.tar.gz` - The source code of [Zig](https://github.com/ziglang/zig). Only the `lib/std` subdirectory is needed.
+
+The `./compile.sh` script can be used to create these artifacts:
+
+```bash
+./compile zls
+./compile zig
+./compile zig_tarball
+```
+
+Compiling Zig and ZLS may require different Zig compiler versions.
+
 ## TODOs
 
 - [ ] Stop using `SharedArrayBuffer`s (they're awesome but a nightmare to deploy)

ZIG_WASM.md

@@ -0,0 +1,99 @@
+#!/usr/bin/env bash
+
+# Requirements:
+# - zig
+# - jq
+# - tar
+# - wasm-opt (binaryen)
+
+set -e
+
+ZIG_SOURCE_TAG="0.14.0"
+ZIG_REQUIRED_COMPILER_VERSION="0.14.0"
+
+ZLS_SOURCE_COMMIT="f9b97383206c05626a21b0f24f89630aa91c072b"
+ZLS_REQUIRED_COMPILER_VERSION="0.15.0-dev.355+206bd1ced"
+
+if command -v zig >/dev/null 2>&1; then
+    ZIG_VERSION=$(zig version) 
+    echo "Found Zig $ZIG_VERSION"
+else
+    echo "zig is not installed or not in PATH"
+    exit 1
+fi
+
+if command -v jq >/dev/null 2>&1; then
+    echo "Found jq"
+else
+    echo "jq is not installed or not in PATH"
+    exit 1
+fi
+
+if command -v wasm-opt >/dev/null 2>&1; then
+    HAS_WASM_OPT=1;
+    echo "Found $(wasm-opt --version)"
+else
+    echo "wasm-opt is not installed or not in PATH"
+fi
+
+compile_zls() {
+    if [ "$ZIG_VERSION" != "$ZLS_REQUIRED_COMPILER_VERSION" ]; then
+        echo "ZLS must be compiled with Zig $ZLS_REQUIRED_COMPILER_VERSION but got $ZIG_VERSION"
+        exit 1
+    fi
+
+    if [ ! -d repos/zls ]; then
+        git clone https://github.com/zigtools/zls.git repos/zls
+        git -C repos/zls checkout --detach $ZLS_SOURCE_COMMIT
+    fi
+    ( cd repos/zls && zig build -Dtarget=wasm32-wasi -Doptimize=ReleaseSmall )
+    if [ -n "$HAS_WASM_OPT" ]; then
+        wasm-opt repos/zls/zig-out/bin/zls.wasm -o src/zls.wasm -O --enable-bulk-memory --enable-mutable-globals --enable-nontrapping-float-to-int --enable-sign-ext
+    else
+        cp repos/zls/zig-out/bin/zls.wasm src/zls.wasm
+    fi
+
+    echo "Created src/zls.wasm"
+}
+
+compile_zig() {
+    if [ "$ZIG_VERSION" != "$ZIG_REQUIRED_COMPILER_VERSION" ]; then
+        echo "Zig must be compiled with Zig $ZIG_REQUIRED_COMPILER_VERSION but got $ZIG_VERSION"
+        exit 1
+    fi
+
+    if [ ! -d repos/zig ]; then
+        git clone https://github.com/ziglang/zig.git repos/zig --branch $ZIG_SOURCE_TAG --depth 1
+        git -C repos/zig apply ../../zig.patch
+    fi
+    ( cd repos/zig && zig build -Dtarget=wasm32-wasi -Doptimize=ReleaseSmall -Dno-lib -Ddev=wasm)
+    if [ -n "$HAS_WASM_OPT" ]; then
+        wasm-opt repos/zig/zig-out/bin/zig.wasm -o src/zig.wasm -O --enable-bulk-memory --enable-mutable-globals --enable-nontrapping-float-to-int --enable-sign-ext
+    else
+        cp repos/zig/zig-out/bin/zig.wasm src/zig.wasm
+    fi
+
+    echo "Created src/zig.wasm"
+}
+
+create_zig_tarball() {
+    tar -czf src/zig.tar.gz -C $(zig env | jq .lib_dir -r)/.. lib/std
+
+    echo "Created src/zig.tar.gz"
+}
+
+case $1 in
+  "zls")
+    compile_zls
+    ;;
+  "zig")
+    compile_zig
+    ;;
+  "zig_tarball")
+    create_zig_tarball
+    ;;
+
+  *)
+    exit 1
+    ;;
+esac