From 5018afeafd3431bed803ea5223c3ace968c3d4c4 Mon Sep 17 00:00:00 2001 From: Marcos Candeia Date: Thu, 11 Jan 2024 15:17:51 -0300 Subject: [PATCH 1/4] Update files as deco version removes blocks Signed-off-by: Marcos Candeia --- LICENSE | 2 +- website/flags/everyone.ts | 2 +- website/handlers/proxy.ts | 2 +- website/handlers/router.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index 2b04acdad..8945192ae 100644 --- a/LICENSE +++ b/LICENSE @@ -12,7 +12,7 @@ "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. - +q "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, diff --git a/website/flags/everyone.ts b/website/flags/everyone.ts index c68f6d615..72aec582a 100644 --- a/website/flags/everyone.ts +++ b/website/flags/everyone.ts @@ -1,7 +1,7 @@ import { FlagObj } from "deco/blocks/flag.ts"; import { asResolved } from "deco/engine/core/resolver.ts"; import Audience, { Route, Routes } from "./audience.ts"; -import MatchAlways from "deco/matchers/MatchAlways.ts"; +import MatchAlways from "../matchers/always.ts"; export interface EveryoneConfig { routes?: Routes; diff --git a/website/handlers/proxy.ts b/website/handlers/proxy.ts index 7a5682761..f22e56df1 100644 --- a/website/handlers/proxy.ts +++ b/website/handlers/proxy.ts @@ -1,4 +1,4 @@ -import { isFreshCtx } from "deco/handlers/fresh.ts"; +import { isFreshCtx } from "deco/runtime/fresh/context.ts"; import { DecoSiteState } from "deco/mod.ts"; import { Handler } from "std/http/mod.ts"; import { proxySetCookie } from "../../utils/cookie.ts"; diff --git a/website/handlers/router.ts b/website/handlers/router.ts index 478826a23..f7cfc4b8c 100644 --- a/website/handlers/router.ts +++ b/website/handlers/router.ts @@ -6,7 +6,7 @@ import { } from "deco/engine/core/resolver.ts"; import { isAwaitable } from "deco/engine/core/utils.ts"; import { FreshContext } from "deco/engine/manifest/manifest.ts"; -import { isFreshCtx } from "deco/handlers/fresh.ts"; +import { isFreshCtx } from "deco/runtime/fresh/context.ts"; import { DecoSiteState, DecoState } from "deco/types.ts"; import { ConnInfo, Handler } from "std/http/server.ts"; import { Route, Routes } from "../flags/audience.ts"; From 51bb2380171d39b9eeb5bf5f3e55b04100cfc6c7 Mon Sep 17 00:00:00 2001 From: Marcos Candeia Date: Thu, 11 Jan 2024 15:29:57 -0300 Subject: [PATCH 2/4] Fixes license Signed-off-by: Marcos Candeia --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 8945192ae..2b04acdad 100644 --- a/LICENSE +++ b/LICENSE @@ -12,7 +12,7 @@ "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. -q + "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, From a39a1e06c524b67763d4543c9cf59ddeaea52d13 Mon Sep 17 00:00:00 2001 From: Marcos Candeia Date: Thu, 11 Jan 2024 15:32:49 -0300 Subject: [PATCH 3/4] Update deco version Signed-off-by: Marcos Candeia --- deno.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deno.json b/deno.json index bf1f09890..1b0709717 100644 --- a/deno.json +++ b/deno.json @@ -9,7 +9,7 @@ "std/": "https://deno.land/std@0.204.0/", "partytown/": "https://deno.land/x/partytown@0.4.8/", "deco-sites/std/": "https://denopkg.com/deco-sites/std@1.22.11/", - "deco/": "https://denopkg.com/deco-cx/deco@1.51.4/" + "deco/": "https://denopkg.com/deco-cx/deco@1.51.5/" }, "lock": false, "tasks": { From 21625422a369583053b2927c58d4880d5ecf9738 Mon Sep 17 00:00:00 2001 From: Marcos Candeia Date: Thu, 11 Jan 2024 16:07:31 -0300 Subject: [PATCH 4/4] Update to std 1.22.12 Signed-off-by: Marcos Candeia --- compat/std/deps.ts | 8 ++++---- deno.json | 2 +- handlebars/deps.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compat/std/deps.ts b/compat/std/deps.ts index 009135535..909e3aa48 100644 --- a/compat/std/deps.ts +++ b/compat/std/deps.ts @@ -1,4 +1,4 @@ -export type { ConfigShopify as ShopifyAccount } from "https://denopkg.com/deco-sites/std@1.22.9/commerce/shopify/client.ts"; -export type { Manifest as StdManifest } from "https://denopkg.com/deco-sites/std@1.22.9/live.gen.ts"; -export type { Account as VNDAAccount } from "https://denopkg.com/deco-sites/std@1.22.9/packs/vnda/accounts/vnda.ts"; -export type { Account as VTEXAccount } from "https://denopkg.com/deco-sites/std@1.22.9/packs/vtex/accounts/vtex.ts"; +export type { ConfigShopify as ShopifyAccount } from "https://denopkg.com/deco-sites/std@1.22.12/commerce/shopify/client.ts"; +export type { Manifest as StdManifest } from "https://denopkg.com/deco-sites/std@1.22.12/live.gen.ts"; +export type { Account as VNDAAccount } from "https://denopkg.com/deco-sites/std@1.22.12/packs/vnda/accounts/vnda.ts"; +export type { Account as VTEXAccount } from "https://denopkg.com/deco-sites/std@1.22.12/packs/vtex/accounts/vtex.ts"; diff --git a/deno.json b/deno.json index 1b0709717..9c8c48ddd 100644 --- a/deno.json +++ b/deno.json @@ -8,7 +8,7 @@ "@preact/signals-core": "https://esm.sh/@preact/signals-core@1.3.0", "std/": "https://deno.land/std@0.204.0/", "partytown/": "https://deno.land/x/partytown@0.4.8/", - "deco-sites/std/": "https://denopkg.com/deco-sites/std@1.22.11/", + "deco-sites/std/": "https://denopkg.com/deco-sites/std@1.22.12/", "deco/": "https://denopkg.com/deco-cx/deco@1.51.5/" }, "lock": false, diff --git a/handlebars/deps.ts b/handlebars/deps.ts index 62c8bfaa9..2b9efb1a5 100644 --- a/handlebars/deps.ts +++ b/handlebars/deps.ts @@ -1 +1 @@ -export { default as HTMLRenderer } from "https://denopkg.com/deco-sites/std@1.21.7/components/HTMLRenderer.tsx"; +export { default as HTMLRenderer } from "https://denopkg.com/deco-sites/std@1.22.12/components/HTMLRenderer.tsx";