chore: use new format for workspaces and re-enable using Deno canary and v1.x (denoland#5375)

* chore: use new format for workspaces

* fixes

---------

Co-authored-by: Asher Gomez <[email protected]>

Author: kt3k

.github/workflows/ci.yml

@@ -18,9 +18,7 @@ jobs:
       matrix:
         deno:
           - v1.x
-          # TODO(iuioiua): Re-enable once workspaces functionality is fixed in canary
-          # See: https://github.com/denoland/deno/issues/24422
-          # - canary
+          - canary
         os:
           - ubuntu-latest
           - windows-latest
@@ -51,9 +49,10 @@ jobs:
           TZ=America/Toronto deno test datetime
         if: matrix.os == 'ubuntu-latest'
 
-      - name: Type check browser compatible modules
-        shell: bash
-        run: deno task test:browser
+      # TODO(kt3k): Rewrite test:browser task and enable this check
+      #- name: Type check browser compatible modules
+      #  shell: bash
+      #  run: deno task test:browser
 
       - name: Generate lcov
         run: deno task cov:gen
@@ -112,10 +111,7 @@ jobs:
       - name: Set up Deno
         uses: denoland/setup-deno@v1
         with:
-          # TODO(iuioiua): Revert once workspaces functionality is fixed in canary
-          # See: https://github.com/denoland/deno/issues/24422
-          # deno-version: canary
-          deno-version: v1.x
+          deno-version: canary
 
       - name: Format
         run: deno fmt --check
@@ -185,10 +181,7 @@ jobs:
       - name: Set up Deno
         uses: denoland/setup-deno@v1
         with:
-          # TODO(iuioiua): Revert once workspaces functionality is fixed in canary
-          # See: https://github.com/denoland/deno/issues/24422
-          # deno-version: canary
-          deno-version: v1.x
+          deno-version: canary
 
       - name: Publish (dry run)
         run: deno publish --dry-run

.github/workflows/workspace_publish.yml

@@ -20,10 +20,7 @@ jobs:
       - name: Set up Deno
         uses: denoland/setup-deno@v1
         with:
-          # TODO(iuioiua): Revert once workspaces functionality is fixed in canary
-          # See: https://github.com/denoland/deno/issues/24422
-          # deno-version: canary
-          deno-version: v1.x
+          deno-version: canary
 
       - name: Format
         run: deno fmt --check

_tools/utils.ts

@@ -1,7 +1,7 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
 const workspaces = JSON.parse(await Deno.readTextFile("deno.json"))
-  .workspaces as string[];
+  .workspace as string[];
 // deno-lint-ignore no-explicit-any
 const denoConfig = {} as Record<string, any>;
 for (const workspace of workspaces) {

deno.json

@@ -92,7 +92,7 @@
       ]
     }
   },
-  "workspaces": [
+  "workspace": [
     "./archive",
     "./assert",
     "./async",

fs/empty_dir_test.ts

@@ -207,8 +207,6 @@ for (const s of scenes) {
           "--no-lock",
           "--quiet",
           "--no-prompt",
-          "--config",
-          "deno.json",
         ];
 
         if (s.read) {

fs/expand_glob_test.ts

@@ -291,8 +291,6 @@ Deno.test(
         "run",
         "--quiet",
         "--no-lock",
-        "--config",
-        "deno.json",
         exampleUrl.toString(),
       ],
     });

http/file_server_test.ts

@@ -361,8 +361,6 @@ Deno.test("serveDir() script prints help", async () => {
       "--no-check",
       "--quiet",
       "--no-lock",
-      "--config",
-      "deno.json",
       "http/file_server.ts",
       "--help",
     ],
@@ -379,8 +377,6 @@ Deno.test("serveDir() script prints version", async () => {
       "--no-check",
       "--quiet",
       "--no-lock",
-      "--config",
-      "deno.json",
       "http/file_server.ts",
       "--version",
     ],
@@ -409,8 +405,6 @@ Deno.test("serveDir() script fails with partial TLS args", async () => {
       "--allow-read",
       "--allow-net",
       "--no-lock",
-      "--config",
-      "deno.json",
       "http/file_server.ts",
       ".",
       "--host",
@@ -1046,8 +1040,6 @@ function spawnDeno(args: string[], opts?: Deno.CommandOptions) {
       "run",
       "--no-lock",
       "--quiet",
-      "--config",
-      "deno.json",
       ...args,
     ],
     stdout: "piped",