Import presets from controller

Author: JunichiSugiura

package.json

@@ -30,9 +30,6 @@
     "test:storybook": "pnpm turbo build:deps test:storybook",
     "test:storybook:update": "pnpm turbo build:deps test:storybook:update"
   },
-  "dependencies": {
-    "@cartridge/presets": "github:cartridge-gg/presets#555aa13"
-  },
   "devDependencies": {
     "@changesets/changelog-github": "^0.4.2",
     "@changesets/cli": "^2.20.0",

packages/controller/package.json

@@ -66,6 +66,7 @@
   "dependencies": {
     "@cartridge/account-wasm": "workspace:*",
     "@cartridge/penpal": "catalog:",
+    "@cartridge/presets": "catalog:",
     "@starknet-io/types-js": "catalog:",
     "@telegram-apps/sdk": "^2.4.0",
     "base64url": "catalog:",

packages/keychain/.storybook/mock.ts

@@ -1,11 +1,10 @@
 import { constants, RpcProvider } from "starknet";
 import Controller from "@cartridge/controller";
-import { SessionPolicies } from "@cartridge/presets";
+import { defaultTheme, SessionPolicies } from "@cartridge/controller";
 import { Parameters } from "@storybook/react";
 import { ConnectionContextValue } from "../src/components/provider/connection";
 import { UpgradeInterface } from "../src/hooks/upgrade";
 import { ConnectCtx, ConnectionCtx } from "../src/utils/connection/types";
-import { defaultTheme } from "@cartridge/presets";
 
 export interface StoryParameters extends Parameters {
   connection?: {

packages/keychain/.storybook/provider.tsx

@@ -1,6 +1,6 @@
 import React, { PropsWithChildren } from "react";
 import { QueryClient, QueryClientProvider } from "react-query";
-import { controllerConfigs } from "@cartridge/presets";
+import { controllerConfigs } from "@cartridge/controller";
 import { mainnet } from "@starknet-react/chains";
 import { StarknetConfig, publicProvider, voyager } from "@starknet-react/core";
 import { useThemeEffect } from "@cartridge/ui-next";

packages/keychain/src/components/connect/CreateSession.stories.tsx

@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from "@storybook/react";
 import { CreateSession } from "./CreateSession";
 import { ETH_CONTRACT_ADDRESS } from "@cartridge/utils";
 import { parseSessionPolicies } from "@/hooks/session";
-import { controllerConfigs } from "@cartridge/presets";
+import { controllerConfigs } from "@cartridge/controller";
 
 const meta: Meta<typeof CreateSession> = {
   component: CreateSession,

packages/keychain/src/components/session/ContractCard.tsx

@@ -1,6 +1,6 @@
 import { useConnection } from "@/hooks/connection";
 import { useCreateSession } from "@/hooks/session";
-import type { Method } from "@cartridge/presets";
+import type { Method } from "@cartridge/controller";
 import {
   CodeIcon,
   InfoIcon,

packages/keychain/src/components/session/MessageCard.tsx

@@ -1,5 +1,5 @@
 import { useCreateSession } from "@/hooks/session";
-import type { SignMessagePolicy } from "@cartridge/presets";
+import type { SignMessagePolicy } from "@cartridge/controller";
 import {
   Accordion,
   AccordionContent,

packages/keychain/src/context/theme.tsx

@@ -1,4 +1,4 @@
-import { ControllerTheme } from "@cartridge/presets";
+import { ControllerTheme } from "@cartridge/controller";
 import { createContext } from "react";
 
 export type VerifiableControllerTheme = ControllerTheme & {

packages/keychain/src/hooks/connection.ts

@@ -10,14 +10,15 @@ import {
   ResponseCodes,
   toArray,
   toSessionPolicies,
+  defaultTheme,
+  controllerConfigs,
+  Policies,
 } from "@cartridge/controller";
 import {
   ConnectionContext,
   ConnectionContextValue,
 } from "@/components/provider/connection";
 import { UpgradeInterface, useUpgrade } from "./upgrade";
-import { Policies } from "@cartridge/presets";
-import { defaultTheme, controllerConfigs } from "@cartridge/presets";
 import { ParsedSessionPolicies, parseSessionPolicies } from "./session";
 import { VerifiableControllerTheme } from "@/context/theme";
 

packages/keychain/src/hooks/session.ts

@@ -5,7 +5,7 @@ import {
   type SignMessagePolicy,
   type TypedDataPolicy,
   erc20Metadata,
-} from "@cartridge/presets";
+} from "@cartridge/controller";
 import { CartridgeIcon, CoinsIcon } from "@cartridge/ui-next";
 import React, { createContext, useContext } from "react";
 import {

packages/keychain/src/utils/connection/connect.ts

@@ -1,6 +1,5 @@
-import { ConnectReply } from "@cartridge/controller";
+import { ConnectReply, Policies } from "@cartridge/controller";
 import { ConnectCtx, ConnectionCtx } from "./types";
-import { Policies } from "@cartridge/presets";
 
 export function connect({
   setRpcUrl,

packages/keychain/src/utils/connection/types.ts

@@ -4,8 +4,8 @@ import {
   ExecuteReply,
   ConnectError,
   DeployReply,
+  Policies,
 } from "@cartridge/controller";
-import { Policies } from "@cartridge/presets";
 import { Call, EstimateFee, Signature, TypedData } from "starknet";
 
 export type ConnectionCtx =

packages/profile/src/components/provider/theme.tsx

@@ -2,7 +2,7 @@ import {
   defaultTheme,
   controllerConfigs,
   ControllerTheme,
-} from "@cartridge/presets";
+} from "@cartridge/controller";
 import { useThemeEffect } from "@cartridge/ui-next";
 import { useCallback, useEffect, useState } from "react";
 import { useSearchParams } from "react-router-dom";

packages/profile/src/context/theme.ts

@@ -1,5 +1,5 @@
 import { createContext } from "react";
-import { defaultTheme, ControllerTheme } from "@cartridge/presets";
+import { defaultTheme, ControllerTheme } from "@cartridge/controller";
 
 export type ColorScheme = "dark" | "light" | "system";
 

packages/ui-next/package.json

@@ -71,6 +71,7 @@
   },
   "devDependencies": {
     "@cartridge/eslint": "workspace:^",
+    "@cartridge/presets": "catalog:",
     "@cartridge/tsconfig": "workspace:*",
     "@storybook/addon-essentials": "catalog:",
     "@storybook/addon-themes": "catalog:",
@@ -107,4 +108,4 @@
     "viem": "catalog:"
   },
   "sideEffects": false
-}
+}

packages/utils/package.json

@@ -28,6 +28,7 @@
     "viem": "catalog:"
   },
   "devDependencies": {
+    "@cartridge/presets": "catalog:",
     "@cartridge/tsconfig": "workspace:*",
     "@graphql-codegen/cli": "^2.6.2",
     "@graphql-codegen/typescript": "^2.4.8",

pnpm-lock.yaml

@@ -6,6 +6,7 @@ packages:
 
 catalog:
   "@cartridge/penpal": "^6.2.4"
+  "@cartridge/presets": "github:cartridge-gg/presets#555aa13"
   "@eslint/js": "^9.18.0"
   "@starknet-io/types-js": "^0.7.7"
   "@starknet-react/chains": "^3.1"