diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index a1ca06e55c..be218af6ba 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -217,42 +217,42 @@ jobs: if-no-files-found: error # --------------------------------------------------------------------------- - # build-wasm — disabled + # build-wasm # --------------------------------------------------------------------------- - # 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 diff --git a/package.json b/package.json index 726208ebdd..858319c3a8 100644 --- a/package.json +++ b/package.json @@ -55,9 +55,6 @@ "@codemirror/autocomplete": "6.18.7", "@codemirror/commands": "6.8.1", "@codemirror/lint": "6.8.5" - }, - "patchedDependencies": { - "wasm-pack@0.14.0": "patches/wasm-pack@0.14.0.patch" } } } diff --git a/patches/wasm-pack@0.14.0.patch b/patches/wasm-pack@0.14.0.patch deleted file mode 100644 index a3a2cf4473..0000000000 --- a/patches/wasm-pack@0.14.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 6b3c1d0044..3869694540 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,11 +24,6 @@ overrides: '@codemirror/commands': 6.8.1 '@codemirror/lint': 6.8.5 -patchedDependencies: - wasm-pack@0.14.0: - hash: 3c7b8af86d6b541704193ec3130f1444612e1187cf4f53aff0ed0570b58d5e56 - path: patches/wasm-pack@0.14.0.patch - importers: .: @@ -4408,8 +4403,8 @@ importers: specifier: ^5.9.2 version: 5.9.3 wasm-pack: - specifier: 0.14.0 - version: 0.14.0(patch_hash=3c7b8af86d6b541704193ec3130f1444612e1187cf4f53aff0ed0570b58d5e56) + specifier: 0.15.0 + version: 0.15.0 rivetkit-typescript/packages/sql-loader: devDependencies: @@ -11069,9 +11064,6 @@ packages: resolution: {integrity: sha512-BASOg+YwO2C+346x3LZOeoovTIoTrRqEsqMa6fmfAV0P+U9mFr9NsyOEpiYvFjbc64NMrSswhV50WdXzdb/Z5A==} engines: {node: '>=4'} - axios@0.26.1: - resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==} - axios@1.13.2: resolution: {integrity: sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==} @@ -11276,11 +11268,6 @@ packages: resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} engines: {node: '>=8'} - binary-install@1.1.2: - resolution: {integrity: sha512-ZS2cqFHPZOy4wLxvzqfQvDjCOifn+7uCPqNmYRIBM/03+yllON+4fNnsD0VJdW0p97y+E+dTRNPStWNqMBq+9g==} - engines: {node: '>=10'} - deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. - bindings@1.5.0: resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==} @@ -11568,10 +11555,6 @@ packages: chownr@1.1.4: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} - chownr@2.0.0: - resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} - engines: {node: '>=10'} - chownr@3.0.0: resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==} engines: {node: '>=18'} @@ -13256,10 +13239,6 @@ packages: resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==} engines: {node: '>=6 <7 || >=8'} - fs-minipass@2.1.0: - resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==} - engines: {node: '>= 8'} - fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} @@ -14909,26 +14888,14 @@ packages: minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} - minipass@3.3.6: - resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==} - engines: {node: '>=8'} - minipass@4.2.8: resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==} engines: {node: '>=8'} - minipass@5.0.0: - resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} - engines: {node: '>=8'} - minipass@7.1.3: resolution: {integrity: sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==} engines: {node: '>=16 || 14 >=14.17'} - minizlib@2.1.2: - resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} - engines: {node: '>= 8'} - minizlib@3.1.0: resolution: {integrity: sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==} engines: {node: '>= 18'} @@ -17052,11 +17019,6 @@ packages: resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==} engines: {node: '>=6'} - tar@6.2.1: - resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==} - engines: {node: '>=10'} - deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me - tar@7.5.11: resolution: {integrity: sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==} engines: {node: '>=18'} @@ -18057,8 +18019,9 @@ packages: warn-once@0.1.1: resolution: {integrity: sha512-VkQZJbO8zVImzYFteBXvBOZEl1qL175WH8VmZcxF2fZAoudNhNDvHi+doCaAEdU2l2vtcIwa2zn0QK5+I1HQ3Q==} - wasm-pack@0.14.0: - resolution: {integrity: sha512-7uKj+483b6ETTnuWHK3zKNB3Ca3M159tPZ5shyXxI4j7i9Lk82rL2ck/L6E9O5VMWk9JgowdtTBOSfWmGBRFtw==} + wasm-pack@0.15.0: + resolution: {integrity: sha512-DdqtGWc3+iFx+7lL7QU5LBWs7qMnwQSWxF0htSfE15sNa3roVwHjAkTm2JXgueU2GGfSwNqbq2EzyC2b/biKDA==} + engines: {node: '>=16'} hasBin: true watchpack@2.5.1: @@ -26301,12 +26264,6 @@ snapshots: axe-core@4.11.1: {} - axios@0.26.1: - dependencies: - follow-redirects: 1.15.11 - transitivePeerDependencies: - - debug - axios@1.13.2: dependencies: follow-redirects: 1.15.11 @@ -26540,14 +26497,6 @@ snapshots: binary-extensions@2.3.0: {} - binary-install@1.1.2: - dependencies: - axios: 0.26.1 - rimraf: 3.0.2 - tar: 6.2.1 - transitivePeerDependencies: - - debug - bindings@1.5.0: dependencies: file-uri-to-path: 1.0.0 @@ -26925,8 +26874,6 @@ snapshots: chownr@1.1.4: {} - chownr@2.0.0: {} - chownr@3.0.0: {} chrome-launcher@0.15.2: @@ -28709,10 +28656,6 @@ snapshots: jsonfile: 4.0.0 universalify: 0.1.2 - fs-minipass@2.1.0: - dependencies: - minipass: 3.3.6 - fs.realpath@1.0.0: {} fsevents@2.3.2: @@ -30973,21 +30916,10 @@ snapshots: minimist@1.2.8: {} - minipass@3.3.6: - dependencies: - yallist: 4.0.0 - minipass@4.2.8: {} - minipass@5.0.0: {} - minipass@7.1.3: {} - minizlib@2.1.2: - dependencies: - minipass: 3.3.6 - yallist: 4.0.0 - minizlib@3.1.0: dependencies: minipass: 7.1.3 @@ -33514,15 +33446,6 @@ snapshots: inherits: 2.0.4 readable-stream: 3.6.2 - tar@6.2.1: - dependencies: - chownr: 2.0.0 - fs-minipass: 2.1.0 - minipass: 5.0.0 - minizlib: 2.1.2 - mkdirp: 1.0.4 - yallist: 4.0.0 - tar@7.5.11: dependencies: '@isaacs/fs-minipass': 4.0.1 @@ -34980,11 +34903,9 @@ snapshots: warn-once@0.1.1: {} - wasm-pack@0.14.0(patch_hash=3c7b8af86d6b541704193ec3130f1444612e1187cf4f53aff0ed0570b58d5e56): + wasm-pack@0.15.0: dependencies: - binary-install: 1.1.2 - transitivePeerDependencies: - - debug + tar: 7.5.11 watchpack@2.5.1: dependencies: diff --git a/rivetkit-typescript/packages/rivetkit-wasm/package.json b/rivetkit-typescript/packages/rivetkit-wasm/package.json index 9b7731f3cc..f76131224e 100644 --- a/rivetkit-typescript/packages/rivetkit-wasm/package.json +++ b/rivetkit-typescript/packages/rivetkit-wasm/package.json @@ -37,6 +37,6 @@ }, "devDependencies": { "typescript": "^5.9.2", - "wasm-pack": "0.14.0" + "wasm-pack": "0.15.0" } }