feat: migrate to Fresh 2

analytics/components/DecoAnalytics.tsx

@@ -1,4 +1,4 @@
-import { Head } from "$fresh/runtime.ts";
+import { Head } from "fresh/runtime";
 import { useScriptAsDataURI } from "@deco/deco/hooks";
 export interface Props {
   /**

deno.json

@@ -1,10 +1,11 @@
 {
   "imports": {
-    "$fresh/": "https://cdn.jsdelivr.net/gh/denoland/fresh@1.6.8/",
-    "preact": "npm:preact@10.23.1",
-    "preact-render-to-string": "npm:preact-render-to-string@6.4.2",
-    "@preact/signals": "https://esm.sh/*@preact/signals@1.1.3",
-    "@preact/signals-core": "https://esm.sh/@preact/signals-core@1.3.0",
+    "fresh": "jsr:@fresh/core@^2.2.0",
+    "fresh/": "jsr:@fresh/core@^2.2.0/",
+    "$fresh/": "jsr:@fresh/core@^2.2.0/",
+    "preact": "npm:preact@^10.27.0",
+    "preact-render-to-string": "npm:preact-render-to-string@^6.5.11",
+    "@preact/signals": "npm:@preact/signals@^2.2.1",
     "std/": "https://deno.land/std@0.204.0/",
     "partytown/": "https://deno.land/x/partytown@0.4.8/",
     "deco-sites/std/": "https://cdn.jsdelivr.net/gh/deco-sites/std@1.26.8/",
@@ -33,8 +34,8 @@
     "@zaubrik/djwt": "jsr:@zaubrik/djwt@^3.0.2",
     "fast-json-patch": "npm:fast-json-patch@^3.1.1",
     "simple-git": "npm:simple-git@^3.25.0",
-    "https://esm.sh/*preact-render-to-string@6.3.1": "npm:preact-render-to-string@6.4.2",
-    "@deco/deco": "jsr:@deco/deco@^1.127.0"
+    "https://esm.sh/*preact-render-to-string@6.3.1": "npm:preact-render-to-string@^6.5.11",
+    "@deco/deco": "https://denopkg.com/deco-cx/deco@fresh2/mod.ts"
   },
   "lock": false,
   "tasks": {
@@ -69,5 +70,5 @@
       ]
     }
   },
-  "version": "0.133.27"
+  "version": "1.0.0"
 }

htmx/sections/htmx.tsx

@@ -1,4 +1,4 @@
-import { Head } from "$fresh/runtime.ts";
+import { Head } from "fresh/runtime";
 import { AppContext, Extension } from "../mod.ts";
 import { type SectionProps } from "@deco/deco";
 import { useScript } from "@deco/deco/hooks";

linx-impulse/sections/Script/LinxImpulseScript.tsx

@@ -1,4 +1,4 @@
-import { Head } from "$fresh/runtime.ts";
+import { Head } from "fresh/runtime";
 import { AppContext } from "../../mod.ts";
 import { type SectionProps } from "@deco/deco";
 export const loader = (_props: unknown, _req: Request, ctx: AppContext) => ({

linx/hooks/context.ts

@@ -1,4 +1,4 @@
-import { IS_BROWSER } from "$fresh/runtime.ts";
+import { IS_BROWSER } from "fresh/runtime";
 import { signal } from "@preact/signals";
 import { invoke } from "../runtime.ts";
 import type { CartResponse } from "../utils/types/basketJSON.ts";

nuvemshop/hooks/context.ts

@@ -1,4 +1,4 @@
-import { IS_BROWSER } from "$fresh/runtime.ts";
+import { IS_BROWSER } from "fresh/runtime";
 import { signal } from "@preact/signals";
 import { invoke } from "../runtime.ts";
 import { Cart } from "../utils/types.ts";

posthog/components/PostHog.tsx

@@ -1,4 +1,4 @@
-import { Head } from "$fresh/runtime.ts";
+import { Head } from "fresh/runtime";
 import { AppContext } from "../mod.ts";
 import { useScriptAsDataURI } from "@deco/deco/hooks";
 export interface Props {

shopify/hooks/context.ts

@@ -1,4 +1,4 @@
-import { IS_BROWSER } from "$fresh/runtime.ts";
+import { IS_BROWSER } from "fresh/runtime";
 import { signal } from "@preact/signals";
 import { Person } from "../../commerce/types.ts";
 import { invoke } from "../runtime.ts";

sourei/sections/Analytics/Sourei.tsx

@@ -1,5 +1,5 @@
 // deno-lint-ignore-file no-explicit-any
-import { Head } from "$fresh/runtime.ts";
+import { Head } from "fresh/runtime";
 import { useScriptAsDataURI } from "@deco/deco/hooks";
 interface Props {
   /**

utils/defaultErrorPage.tsx

@@ -1,4 +1,4 @@
-import { Head } from "$fresh/runtime.ts";
+import { Head } from "fresh/runtime";
 
 type Props = {
   error?: string;

vnda/hooks/context.ts

@@ -1,4 +1,4 @@
-import { IS_BROWSER } from "$fresh/runtime.ts";
+import { IS_BROWSER } from "fresh/runtime";
 import { signal } from "@preact/signals";
 import { invoke } from "../runtime.ts";
 import type { Cart } from "../loaders/cart.ts";

vtex/hooks/context.ts

@@ -1,4 +1,4 @@
-import { IS_BROWSER } from "$fresh/runtime.ts";
+import { IS_BROWSER } from "fresh/runtime";
 import { signal } from "@preact/signals";
 import { Person } from "../../commerce/types.ts";
 import { invoke } from "../runtime.ts";

wake/hooks/context.ts

@@ -1,4 +1,4 @@
-import { IS_BROWSER } from "$fresh/runtime.ts";
+import { IS_BROWSER } from "fresh/runtime";
 import { signal } from "@preact/signals";
 import { invoke } from "../runtime.ts";
 import type {

wap/hooks/context.ts

@@ -1,4 +1,4 @@
-import { IS_BROWSER } from "$fresh/runtime.ts";
+import { IS_BROWSER } from "fresh/runtime";
 import { signal } from "@preact/signals";
 import { Person } from "../../commerce/types.ts";
 import { invoke } from "../runtime.ts";

website/components/Analytics.tsx

@@ -1,4 +1,4 @@
-import { Head } from "$fresh/runtime.ts";
+import { Head } from "fresh/runtime";
 import { useScriptAsDataURI } from "@deco/deco/hooks";
 import { context } from "@deco/deco";
 declare global {

website/components/Clickhouse.tsx

@@ -1,4 +1,4 @@
-import { Head } from "$fresh/runtime.ts";
+import { Head } from "fresh/runtime";
 import { encryptToHex } from "../utils/crypto.ts";
 import { useScriptAsDataURI } from "@deco/deco/hooks";
 declare global {

website/components/Events.tsx

@@ -1,4 +1,4 @@
-import { Head } from "$fresh/runtime.ts";
+import { Head } from "fresh/runtime";
 import { type AnalyticsEvent, type Deco } from "../../commerce/types.ts";
 import { useScriptAsDataURI } from "@deco/deco/hooks";
 import { DECO_SEGMENT, type Flag } from "@deco/deco";

website/components/Image.tsx

@@ -1,4 +1,4 @@
-import { Head, IS_BROWSER } from "$fresh/runtime.ts";
+import { Head, IS_BROWSER } from "fresh/runtime";
 import type { JSX } from "preact";
 import { forwardRef } from "preact/compat";
 import { Manifest } from "../manifest.gen.ts";

website/components/OneDollarStats.tsx

@@ -1,4 +1,4 @@
-import { Head } from "$fresh/runtime.ts";
+import { Head } from "fresh/runtime";
 import { useScriptAsDataURI } from "@deco/deco/hooks";
 import { DEFAULT_ANALYTICS_SCRIPT_URL } from "../loaders/analyticsScript.ts";
 

website/components/Picture.tsx

@@ -1,7 +1,7 @@
 import { useContext, useMemo } from "preact/hooks";
 import { forwardRef } from "preact/compat";
 import { ComponentChildren, createContext, JSX } from "preact";
-import { Head, IS_BROWSER } from "$fresh/runtime.ts";
+import { Head, IS_BROWSER } from "fresh/runtime";
 
 import {
   FACTORS,

website/components/Seo.tsx

@@ -1,4 +1,4 @@
-import { Head } from "$fresh/runtime.ts";
+import { Head } from "fresh/runtime";
 import type { ImageWidget } from "../../admin/widgets.ts";
 import { stripHTML } from "../utils/html.ts";
 import { JSX } from "preact";

website/components/Theme.tsx

@@ -1,4 +1,4 @@
-import { Head } from "$fresh/runtime.ts";
+import { Head } from "fresh/runtime";
 import { useId } from "preact/hooks";
 
 export interface Variable {

website/components/_Controls.tsx

@@ -1,4 +1,4 @@
-import { Head } from "$fresh/runtime.ts";
+import { Head } from "fresh/runtime";
 import { Page } from "../../commerce/types.ts";
 import { useScriptAsDataURI } from "@deco/deco/hooks";
 import { type Flag, type Site } from "@deco/deco";

website/components/_seo/Preview.tsx

@@ -1,4 +1,4 @@
-import { Head } from "$fresh/runtime.ts";
+import { Head } from "fresh/runtime";
 import type { ComponentChildren, ComponentProps } from "preact";
 import { useMemo } from "preact/hooks";
 import { ImageWidget } from "../../../admin/widgets.ts";

website/handlers/fresh.ts

@@ -1,4 +1,3 @@
-import { HandlerContext } from "$fresh/server.ts";
 import { getSetCookies } from "std/http/cookie.ts";
 import { __DECO_FBT } from "../../utils/deferred.ts";
 import { errorIfFrameworkMismatch } from "../../utils/framework.tsx";
@@ -15,16 +14,23 @@ import {
 import type { Exception } from "npm:@opentelemetry/api@1.9.0";
 
 type ConnInfo = Deno.ServeHandlerInfo;
+
+/** Fresh context with render function */
+interface FreshContext<Data = unknown, State = unknown> {
+  render: (data?: Data) => Response | Promise<Response>;
+  state: State;
+}
+
 /**
  * @title Fresh Config
  */
 export interface FreshConfig {
   page: Page;
 }
 export const isFreshCtx = <TState>(
-  ctx: ConnInfo | HandlerContext<unknown, TState>,
-): ctx is HandlerContext<unknown, TState> => {
-  return typeof (ctx as HandlerContext).render === "function";
+  ctx: ConnInfo | FreshContext<unknown, TState>,
+): ctx is FreshContext<unknown, TState> => {
+  return typeof (ctx as FreshContext).render === "function";
 };
 function abortHandler(
   ctrl: AbortController,

website/pages/Page.tsx

@@ -1,4 +1,4 @@
-import { Head } from "$fresh/runtime.ts";
+import { Head } from "fresh/runtime";
 import {
   Context,
   HttpError,

workflows/handlers/workflowRunner.ts

@@ -1,18 +1,22 @@
-import { HandlerContext } from "$fresh/server.ts";
 import { type Handler, Workflow, WorkflowContext } from "@deco/deco/blocks";
 import { workflowHTTPHandler } from "@deco/durable";
 import {
   type AppManifest,
   type DecoSiteState,
   type DecoState,
 } from "@deco/deco";
+
+/** Context with state for workflow handlers */
+interface ContextWithState<State = unknown> {
+  state: State;
+}
+
 export interface Config {
   workflow: Workflow;
 }
 export default function WorkflowHandler({ workflow }: Config): Handler {
   return (req: Request, conn: Deno.ServeHandlerInfo) => {
-    const ctx = conn as unknown as HandlerContext<
-      unknown,
+    const ctx = conn as unknown as ContextWithState<
       DecoState<unknown, DecoSiteState, AppManifest>
     >;
     if (ctx?.state) {