chore: update for deno 2

.github/workflows/tests.yml

@@ -28,7 +28,7 @@ jobs:
         run: deno lint
 
       - name: Run tests
-        run: deno task test
+        run: deno run test
 
       - name: Test upgrade
         run: deno run -A cli.ts upgrade

CHANGELOG.md

@@ -226,7 +226,7 @@ Go to the `v1` branch to see the changelog of Lume 1.
 - logging:
   - URL transformation direction is more visually distinct. [#563]
   - colors replaced to `gray` to support terminals that does not support `dim` colors. [#566]
-- `deno task lume upgrade` removes the `deno.lock` file [#527].
+- `deno run lume upgrade` removes the `deno.lock` file [#527].
 - `transform_images` plugin: don't enlarge images by default [#530].
 
 ### Fixed

README.md

@@ -48,8 +48,8 @@ title: Welcome to my page
 
 Build it:
 
-```
-deno run -A https://deno.land/x/lume/cli.ts
+```sh
+deno -A https://deno.land/x/lume/cli.ts
 ```
 
 This command will compile your documents to HTML and save them into the

cli/build_worker.ts

@@ -32,12 +32,7 @@ onmessage = async (event) => {
     site.root(),
   );
 
-  function mustReload(files: Set<string>): boolean {
-    if (files.has(_config)) {
-      return true;
-    }
-    return false;
-  }
+  const mustReload = (files: Set<string>): boolean => files.has(_config);
 
   watcher.addEventListener("change", (event) => {
     const files = event.files!;

cli/cms_worker.ts

@@ -43,12 +43,8 @@ onmessage = async (event) => {
     site.root(),
   );
 
-  function mustReload(files: Set<string>): boolean {
-    if (files.has(_config) || files.has(_cms)) {
-      return true;
-    }
-    return false;
-  }
+  const mustReload = (files: Set<string>): boolean =>
+    files.has(_config) || files.has(_cms);
 
   site.addEventListener("beforeUpdate", (ev) => {
     if (mustReload(ev.files)) {

core/loaders/mod.ts

@@ -30,9 +30,5 @@ const binaryFormats = new Set<string>([
 ]);
 
 export default function getLoader(extension: string): Loader {
-  if (binaryFormats.has(extension)) {
-    return binaryLoader;
-  }
-
-  return textLoader;
+  return binaryFormats.has(extension) ? binaryLoader : textLoader;
 }

core/server.ts

@@ -12,6 +12,7 @@ import { decodeURIComponentSafe } from "./utils/path.ts";
 export interface Options extends Deno.ServeOptions {
   /** The root path */
   root: string;
+  port?: number;
 }
 
 export const defaults: Options = {
@@ -92,10 +93,10 @@ export default class Server {
   stop() {
     try {
       this.#server?.shutdown();
-    } catch (error) {
+    } catch (err) {
       this.dispatchEvent({
         type: "error",
-        error,
+        error: err as Error,
       });
     }
   }

core/watcher.ts

@@ -103,8 +103,8 @@ export default class FSWatcher implements Watcher {
           runningCallback = false;
           return watcher.close();
         }
-      } catch (error) {
-        await this.dispatchEvent({ type: "error", error });
+      } catch (err) {
+        await this.dispatchEvent({ type: "error", error: err as Error });
       }
 
       runningCallback = false;

core/writer.ts

@@ -152,8 +152,11 @@ export class FSWriter implements Writer {
         }</gray>`,
       );
       return true;
-    } catch (error) {
-      log.error(`Failed to copy file: ${file.outputPath}: ${error.message}`);
+    } catch (error: unknown) {
+      log.error(
+        // deno-lint-ignore no-explicit-any
+        `Failed to copy file: ${file.outputPath}: ${(error as any).message}`,
+      );
     }
 
     return false;

deno.json

@@ -10,9 +10,9 @@
   },
   "tasks": {
     "test": "TZ=Z LUME_LOGS=ERROR DENO_FUTURE=1 deno test -A",
-    "test:update": "deno task test -- --update",
-    "changelog": "deno run --allow-read --allow-write https://deno.land/x/[email protected]/bin.ts",
-    "update-deps": "deno run -A --quiet 'https://deno.land/x/[email protected]/cli.ts' update deps/*.ts deno.json"
+    "test:update": "deno run test -- --update",
+    "changelog": "deno --allow-read --allow-write https://deno.land/x/[email protected]/bin.ts",
+    "update-deps": "deno -A --quiet 'https://deno.land/x/[email protected]/cli.ts' update deps/*.ts deno.json"
   },
   "imports": {
     "lume/cms/": "https://cdn.jsdelivr.net/gh/lumeland/[email protected]/"

init.ts

@@ -1,7 +1,7 @@
 import { run } from "./deps/init.ts";
 
 console.warn(
-  "This module is deprecated. Use `deno run -A https://lume.land/init.ts` instead.",
+  "This module is deprecated. Use `deno -A https://lume.land/init.ts` instead.",
 );
 
 run();

plugins/decap_cms.ts

@@ -35,7 +35,7 @@ export const defaults: Options = {
   configKey: "decap_cms",
   extraHTML: "",
   proxyCommand:
-    `deno run --allow-read --allow-net=0.0.0.0 --allow-write --allow-env ${serverUrl}`,
+    `deno --allow-read --allow-net=0.0.0.0 --allow-write --allow-env ${serverUrl}`,
 };
 
 /**