diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 4c1b470cf5..a1ca06e55c 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -217,42 +217,42 @@ jobs: if-no-files-found: error # --------------------------------------------------------------------------- - # build-wasm — wasm package artifact built in parallel with native artifacts + # build-wasm — disabled # --------------------------------------------------------------------------- - build-wasm: - needs: [context] - name: "Build rivetkit-wasm" - runs-on: depot-ubuntu-24.04-8 - permissions: - contents: read - steps: - - uses: actions/checkout@v4 - with: - lfs: ${{ needs.context.outputs.trigger == 'release' }} - - run: corepack enable - - uses: actions/setup-node@v4 - with: - node-version: "22" - cache: pnpm - - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - toolchain: stable - target: wasm32-unknown-unknown - rustflags: "" - - uses: Swatinem/rust-cache@v2 - with: - shared-key: "rivetkit-wasm-publish" - cache-on-failure: true - - name: Install wasm package dependencies - run: pnpm install --frozen-lockfile --filter=@rivetkit/rivetkit-wasm - - name: Build wasm package - run: pnpm --filter=@rivetkit/rivetkit-wasm build - - name: Upload wasm package artifact - uses: actions/upload-artifact@v4 - with: - name: wasm-package - path: rivetkit-typescript/packages/rivetkit-wasm/pkg - if-no-files-found: error + # build-wasm: + # needs: [context] + # name: "Build rivetkit-wasm" + # runs-on: depot-ubuntu-24.04-8 + # permissions: + # contents: read + # steps: + # - uses: actions/checkout@v4 + # with: + # lfs: ${{ needs.context.outputs.trigger == 'release' }} + # - run: corepack enable + # - uses: actions/setup-node@v4 + # with: + # node-version: "22" + # cache: pnpm + # - uses: actions-rust-lang/setup-rust-toolchain@v1 + # with: + # toolchain: stable + # target: wasm32-unknown-unknown + # rustflags: "" + # - uses: Swatinem/rust-cache@v2 + # with: + # shared-key: "rivetkit-wasm-publish" + # cache-on-failure: true + # - name: Install wasm package dependencies + # run: pnpm install --frozen-lockfile --filter=@rivetkit/rivetkit-wasm + # - name: Build wasm package + # run: pnpm --filter=@rivetkit/rivetkit-wasm build + # - name: Upload wasm package artifact + # uses: actions/upload-artifact@v4 + # with: + # name: wasm-package + # path: rivetkit-typescript/packages/rivetkit-wasm/pkg + # if-no-files-found: error # --------------------------------------------------------------------------- # docker-images — per-arch runtime images pushed to Docker Hub @@ -319,12 +319,11 @@ jobs: # publish — npm publish + R2 upload + Docker manifest + release tail # --------------------------------------------------------------------------- publish: - needs: [context, build, build-wasm, docker-images] + needs: [context, build, docker-images] name: "Publish" if: | !cancelled() && needs.build.result == 'success' && - needs.build-wasm.result == 'success' && needs.docker-images.result == 'success' runs-on: depot-ubuntu-24.04-8 permissions: @@ -364,17 +363,6 @@ jobs: path: engine-artifacts pattern: engine-* merge-multiple: true - - name: Download wasm package artifact - uses: actions/download-artifact@v4 - with: - name: wasm-package - path: rivetkit-typescript/packages/rivetkit-wasm/pkg - - name: Validate wasm package artifact - run: | - test -f rivetkit-typescript/packages/rivetkit-wasm/pkg/rivetkit_wasm.js - test -f rivetkit-typescript/packages/rivetkit-wasm/pkg/rivetkit_wasm.d.ts - test -f rivetkit-typescript/packages/rivetkit-wasm/pkg/rivetkit_wasm_bg.wasm - - name: Place native binaries in platform packages run: | NATIVE_DIR=rivetkit-typescript/packages/rivetkit-napi diff --git a/package.json b/package.json index a7fb8d47ce..211d390464 100644 --- a/package.json +++ b/package.json @@ -55,8 +55,10 @@ "@codemirror/view": "6.38.2", "@codemirror/autocomplete": "6.18.7", "@codemirror/commands": "6.8.1", - "@codemirror/lint": "6.8.5", - "wasm-pack": "=0.13.1" + "@codemirror/lint": "6.8.5" + }, + "patchedDependencies": { + "wasm-pack@0.14.0": "patches/wasm-pack@0.14.0.patch" } } -} +} \ No newline at end of file diff --git a/patches/wasm-pack@0.14.0.patch b/patches/wasm-pack@0.14.0.patch new file mode 100644 index 0000000000..a3a2cf4473 --- /dev/null +++ b/patches/wasm-pack@0.14.0.patch @@ -0,0 +1,13 @@ +diff --git a/binary.js b/binary.js +index 7f0472a1f80325d4b75860f0ec9f784779a90c01..f9d1fae49b5bb6dd6baa1a8e268c8aa930fe299a 100644 +--- a/binary.js ++++ b/binary.js +@@ -31,7 +31,7 @@ const getPlatform = () => { + const getBinary = () => { + const platform = getPlatform(); + const version = require("./package.json").version; +- const author = "drager"; ++ const author = "wasm-bindgen"; + const name = "wasm-pack"; + const url = `https://github.com/${author}/${name}/releases/download/v${version}/${name}-v${version}-${platform}.tar.gz`; + return new Binary(platform === windows ? "wasm-pack.exe" : "wasm-pack", url, { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f8e7443bce..eae9f46d3a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,6 +25,11 @@ overrides: '@codemirror/lint': 6.8.5 wasm-pack: '=0.13.1' +patchedDependencies: + wasm-pack@0.14.0: + hash: 3c7b8af86d6b541704193ec3130f1444612e1187cf4f53aff0ed0570b58d5e56 + path: patches/wasm-pack@0.14.0.patch + importers: .: @@ -4377,8 +4382,8 @@ importers: specifier: ^5.9.2 version: 5.9.3 wasm-pack: - specifier: '=0.13.1' - version: 0.13.1 + specifier: 0.14.0 + version: 0.14.0(patch_hash=3c7b8af86d6b541704193ec3130f1444612e1187cf4f53aff0ed0570b58d5e56) rivetkit-typescript/packages/sql-loader: devDependencies: @@ -34888,7 +34893,7 @@ snapshots: warn-once@0.1.1: {} - wasm-pack@0.13.1: + wasm-pack@0.14.0(patch_hash=3c7b8af86d6b541704193ec3130f1444612e1187cf4f53aff0ed0570b58d5e56): dependencies: binary-install: 1.1.2 transitivePeerDependencies: