fix: publish via JSR (#136)

* First pass

* chore: fixes to imports etc

* chore: format

* readme

---------

Co-authored-by: ascorbic <[email protected]>

.github/workflows/npm-publish.yml

@@ -27,10 +27,17 @@ jobs:
         run: deno run -A ./scripts/build_npm.ts ${{steps.get_tag_version.outputs.TAG_VERSION}}
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.x"
+          node-version: "22.x"
           registry-url: "https://registry.npmjs.org"
       - name: npm publish
         if: startsWith(github.ref, 'refs/tags/')
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: cd npm && npm publish --provenance --access public
+      - name: Update version in deno.json
+        run: |
+          VERSION=$(cat version.txt) && jq --arg v "$VERSION" '.version = $v' deno.json > deno.json.tmp
+          mv deno.json.tmp deno.json
+          deno fmt deno.json
+      - name: Publish to JSR
+        run: npx jsr publish --allow-dirty

.vscode/settings.json

@@ -6,6 +6,7 @@
 		"./scripts",
 		"./mod.ts",
 		"./deps.ts",
+		"./e2e.test.ts",
 		"*/*.json",
 		"./example"
 	],

README.md

@@ -22,12 +22,8 @@ transform the image on the fly.
 
 ## Usage
 
-This library is available via URL imports for Deno and via npm for Node. To use
-it in Deno, import the module from deno.land:
-
-```ts
-import { transformUrl } from "https://deno.land/x/unpic/mod.ts";
-```
+This library is available via NPM as `unpic` and JSR as
+[`@unpic/lib`](https://jsr.io/@unpic/lib).
 
 To use it in Node, install it from npm:
 
@@ -41,6 +37,15 @@ Then import it in your code:
 import { transformUrl } from "unpic";
 ```
 
+To use it in Deno, import [the module from JSR](https://jsr.io/@unpic/lib):
+
+```ts
+import { transformUrl } from "jsr:@unpic/lib";
+```
+
+If you previously installed the library from deno.land/x, you should update to
+use JSR instead as the deno.land/x version is no longer updated.
+
 You can then use the `transformUrl` function to transform a URL:
 
 ```ts

deno.json

@@ -0,0 +1,33 @@
+{
+	"name": "@unpic/lib",
+	"version": "3.18.0",
+	"exports": "./mod.ts",
+	"tasks": {
+		"build:npm": "deno run --allow-all scripts/build_npm.ts"
+	},
+	"compilerOptions": {
+		"jsx": "react-jsx",
+		"jsxImportSource": "https://esm.sh/[email protected]"
+	},
+	"fmt": {
+		"useTabs": true
+	},
+	"imports": {
+		"@deno/dnt": "jsr:@deno/[email protected]",
+		"@std/path": "jsr:@std/[email protected]",
+		"@std/fs": "jsr:@std/[email protected]",
+		"@std/testing": "jsr:@std/[email protected]"
+	},
+	"publish": {
+		"include": [
+			"src",
+			"mod.ts",
+			"README.md",
+			"data"
+		],
+		"exclude": [
+			"**/*.test.ts"
+		]
+	},
+	"license": "MIT"
+}

src/e2e.test.ts → e2e.test.ts

@@ -1,12 +1,8 @@
-import {
-	assertAlmostEquals,
-	assertEquals,
-	assertExists,
-} from "jsr:@std/assert";
-import examples from "../demo/src/examples.json" with { type: "json" };
-import { getPixels } from "https://deno.land/x/[email protected]/mod.ts";
-import { transformUrl } from "./transform.ts";
-import type { ImageCdn } from "./types.ts";
+import { assertAlmostEquals, assertExists } from "jsr:@std/assert";
+import examples from "./demo/src/examples.json" with { type: "json" };
+import { getPixels } from "jsr:@unpic/pixels";
+import { transformUrl } from "./src/transform.ts";
+import type { ImageCdn } from "./src/types.ts";
 
 Deno.test("E2E tests", async (t) => {
 	for (const [cdn, example] of Object.entries(examples)) {

scripts/build_npm.ts

@@ -1,16 +1,16 @@
-import { build, emptyDir } from "https://deno.land/x/dnt@0.37.0/mod.ts";
-import { basename } from "https://deno.land/[email protected]/path/mod.ts";
-import { walk } from "https://deno.land/[email protected]/fs/mod.ts";
+import { build, emptyDir } from "jsr:@deno/dnt";
+import { basename } from "jsr:@std/path";
+import { walk } from "jsr:@std/fs";
 
 await emptyDir("./npm");
 
-const trans = await Array.fromAsync(walk("./src/transformers", {
+const transformers = await Array.fromAsync(walk("./src/transformers", {
 	match: [/^(?!.*test\.ts$).*\.ts$/],
 }));
 
-const entry = trans.map((t) => ({
-	path: t.path,
-	name: `./transformers/${basename(t.path, ".ts")}`,
+const entry = transformers.map((entry) => ({
+	path: entry.path,
+	name: `./transformers/${basename(entry.path, ".ts")}`,
 }));
 
 await build({
@@ -51,9 +51,6 @@ await build({
 			"@unpic/pixels": "latest",
 		},
 	},
-	mappings: {
-		"https://deno.land/x/[email protected]/mod.ts": "@unpic/pixels",
-	},
 });
 
 // post build steps

src/canonical.test.ts

@@ -1,7 +1,4 @@
-import {
-	assertEquals,
-	assertExists,
-} from "https://deno.land/[email protected]/testing/asserts.ts";
+import { assertEquals, assertExists } from "jsr:@std/assert";
 import { getCanonicalCdnForUrl } from "./canonical.ts";
 
 const nextImgLocal =
@@ -43,8 +40,10 @@ Deno.test("Canonical", async (t) => {
 	await t.step(
 		"should fall back to the default CDN for unrecognized image domains - vercel",
 		() => {
-			const result =
-				getCanonicalCdnForUrl("https://placekitten.com/100", "vercel") ||
+			const result = getCanonicalCdnForUrl(
+				"https://placekitten.com/100",
+				"vercel",
+			) ||
 				undefined;
 			assertExists(result);
 			assertEquals(

src/transform.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "https://deno.land/[email protected]/testing/asserts.ts";
+import { assertEquals } from "jsr:@std/assert";
 import { getImageCdnForUrl } from "./detect.ts";
 import { transformUrl } from "./transform.ts";
 
@@ -142,7 +142,9 @@ Deno.test("delegation", async (t) => {
 
 Deno.test("detection", async (t) => {
 	await t.step("should detect by path with a relative URL", () => {
-		const cdn = getImageCdnForUrl("/_next/image?url=%2Fprofile.png&w=200&q=75");
+		const cdn = getImageCdnForUrl(
+			"/_next/image?url=%2Fprofile.png&w=200&q=75",
+		);
 		assertEquals(cdn, "nextjs");
 	});
 });

src/transformers/astro.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "https://deno.land/[email protected]/testing/asserts.ts";
+import { assertEquals } from "jsr:@std/assert";
 
 import { ParsedUrl } from "../types.ts";
 import { AstroParams, parse, transform } from "./astro.ts";

src/transformers/builder.io.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "https://deno.land/[email protected]/testing/asserts.ts";
+import { assertEquals } from "jsr:@std/assert";
 
 import { transform } from "./builder.io.ts";
 

src/transformers/cloudflare.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "https://deno.land/[email protected]/testing/asserts.ts";
+import { assertEquals } from "jsr:@std/assert";
 import { ParsedUrl } from "../types.ts";
 import { CloudflareParams, parse, transform } from "./cloudflare.ts";
 

src/transformers/cloudflare_images.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "https://deno.land/[email protected]/testing/asserts.ts";
+import { assertEquals } from "jsr:@std/assert";
 import { ParsedUrl } from "../types.ts";
 import {
 	CloudflareImagesParams,

src/transformers/cloudimage.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "https://deno.land/[email protected]/testing/asserts.ts";
+import { assertEquals } from "jsr:@std/assert";
 import { ParsedUrl } from "../types.ts";
 import { CloudimageParams, parse, transform } from "./cloudimage.ts";
 

src/transformers/cloudinary.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "https://deno.land/[email protected]/testing/asserts.ts";
+import { assertEquals } from "jsr:@std/assert";
 import { ParsedUrl } from "../types.ts";
 import { CloudinaryParams, parse, transform } from "./cloudinary.ts";