Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/wagmi-dev/wagmi into chore/…
Browse files Browse the repository at this point in the history
…bump-react-query
  • Loading branch information
tmm committed Jul 1, 2024
2 parents 40fc5cc + ac038b2 commit 4959b69
Show file tree
Hide file tree
Showing 13 changed files with 74 additions and 49 deletions.
5 changes: 5 additions & 0 deletions .changeset/happy-dolphins-raise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@wagmi/cli": patch
---

Updated Foundry default excludes.
2 changes: 1 addition & 1 deletion biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
}
},
{
"include": ["./.scripts/**/*.ts"],
"include": ["./scripts/**/*.ts"],
"linter": {
"rules": {
"suspicious": {
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "module",
"scripts": {
"build": "pnpm run --r --filter \"./packages/**\" build",
"changeset:prepublish": "pnpm version:update && pnpm build && bun .scripts/formatPackageJson.ts && bun .scripts/generateProxyPackages.ts",
"changeset:prepublish": "pnpm version:update && pnpm build && bun scripts/formatPackageJson.ts && bun .scripts/generateProxyPackages.ts",
"changeset:publish": "pnpm changeset:prepublish && changeset publish",
"changeset:version": "changeset version && pnpm version:update && pnpm format",
"clean": "pnpm run --r --parallel clean && rm -rf packages/**/*.json.tmp",
Expand All @@ -22,7 +22,7 @@
"lint:repo": "sherif",
"lint:unused": "pnpm clean && knip",
"postinstall": "pnpm preconstruct",
"preconstruct": "bun .scripts/preconstruct.ts",
"preconstruct": "bun scripts/preconstruct.ts",
"preinstall": "pnpx only-allow pnpm",
"prepare": "pnpm simple-git-hooks",
"test": "vitest",
Expand All @@ -37,8 +37,8 @@
"test:ui": "vitest --ui",
"test:vue": "vitest --project @wagmi/vue",
"typecheck": "pnpm run --r --parallel typecheck && tsc --noEmit",
"version:update": "bun .scripts/updateVersion.ts",
"version:update:viem": "bun .scripts/updateViemVersion.ts"
"version:update": "bun scripts/updateVersion.ts",
"version:update:viem": "bun scripts/updateViemVersion.ts"
},
"devDependencies": {
"@arethetypeswrong/cli": "^0.15.3",
Expand All @@ -61,7 +61,7 @@
"viem": "2.9.31",
"vitest": "^1.6.0"
},
"packageManager": "pnpm@9.1.0",
"packageManager": "pnpm@9.4.0",
"pnpm": {
"peerDependencyRules": {
"ignoreMissing": [
Expand All @@ -88,7 +88,7 @@
],
"workspaces": {
".": {
"project": ".scripts/*.ts"
"project": "scripts/*.ts"
},
"packages/cli": {
"entry": [
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/plugins/__fixtures__/foundry/foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ out = 'out'
solc = '0.8.13'
src = 'src'

# See more config options https://github.com/foundry-rs/foundry/tree/master/config
# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
16 changes: 13 additions & 3 deletions packages/cli/src/plugins/foundry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,33 @@ import * as logger from '../logger.js'
import type { Evaluate, RequiredBy } from '../types.js'

const defaultExcludes = [
'Base.sol/**',
'Common.sol/**',
'Components.sol/**',
'IERC165.sol/**',
'IERC20.sol/**',
'IERC721.sol/**',
'IMulticall2.sol/**',
'MockERC20.sol/**',
'MockERC721.sol/**',
'Script.sol/**',
'StdAssertions.sol/**',
'StdInvariant.sol/**',
'StdError.sol/**',
'StdChains.sol/**',
'StdCheats.sol/**',
'StdMath.sol/**',
'StdError.sol/**',
'StdInvariant.sol/**',
'StdJson.sol/**',
'StdMath.sol/**',
'StdStorage.sol/**',
'StdStyle.sol/**',
'StdToml.sol/**',
'StdUtils.sol/**',
'Test.sol/**',
'Vm.sol/**',
'build-info/**',
'console.sol/**',
'console2.sol/**',
'safeconsole.sol/**',
'**.s.sol/*.json',
'**.t.sol/*.json',
]
Expand Down
84 changes: 47 additions & 37 deletions packages/core/src/createConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,8 @@ export function createConfig<
// Types
/////////////////////////////////////////////////////////////////////////////////////////////////

export declare const internal: unique symbol

export type Config<
chains extends readonly [Chain, ...Chain[]] = readonly [Chain, ...Chain[]],
transports extends Record<chains[number]['id'], Transport> = Record<
Expand Down Expand Up @@ -481,43 +483,51 @@ export type Config<
* Not part of versioned API, proceed with caution.
* @internal
*/
_internal: {
readonly mipd: MipdStore | undefined
readonly store: Mutate<StoreApi<any>, [['zustand/persist', any]]>
readonly ssr: boolean
readonly syncConnectedChain: boolean
readonly transports: transports

chains: {
setState(
value:
| readonly [Chain, ...Chain[]]
| ((
state: readonly [Chain, ...Chain[]],
) => readonly [Chain, ...Chain[]]),
): void
subscribe(
listener: (
state: readonly [Chain, ...Chain[]],
prevState: readonly [Chain, ...Chain[]],
) => void,
): () => void
}
connectors: {
providerDetailToConnector(
providerDetail: EIP6963ProviderDetail,
): CreateConnectorFn
setup(connectorFn: CreateConnectorFn): Connector
setState(value: Connector[] | ((state: Connector[]) => Connector[])): void
subscribe(
listener: (state: Connector[], prevState: Connector[]) => void,
): () => void
}
events: {
change(data: EventData<ConnectorEventMap, 'change'>): void
connect(data: EventData<ConnectorEventMap, 'connect'>): void
disconnect(data: EventData<ConnectorEventMap, 'disconnect'>): void
}
_internal: Internal<chains, transports>
}

type Internal<
chains extends readonly [Chain, ...Chain[]] = readonly [Chain, ...Chain[]],
transports extends Record<chains[number]['id'], Transport> = Record<
chains[number]['id'],
Transport
>,
> = {
readonly mipd: MipdStore | undefined
readonly store: Mutate<StoreApi<any>, [['zustand/persist', any]]>
readonly ssr: boolean
readonly syncConnectedChain: boolean
readonly transports: transports

chains: {
setState(
value:
| readonly [Chain, ...Chain[]]
| ((
state: readonly [Chain, ...Chain[]],
) => readonly [Chain, ...Chain[]]),
): void
subscribe(
listener: (
state: readonly [Chain, ...Chain[]],
prevState: readonly [Chain, ...Chain[]],
) => void,
): () => void
}
connectors: {
providerDetailToConnector(
providerDetail: EIP6963ProviderDetail,
): CreateConnectorFn
setup(connectorFn: CreateConnectorFn): Connector
setState(value: Connector[] | ((state: Connector[]) => Connector[])): void
subscribe(
listener: (state: Connector[], prevState: Connector[]) => void,
): () => void
}
events: {
change(data: EventData<ConnectorEventMap, 'change'>): void
connect(data: EventData<ConnectorEventMap, 'connect'>): void
disconnect(data: EventData<ConnectorEventMap, 'disconnect'>): void
}
}

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "./tsconfig.base.json",
"include": [".scripts/**/*.ts", "vitest.workspace.ts", "vitest.config.ts"],
"include": ["scripts/**/*.ts", "vitest.workspace.ts", "vitest.config.ts"],
"exclude": [],
"compilerOptions": {
"types": ["@types/bun"]
Expand Down

0 comments on commit 4959b69

Please sign in to comment.