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

Jump to bottom

Move typescript and viem to peer dependencies #420

Closed
wants to merge 9 commits into from
Closed

Move typescript and viem to peer dependencies #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5c1ae1b
update top level linters
kyscott18 Nov 10, 2023
9131d26
update core deps
kyscott18 Nov 10, 2023
f3f5157
pnpm dedupe
kyscott18 Nov 10, 2023
e051976
cleanup client type
kyscott18 Nov 10, 2023
4c0e17a
update example deps
kyscott18 Nov 10, 2023
f18a820
update latest
kyscott18 Nov 10, 2023
09fe7aa
docs update
kyscott18 Nov 10, 2023
27348d1
pnpm dedupe
kyscott18 Nov 10, 2023
d8cdaa8
move to peer deps
kyscott18 Nov 10, 2023
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
2 changes: 1 addition & 1 deletion benchmarks/src/anvil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if (!process.env.ANVIL_FORK_BLOCK_NUMBER) {
throw new Error('Missing environment variable "ANVIL_FORK_BLOCK_NUMBER"');
}
export const FORK_BLOCK_NUMBER = BigInt(
Number(process.env.ANVIL_FORK_BLOCK_NUMBER)
Number(process.env.ANVIL_FORK_BLOCK_NUMBER),
);

export const anvil = {
Expand Down
6 changes: 3 additions & 3 deletions benchmarks/src/ponder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const END_BLOCK_TIMESTAMP = 1687010711; // Mainnet block 17500010
const fetchPonderMetrics = async () => {
try {
const metricsResponse = await fetchWithTimeout(
"http://localhost:42069/metrics"
"http://localhost:42069/metrics",
);
const metricsRaw = await metricsResponse.text();
const metrics = parsePrometheusText(metricsRaw);
Expand All @@ -26,10 +26,10 @@ const waitForSyncComplete = async () => {
const metrics = await fetchPonderMetrics();
const latestProcessedTimestamp =
metrics.find(
(m) => m.name === "ponder_indexing_latest_processed_timestamp"
(m) => m.name === "ponder_indexing_latest_processed_timestamp",
)?.metrics[0].value ?? 0;
console.log(
`Latest processed timestamp: ${latestProcessedTimestamp}/${END_BLOCK_TIMESTAMP}`
`Latest processed timestamp: ${latestProcessedTimestamp}/${END_BLOCK_TIMESTAMP}`,
);

if (latestProcessedTimestamp >= END_BLOCK_TIMESTAMP) {
Expand Down
10 changes: 5 additions & 5 deletions benchmarks/src/subgraph.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ const fetchSubgraphLatestBlockNumber = async () => {
number
}
}
}`
}`,
);

const error = response.errors?.[0];

if (error) {
if (
error.message?.endsWith(
"Wait for it to ingest a few blocks before querying it"
"Wait for it to ingest a few blocks before querying it",
)
) {
return 0;
Expand Down Expand Up @@ -82,7 +82,7 @@ const waitForSyncComplete = async () => {
const interval = setInterval(async () => {
const latestSyncedBlockNumber = await fetchSubgraphLatestBlockNumber();
console.log(
`Latest synced block number: ${latestSyncedBlockNumber}/${END_BLOCK}`
`Latest synced block number: ${latestSyncedBlockNumber}/${END_BLOCK}`,
);

if (latestSyncedBlockNumber >= END_BLOCK) {
Expand Down Expand Up @@ -114,7 +114,7 @@ export const subgraph = async () => {
{
timeout: 10_000,
stdio: "inherit",
}
},
);

console.log("Deploying subgraph...");
Expand All @@ -132,7 +132,7 @@ export const subgraph = async () => {
{
timeout: 10_000,
stdio: "inherit",
}
},
);

const duration = await waitForSyncComplete();
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const startClock = () => {

export const fetchWithTimeout = async (
input: RequestInfo | URL,
options: RequestInit & { timeout?: number } = {}
options: RequestInit & { timeout?: number } = {},
) => {
const { timeout = 2_000 } = options;

Expand Down
24 changes: 12 additions & 12 deletions docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@
"lint": "next lint"
},
"dependencies": {
"@segment/analytics-node": "^1.1.0",
"next": "^13.4.12",
"@segment/analytics-node": "^1.1.3",
"next": "^14.0.2",
"nextra": "^2.13.2",
"nextra-theme-docs": "^2.13.2",
"react": "^18.1.0",
"react-dom": "^18.1.0"
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@mdx-js/react": "^2.1.5",
"@svgr/webpack": "^6.5.1",
"@types/node": "^18.7.8",
"@types/react": "^18.0.25",
"@types/react-dom": "^18.0.9",
"eslint": "^8.17.0",
"eslint-config-next": "^13.0.5",
"typescript": "^4.9.3"
"@mdx-js/react": "^3.0.0",
"@svgr/webpack": "^8.1.0",
"@types/node": "^20.9.0",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"eslint": "^8.53.0",
"eslint-config-next": "^14.0.2",
"typescript": "^5.2.2"
}
}
2 changes: 1 addition & 1 deletion docs/pages/api/telemetry/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const asyncTrack = (payload: TrackParams) => {

export default async function forwardTelemetry(
req: NextApiRequest,
res: NextApiResponse
res: NextApiResponse,
) {
if (req.method !== "POST") {
return res.status(405).json({
Expand Down
8 changes: 4 additions & 4 deletions examples/art-gobblers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"@ponder/core": "workspace:*"
},
"devDependencies": {
"abitype": "^0.8.11",
"eslint": "^8.43.0",
"abitype": "^0.10.2",
"eslint": "^8.53.0",
"eslint-config-ponder": "workspace:*",
"typescript": "^5.1.3",
"viem": "^1.2.6"
"typescript": "^5.2.2",
"viem": "^1.18.9"
}
}
8 changes: 4 additions & 4 deletions examples/ethfs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"@ponder/core": "workspace:*"
},
"devDependencies": {
"abitype": "^0.8.11",
"eslint": "^8.43.0",
"abitype": "^0.10.2",
"eslint": "^8.53.0",
"eslint-config-ponder": "workspace:*",
"typescript": "^5.1.3",
"viem": "^1.2.6"
"typescript": "^5.2.2",
"viem": "^1.18.9"
}
}
8 changes: 4 additions & 4 deletions examples/factory-llama/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"@ponder/core": "workspace:latest"
},
"devDependencies": {
"abitype": "^0.8.11",
"eslint": "^8.43.0",
"abitype": "^0.10.2",
"eslint": "^8.53.0",
"eslint-config-ponder": "workspace:latest",
"typescript": "^5.1.3",
"viem": "^1.2.6"
"typescript": "^5.2.2",
"viem": "^1.18.9"
}
}
8 changes: 4 additions & 4 deletions examples/friendtech/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"@ponder/core": "workspace:*"
},
"devDependencies": {
"abitype": "^0.8.11",
"eslint": "^8.43.0",
"abitype": "^0.10.2",
"eslint": "^8.53.0",
"eslint-config-ponder": "workspace:*",
"typescript": "^5.1.3",
"viem": "^1.2.6"
"typescript": "^5.2.2",
"viem": "^1.18.9"
}
}
8 changes: 4 additions & 4 deletions examples/token-erc721/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"@ponder/core": "workspace:*"
},
"devDependencies": {
"abitype": "^0.8.11",
"eslint": "^8.43.0",
"abitype": "^0.10.2",
"eslint": "^8.53.0",
"eslint-config-ponder": "workspace:*",
"typescript": "^5.1.3",
"viem": "^1.2.6"
"typescript": "^5.2.2",
"viem": "^1.18.9"
}
}
8 changes: 4 additions & 4 deletions examples/token-reth/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"@ponder/core": "workspace:*"
},
"devDependencies": {
"abitype": "^0.8.11",
"eslint": "^8.43.0",
"abitype": "^0.10.2",
"eslint": "^8.53.0",
"eslint-config-ponder": "workspace:*",
"typescript": "^5.1.3",
"viem": "^1.2.6"
"typescript": "^5.2.2",
"viem": "^1.18.9"
}
}
20 changes: 10 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
},
"devDependencies": {
"@changesets/changelog-github": "^0.4.8",
"@changesets/cli": "^2.26.1",
"@typescript-eslint/eslint-plugin": "^6.3.0",
"@typescript-eslint/parser": "^6.3.0",
"eslint": "^8.43.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-simple-import-sort": "^7.0.0",
"lint-staged": "^13.2.3",
"prettier": "^2.8.8",
"@changesets/cli": "^2.26.2",
"@typescript-eslint/eslint-plugin": "^6.10.0",
"@typescript-eslint/parser": "^6.10.0",
"eslint": "^8.53.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-simple-import-sort": "^10.0.0",
"lint-staged": "^15.0.2",
"prettier": "^3.0.3",
"simple-git-hooks": "^2.9.0",
"typescript": "^5.2.2"
},
Expand Down
62 changes: 32 additions & 30 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,57 +32,59 @@
"test": "vitest",
"typecheck": "tsc --project tsconfig.json --noEmit"
},
"peerDependencies": {
"viem": "^1",
"typescript": "^5"
},
"dependencies": {
"@babel/code-frame": "^7.18.6",
"@jridgewell/trace-mapping": "^0.3.17",
"abitype": "^0.8.11",
"@babel/code-frame": "^7.22.13",
"@jridgewell/trace-mapping": "^0.3.20",
"abitype": "^0.10.2",
"async-mutex": "^0.4.0",
"better-sqlite3": "^8.7.0",
"better-sqlite3": "^9.1.1",
"cac": "^6.7.14",
"conf": "^12.0.0",
"cors": "^2.8.5",
"data-uri-to-buffer": "3.0.1",
"detect-package-manager": "^2.0.1",
"dotenv": "^16.0.1",
"emittery": "^0.13.1",
"data-uri-to-buffer": "6.0.1",
"detect-package-manager": "^3.0.1",
"dotenv": "^16.3.1",
"emittery": "^1.0.1",
"ethereum-bloom-filters": "^1.0.10",
"express": "^4.18.1",
"glob": "^8.1.0",
"express": "^4.18.2",
"glob": "^10.3.10",
"graphql": "^16.8.1",
"graphql-http": "^1.22.0",
"http-terminator": "^3.2.0",
"ink": "^3.2.0",
"kysely": "^0.24.2",
"p-limit": "3",
"ink": "^4.4.1",
"kysely": "^0.26.3",
"p-limit": "^5.0.0",
"p-queue": "^7.4.1",
"pg": "^8.11.3",
"picocolors": "^1.0.0",
"pino": "^8.14.1",
"prom-client": "^14.2.0",
"react": "17",
"pino": "^8.16.1",
"prom-client": "^15.0.0",
"react": "^18.2.0",
"retry": "^0.13.1",
"stacktrace-parser": "^0.1.10",
"viem": "^1.2.6",
"vite": "^4.5.0",
"vite-node": "^0.34.6"
},
"devDependencies": {
"@types/babel__code-frame": "^7.0.3",
"@types/better-sqlite3": "^7.6.0",
"@types/cors": "^2.8.12",
"@types/express": "^4.17.13",
"@types/glob": "^8.0.0",
"@types/babel__code-frame": "^7.0.6",
"@types/better-sqlite3": "^7.6.7",
"@types/cors": "^2.8.16",
"@types/express": "^4.17.21",
"@types/glob": "^8.1.0",
"@types/node": "^20.9.0",
"@types/pg": "^8.6.6",
"@types/react": "^18.0.25",
"@types/retry": "^0.12.2",
"@types/supertest": "^2.0.12",
"@types/pg": "^8.10.9",
"@types/react": "^18.2.37",
"@types/retry": "^0.12.5",
"@types/supertest": "^2.0.16",
"@viem/anvil": "^0.0.6",
"concurrently": "^8.2.0",
"rimraf": "^5.0.1",
"concurrently": "^8.2.2",
"rimraf": "^5.0.5",
"supertest": "^6.3.3",
"tsc-alias": "^1.8.2",
"typescript": "^5.2.2",
Copy link
Collaborator

Choose a reason for hiding this comment

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

I noticed that the wagmi package.json still likes typescript (and viem) in dev deps. Not sure of the interaction between dev and peer deps but thought I'd mention. https://www.npmjs.com/package/wagmi?activeTab=code

"tsc-alias": "^1.8.8",
"vitest": "^0.34.6"
}
}
Loading
Loading