Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup dependencies #1430

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Cleanup dependencies #1430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f5d16d
Cleanup dependencies
JunichiSugiura Feb 25, 2025
4b276bc
Import presets from controller
JunichiSugiura Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"starknet": "catalog:"
},
"devDependencies": {
"typescript": "^5.3.3",
"tsx": "^4.7.0",
"@types/node": "^22.12.0"
"typescript": "catalog:",
"tsx": "catalog:",
"@types/node": "catalog:"
}
}
3 changes: 0 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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#c7e6fb7"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to make sure this change works with the presets update ci

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point !

},
"devDependencies": {
"@changesets/changelog-github": "^0.4.2",
"@changesets/cli": "^2.20.0",
Expand Down
1 change: 1 addition & 0 deletions packages/controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:",
Expand Down
10 changes: 6 additions & 4 deletions packages/keychain/.storybook/mock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { constants, RpcProvider } from "starknet";
import Controller from "@cartridge/controller";
import { controllerConfigs, SessionPolicies } from "@cartridge/presets";
import Controller, {
controllerConfigs,
defaultTheme,
SessionPolicies,
} from "@cartridge/controller";
import { useThemeEffect } from "@cartridge/ui-next";
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";
import { useThemeEffect } from "@cartridge/ui-next";

export interface StoryParameters extends Parameters {
connection?: {
Expand Down
2 changes: 0 additions & 2 deletions packages/keychain/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
"graphql-request": "^5.0.0",
"inapp-spy": "4.2.1",
"lodash": "catalog:",
"p-throttle": "^6.2.0",
"posthog-js-lite": "3.2.1",
"react": "catalog:",
"react-dom": "catalog:",
"react-query": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion packages/keychain/src/components/connect/CreateSession.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/keychain/src/components/session/ContractCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/keychain/src/components/session/MessageCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useCreateSession } from "@/hooks/session";
import type { SignMessagePolicy } from "@cartridge/presets";
import type { SignMessagePolicy } from "@cartridge/controller";
import {
Accordion,
AccordionContent,
Expand Down
5 changes: 3 additions & 2 deletions packages/keychain/src/hooks/connection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ import {
ResponseCodes,
toArray,
toSessionPolicies,
defaultTheme,
controllerConfigs,
Policies,
} from "@cartridge/controller";
import {
ConnectionContext,
ConnectionContextValue,
VerifiableControllerTheme,
} from "@/components/provider/connection";
import { Policies } from "@cartridge/presets";
import { defaultTheme, controllerConfigs } from "@cartridge/presets";
import { ParsedSessionPolicies, parseSessionPolicies } from "./session";
import { useThemeEffect } from "@cartridge/ui-next";

Expand Down
2 changes: 1 addition & 1 deletion packages/keychain/src/hooks/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions packages/keychain/src/utils/connection/connect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/keychain/src/utils/connection/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion packages/profile/src/components/provider/theme.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/profile/src/context/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
1 change: 1 addition & 0 deletions packages/ui-next/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
},
"devDependencies": {
"@cartridge/eslint": "workspace:^",
"@cartridge/presets": "catalog:",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this needed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is used in storybook for mainly layout thus devDependencies.

controller/packages/ui-next/.storybook/preview.tsx

Line 10 in 4077975

import { defaultTheme } from "@cartridge/presets";

"@cartridge/tsconfig": "workspace:*",
"@storybook/addon-essentials": "catalog:",
"@storybook/addon-themes": "catalog:",
Expand Down
3 changes: 2 additions & 1 deletion packages/utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"viem": "catalog:"
},
"devDependencies": {
"@cartridge/presets": "catalog:",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this needed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is used to pass ERC20 icons to ERC20 class. In the future, it should be provided via gateway API.

"@cartridge/tsconfig": "workspace:*",
"@graphql-codegen/cli": "^2.6.2",
"@graphql-codegen/typescript": "^2.4.8",
Expand All @@ -36,7 +37,7 @@
"@types/node": "catalog:",
"@types/react": "catalog:",
"prettier": "catalog:",
"tsx": "^4.19.2",
"tsx": "catalog:",
"typescript": "catalog:"
}
}
Loading
Loading