feat: publish to jsr.io

wasm-fmt · Mar 14, 2024 · 84250fb · 84250fb
1 parent 6b07bef
commit 84250fb
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 31 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -11,11 +11,9 @@ env:
     RUST_LOG: "off"
 
 jobs:
-    publish-npm:
-        if: startsWith(github.ref, 'refs/tags/v')
+    wasm-build:
+        name: Wasm build
         runs-on: ubuntu-latest
-        permissions:
-            id-token: write
         steps:
             - uses: actions/checkout@v4
 
@@ -25,60 +23,98 @@ jobs:
             - name: Build wasm
               run: ./crates/ruff_fmt/scripts/build.sh
 
+            - name: Package
+              run: npm pack
+              working-directory: crates/ruff_fmt/pkg
+
+            - name: Upload
+              uses: actions/upload-artifact@v4
+              with:
+                  name: build
+                  path: crates/ruff_fmt/pkg
+
+    publish-npm:
+        if: startsWith(github.ref, 'refs/tags/v')
+        runs-on: ubuntu-latest
+        needs: wasm-build
+        permissions:
+            id-token: write
+        steps:
+            - uses: actions/checkout@v4
             - uses: actions/setup-node@v4
               with:
                   node-version-file: ".node-version"
                   registry-url: "https://registry.npmjs.org"
 
-            - run: |
-                  cd crates/ruff_fmt/pkg
-                  npm publish --provenance
+            - uses: actions/download-artifact@v4
+              with:
+                  name: build
+                  path: crates/ruff_fmt/pkg
+
+            - run: npm publish --provenance
+              working-directory: crates/ruff_fmt/pkg
               env:
                   NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
     publish-github:
         if: startsWith(github.ref, 'refs/tags/v')
         runs-on: ubuntu-latest
+        needs: wasm-build
         permissions:
             packages: write
         steps:
             - uses: actions/checkout@v4
-
-            - name: Install wasm-pack
-              run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-
-            - name: Build wasm
-              run: ./crates/ruff_fmt/scripts/build.sh
-
             - uses: actions/setup-node@v4
               with:
                   node-version-file: ".node-version"
                   registry-url: "https://npm.pkg.github.com"
 
-            - run: |
-                  cd crates/ruff_fmt/pkg
-                  npm publish
+            - uses: actions/download-artifact@v4
+              with:
+                  name: build
+                  path: crates/ruff_fmt/pkg
+
+            - run: npm publish
+              working-directory: crates/ruff_fmt/pkg
               env:
                   NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+    publish-jsr:
+        if: startsWith(github.ref, 'refs/tags/v')
+        runs-on: ubuntu-latest
+        needs: wasm-build
+        permissions:
+            contents: read
+            id-token: write
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
+              with:
+                  node-version-file: ".node-version"
+
+            - uses: actions/download-artifact@v4
+              with:
+                  name: build
+                  path: crates/ruff_fmt/pkg
+
+            - run: npx jsr publish
+              working-directory: crates/ruff_fmt/pkg
+
     publish-github-release:
         if: startsWith(github.ref, 'refs/tags/v')
         runs-on: ubuntu-latest
+        needs: wasm-build
         permissions:
             contents: write
         steps:
             - uses: actions/checkout@v4
+            - uses: actions/download-artifact@v4
+              with:
+                  name: build
+                  path: crates/ruff_fmt/pkg
 
-            - name: Install wasm-pack
-              run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-
-            - name: Build wasm
-              run: |
-                  # build for JS API
-                  ./crates/ruff_fmt/scripts/build.sh
-                  (cd crates/ruff_fmt/pkg && npm pack)
-                  # build for dprint plugin
-                  cargo build --release --target=wasm32-unknown-unknown -p ruff_fmt_dprint
+            - name: Build dprint plugin
+              run: cargo build --release --target=wasm32-unknown-unknown -p ruff_fmt_dprint
 
             - name: Get tag version
               id: get_tag_version

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -43,8 +43,9 @@ jobs:
             - name: Build wasm
               run: ./crates/ruff_fmt/scripts/build.sh
 
-            - name: npm pack
-              run: cd crates/ruff_fmt/pkg && npm pack
+            - name: Package
+              run: npm pack
+              working-directory: crates/ruff_fmt/pkg
 
             - name: Upload
               uses: actions/upload-artifact@v4

diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,7 @@ resolver = "2"
 
     [workspace.package]
     authors     = ["magic-akari <[email protected]>"]
-    description = "A wasm based python formatter"
+    description = "A WASM Based Python Formatter"
     edition     = "2021"
     homepage    = "https://github.com/wasm-fmt/ruff_fmt"
     keywords    = ["wasm", "ruff", "python", "formatter"]

diff --git a/README.md b/README.md
@@ -1,12 +1,19 @@
 [![Test](https://github.com/wasm-fmt/ruff_fmt/actions/workflows/test.yml/badge.svg)](https://github.com/wasm-fmt/ruff_fmt/actions/workflows/test.yml)
-[![npm](https://img.shields.io/npm/v/@wasm-fmt/ruff_fmt)](https://www.npmjs.com/package/@wasm-fmt/ruff_fmt)
 
 # Install
 
+[![npm](https://img.shields.io/npm/v/@wasm-fmt/ruff_fmt)](https://www.npmjs.com/package/@wasm-fmt/ruff_fmt)
+
 ```bash
 npm install @wasm-fmt/ruff_fmt
 ```
 
+[![jsr.io](https://jsr.io/badges/@fmt/ruff-fmt)](https://jsr.io/@fmt/ruff-fmt)
+
+```bash
+npx jsr add @fmt/ruff-fmt
+```
+
 # Usage
 
 ```javascript

diff --git a/crates/ruff_fmt/extra/.npmignore b/crates/ruff_fmt/extra/.npmignore
@@ -1 +1,2 @@
 *.tgz
+jsr.jsonc
diff --git a/crates/ruff_fmt/scripts/package.mjs b/crates/ruff_fmt/scripts/package.mjs
@@ -29,3 +29,11 @@ pkg_json.exports = {
 };
 
 fs.writeFileSync(pkg_path, JSON.stringify(pkg_json, null, 4));
+
+// JSR
+
+const jsr_path = path.resolve(pkg_path, "..", "jsr.jsonc");
+pkg_json.name = "@fmt/ruff-fmt";
+pkg_json.exports = "./ruff_fmt.js";
+pkg_json.exclude = ["!**", "*.tgz"];
+fs.writeFileSync(jsr_path, JSON.stringify(pkg_json, null, 4));