Merge pull request #65 from thefrontside/deno-config-updates-1.36.x

update deno config for capat with 1.36.x (and earlier?)
thefrontside · Sep 14, 2023 · 5a84250 · 5a84250
2 parents 9007df1 + d67dae7
commit 5a84250
Show file tree

Hide file tree

Showing 11 changed files with 895 additions and 543 deletions.
diff --git a/.github/workflows/cli-release.yml b/.github/workflows/cli-release.yml
@@ -20,10 +20,9 @@ jobs:
         uses: actions/checkout@v3
 
       - name: setup deno
-        # uses: denoland/setup-deno@v1
-        uses: denoland/setup-deno@004814556e37c54a2f6e31384c9e18e983317366
+        uses: denoland/setup-deno@v1
         with:
-          deno-version: v1.25.x
+          deno-version: v1.x
 
       - name: Get Version
         id: vars

diff --git a/.github/workflows/npm-release.yml b/.github/workflows/npm-release.yml
@@ -20,8 +20,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: setup deno
-        # uses: denoland/setup-deno@v1
-        uses: denoland/setup-deno@004814556e37c54a2f6e31384c9e18e983317366
+        uses: denoland/setup-deno@v1
         with:
           deno-version: v1.x
 

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -28,7 +28,7 @@ jobs:
       - name: setup deno
         uses: denoland/setup-deno@v1
         with:
-          deno-version: "1.25.1"
+          deno-version: v1.x
 
       - name: format
         run: deno fmt --check

diff --git a/cli/deno.json b/cli/deno.json
@@ -19,26 +19,20 @@
     "rules": {
       "exclude": ["prefer-const", "require-yield", "no-inner-declarations"]
     },
-    "files": {
-      "exclude": ["dist", "example", "bundled-assets.js", "node_modules"]
-    }
+    "exclude": ["dist", "example", "bundled-assets.js", "node_modules"]
   },
   "fmt": {
-    "files": {
-      "exclude": [
-        "README.md",
-        "build/",
-        "node_modules",
-        "example",
-        "bundled-assets.js",
-        "dist"
-      ]
-    }
+    "exclude": [
+      "README.md",
+      "build/",
+      "node_modules",
+      "example",
+      "bundled-assets.js",
+      "dist"
+    ]
   },
   "test": {
-    "files": {
-      "exclude": ["build", "node_modules", "example"]
-    }
+    "exclude": ["build", "node_modules", "example"]
   },
   "compilerOptions": {
     "jsx": "react-jsx",

diff --git a/cli/deno.lock b/cli/deno.lock
diff --git a/deno.json b/deno.json
@@ -8,18 +8,12 @@
     "rules": {
       "exclude": ["prefer-const", "require-yield", "no-inner-declarations"]
     },
-    "files": {
-      "exclude": ["build", "cli", "www/"]
-    }
+    "exclude": ["build", "cli", "www/"]
   },
   "fmt": {
-    "files": {
-      "exclude": ["README.md", "build/", "cli", "www/"]
-    }
+    "exclude": ["README.md", "build/", "cli", "www/"]
   },
   "test": {
-    "files": {
-      "exclude": ["build", "cli", "www/"]
-    }
+    "exclude": ["build", "cli", "www/"]
   }
 }
diff --git a/deno.lock b/deno.lock
diff --git a/src/deps.ts b/src/deps.ts
@@ -1,9 +1,9 @@
-export * as graphql from "https://esm.sh/[email protected]";
+export * as graphql from "https://esm.sh/[email protected]?pin=v132";
 export * from "https://deno.land/x/[email protected]/mod.ts";
 export * from "https://deno.land/x/[email protected]/index.ts";
 export { assert } from "https://deno.land/[email protected]/testing/asserts.ts";
-export { default as globToRegExp } from "https://esm.sh/[email protected]";
-export { default as hash } from "https://esm.sh/[email protected]";
+export { default as globToRegExp } from "https://esm.sh/[email protected]?pin=v132";
+export { default as hash } from "https://esm.sh/[email protected]?pin=v132";
 
-import * as alea from "https://esm.sh/[email protected]";
+import * as alea from "https://esm.sh/[email protected]?pin=v132";
 export const Alea = alea.default;
diff --git a/src/graphql/types.ts b/src/graphql/types.ts
@@ -78,7 +78,6 @@ export interface Node {
 
 type NonOverridableKeys = "__typename" | "id";
 
-//deno-lint-ignore ban-types
 export type Preset<T> = T extends object ? {
     [P in keyof T as P extends NonOverridableKeys ? never : P]?: Preset<T[P]>;
   }

diff --git a/www/deno.lock b/www/deno.lock
diff --git a/www/test/www.test.ts b/www/test/www.test.ts
@@ -14,7 +14,6 @@ import twindConfig from "../twind.config.ts";
 
 describe("www", () => {
   let controller: AbortController;
-  let closed: Promise<void>;
   beforeEach(async function () {
     controller = new AbortController();
     let opts = {
@@ -26,11 +25,14 @@ describe("www", () => {
       plugins: [twindPlugin(twindConfig)],
     });
     await new Promise((onListen) => {
-      closed = Deno.serve(cxt.handler() as Deno.ServeHandler, {
-        ...opts,
-        signal: controller.signal,
-        onListen,
-      });
+      Deno.serve(
+        {
+          ...opts,
+          signal: controller.signal,
+          onListen,
+        },
+        cxt.handler() as Deno.ServeHandler
+      );
     });
   });
   afterEach(async () => {
@@ -56,7 +58,7 @@ describe("www", () => {
     expect(response.ok).toEqual(true);
     expect(response.headers.get("Content-Type")).toMatch("text/html");
     expect(html).toContain(
-      `<base href="http://example.com/path/to/subdir/" />`,
+      `<base href="http://example.com/path/to/subdir/" />`
     );
   });
 });