Use deno^2 (#79)

Author: mxcl

deno.json

@@ -3,16 +3,9 @@
     "allowJs": false,
     "strict": true
   },
-  "fmt": {
-    "files": {
-      "exclude": [
-        "./"
-      ]
-    }
-  },
-  "pkgx": "deno^1.40",
+  "pkgx": "deno^2.0",
   "tasks": {
-    "test": "deno test --parallel --unstable-fs --unstable-ffi --allow-env --allow-read --allow-ffi --allow-net=dist.pkgx.dev,github.com,codeload.github.com --allow-write --allow-run=tar,uname,/bin/sh,foo,'C:\\Windows\\system32\\cmd.exe'",
+    "test": "deno test --parallel --unstable-fs --unstable-ffi --allow-all",
     "typecheck": "deno check ./mod.ts"
   },
   "lint": {
@@ -24,8 +17,9 @@
     "exclude": ["dist/"]
   },
   "imports": {
+    "@std/assert": "jsr:@std/assert@^1.0.6",
+    "@std/testing": "jsr:@std/testing@^1.0.3",
     "is-what": "https://deno.land/x/is_what@v4.1.15/src/index.ts",
-    "deno/": "https://deno.land/std@0.224.0/",
     "outdent": "https://deno.land/x/outdent@v0.8.0/mod.ts"
   }
 }

src/deps.ts

@@ -8,17 +8,14 @@ import * as outdent from "outdent"
 export { outdent }
 
 // importing super specifically to reduce final npm bundle size
-import * as crypto from "deno/crypto/mod.ts"
-import { moveSync } from "deno/fs/move.ts"
-import { readLines } from "deno/io/read_lines.ts"
-import { writeAll } from "deno/io/write_all.ts"
-import { parse as parseYaml } from "deno/yaml/parse.ts"
-import { SEPARATOR as SEP } from "deno/path/mod.ts"
-import { fromFileUrl } from "deno/path/mod.ts"
+import * as crypto from "jsr:@std/crypto@1"
+import { moveSync } from "jsr:@std/fs@1"
+import { writeAll } from "jsr:@std/io@^0.225.0"
+import { parse as parseYaml } from "jsr:@std/yaml@1"
+import { SEPARATOR as SEP, fromFileUrl } from "jsr:@std/path@1"
 
 const streams = { writeAll }
-const io = { readLines }
 const fs = { moveSync }
-const deno = { readLines, crypto, fs, io, streams, parseYaml, SEP, fromFileUrl }
+const deno = { crypto, fs, streams, parseYaml, SEP, fromFileUrl }
 
 export { deno }

src/hooks/useCache.test.ts

@@ -1,6 +1,6 @@
 import { Stowage, StowageNativeBottle } from "../types.ts"
 import { useTestConfig } from "./useTestConfig.ts"
-import { assertEquals } from "deno/assert/mod.ts"
+import { assertEquals } from "@std/assert"
 import SemVer from "../utils/semver.ts"
 import useCache from "./useCache.ts"
 import host from "../utils/host.ts"

src/hooks/useCellar.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals, assertRejects } from "deno/assert/mod.ts"
+import { assertEquals, assertRejects } from "@std/assert"
 import SemVer, * as semver from "../utils/semver.ts"
 import { useTestConfig } from "./useTestConfig.ts"
 import useCellar from "./useCellar.ts"

src/hooks/useConfig.test.ts

@@ -1,4 +1,4 @@
-import { assert, assertEquals, assertFalse, assertThrows, assertMatch } from "deno/assert/mod.ts"
+import { assert, assertEquals, assertFalse, assertThrows, assertMatch } from "@std/assert"
 import { _internals, ConfigDefault } from "./useConfig.ts"
 import { useTestConfig } from "./useTestConfig.ts"
 import Path from "../utils/Path.ts"

src/hooks/useDownload.test.ts

@@ -1,5 +1,5 @@
 import { useTestConfig } from "./useTestConfig.ts"
-import { assert } from "deno/assert/mod.ts"
+import { assert } from "@std/assert"
 import useDownload from "./useDownload.ts"
 
 //TODO don’t actually do http obv.

src/hooks/useDownload.ts

@@ -1,7 +1,7 @@
 import { deno } from "../deps.ts"
 const { crypto: crypto_, streams: { writeAll } } = deno
 const { crypto } = crypto_
-import { encodeHex } from "deno/encoding/hex.ts"
+import { encodeHex } from "jsr:@std/encoding@1"
 import { PkgxError, panic } from "../utils/error.ts"
 import useConfig from "./useConfig.ts"
 import useFetch from "./useFetch.ts"

src/hooks/useFetch.test.ts

@@ -1,4 +1,4 @@
-import { stub, assertSpyCallArgs } from "deno/testing/mock.ts"
+import { stub, assertSpyCallArgs } from "@std/testing/mock"
 import { useTestConfig } from "./useTestConfig.ts";
 import useFetch, { _internals } from "./useFetch.ts"
 

src/hooks/useInventory.test.ts

@@ -1,8 +1,7 @@
 // deno-lint-ignore-file require-await no-explicit-any
-import { assertEquals } from "deno/assert/assert_equals.ts"
+import { assertEquals, assertRejects } from "@std/assert"
 import SemVer, * as semver from "../utils/semver.ts"
-import { assertRejects } from "deno/assert/mod.ts"
-import * as mock from "deno/testing/mock.ts"
+import * as mock from "@std/testing/mock"
 import { _internals } from "./useFetch.ts"
 import specimen from "./useInventory.ts"
 

src/hooks/useMoustaches.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "deno/assert/mod.ts"
+import { assertEquals } from "@std/assert"
 import { useTestConfig } from "./useTestConfig.ts"
 import useMoustaches from "./useMoustaches.ts"
 import { Package } from "../types.ts"