Merge branch 'main' into release-with-main-30-3

Author: infomiho

.github/actions/compute-artifact-names/action.yaml

@@ -21,8 +21,7 @@ runs:
             "linux-x86_64",
             "linux-x86_64-static",
             "macos-x86_64",
-            "macos-aarch64",
-            "macos-universal"
+            "macos-aarch64"
           ]'),
           inputs.build-name
         )
@@ -42,7 +41,7 @@ runs:
 
     - name: Set npm target
       id: set-npm-target
-      if: inputs.build-name != 'all' && inputs.build-name != 'macos-universal'
+      if: inputs.build-name != 'all'
       shell: sh
       run: |
         case '${{ inputs.build-name }}' in

.github/actions/setup-haskell/action.yaml

@@ -49,7 +49,7 @@ runs:
     # Based on the official recipe for Cabal caching:
     # https://github.com/actions/cache/blob/v4.2.3/examples.md#haskell---cabal
     - name: Cache Cabal dependencies
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         # There are two extra directories that are commonly cache, that we've
         # decided not to cache:

.github/workflows/ci-deploy-test.yaml

@@ -99,7 +99,7 @@ jobs:
       name: railway-deploy-test
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: ./.github/actions/prepare-deploy-test
 

.github/workflows/ci-formatting.yaml

@@ -23,7 +23,7 @@ jobs:
       - name: Run Prettier
         run: |
           npm ci
-          npm run prettier:check
+          npm run check:prettier
 
   ormolu:
     runs-on: ubuntu-latest
@@ -44,3 +44,25 @@ jobs:
       - uses: haskell-actions/run-ormolu@v15
         with:
           version: ${{ env.ORMOLU_VERSION }}
+
+  cabal-gild:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Parse cabal-gild version
+        working-directory: waspc
+        run: |
+          echo "CABAL_GILD_VERSION=$(grep 'cabal-gild ==' dev-tool.project | sed 's/.*==\s*\([0-9.]*\).*/\1/')" >> $GITHUB_ENV
+
+      - uses: tfausak/cabal-gild-setup-action@v2
+        with:
+          version: ${{ env.CABAL_GILD_VERSION }}
+
+      - name: Run cabal-gild
+        working-directory: waspc
+        run: |
+          for f in $(git ls-files '*.cabal'); do
+            cabal-gild --mode check --input "$f"
+          done

.github/workflows/ci-npm-package-build.yaml

@@ -33,7 +33,7 @@ jobs:
         with:
           build-name: all
 
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v8
         with:
           path: "./download/"
           pattern: ${{ steps.compute-download-artifact-names.outputs.artifact-name }}
@@ -83,13 +83,10 @@ jobs:
         working-directory: ./scripts/make-npm-packages
         run: npm ci
 
-        # NOTE: --experimental-strip-types allows Node to run TypeScript
-        # directly. This flag became the default in Node v22.18+, but we need
-        # it explicitly for our minimum supported version (v22.12.0).
       - name: Run packager script
-        run: node --experimental-strip-types ./scripts/make-npm-packages/src/index.ts --input-dir ./input/ --output-dir ./output/
+        run: node ./scripts/make-npm-packages/src/index.ts --input-dir ./input/ --output-dir ./output/
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v7
         with:
           name: ${{ vars.WASP_NPM_ARTIFACT_NAME }}
           include-hidden-files: true

.github/workflows/ci-npm-package-publish.yaml

@@ -15,7 +15,7 @@ jobs:
         with:
           node-version-file: .nvmrc
 
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v8
         with:
           name: ${{ vars.WASP_NPM_ARTIFACT_NAME }}
           path: packages/

.github/workflows/ci-npm-package-test.yaml

@@ -2,6 +2,11 @@ name: "Test - Wasp npm packages"
 
 on:
   workflow_call:
+    inputs:
+      data-files-list:
+        description: "Expected data files list with per-file SHA-256 hashes."
+        required: true
+        type: string
 
 jobs:
   test:
@@ -14,7 +19,7 @@ jobs:
 
           - # Linux with Musl
             os: ubuntu-latest
-            container: node:22-alpine
+            container: node:22-alpine3.23
             install-deps: apk add curl
 
           - # Apple Silicon
@@ -31,11 +36,6 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - uses: actions/download-artifact@v6
-        with:
-          name: ${{ vars.WASP_NPM_ARTIFACT_NAME }}
-          path: packages/
-
       - name: Install dependencies
         if: matrix.runner.install-deps
         run: ${{ matrix.runner.install-deps }}
@@ -45,43 +45,58 @@ jobs:
         with:
           node-version-file: .nvmrc
 
-      - name: Publish and run Wasp npm packages
+      - name: Install Wasp CLI from pkg.pr.new
         env:
-          TEST_REGISTRY_URL: http://localhost:4873
-          TEST_REGISTRY_CONFIG: |
-            storage: "$HOME/.verdaccio/storage"
-            log: { type: stdout, format: pretty, level: info }
-            max_body_size: 1000mb # Needed because Wasp packages are large
-            packages: { '**': { access: $all, publish: $all } }
+          COMMIT_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
         run: |
           set -eux
 
-          # Install global packages
-          npm install -g npm-cli-login@1 verdaccio@6
+          # Create a test project to install into
+          mkdir install-test && cd install-test
+          npm init -y
 
-          # Create registry config
-          mkdir -p "$HOME/.config/verdaccio"
-          echo "$TEST_REGISTRY_CONFIG" > "$HOME/.config/verdaccio/config.yaml"
+          # Install the CLI package (its optional deps pull in the
+          # platform-specific sub-package for this runner).
+          npm install "https://pkg.pr.new/@wasp.sh/wasp-cli@$COMMIT_SHA"
 
-          # Start local registry
-          verdaccio &
+      - name: Run Wasp CLI
+        run: |
+          set -eux
+          cd install-test
 
-          # Wait for registry to be ready
-          until curl -sSf "$TEST_REGISTRY_URL/-/ping" >/dev/null; do
-            sleep 1
-          done
+          # Test that the Wasp CLI can find and run the binary.
+          NODE_DEBUG=wasp-bin-wrapper npx wasp version
 
-          # Set registry and login
-          npm-cli-login -u fake-user -p fake-password -e fake@email.com -r "$TEST_REGISTRY_URL"
-          npm config set registry "$TEST_REGISTRY_URL"
+      - name: Generate list of installed data files
+        run: |
+          set -eux
 
-          # Publish all packages to the test registry
-          for pkg_dir in ./packages/*; do
-            npm publish "$pkg_dir"
-          done
+          # Find the installed platform sub-package (there should be exactly
+          # one matching the runner's os/cpu/libc).
+          pkg_dir=$(ls -d install-test/node_modules/@wasp.sh/wasp-cli-*/data 2>/dev/null | head -1)
+
+          if [ -z "$pkg_dir" ]; then
+            echo "::error::No platform sub-package with data directory found"
+            exit 1
+          fi
+
+          # Strip the trailing /data to get the package root, then walk the
+          # data directory and produce a tab-separated manifest of relative
+          # paths and their SHA-256 hashes.
+          pkg_root="${pkg_dir%/data}"
+          (cd "$pkg_root" && find ./data -type f | while IFS= read -r file; do
+            hash=$(sha256sum "$file" | cut -d' ' -f1)
+            printf '%s\t%s\n' "$file" "$hash"
+          done) > actual-data-files.txt
+
+      - name: Verify data files match
+        env:
+          EXPECTED_DATA_FILES: ${{ inputs.data-files-list }}
+        run: |
+          set -eux
 
-          # Test installing and using the Wasp CLI from the test registry
-          # We'll enable debug logging in the wrapper to see if it can find and run the Wasp binary.
-          NODE_DEBUG=wasp-bin-wrapper npx -y @wasp.sh/wasp-cli version
+          echo "$EXPECTED_DATA_FILES" > expected-data-files.txt
 
-          exit 0 # Done, do not wait for registry to exit
+          # Both lists are sorted before comparison so file discovery order
+          # doesn't cause spurious failures.
+          diff <(sort expected-data-files.txt) <(sort actual-data-files.txt)

.github/workflows/ci-packages-test.yaml

@@ -0,0 +1,22 @@
+name: "Test - Wasp Packages"
+
+on:
+  workflow_call:
+
+env:
+  WASP_TELEMETRY_DISABLE: 1
+
+jobs:
+  test-packages:
+    name: Test Wasp packages
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: "actions/checkout@v6"
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version-file: .nvmrc
+
+      - name: Test all packages
+        working-directory: waspc
+        run: ./run test:packages

.github/workflows/ci-waspc-build.yaml

@@ -10,13 +10,16 @@ on:
         # Don't change this version without updating it in all required
         # places (full list in /.nvmrc).
         description: "Node.js version to use for building"
-        default: "22.12.0"
+        default: "22.22.2"
         type: string
         required: false
     outputs:
       waspc_version:
         value: ${{ jobs.build.outputs.waspc_version }}
         description: "The Wasp version built in this workflow."
+      data_files_list:
+        value: ${{ jobs.build.outputs.data_files_list }}
+        description: "List of data files with per-file SHA-256 hashes."
       output_linux-x86_64:
         value: ${{ jobs.build.outputs.output_linux-x86_64 }}
         description: "The build output metadata for linux-x86_64."
@@ -37,6 +40,7 @@ jobs:
   build:
     outputs:
       waspc_version: ${{ steps.set-outputs.outputs.waspc_version }}
+      data_files_list: ${{ steps.data-files.outputs.list }}
       output_linux-x86_64: ${{ steps.set-outputs.outputs.output_linux-x86_64 }}
       output_linux-x86_64-static: ${{ steps.set-outputs.outputs.output_linux-x86_64-static }}
       output_macos-x86_64: ${{ steps.set-outputs.outputs.output_macos-x86_64 }}
@@ -83,17 +87,19 @@ jobs:
             # We also pin the `alpine` version to a specific one we have tested,
             # since newer releases might have different versions of the
             # libraries we depend on.
-            container: node:${{ inputs.node-version }}-alpine3.21
+            container: node:${{ inputs.node-version }}-alpine3.23
             skip-node-install: true
             static: true
             install-deps: |
               apk update
               # GHCup dependencies (https://www.haskell.org/ghcup/install/#linux-alpine)
-              apk add binutils-gold curl gcc g++ gmp-dev libc-dev libffi-dev make musl-dev ncurses-dev perl pkgconfig tar xz
+              apk add binutils-gold curl gcc g++ gmp-dev gmp-static libc-dev libffi-dev make musl-dev ncurses-dev perl pkgconfig tar xz
               # `./run` script dependencies
               apk add bash
               # Cabal dependencies
               apk add zlib-dev zlib-static
+              # Prisma dependencies
+              apk add openssl
 
           - name: macos-x86_64
             runner: macos-15-intel
@@ -141,7 +147,27 @@ jobs:
           mkdir -p artifacts
           ./tools/make_binary_package.sh "artifacts/${{ steps.compute-artifact-names.outputs.tarball-name }}"
 
-      - uses: actions/upload-artifact@v4
+      - name: Compute data files list
+        id: data-files
+        working-directory: waspc
+        run: |
+          if command -v sha256sum >/dev/null 2>&1; then
+            HASH_CMD="sha256sum"
+          else
+            HASH_CMD="shasum -a 256"
+          fi
+          {
+            echo 'list<<EOF'
+            cabal sdist --list-only \
+              | grep '^\./data/' \
+              | while IFS= read -r file; do
+                  hash=$($HASH_CMD "$file" | cut -d' ' -f1)
+                  printf '%s\t%s\n' "$file" "$hash"
+                done
+            echo 'EOF'
+          } >> $GITHUB_OUTPUT
+
+      - uses: actions/upload-artifact@v7
         with:
           path: ./waspc/artifacts/${{ steps.compute-artifact-names.outputs.tarball-name }}
           name: ${{ steps.compute-artifact-names.outputs.artifact-name }}
@@ -158,59 +184,3 @@ jobs:
             echo 'EOF'
           } >> $GITHUB_OUTPUT
           echo "waspc_version=$(cd waspc && ./run get-waspc-version)" >> $GITHUB_OUTPUT
-
-  build-universal:
-    name: Build Wasp (universal)
-    needs: build
-    runs-on: macos-15
-
-    env:
-      X86_64_TARBALL_NAME: ${{ fromJson(needs.build.outputs.output_macos-x86_64).tarball-name }}
-      X86_64_ARTIFACT_NAME: ${{ fromJson(needs.build.outputs.output_macos-x86_64).artifact-name }}
-      AARCH64_TARBALL_NAME: ${{ fromJson(needs.build.outputs.output_macos-aarch64).tarball-name }}
-      AARCH64_ARTIFACT_NAME: ${{ fromJson(needs.build.outputs.output_macos-aarch64).artifact-name }}
-
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Compute artifact names
-        uses: ./.github/actions/compute-artifact-names
-        id: compute-artifact-names
-        with:
-          build-name: macos-universal
-
-      - name: Download macOS Intel binaries
-        uses: actions/download-artifact@v5
-        with:
-          name: "${{ env.X86_64_ARTIFACT_NAME }}"
-
-      - name: Download macOS ARM binaries
-        uses: actions/download-artifact@v5
-        with:
-          name: "${{ env.AARCH64_ARTIFACT_NAME }}"
-
-      - name: Unpack, create universal binary and pack
-        run: |
-          set -eux # Fail on error and print each command
-
-          mkdir x86_64 aarch64 universal
-
-          # Unpack both architectures
-          tar -xzf "$X86_64_TARBALL_NAME" -C x86_64
-          tar -xzf "$AARCH64_TARBALL_NAME" -C aarch64
-
-          # Create the universal binary
-          lipo \
-            -create "x86_64/wasp-bin" "aarch64/wasp-bin" \
-            -output "universal/wasp-bin"
-
-          # Copy the data folder too (we take the first one, should be identical in both)
-          cp -R "x86_64/data/" "universal/"
-
-          # Pack back up
-          tar -czf ${{ steps.compute-artifact-names.outputs.tarball-name }} -C universal .
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: ${{ steps.compute-artifact-names.outputs.artifact-name }}
-          path: ./${{ steps.compute-artifact-names.outputs.tarball-name }}