diff --git a/.github/workflows/napi.yml b/.github/workflows/napi.yml index d46bfed0e..75c1d72b8 100644 --- a/.github/workflows/napi.yml +++ b/.github/workflows/napi.yml @@ -77,8 +77,8 @@ jobs: export TARGET_CXXFLAGS="--target=wasm32-wasi-threads --sysroot=$(pwd)/wasi-sdk-25.0-x86_64-linux/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -lsetjmp" export TARGET_CFLAGS="$TARGET_CXXFLAGS" yarn workspace @tursodatabase/database-common build - yarn workspace @tursodatabase/database-browser-common build - yarn workspace @tursodatabase/database-browser build + yarn workspace @tursodatabase/database-wasm-common build + yarn workspace @tursodatabase/database-wasm build - host: ubuntu-latest target: wasm32-wasip1-threads artifact: sync-bindings-wasm32-wasip1-threads @@ -92,9 +92,9 @@ jobs: export TARGET_CXXFLAGS="--target=wasm32-wasi-threads --sysroot=$(pwd)/wasi-sdk-25.0-x86_64-linux/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -lsetjmp" export TARGET_CFLAGS="$TARGET_CXXFLAGS" yarn workspace @tursodatabase/database-common build - yarn workspace @tursodatabase/database-browser-common build + yarn workspace @tursodatabase/database-wasm-common build yarn workspace @tursodatabase/sync-common build - yarn workspace @tursodatabase/sync-browser build + yarn workspace @tursodatabase/sync-wasm build name: ${{ matrix.settings.artifact }} - node@20 runs-on: ${{ matrix.settings.host }} steps: @@ -155,9 +155,9 @@ jobs: name: ${{ matrix.settings.artifact }} path: | bindings/javascript/packages/native/turso.*.node - bindings/javascript/packages/browser/turso.*.wasm + bindings/javascript/packages/wasm/turso.*.wasm bindings/javascript/sync/packages/native/sync.*.node - bindings/javascript/sync/packages/browser/sync.*.wasm + bindings/javascript/sync/packages/wasm/sync.*.wasm if-no-files-found: error test-db-linux-x64-gnu-binding: name: Test DB bindings on Linux-x64-gnu - node@${{ matrix.node }} @@ -191,7 +191,7 @@ jobs: shell: bash - name: Test bindings run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim yarn workspace @tursodatabase/database test - test-db-browser-binding: + test-db-wasm-binding: name: Test DB bindings on browser@${{ matrix.node }} timeout-minutes: 30 needs: @@ -212,10 +212,10 @@ jobs: run: yarn install - name: Build common run: yarn workspace @tursodatabase/database-common build - - name: Build browser-common - run: yarn workspace @tursodatabase/database-browser-common build + - name: Build wasm-common + run: yarn workspace @tursodatabase/database-wasm-common build - name: Install playwright with deps - run: yarn workspace @tursodatabase/database-browser playwright install --with-deps + run: yarn workspace @tursodatabase/database-wasm playwright install --with-deps - name: Download all DB artifacts uses: actions/download-artifact@v4 with: @@ -226,7 +226,7 @@ jobs: run: ls -R . shell: bash - name: Test bindings - run: yarn workspace @tursodatabase/database-browser test + run: yarn workspace @tursodatabase/database-wasm test publish: name: Publish runs-on: ubuntu-latest @@ -236,7 +236,7 @@ jobs: id-token: write needs: - test-db-linux-x64-gnu-binding - - test-db-browser-binding + - test-db-wasm-binding steps: - uses: actions/checkout@v4 - name: Setup node @@ -284,4 +284,4 @@ jobs: - name: Publish (dry-run) if: "!startsWith(github.ref, 'refs/tags/v')" run: | - npm publish --workspaces --dry-run \ No newline at end of file + npm publish --workspaces --dry-run diff --git a/bindings/javascript/Makefile b/bindings/javascript/Makefile index 9bca855b1..8602ef1d3 100644 --- a/bindings/javascript/Makefile +++ b/bindings/javascript/Makefile @@ -1,20 +1,20 @@ pack-native: npm publish --dry-run && npm pack -pack-browser: +pack-wasm: cp package.json package.native.json cp package.browser.json package.json npm publish --dry-run && npm pack; cp package.native.json package.json publish-native: npm publish --access public -publish-browser: +publish-wasm: cp package.json package.native.json cp package.browser.json package.json npm publish --access public; cp package.native.json package.json publish-native-next: npm publish --tag next --access public -publish-browser-next: +publish-wasm-next: cp package.json package.native.json cp package.browser.json package.json npm publish --tag next --access public; cp package.native.json package.json diff --git a/bindings/javascript/examples/drizzle/package-lock.json b/bindings/javascript/examples/drizzle/package-lock.json index 7867fc918..7510895bc 100644 --- a/bindings/javascript/examples/drizzle/package-lock.json +++ b/bindings/javascript/examples/drizzle/package-lock.json @@ -27,13 +27,13 @@ ] }, "../../packages/browser": { - "name": "@tursodatabase/database-browser", + "name": "@tursodatabase/database-wasm", "version": "0.1.5", "extraneous": true, "license": "MIT", "dependencies": { "@napi-rs/wasm-runtime": "^1.0.3", - "@tursodatabase/database-browser-common": "^0.1.5", + "@tursodatabase/database-wasm-common": "^0.1.5", "@tursodatabase/database-common": "^0.1.5" }, "devDependencies": { @@ -45,7 +45,7 @@ } }, "../../packages/browser-common": { - "name": "@tursodatabase/database-browser-common", + "name": "@tursodatabase/database-wasm-common", "version": "0.1.5", "extraneous": true, "license": "MIT", @@ -77,13 +77,13 @@ } }, "../../sync/packages/browser": { - "name": "@tursodatabase/sync-browser", + "name": "@tursodatabase/sync-wasm", "version": "0.1.5", "extraneous": true, "license": "MIT", "dependencies": { "@napi-rs/wasm-runtime": "^1.0.3", - "@tursodatabase/database-browser-common": "^0.1.5", + "@tursodatabase/database-wasm-common": "^0.1.5", "@tursodatabase/database-common": "^0.1.5", "@tursodatabase/sync-common": "^0.1.5" }, diff --git a/bindings/javascript/examples/wasm/vite.config.js b/bindings/javascript/examples/wasm/vite.config.js index 299f21d60..7adffc470 100644 --- a/bindings/javascript/examples/wasm/vite.config.js +++ b/bindings/javascript/examples/wasm/vite.config.js @@ -6,7 +6,7 @@ export default defineConfig({ }, resolve: { alias: { - '@tursodatabase/database-wasm32-wasi': '../../turso.wasi-browser.js' + '@tursodatabase/database-wasm32-wasi': '../../turso.wasi-wasm.js' }, }, server: { diff --git a/bindings/javascript/examples/browser/index.html b/bindings/javascript/examples/wasm/wasm/index.html similarity index 99% rename from bindings/javascript/examples/browser/index.html rename to bindings/javascript/examples/wasm/wasm/index.html index 540e86750..5aac23315 100644 --- a/bindings/javascript/examples/browser/index.html +++ b/bindings/javascript/examples/wasm/wasm/index.html @@ -166,7 +166,7 @@