Deno 2 support (#937)

* Deno 2 support

Signed-off-by: Marcos Candeia <[email protected]>

* Set frozen arg

Signed-off-by: Marcos Candeia <[email protected]>

* Fix checks

* Allow imports on deno check

---------

Signed-off-by: Marcos Candeia <[email protected]>
Co-authored-by: Matheus Gaudencio do Rêgo <[email protected]>

.github/workflows/ci.yaml

@@ -26,11 +26,11 @@ jobs:
           path: |
             /home/runner/.deno
             /home/runner/.cache/deno/deps/https/deno.land
-      - uses: denoland/setup-deno@v1
+      - uses: denoland/setup-deno@v2
         with:
-          deno-version: v1.x
+          deno-version: v2.x
       - name: Bundle Apps
-        run: deno run -A --lock=deno.lock --lock-write --reload scripts/start.ts
+        run: deno run -A --lock=deno.lock --frozen=false --reload scripts/start.ts
 
       - name: Check
         run: deno task check
@@ -47,8 +47,8 @@ jobs:
 
       - name: Test
         continue-on-error: true
-        run: deno test --lock=deno.lock --lock-write -A .
+        run: deno test --lock=deno.lock --frozen=false -A .
 
       - name: Benchmark
         continue-on-error: true
-        run: deno bench --lock=deno.lock --lock-write -A .
+        run: deno bench --lock=deno.lock --frozen=false -A .

.github/workflows/issues.yaml

@@ -15,4 +15,4 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GH_REPO: ${{ github.repository }}
           NUMBER: ${{ github.event.issue.number }}
-          LABELS: triage
+          LABELS: triage

.github/workflows/releaser.yaml

@@ -9,9 +9,9 @@ on:
       - main
 
 permissions:
-  contents: write  # Necessary for accessing and modifying repository content
-  pull-requests: write  # Necessary for interacting with pull requests
-  actions: write  # Necessary for triggering other workflows
+  contents: write # Necessary for accessing and modifying repository content
+  pull-requests: write # Necessary for interacting with pull requests
+  actions: write # Necessary for triggering other workflows
 
 jobs:
   tag-discussion:
@@ -21,9 +21,9 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v3
         with:
-          ref: ${{ github.event.pull_request.base.ref }}  # Checkout the base branch (target repository)
-          repository: ${{ github.event.pull_request.base.repo.full_name }}  # Checkout from the target repo
-          
+          ref: ${{ github.event.pull_request.base.ref }} # Checkout the base branch (target repository)
+          repository: ${{ github.event.pull_request.base.repo.full_name }} # Checkout from the target repo
+
       - name: Calculate new versions
         id: calculate_versions
         run: |
@@ -162,11 +162,11 @@ jobs:
         run: |
           git tag ${{ steps.determine_version.outputs.new_version }}
           git push origin ${{ steps.determine_version.outputs.new_version }}
-  
+
       - name: Trigger Release Workflow
         run: |
           curl -X POST \
             -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
             -H "Accept: application/vnd.github.everest-preview+json" \
             https://api.github.com/repos/${{ github.repository }}/actions/workflows/release.yaml/dispatches \
-            -d '{"ref":"main", "inputs":{"tag_name":"${{ steps.determine_version.outputs.new_version }}"}}'
+            -d '{"ref":"main", "inputs":{"tag_name":"${{ steps.determine_version.outputs.new_version }}"}}'

ai-assistants/actions/describeImage.ts

@@ -2,6 +2,7 @@ import { AssistantIds } from "../types.ts";
 import { AppContext } from "../mod.ts";
 import { logger, meter, ValueType } from "@deco/deco/o11y";
 import { shortcircuit } from "@deco/deco";
+
 const stats = {
   promptTokens: meter.createHistogram("assistant_image_prompt_tokens", {
     description: "Tokens used in Sales Assistant Describe Image Input - OpenAI",
@@ -78,13 +79,18 @@ export default async function describeImage(
     });
     return response;
   } catch (error) {
+    const errorObj = error as {
+      error: { message: string };
+      status: number;
+      headers: Headers;
+    };
     stats.describeImageError.add(1, {
       assistantId,
     });
     shortcircuit(
-      new Response(JSON.stringify({ error: error.error.message }), {
-        status: error.status,
-        headers: error.headers,
+      new Response(JSON.stringify({ error: errorObj.error.message }), {
+        status: errorObj.status,
+        headers: errorObj.headers,
       }),
     );
   }

ai-assistants/mod.ts

@@ -1,4 +1,4 @@
-import AWS from "https://esm.sh/[email protected]";
+import AWS from "npm:[email protected]";
 import { deferred } from "std/async/deferred.ts";
 import openai, {
   Props as OpenAIProps,

deno.json

@@ -38,7 +38,7 @@
   },
   "lock": false,
   "tasks": {
-    "check": "deno fmt && deno lint && deno check **/mod.ts",
+    "check": "deno fmt && deno lint && deno check --allow-import **/mod.ts",
     "release": "deno eval 'import \"deco/scripts/release.ts\"'",
     "start": "deno run -A ./scripts/start.ts",
     "bundle": "deno run -A jsr:@deco/deco/scripts/bundle",

konfidency/loaders/productDetailsPage.ts

@@ -40,8 +40,9 @@ export default function productDetailsPage(
         },
       };
     } catch (error) {
-      logger.error(`{ errorName: ${error.name},  
-      errorMessage: ${error.message} }`);
+      const errorObj = error as { name: string; message: string };
+      logger.error(`{ errorName: ${errorObj.name},  
+      errorMessage: ${errorObj.message} }`);
       return productDetailsPage;
     }
   };

posthog/components/PostHog.tsx

@@ -29,7 +29,7 @@ const snippet = () => {
   const trackPageview = () =>
     globalThis.window.posthog?.capture("$pageview", {
       ...props,
-      "$current_url": window.location.href,
+      "$current_url": globalThis.location.href,
     });
   // Attach pushState and popState listeners
   const originalPushState = history.pushState;

records/deps.ts

@@ -1,5 +1,5 @@
 import { context } from "@deco/deco";
-export * from "https://esm.sh/[email protected]/libsql";
+export * from "npm:[email protected]/libsql";
 export * from "npm:@libsql/[email protected]";
 export const createLocalClient = !context.isDeploy &&
   (await import("npm:@libsql/[email protected]/node")).createClient;

smarthint/components/Click.tsx

@@ -21,7 +21,7 @@ export const SmarthintSendEventOnClick = ({
         }
 
         elem.addEventListener("click", () => {
-          window.smarthint.click(event);
+          globalThis.smarthint.click(event);
         });
       },
       id,

smarthint/sections/Analytics/SmarthintTracking.tsx

@@ -16,7 +16,7 @@ const listener = (
     ReturnType<typeof loader>,
 ) => {
   const prodURL = new URL(publicUrl);
-  const url = new URL(window.location.href);
+  const url = new URL(globalThis.location.href);
   url.host = prodURL.host;
   url.port = "";
   const pageType =

utils/pool.ts

@@ -17,6 +17,8 @@ export const createPool = <T>(resources: T[]) => {
 
       const index = free.values().next().value;
 
+      if (index === undefined) return;
+
       taken.add(index);
       free.delete(index);
 

vtex/sections/Analytics/Vtex.tsx

@@ -15,7 +15,7 @@ interface ISCookies {
   session: any;
 }
 const snippet = (account: string, agent: string, cookies: ISCookies | null) => {
-  const url = new URL(window.location.href);
+  const url = new URL(globalThis.location.href);
   const isSearch = url.searchParams.get("q");
   const apiUrl = `https://sp.vtex.com/event-api/v1/${account}/event`;
   const eventFetch = (props: SPEvent) => {

wake/hooks/context.ts

@@ -83,7 +83,7 @@ const enqueue2 = (
         return;
       }
 
-      const isLocalhost = window.location.hostname === "localhost";
+      const isLocalhost = globalThis.location.hostname === "localhost";
 
       if (!isLocalhost) {
         const url = new URL("/api/carrinho", shop.checkoutUrl);

website/components/Clickhouse.tsx

@@ -218,7 +218,7 @@ const snippet = ({ siteId, siteName, serviceEndpoint, userId, sessionId }: {
       return match ? match[1].replace("_", ".") : "Unknown";
     }
     function getUrlParam(param: string) {
-      const urlParams = new URLSearchParams(window.location.search);
+      const urlParams = new URLSearchParams(globalThis.location.search);
       return urlParams.get(param);
     }
     function getReferrerSource(referrer: string) {
@@ -245,7 +245,7 @@ const snippet = ({ siteId, siteName, serviceEndpoint, userId, sessionId }: {
       start_time: new Date().toISOString(),
       timestamp: undefined, // get server side
       pathname: globalThis.window.location.pathname +
-        (window.location.hash ?? ""),
+        (globalThis.location.hash ?? ""),
       navigation_from: globalThis.window.navigation.activation.from,
       entry_meta: {
         key: Object.keys(values),
@@ -266,7 +266,7 @@ const snippet = ({ siteId, siteName, serviceEndpoint, userId, sessionId }: {
       ip_timezone: undefined, // get server side
       ip_lat: undefined, // get server side
       ip_long: undefined, // get server side
-      screen_size: `${window.screen.width}x${window.screen.height}`,
+      screen_size: `${globalThis.screen.width}x${globalThis.screen.height}`,
       device: getDeviceType(),
       operating_system: getOperatingSystem(),
       operating_system_version: getOSVersion(),

website/handlers/fresh.ts

@@ -12,6 +12,8 @@ import {
   isDeferred,
   RequestContext,
 } from "@deco/deco";
+import type { Exception } from "npm:@opentelemetry/[email protected]";
+
 type ConnInfo = Deno.ServeHandlerInfo;
 /**
  * @title Fresh Config
@@ -120,7 +122,7 @@ export default function Fresh(
           try {
             return await getPage();
           } catch (e) {
-            span.recordException(e);
+            span.recordException(e as Exception);
             throw e;
           } finally {
             span.end();
@@ -163,7 +165,7 @@ export default function Fresh(
               }
               return response;
             } catch (err) {
-              span.recordException(err);
+              span.recordException(err as Exception);
               throw err;
             } finally {
               span.end();

website/loaders/image.ts

@@ -68,10 +68,11 @@ const handler = async (
 
     return response;
   } catch (error) {
+    const errorObj = error as { message?: string; status: number };
     console.error(error);
 
-    return new Response(error.message ?? Deno.inspect(error), {
-      status: error instanceof HttpError ? error.status : 500,
+    return new Response(errorObj.message ?? Deno.inspect(error), {
+      status: error instanceof HttpError ? errorObj.status : 500,
       headers: {
         "cache-control": "no-cache, no-store",
         "vary": "Accept",

website/pages/Page.tsx

@@ -61,9 +61,9 @@ class ErrorBoundary extends Component<{
   // deno-lint-ignore no-explicit-any
   fallback: ComponentFunc<any>;
 }> {
-  state = { error: null as Error | null };
+  override state = { error: null as Error | null };
   // deno-lint-ignore no-explicit-any
-  static getDerivedStateFromError(error: any) {
+  static override getDerivedStateFromError(error: any) {
     return { error };
   }
   render() {

website/utils/image/engines/cloudflare/engine.ts

@@ -8,15 +8,21 @@ export const engine: Engine = {
 
     const format = prefferedMediaType?.replace("image/", "");
 
-    return fetch(src, {
-      // @ts-expect-error Only available when deployed into cloudflare workers
-      cf: {
-        image: { format, fit, width, height, quality },
-        cacheKey: `${format}-${src}`,
-        cacheEverything: true,
-        cacheTtlByStatus: { "200-299": 15552000, "400-499": 10, "500-599": 0 },
-      },
-    });
+    return fetch(
+      src,
+      {
+        cf: {
+          image: { format, fit, width, height, quality },
+          cacheKey: `${format}-${src}`,
+          cacheEverything: true,
+          cacheTtlByStatus: {
+            "200-299": 15552000,
+            "400-499": 10,
+            "500-599": 0,
+          },
+        },
+      } as RequestInit & { cf: unknown },
+    );
   },
 
   // is Cloudflare worker