Update to latest official deno_cache rather than a patched version

Update tests to use Deno.serve and latest std lib

.gitignore

@@ -1 +1,2 @@
 .vscode
+deno.lock

README.md

@@ -1,6 +1,6 @@
 # deno_import_content
 
-[![deno doc](https://doc.deno.land/badge.svg)](https://doc.deno.land/https://deno.land/x/import_content/mod.ts)
+[![deno doc](https://doc.deno.land/badge.svg)](https://deno.land/x/import_content/mod.ts)
 
 Import arbitrary file content in Deno using module resolution algorithms.
 
@@ -24,6 +24,10 @@ This module makes use of [`deno_cache`](https://deno.land/x/deno_cache) to
 perform fetching, and therefore requires all permissions that it requires. See
 those [docs](https://deno.land/x/deno_cache#permissions) for full details.
 
+Although, `--allow-write` permission for the cache dir is optional. If it is
+granted, then remote content will be cached, otherwise it will be fetched every
+time if the content isn't already present in the cache.
+
 ## Example
 
 ```ts
@@ -41,16 +45,8 @@ const localReadme = await importText(import.meta.resolve("./README.md"));
 const mappedReadme = await importText("bare/README.md");
 ```
 
-## Known Bugs
-
-Authentication via `DENO_AUTH_TOKENS` currently doesn't work due to a bug in
-`deno_cache`. There is a [PR](https://github.com/denoland/deno_cache/pull/18) to
-fix this, currently awaiting review.
-
-There is also a bug in `deno_cache` that requires the `--allow-write` permission
-to be given. There is another
-[PR](https://github.com/denoland/deno_cache/pull/21) for this too.
+## Fixed Dependencies
 
-Until those issues are solved, this module will depend upon a patched fork of
-`deno_cache` imported directly from my own
-[repository](https://github.com/jollytoad/deno_cache/tree/fixes).
+Previous versions of this module depended on my patched version of `deno_cache`,
+due to bugs in that module. These have since been fixed, so this module now
+depends on the official [`deno_cache`](https://deno.land/x/deno_cache@0.6.1).

deno.json

@@ -1,5 +1,6 @@
 {
   "tasks": {
-    "test": "deno test --allow-read --allow-write --allow-net --allow-env --import-map=test/import_map.json"
+    "test": "deno test --allow-read --allow-write --allow-net --allow-env --import-map=test/import_map.json",
+    "check": "deno fmt && deno lint && deno check **/*.ts"
   }
 }

deps.ts

@@ -1,2 +1,2 @@
-export { DenoDir } from "https://raw.githubusercontent.com/jollytoad/deno_cache/fixes/deno_dir.ts";
-export { FileFetcher } from "https://raw.githubusercontent.com/jollytoad/deno_cache/fixes/file_fetcher.ts";
+export { DenoDir } from "https://deno.land/x/deno_cache@0.6.1/deno_dir.ts";
+export { FileFetcher } from "https://deno.land/x/deno_cache@0.6.1/file_fetcher.ts";

mod.ts

@@ -13,7 +13,12 @@ let fileFetcher: FileFetcher | undefined;
 export async function importText(specifier: string): Promise<string> {
   if (!fileFetcher) {
     const denoDir = new DenoDir();
-    fileFetcher = new FileFetcher(denoDir.deps);
+    const writeGranted =
+      (await Deno.permissions.query({ name: "write", path: denoDir.root }))
+        .state === "granted";
+    fileFetcher = new FileFetcher(
+      denoDir.createHttpCache({ readOnly: !writeGranted }),
+    );
   }
 
   if (isRelative(specifier)) {

test/deps.ts

@@ -1,6 +1,5 @@
-export {
-  assertEquals,
-  assertRejects,
-  assertStringIncludes,
-} from "https://deno.land/[email protected]/testing/asserts.ts";
-export { generate as randomString } from "https://deno.land/[email protected]/uuid/v1.ts";
+export { assertEquals } from "https://deno.land/[email protected]/assert/assert_equals.ts";
+export { assertRejects } from "https://deno.land/[email protected]/assert/assert_rejects.ts";
+export { assertStringIncludes } from "https://deno.land/[email protected]/assert/assert_string_includes.ts";
+
+export { ulid as randomString } from "https://deno.land/[email protected]/ulid/mod.ts";

test/with_server.ts

@@ -1,9 +1,3 @@
-import {
-  type Handler,
-  serve,
-  type ServeInit,
-} from "https://deno.land/[email protected]/http/mod.ts";
-
 /**
  * Create a basic HTTP server to run a test against.
  *
@@ -13,16 +7,17 @@ import {
  * @returns a test function that can be passed directly to `Deno.test`
  */
 export const withServer = (
-  handler: Handler,
-  opts: Pick<ServeInit, "hostname" | "port">,
+  handler: Deno.ServeHandler,
+  opts: Pick<Deno.ServeOptions, "hostname" | "port">,
   test: (url: string, t: Deno.TestContext) => void | Promise<void>,
 ) =>
 async (t: Deno.TestContext) => {
   const controller = new AbortController();
 
   let caught: unknown;
 
-  await serve(handler, {
+  await Deno.serve({
+    handler,
     ...opts,
     signal: controller.signal,
     onListen: ({ hostname, port }) => {
@@ -36,7 +31,7 @@ async (t: Deno.TestContext) => {
         }
       });
     },
-  });
+  }).finished;
 
   if (caught) {
     throw caught;