light brush up to deno v2

Author: danopia

.github/dependabot.yml

@@ -1,7 +1,7 @@
 version: 2
 updates:
-  # Maintain dependencies for GitHub Actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
+
+  - package-ecosystem: github-actions
+    directory: /
     schedule:
-      interval: "weekly"
+      interval: monthly

Dockerfile

@@ -1,4 +1,4 @@
-FROM denoland/deno:alpine-1.43.5
+FROM denoland/deno:alpine-2.2.10
 RUN apk add --no-cache graphviz
 ADD fonts/ /usr/share/fonts/truetype/
 
@@ -8,4 +8,4 @@ ADD deps.ts .
 RUN deno check deps.ts
 ADD . .
 RUN deno check entrypoint.ts
-ENTRYPOINT ["deno","run","--allow-sys=hostname,osRelease","--allow-env","--allow-net","--allow-run=deno,dot","--allow-read=.","entrypoint.ts"]
+ENTRYPOINT ["deno","run","--allow-sys","--allow-env","--allow-net","--allow-run=deno,dot","--allow-read=.","entrypoint.ts"]

feat/dependencies-of/api.ts

@@ -106,9 +106,10 @@ async function renderModuleToHtml(modUrl: string, args: URLSearchParams) {
       .slice(fullSvg.indexOf('<!--'))
       .replace(/<svg width="[^"]+" height="[^"]+"/, '<svg '+attrs.join(' '));
 
-  } catch (err) {
+  } catch (thrown) {
+    const err = thrown as Error & {subproc?: SubprocessErrorData};
     if (err.subproc) {
-      const info = err.subproc as SubprocessErrorData;
+      const info = err.subproc;
       return `
         <div id="graph-error">
         <h2>${entities.encode(info.procLabel.toUpperCase())} FAILED</h2>
@@ -121,7 +122,7 @@ async function renderModuleToHtml(modUrl: string, args: URLSearchParams) {
         </div>`.replace(/^ +/gm, '');
     }
     console.error('Graph computation error:', err.stack);
-    return `<div id="graph-error">${entities.encode(err.stack)}</div>`;
+    return `<div id="graph-error">${entities.encode(err.stack ?? '')}</div>`;
   }
 }
 
@@ -136,7 +137,8 @@ async function serveHtmlGraphPage(req: Request, modUrl: string, modSlug: string,
       module_url: entities.encode(modUrl),
       export_prefix: entities.encode(`${req.url}${req.url.includes('?') ? '&' : '?'}format=`),
     });
-  } catch (err) {
+  } catch (thrown) {
+    const err = thrown as Error;
     return makeErrorResponse(err);
   }
 

lib/module-map.ts

@@ -40,7 +40,7 @@ export class ModuleMap {
         totalSize: 0,
         deps: new Set(),
         depsUnversioned: new Set(),
-        files: new Array(),
+        files: [],
       };
       this.modules.set(base + fragment, moduleInfo);
     }
@@ -212,17 +212,19 @@ export function computeDependencies(data: ModuleGraphJson, args: URLSearchParams
 
     case 'dot':
     case null:
-      const lines = new Array<string>();
-      map.emitDOT(line => lines.push(line));
-      return lines.join('\n')+'\n';
+      {
+        const lines = new Array<string>();
+        map.emitDOT(line => lines.push(line));
+        return lines.join('\n')+'\n';
+      }
 
     default:
       throw new Error(`Unexpected format ${JSON.stringify(args.get('format'))}`);
   }
 }
 
 if (import.meta.main) {
-  const rawData = new TextDecoder().decode(await Deno.readAll(Deno.stdin));
+  const rawData = await new Response(Deno.stdin.readable).text();
   if (rawData[0] !== '{') throw new Error(`Expected JSON from "deno info --json"`);
   const data = JSON.parse(rawData) as ModuleGraphJson;
 

server.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S deno run --watch --check --allow-sys=hostname --allow-read --allow-net --allow-run=deno,dot --allow-env
+#!/usr/bin/env -S deno run --watch --check --allow-sys --allow-read --allow-net --allow-run=deno,dot --allow-env --allow-import=deno.land,crux.land
 
 import { httpTracer, trace } from "./deps.ts";
 import { serveFont, servePublic, serveTemplatedHtml } from './lib/request-handling.ts';
@@ -8,10 +8,11 @@ import * as DependenciesOf from './feat/dependencies-of/api.ts';
 import * as Shields from './feat/shields/api.ts';
 import * as RegistryKey from './feat/registry-key/api.ts';
 
-let port = 5000;
+let port = 8000;
 try {
   port = parseInt(Deno.env.get('PORT') || port.toString());
-} catch (err) {
+} catch (thrown) {
+  const err = thrown as Error;
   console.error(`WARN: failed to read $PORT due to ${err.name}`);
 }