Import from deco instead of live

Signed-off-by: Marcos Candeia <marrcooos@gmail.com>

compat/$live/handlers/devPage.ts

@@ -1,6 +1,6 @@
-import { Page } from "$live/blocks/page.ts";
-import { context } from "$live/live.ts";
-import { adminUrlFor, isAdmin } from "$live/utils/admin.ts";
+import { Page } from "deco/blocks/page.ts";
+import { context } from "deco/live.ts";
+import { adminUrlFor, isAdmin } from "deco/utils/admin.ts";
 import { ConnInfo } from "std/http/server.ts";
 import Fresh from "../../../website/handlers/fresh.ts";
 import { pageIdFromMetadata } from "../../../website/pages/Page.tsx";

compat/$live/handlers/router.ts

@@ -1,5 +1,5 @@
-import { Handler } from "$live/blocks/handler.ts";
-import { FnContext } from "$live/types.ts";
+import { Handler } from "deco/blocks/handler.ts";
+import { FnContext } from "deco/types.ts";
 import { Routes } from "../../../website/flags/audience.ts";
 import { router } from "../../../website/handlers/router.ts";
 

compat/$live/loaders/state.ts

@@ -1,11 +1,11 @@
-import { Accounts } from "$live/blocks/account.ts";
-import { Flag } from "$live/blocks/flag.ts";
-import { Loader } from "$live/blocks/loader.ts";
-import { Page } from "$live/blocks/page.ts";
-import { Section } from "$live/blocks/section.ts";
-import { Resolvable } from "$live/engine/core/resolver.ts";
-import { Apps, LoaderContext } from "$live/mod.ts";
-import { MiddlewareConfig } from "$live/routes/_middleware.ts";
+import { Accounts } from "deco/blocks/account.ts";
+import { Flag } from "deco/blocks/flag.ts";
+import { Loader } from "deco/blocks/loader.ts";
+import { Page } from "deco/blocks/page.ts";
+import { Section } from "deco/blocks/section.ts";
+import { Resolvable } from "deco/engine/core/resolver.ts";
+import { Apps, LoaderContext } from "deco/mod.ts";
+import { MiddlewareConfig } from "deco/routes/_middleware.ts";
 
 /**
  * @titleBy key

compat/$live/mod.ts

@@ -1,14 +1,14 @@
 // deno-lint-ignore-file no-explicit-any
-import type { App } from "$live/mod.ts";
+import type { App } from "deco/mod.ts";
 // this should not be changed to $live because newly created versions might not include live.gen.ts.
-import { buildSourceMap } from "$live/blocks/utils.tsx";
-import type { Manifest as LiveManifest } from "$live/live.gen.ts";
+import { buildSourceMap } from "deco/blocks/utils.tsx";
+import type { Manifest as LiveManifest } from "deco/live.gen.ts";
 
 import type { Manifest as WebSiteManifest } from "../../website/manifest.gen.ts";
 import webSite, { Props } from "../../website/mod.ts";
 import type { Manifest as WorkflowsManifest } from "../../workflows/manifest.gen.ts";
 
-import { SourceMap } from "$live/blocks/app.ts";
+import { SourceMap } from "deco/blocks/app.ts";
 import workflows from "../../workflows/mod.ts";
 import manifest, { Manifest as _Manifest } from "./manifest.gen.ts";
 

compat/$live/sections/Conditional_Beta.tsx

@@ -1,8 +1,8 @@
-import { Section } from "$live/blocks/section.ts";
+import { Section } from "deco/blocks/section.ts";
 import { renderSection } from "../../../website/pages/Page.tsx";
 import withConditions, {
   Props as ConditionalProps,
-} from "$live/utils/conditionals.ts";
+} from "deco/utils/conditionals.ts";
 
 export interface Props {
   sections: Section[];

compat/$live/sections/PageInclude.tsx

@@ -1,5 +1,5 @@
-import { Page } from "$live/blocks/page.ts";
-import { notUndefined } from "$live/engine/core/utils.ts";
+import { Page } from "deco/blocks/page.ts";
+import { notUndefined } from "deco/engine/core/utils.ts";
 
 import {
   Props as LivePageProps,

compat/$live/sections/Slot.tsx

@@ -1,4 +1,4 @@
-import { isSection, Section } from "$live/blocks/section.ts";
+import { isSection, Section } from "deco/blocks/section.ts";
 
 export type WellKnownSlots =
   | "content"

compat/$live/sections/UseSlot.tsx

@@ -1,5 +1,5 @@
-import { Section } from "$live/blocks/section.ts";
-import { notUndefined } from "$live/engine/core/utils.ts";
+import { Section } from "deco/blocks/section.ts";
+import { notUndefined } from "deco/engine/core/utils.ts";
 import { useLivePageContext } from "../../../website/pages/Page.tsx";
 import { WellKnownSlots } from "../sections/Slot.tsx";
 

compat/std/mod.ts

@@ -1,8 +1,8 @@
 // deno-lint-ignore-file no-explicit-any
 export { onBeforeResolveProps } from "../../website/mod.ts";
-import { SourceMap } from "$live/blocks/app.ts";
-import { buildSourceMap } from "$live/blocks/utils.tsx";
-import type { App, AppManifest } from "$live/mod.ts";
+import { SourceMap } from "deco/blocks/app.ts";
+import { buildSourceMap } from "deco/blocks/utils.tsx";
+import type { App, AppManifest } from "deco/mod.ts";
 import type { PickByValue } from "https://esm.sh/utility-types@3.10.0";
 import $live from "../$live/mod.ts";
 import type { Manifest as ShopifyManifest } from "../../shopify/manifest.gen.ts";

compat/std/runtime.ts

@@ -1,4 +1,4 @@
-import { forApp } from "$live/clients/withManifest.ts";
+import { forApp } from "deco/clients/withManifest.ts";
 import app from "./mod.ts";
 
 export const Runtime = forApp<ReturnType<typeof app>>();

decohub/mod.ts

@@ -1,4 +1,4 @@
-import type { App, FnContext } from "$live/mod.ts";
+import type { App, FnContext } from "deco/mod.ts";
 import manifest, { Manifest } from "./manifest.gen.ts";
 
 // deno-lint-ignore ban-types

deno.json

@@ -2,13 +2,13 @@
   "lock": false,
   "tasks": {
     "check": "deno fmt && deno lint",
-    "release": "deno eval 'import \"$live/scripts/release.ts\"'",
-    "start": "deno eval 'import \"$live/scripts/apps/bundle.ts\"'",
-    "link": "deno eval 'import \"$live/scripts/apps/link.ts\"'",
-    "unlink": "deno eval 'import \"$live/scripts/apps/unlink.ts\"'",
-    "serve": "deno eval 'import \"$live/scripts/apps/serve.ts\"'",
-    "watcher": "deno eval 'import \"$live/scripts/apps/watcher.ts\"'",
-    "update": "deno eval 'import \"$live/scripts/update.ts\"'",
+    "release": "deno eval 'import \"deco/scripts/release.ts\"'",
+    "start": "deno eval 'import \"deco/scripts/apps/bundle.ts\"'",
+    "link": "deno eval 'import \"deco/scripts/apps/link.ts\"'",
+    "unlink": "deno eval 'import \"deco/scripts/apps/unlink.ts\"'",
+    "serve": "deno eval 'import \"deco/scripts/apps/serve.ts\"'",
+    "watcher": "deno eval 'import \"deco/scripts/apps/watcher.ts\"'",
+    "update": "deno eval 'import \"deco/scripts/update.ts\"'",
     "new": "deno run -A ./scripts/new.ts"
   },
   "githooks": {

handlebars/mod.ts

@@ -1,4 +1,4 @@
-import type { App, AppContext as AC } from "$live/mod.ts";
+import type { App, AppContext as AC } from "deco/mod.ts";
 import { SourceMap } from "deco/blocks/app.ts";
 import { SectionModule } from "deco/blocks/section.ts";
 import { JSONSchema7 } from "deco/deps.ts";

import_map.json

@@ -1,6 +1,5 @@
 {
   "imports": {
-    "$live/": "https://denopkg.com/deco-cx/deco@1.34.3/",
     "$fresh/": "https://denopkg.com/denoland/fresh@1.4.2/",
     "preact": "https://esm.sh/preact@10.15.1",
     "preact/": "https://esm.sh/preact@10.15.1/",
@@ -10,6 +9,7 @@
     "std/": "https://deno.land/std@0.190.0/",
     "partytown/": "https://deno.land/x/partytown@0.3.4/",
     "deco-sites/std/": "https://denopkg.com/deco-sites/std@1.21.7/",
-    "deco/": "https://denopkg.com/deco-cx/deco@1.34.3/"
+    "deco/": "https://deno.land/x/deco@1.34.5/",
+    "$live/": "https://deno.land/x/deco@1.34.5/"
   }
 }

scripts/new.ts

@@ -13,7 +13,7 @@ await Deno.writeTextFile(
 await Deno.writeTextFile(
   join(Deno.cwd(), appName, "mod.ts"),
   `
-import type { App, AppContext as AC } from "$live/mod.ts";
+import type { App, AppContext as AC } from "deco/mod.ts";
 import manifest, { Manifest } from "./manifest.gen.ts";
 
 // deno-lint-ignore ban-types

shopify/mod.ts

@@ -1,4 +1,4 @@
-import type { App, FnContext } from "$live/mod.ts";
+import type { App, FnContext } from "deco/mod.ts";
 import { fetchSafe } from "../utils/fetch.ts";
 import { createGraphqlClient } from "../utils/graphql.ts";
 import manifest, { Manifest } from "./manifest.gen.ts";

shopify/runtime.ts

@@ -1,4 +1,4 @@
-import { proxy } from "$live/clients/withManifest.ts";
+import { proxy } from "deco/clients/withManifest.ts";
 import { Manifest } from "./manifest.gen.ts";
 
 export const invoke = proxy<Manifest>();

utils/fetch.ts

@@ -4,7 +4,7 @@ import {
   retry,
 } from "https://esm.sh/cockatiel@3.1.1?target=es2019";
 import { HttpError } from "./http.ts";
-import { fetch } from "$live/runtime/fetch/mod.ts";
+import { fetch } from "deco/runtime/fetch/mod.ts";
 
 // this error is thrown by deno deploy when the connection is closed by the server.
 // check the discussion at discord: https://discord.com/channels/985687648595243068/1107104244517048320/1107111259813466192

utils/http.ts

@@ -1,4 +1,4 @@
-import { RequestInit } from "$live/runtime/fetch/mod.ts";
+import { RequestInit } from "deco/runtime/fetch/mod.ts";
 import { fetchSafe } from "./fetch.ts";
 
 const HTTP_VERBS = new Set(

vnda/mod.ts

@@ -1,4 +1,4 @@
-import type { App, FnContext } from "$live/mod.ts";
+import type { App, FnContext } from "deco/mod.ts";
 import { createHttpClient } from "../utils/http.ts";
 import manifest, { Manifest } from "./manifest.gen.ts";
 import { API } from "./utils/client/client.ts";

vnda/runtime.ts

@@ -1,4 +1,4 @@
-import { proxy } from "$live/clients/withManifest.ts";
+import { proxy } from "deco/clients/withManifest.ts";
 import { Manifest } from "./manifest.gen.ts";
 
 export const invoke = proxy<Manifest>();

vtex/handlers/sitemap.ts

@@ -1,4 +1,4 @@
-import Proxy from "$live/handlers/proxy.ts";
+import Proxy from "deco/handlers/proxy.ts";
 import { ConnInfo } from "std/http/server.ts";
 import { AppContext } from "../mod.ts";
 

vtex/mod.ts

@@ -1,4 +1,4 @@
-import type { App, FnContext } from "$live/mod.ts";
+import type { App, FnContext } from "deco/mod.ts";
 import { fetchSafe } from "./utils/fetchVTEX.ts";
 import { createHttpClient } from "../utils/http.ts";
 import manifest, { Manifest } from "./manifest.gen.ts";

vtex/runtime.ts

@@ -1,4 +1,4 @@
-import { proxy } from "$live/clients/withManifest.ts";
+import { proxy } from "deco/clients/withManifest.ts";
 import { Manifest } from "./manifest.gen.ts";
 
 export const invoke = proxy<Manifest>();

website/actions/secrets/encrypt.ts

@@ -1,7 +1,7 @@
-import { badRequest } from "$live/engine/errors.ts";
-import { context } from "$live/live.ts";
-import { ActionContext } from "$live/types.ts";
-import { allowCorsFor } from "$live/utils/http.ts";
+import { badRequest } from "deco/engine/errors.ts";
+import { context } from "deco/live.ts";
+import { ActionContext } from "deco/types.ts";
+import { allowCorsFor } from "deco/utils/http.ts";
 import { encryptToHex } from "../../utils/crypto.ts";
 
 export interface Props {

website/components/_Analytics.tsx

@@ -1,7 +1,7 @@
-import { context } from "$live/live.ts";
+import { context } from "deco/live.ts";
 import Script from "partytown/Script.tsx";
 import Jitsu from "partytown/integrations/Jitsu.tsx";
-import { Flag } from "$live/types.ts";
+import { Flag } from "deco/types.ts";
 
 const main = (
   userData: {

website/components/_Controls.tsx

@@ -1,5 +1,5 @@
 import { Head } from "$fresh/runtime.ts";
-import type { Flag, Site } from "$live/types.ts";
+import type { Flag, Site } from "deco/types.ts";
 
 interface Page {
   id: string | number;

website/flags/audience.ts

@@ -1,9 +1,9 @@
-import { FlagObj } from "$live/blocks/flag.ts";
-import { Handler } from "$live/blocks/handler.ts";
-import { Matcher } from "$live/blocks/matcher.ts";
-import JsonViewer from "$live/components/JsonViewer.tsx";
-import { Resolvable } from "$live/engine/core/resolver.ts";
-import { metabasePreview } from "$live/utils/metabase.tsx";
+import { FlagObj } from "deco/blocks/flag.ts";
+import { Handler } from "deco/blocks/handler.ts";
+import { Matcher } from "deco/blocks/matcher.ts";
+import JsonViewer from "deco/components/JsonViewer.tsx";
+import { Resolvable } from "deco/engine/core/resolver.ts";
+import { metabasePreview } from "deco/utils/metabase.tsx";
 import Flag from "./flag.ts";
 export { onBeforeResolveProps } from "./everyone.ts";
 /**

website/flags/everyone.ts

@@ -1,7 +1,7 @@
-import { FlagObj } from "$live/blocks/flag.ts";
-import { asResolved } from "$live/engine/core/resolver.ts";
+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 "$live/matchers/MatchAlways.ts";
+import MatchAlways from "deco/matchers/MatchAlways.ts";
 
 export interface EveryoneConfig {
   routes?: Routes;

website/flags/flag.ts

@@ -1,4 +1,4 @@
-import { FlagObj } from "$live/blocks/flag.ts";
+import { FlagObj } from "deco/blocks/flag.ts";
 export { onBeforeResolveProps } from "./everyone.ts";
 
 export type Props<T> = FlagObj<T>;

website/flags/multivariate.ts

@@ -1,6 +1,6 @@
-import { MultivariateFlag, Variant } from "$live/blocks/flag.ts";
-import { Section } from "$live/blocks/section.ts";
-import { asResolved } from "$live/engine/core/resolver.ts";
+import { MultivariateFlag, Variant } from "deco/blocks/flag.ts";
+import { Section } from "deco/blocks/section.ts";
+import { asResolved } from "deco/engine/core/resolver.ts";
 
 /**
  * @title Multivariate

website/functions/requestToParam.ts

@@ -1,4 +1,4 @@
-import type { FunctionContext, LoaderFunction } from "$live/types.ts";
+import type { FunctionContext, LoaderFunction } from "deco/types.ts";
 
 export type RequestURLParam = string;
 

website/handlers/fresh.ts

@@ -1,7 +1,7 @@
 import { HandlerContext } from "$fresh/server.ts";
-import { Page } from "$live/blocks/page.ts";
-import { RouterContext } from "$live/types.ts";
-import { allowCorsFor } from "$live/utils/http.ts";
+import { Page } from "deco/blocks/page.ts";
+import { RouterContext } from "deco/types.ts";
+import { allowCorsFor } from "deco/utils/http.ts";
 import { ConnInfo } from "std/http/server.ts";
 
 export interface FreshConfig {

website/handlers/proxy.ts

@@ -1,5 +1,5 @@
 import { getSetCookies, Handler, setCookie } from "std/http/mod.ts";
-import { isFreshCtx } from "$live/handlers/fresh.ts";
+import { isFreshCtx } from "deco/handlers/fresh.ts";
 
 const HOP_BY_HOP = [
   "Keep-Alive",

website/handlers/router.ts

@@ -1,13 +1,13 @@
-import { ResolveOptions } from "$live/engine/core/mod.ts";
+import { ResolveOptions } from "deco/engine/core/mod.ts";
 import {
   isDeferred,
   Resolvable,
   ResolveFunc,
-} from "$live/engine/core/resolver.ts";
-import { isAwaitable } from "$live/engine/core/utils.ts";
-import { FreshContext } from "$live/engine/manifest/manifest.ts";
-import { isFreshCtx } from "$live/handlers/fresh.ts";
-import { Flag, LiveState, RouterContext } from "$live/types.ts";
+} 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 { Flag, LiveState, RouterContext } from "deco/types.ts";
 import { ConnInfo, Handler } from "std/http/server.ts";
 import { Route, Routes } from "../flags/audience.ts";
 import { AppContext } from "../mod.ts";

website/handlers/sitemap.ts

@@ -1,6 +1,6 @@
-import type { Handler } from "$live/blocks/handler.ts";
-import type { Resolvable } from "$live/engine/core/resolver.ts";
-import { isResolvable } from "$live/engine/core/resolver.ts";
+import type { Handler } from "deco/blocks/handler.ts";
+import type { Resolvable } from "deco/engine/core/resolver.ts";
+import { isResolvable } from "deco/engine/core/resolver.ts";
 import { ConnInfo } from "std/http/server.ts";
 import { Route } from "../flags/audience.ts";
 

website/loaders/extension.ts

@@ -1,4 +1,4 @@
-import { PromiseOrValue } from "$live/engine/core/utils.ts";
+import { PromiseOrValue } from "deco/engine/core/utils.ts";
 
 /**
  * @title The type extension.

website/loaders/pages.ts

@@ -1,4 +1,4 @@
-import defaults from "$live/engine/manifest/defaults.ts";
+import defaults from "deco/engine/manifest/defaults.ts";
 import { Route } from "../flags/audience.ts";
 import { AppContext } from "../mod.ts";
 import LivePage from "../pages/Page.tsx";

website/loaders/secret.ts

@@ -1,4 +1,4 @@
-import { context } from "$live/live.ts";
+import { context } from "deco/live.ts";
 import { decryptFromHex } from "../utils/crypto.ts";
 
 /**

website/matchers/device.ts

@@ -1,4 +1,4 @@
-import { MatchContext } from "$live/blocks/matcher.ts";
+import { MatchContext } from "deco/blocks/matcher.ts";
 import { UAParser } from "https://esm.sh/ua-parser-js@1.0.35";
 
 /**

website/matchers/host.ts

@@ -1,4 +1,4 @@
-import { MatchContext } from "$live/blocks/matcher.ts";
+import { MatchContext } from "deco/blocks/matcher.ts";
 
 /**
  * @title {{{includes}}} {{{match}}}

website/matchers/location.ts

@@ -1,4 +1,4 @@
-import { MatchContext } from "$live/blocks/matcher.ts";
+import { MatchContext } from "deco/blocks/matcher.ts";
 
 /**
  * @title {{{city}}} {{{regionCode}}} {{{country}}}

website/matchers/multi.ts

@@ -1,4 +1,4 @@
-import { MatchContext, Matcher } from "$live/blocks/matcher.ts";
+import { MatchContext, Matcher } from "deco/blocks/matcher.ts";
 
 /**
  * @title Combined options with {{{op}}}

website/matchers/site.ts

@@ -1,4 +1,4 @@
-import { MatchContext } from "$live/blocks/matcher.ts";
+import { MatchContext } from "deco/blocks/matcher.ts";
 
 /**
  * @title {{{siteId}}}