From 0a0230cbbee30178380309da031995c7fd51910a Mon Sep 17 00:00:00 2001 From: Tom Meagher Date: Mon, 1 Jul 2024 11:15:00 -0400 Subject: [PATCH 1/2] chore: bump pnpm --- biome.json | 2 +- package.json | 12 +-- packages/core/src/createConfig.ts | 84 +++++++++++-------- {.scripts => scripts}/formatPackageJson.ts | 0 .../generateProxyPackages.ts | 0 {.scripts => scripts}/preconstruct.ts | 0 {.scripts => scripts}/restorePackageJson.ts | 0 {.scripts => scripts}/updateVersion.ts | 0 {.scripts => scripts}/updateViemVersion.ts | 0 tsconfig.json | 2 +- 10 files changed, 55 insertions(+), 45 deletions(-) rename {.scripts => scripts}/formatPackageJson.ts (100%) rename {.scripts => scripts}/generateProxyPackages.ts (100%) rename {.scripts => scripts}/preconstruct.ts (100%) rename {.scripts => scripts}/restorePackageJson.ts (100%) rename {.scripts => scripts}/updateVersion.ts (100%) rename {.scripts => scripts}/updateViemVersion.ts (100%) diff --git a/biome.json b/biome.json index d323175279..ce99662cb0 100644 --- a/biome.json +++ b/biome.json @@ -61,7 +61,7 @@ } }, { - "include": ["./.scripts/**/*.ts"], + "include": ["./scripts/**/*.ts"], "linter": { "rules": { "suspicious": { diff --git a/package.json b/package.json index f3b0f6793f..d706a6ed18 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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", @@ -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", @@ -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": [ @@ -88,7 +88,7 @@ ], "workspaces": { ".": { - "project": ".scripts/*.ts" + "project": "scripts/*.ts" }, "packages/cli": { "entry": [ diff --git a/packages/core/src/createConfig.ts b/packages/core/src/createConfig.ts index d4d8ab23ee..6104a6551a 100644 --- a/packages/core/src/createConfig.ts +++ b/packages/core/src/createConfig.ts @@ -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 = Record< @@ -481,43 +483,51 @@ export type Config< * Not part of versioned API, proceed with caution. * @internal */ - _internal: { - readonly mipd: MipdStore | undefined - readonly store: Mutate, [['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): void - connect(data: EventData): void - disconnect(data: EventData): void - } + _internal: Internal +} + +type Internal< + chains extends readonly [Chain, ...Chain[]] = readonly [Chain, ...Chain[]], + transports extends Record = Record< + chains[number]['id'], + Transport + >, +> = { + readonly mipd: MipdStore | undefined + readonly store: Mutate, [['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): void + connect(data: EventData): void + disconnect(data: EventData): void } } diff --git a/.scripts/formatPackageJson.ts b/scripts/formatPackageJson.ts similarity index 100% rename from .scripts/formatPackageJson.ts rename to scripts/formatPackageJson.ts diff --git a/.scripts/generateProxyPackages.ts b/scripts/generateProxyPackages.ts similarity index 100% rename from .scripts/generateProxyPackages.ts rename to scripts/generateProxyPackages.ts diff --git a/.scripts/preconstruct.ts b/scripts/preconstruct.ts similarity index 100% rename from .scripts/preconstruct.ts rename to scripts/preconstruct.ts diff --git a/.scripts/restorePackageJson.ts b/scripts/restorePackageJson.ts similarity index 100% rename from .scripts/restorePackageJson.ts rename to scripts/restorePackageJson.ts diff --git a/.scripts/updateVersion.ts b/scripts/updateVersion.ts similarity index 100% rename from .scripts/updateVersion.ts rename to scripts/updateVersion.ts diff --git a/.scripts/updateViemVersion.ts b/scripts/updateViemVersion.ts similarity index 100% rename from .scripts/updateViemVersion.ts rename to scripts/updateViemVersion.ts diff --git a/tsconfig.json b/tsconfig.json index 3a50dbcb11..506583064b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -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"] From ac038b29623ccb0d2fee40d9f943c8df28138dac Mon Sep 17 00:00:00 2001 From: Tom Meagher Date: Mon, 1 Jul 2024 11:53:19 -0400 Subject: [PATCH 2/2] fix: #4103 --- .changeset/happy-dolphins-raise.md | 5 +++++ .../plugins/__fixtures__/foundry/foundry.toml | 2 +- packages/cli/src/plugins/foundry.ts | 16 +++++++++++++--- 3 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 .changeset/happy-dolphins-raise.md diff --git a/.changeset/happy-dolphins-raise.md b/.changeset/happy-dolphins-raise.md new file mode 100644 index 0000000000..f1386660c5 --- /dev/null +++ b/.changeset/happy-dolphins-raise.md @@ -0,0 +1,5 @@ +--- +"@wagmi/cli": patch +--- + +Updated Foundry default excludes. diff --git a/packages/cli/src/plugins/__fixtures__/foundry/foundry.toml b/packages/cli/src/plugins/__fixtures__/foundry/foundry.toml index cdd2c3920f..59374b16cf 100644 --- a/packages/cli/src/plugins/__fixtures__/foundry/foundry.toml +++ b/packages/cli/src/plugins/__fixtures__/foundry/foundry.toml @@ -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 diff --git a/packages/cli/src/plugins/foundry.ts b/packages/cli/src/plugins/foundry.ts index a0aef65440..152db668f5 100644 --- a/packages/cli/src/plugins/foundry.ts +++ b/packages/cli/src/plugins/foundry.ts @@ -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', ]