Chore: support JSR (#284)

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Setup Deno
         uses: denoland/setup-deno@v1
         with:
-          deno-version: ${{ matrix.deno == 'old' && '1.37.2' || (matrix.deno == 'stable' && '1.x' || matrix.deno) }}
+          deno-version: ${{ matrix.deno == 'old' && '1.40.0' || (matrix.deno == 'stable' && '1.x' || matrix.deno) }}
 
       - run: deno --version
 

README.md

@@ -6,7 +6,7 @@ contains the `denoland/deployctl` GitHub Action.
 ## Install
 
 ```shell
-deno install -qArf https://deno.land/x/deploy/deployctl.ts
+deno install -Arf jsr:@deno/deployctl
 ```
 
 ## Usage

deno.json

@@ -1,4 +1,7 @@
 {
+  "name": "@deno/deployctl",
+  "version": "1.11.0",
+  "exports": "./deployctl.ts",
   "fmt": {
     "files": {
       "exclude": ["action/node_modules/"]
@@ -13,5 +16,6 @@
     "test": "deno test -A --unstable tests/ src/",
     "build-action": "deno bundle ./src/utils/mod.ts > ./action/deps.js",
     "version-match": "deno run --allow-read --allow-env ./tools/version_match.ts"
-  }
+  },
+  "importMap": "./import_map.json"
 }

deployctl.ts

@@ -2,7 +2,11 @@
 
 // Copyright 2021 Deno Land Inc. All rights reserved. MIT license.
 
-import { semverGreaterThanOrEquals, setColorEnabled } from "./deps.ts";
+import {
+  semverGreaterThanOrEquals,
+  semverParse,
+  setColorEnabled,
+} from "./deps.ts";
 import { Args, parseArgs } from "./src/args.ts";
 import { error } from "./src/error.ts";
 import deploySubcommand from "./src/subcommands/deploy.ts";
@@ -36,7 +40,12 @@ For more detailed help on each subcommand, use:
     deployctl <SUBCOMMAND> -h
 `;
 
-if (!semverGreaterThanOrEquals(Deno.version.deno, MINIMUM_DENO_VERSION)) {
+if (
+  !semverGreaterThanOrEquals(
+    semverParse(Deno.version.deno),
+    semverParse(MINIMUM_DENO_VERSION),
+  )
+) {
   error(
     `The Deno version you are using is too old. Please update to Deno ${MINIMUM_DENO_VERSION} or later. To do this run \`deno upgrade\`.`,
   );
@@ -76,7 +85,10 @@ if (isTerminal(Deno.stdin)) {
   // If latestVersion is set we need to inform the user about a new release.
   if (
     latestVersion &&
-    !(semverGreaterThanOrEquals(VERSION, latestVersion.toString()))
+    !(semverGreaterThanOrEquals(
+      semverParse(VERSION),
+      semverParse(latestVersion.toString()),
+    ))
   ) {
     console.error(
       [

deps.ts

@@ -13,7 +13,7 @@ export {
   relative,
   resolve,
   toFileUrl,
-} from "https://deno.land/std@0.170.0/path/mod.ts";
+} from "jsr:@std/path@0.217";
 export {
   bold,
   cyan,
@@ -23,18 +23,19 @@ export {
   setColorEnabled,
   stripColor,
   yellow,
-} from "https://deno.land/std@0.170.0/fmt/colors.ts";
-export { parse } from "https://deno.land/std@0.195.0/flags/mod.ts";
-export { TextLineStream } from "https://deno.land/std@0.170.0/streams/text_line_stream.ts";
-export * as JSONC from "https://deno.land/std@0.170.0/encoding/jsonc.ts";
-export { encodeHex } from "https://deno.land/std@0.212.0/encoding/hex.ts";
-export { delay } from "https://deno.land/std@0.212.0/async/mod.ts";
+} from "jsr:@std/fmt@0.217/colors";
+export { parse } from "jsr:@std/flags@0.217";
+export { TextLineStream } from "jsr:@std/streams@0.217/text_line_stream";
+export * as JSONC from "jsr:@std/jsonc@0.217";
+export { encodeHex } from "jsr:@std/encoding@0.217/hex";
+export { delay } from "jsr:@std/async@0.217";
 
 // x/semver
 export {
-  gte as semverGreaterThanOrEquals,
-  valid as semverValid,
-} from "https://deno.land/[email protected]/semver/mod.ts";
+  canParse as semverValid,
+  greaterOrEqual as semverGreaterThanOrEquals,
+  parse as semverParse,
+} from "jsr:@std/[email protected]";
 
 // x/wait
 export {

import_map.json

@@ -0,0 +1,6 @@
+{
+  "imports": {
+    "https://deno.land/": "./vendor/deno.land/",
+    "https://raw.githubusercontent.com/denosaurs/wait/453df8babdd72c59d865c5a616c5b04ee1154b9f/": "./vendor/wait-deprecated-warnings-pr-head/"
+  }
+}

src/subcommands/deploy.ts

@@ -57,7 +57,7 @@ The following example will fail because main.ts is not included:
 The entrypoint can also be a remote script. A common use case for this is to deploy an static site
 using std/http/file_server.ts (more details in https://docs.deno.com/deploy/tutorials/static-site ):
 
-    deployctl deploy --entrypoint=https://deno.land/[email protected]/http/file_server.ts
+    deployctl deploy --entrypoint=jsr:@std/http/file_server
 
 
 USAGE:

src/subcommands/logs_test.ts

@@ -1,8 +1,5 @@
 import { parseArgsForLogSubcommand } from "./logs.ts";
-import {
-  assertEquals,
-  assertThrows,
-} from "https://deno.land/[email protected]/testing/asserts.ts";
+import { assertEquals, assertThrows } from "jsr:@std/[email protected]";
 import { parseArgs } from "../args.ts";
 
 Deno.test("parseArgsForLogSubcommand", async (t) => {

src/subcommands/upgrade.ts

@@ -1,7 +1,11 @@
 // Copyright 2021 Deno Land Inc. All rights reserved. MIT license.
 
 import { error } from "../error.ts";
-import { semverGreaterThanOrEquals, semverValid } from "../../deps.ts";
+import {
+  semverGreaterThanOrEquals,
+  semverParse,
+  semverValid,
+} from "../../deps.ts";
 import { VERSION } from "../version.ts";
 
 const help = `deployctl upgrade
@@ -56,7 +60,10 @@ export default async function (rawArgs: Record<string, any>): Promise<void> {
     );
   }
 
-  if (!version && semverGreaterThanOrEquals(VERSION, latest)) {
+  if (
+    !version &&
+    semverGreaterThanOrEquals(semverParse(VERSION), semverParse(latest))
+  ) {
     console.log("You're using the latest version.");
     Deno.exit();
   } else {

src/utils/api.ts

@@ -152,10 +152,10 @@ export class API {
       throw new Error("Stream ended unexpectedly");
     }
 
-    const lines = res.body
+    const lines: ReadableStream<string> = res.body
       .pipeThrough(new TextDecoderStream())
       .pipeThrough(new TextLineStream());
-    return async function* () {
+    return async function* (): AsyncGenerator<string, void> {
       for await (const line of lines) {
         if (line === "") return;
         yield line;

src/utils/mod.ts

@@ -1,4 +1,4 @@
-import { semverGreaterThanOrEquals } from "../../deps.ts";
+import { semverGreaterThanOrEquals, semverParse } from "../../deps.ts";
 
 export { parseEntrypoint } from "./entrypoint.ts";
 export { API, APIError } from "./api.ts";
@@ -7,7 +7,12 @@ export { fromFileUrl, resolve } from "../../deps.ts";
 
 // deno-lint-ignore no-explicit-any
 export function isTerminal(stream: any) {
-  if (semverGreaterThanOrEquals(Deno.version.deno, "1.40.0")) {
+  if (
+    semverGreaterThanOrEquals(
+      semverParse(Deno.version.deno),
+      semverParse("1.40.0"),
+    )
+  ) {
     return stream.isTerminal();
   } else {
     // deno-lint-ignore no-deprecated-deno-api

src/version.ts

@@ -1,3 +1,3 @@
-export const VERSION = "1.10.5";
+export const VERSION = "1.11.0";
 
-export const MINIMUM_DENO_VERSION = "1.31.0";
+export const MINIMUM_DENO_VERSION = "1.40.0";

tests/deps.ts

@@ -1 +1 @@
-export * from "https://deno.land/std@0.116.0/testing/asserts.ts";
+export * from "jsr:@std/assert@0.217";

tools/version_match.ts

@@ -5,7 +5,7 @@
 // Intended to run when a draft release is created on GitHub.
 
 import { VERSION } from "../src/version.ts";
-import { assertEquals } from "https://deno.land/std@0.194.0/testing/asserts.ts";
+import { assertEquals } from "jsr:@std/assert@0.217";
 
 const releaseTagVersion = Deno.env.get("RELEASE_TAG")!;
 assertEquals(VERSION, releaseTagVersion);