Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
attempt to upgrade to node 22
  • Loading branch information
frolic committed Jan 17, 2025
commit 531982ae1b323faf46a8484d35f08fbd7dd42087
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.18.1
22.13.0
2 changes: 1 addition & 1 deletion docs/pages/_meta.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import worldPackageJson from "../../packages/world/package.json" assert { type: "json" };
import worldPackageJson from "../../packages/world/package.json" with { type: "json" };

export default {
introduction: {
Expand Down
2 changes: 1 addition & 1 deletion examples/local-explorer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"typescript": "5.4.2"
},
"engines": {
"node": "^20",
"node": "^22",
"pnpm": "^9"
}
}
2 changes: 1 addition & 1 deletion examples/minimal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"typescript": "5.4.2"
},
"engines": {
"node": "^20",
"node": "^22",
"pnpm": "^9"
}
}
2 changes: 1 addition & 1 deletion examples/multiple-accounts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"typescript": "5.4.2"
},
"engines": {
"node": "^20",
"node": "^22",
"pnpm": "^9"
}
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
"prettier-plugin-solidity": "1.3.1",
"shx": "^0.3.4",
"sort-package-json": "^2.10.1",
"tsup": "^8.3.5",
"tsx": "4.19.0",
"turbo": "^1.9.3",
"typescript": "5.4.2",
Expand All @@ -63,7 +64,7 @@
},
"packageManager": "[email protected]",
"engines": {
"node": "^20",
"node": "^22",
"pnpm": "^9"
}
}
1 change: 0 additions & 1 deletion packages/abi-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
"devDependencies": {
"@types/debug": "^4.1.7",
"@types/yargs": "^17.0.10",
"tsup": "^6.7.0",
"vitest": "0.34.6"
},
"publishConfig": {
Expand Down
1 change: 0 additions & 1 deletion packages/block-logs-stream/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
},
"devDependencies": {
"@types/debug": "^4.1.7",
"tsup": "^6.7.0",
"viem": "2.21.19",
"vitest": "0.34.6"
},
Expand Down
1 change: 0 additions & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
"@types/yargs": "^17.0.10",
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
"forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
"tsup": "^6.7.0",
"vitest": "0.34.6"
}
}
2 changes: 1 addition & 1 deletion packages/cli/src/commands/set-version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import path from "path";
import type { CommandModule } from "yargs";
import { MUDError } from "@latticexyz/common/errors";
import { logError } from "../utils/errors";
import localPackageJson from "../../package.json" assert { type: "json" };
import localPackageJson from "../../package.json" with { type: "json" };
import { globSync } from "glob";
import { mudPackages } from "../mudPackages";

Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/deploy/common.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Abi, Account, Address, Chain, Client, Hex, Transport } from "viem";
import IBaseWorldAbi from "@latticexyz/world/out/IBaseWorld.sol/IBaseWorld.abi.json" assert { type: "json" };
import IBaseWorldAbi from "@latticexyz/world/out/IBaseWorld.sol/IBaseWorld.abi.json" with { type: "json" };
import { helloStoreEvent } from "@latticexyz/store";
import { helloWorldEvent } from "@latticexyz/world";
import { LibraryMap } from "./getLibraryMap";
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/deploy/deployWorld.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Account, Chain, Client, Hex, Transport } from "viem";
import { waitForTransactionReceipt } from "viem/actions";
import { ensureWorldFactory } from "./ensureWorldFactory";
import WorldFactoryAbi from "@latticexyz/world/out/WorldFactory.sol/WorldFactory.abi.json" assert { type: "json" };
import WorldFactoryAbi from "@latticexyz/world/out/WorldFactory.sol/WorldFactory.abi.json" with { type: "json" };
import { writeContract } from "@latticexyz/common";
import { debug } from "./debug";
import { logsToWorldDeploy } from "./logsToWorldDeploy";
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/deploy/ensureResourceTags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { debug } from "./debug";
import { hexToResource, writeContract } from "@latticexyz/common";
import { identity, isDefined } from "@latticexyz/common/utils";
import metadataConfig from "@latticexyz/world-module-metadata/mud.config";
import metadataAbi from "@latticexyz/world-module-metadata/out/IMetadataSystem.sol/IMetadataSystem.abi.json" assert { type: "json" };
import metadataAbi from "@latticexyz/world-module-metadata/out/IMetadataSystem.sol/IMetadataSystem.abi.json" with { type: "json" };
import { ensureModules } from "./ensureModules";
import metadataModule from "@latticexyz/world-module-metadata/out/MetadataModule.sol/MetadataModule.json" assert { type: "json" };
import metadataModule from "@latticexyz/world-module-metadata/out/MetadataModule.sol/MetadataModule.json" with { type: "json" };
import { getContractArtifact } from "../utils/getContractArtifact";
import { createPrepareDeploy } from "./createPrepareDeploy";
import { LibraryMap } from "./getLibraryMap";
Expand Down
12 changes: 6 additions & 6 deletions packages/cli/src/deploy/getWorldContracts.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import accessManagementSystemBuild from "@latticexyz/world/out/AccessManagementSystem.sol/AccessManagementSystem.json" assert { type: "json" };
import balanceTransferSystemBuild from "@latticexyz/world/out/BalanceTransferSystem.sol/BalanceTransferSystem.json" assert { type: "json" };
import batchCallSystemBuild from "@latticexyz/world/out/BatchCallSystem.sol/BatchCallSystem.json" assert { type: "json" };
import registrationSystemBuild from "@latticexyz/world/out/RegistrationSystem.sol/RegistrationSystem.json" assert { type: "json" };
import initModuleBuild from "@latticexyz/world/out/InitModule.sol/InitModule.json" assert { type: "json" };
import initModuleAbi from "@latticexyz/world/out/InitModule.sol/InitModule.abi.json" assert { type: "json" };
import accessManagementSystemBuild from "@latticexyz/world/out/AccessManagementSystem.sol/AccessManagementSystem.json" with { type: "json" };
import balanceTransferSystemBuild from "@latticexyz/world/out/BalanceTransferSystem.sol/BalanceTransferSystem.json" with { type: "json" };
import batchCallSystemBuild from "@latticexyz/world/out/BatchCallSystem.sol/BatchCallSystem.json" with { type: "json" };
import registrationSystemBuild from "@latticexyz/world/out/RegistrationSystem.sol/RegistrationSystem.json" with { type: "json" };
import initModuleBuild from "@latticexyz/world/out/InitModule.sol/InitModule.json" with { type: "json" };
import initModuleAbi from "@latticexyz/world/out/InitModule.sol/InitModule.abi.json" with { type: "json" };
import { Hex, encodeDeployData, size } from "viem";
import { getContractAddress } from "@latticexyz/common/internal";

Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/deploy/getWorldFactoryContracts.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import worldFactoryBuild from "@latticexyz/world/out/WorldFactory.sol/WorldFactory.json" assert { type: "json" };
import worldFactoryAbi from "@latticexyz/world/out/WorldFactory.sol/WorldFactory.abi.json" assert { type: "json" };
import worldFactoryBuild from "@latticexyz/world/out/WorldFactory.sol/WorldFactory.json" with { type: "json" };
import worldFactoryAbi from "@latticexyz/world/out/WorldFactory.sol/WorldFactory.abi.json" with { type: "json" };
import { Hex, encodeDeployData, size } from "viem";
import { getWorldContracts } from "./getWorldContracts";
import { getContractAddress } from "@latticexyz/common/internal";
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/deploy/getWorldProxyFactoryContracts.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import worldProxyFactoryBuild from "@latticexyz/world/out/WorldProxyFactory.sol/WorldProxyFactory.json" assert { type: "json" };
import worldProxyFactoryAbi from "@latticexyz/world/out/WorldProxyFactory.sol/WorldProxyFactory.abi.json" assert { type: "json" };
import worldProxyFactoryBuild from "@latticexyz/world/out/WorldProxyFactory.sol/WorldProxyFactory.json" with { type: "json" };
import worldProxyFactoryAbi from "@latticexyz/world/out/WorldProxyFactory.sol/WorldProxyFactory.abi.json" with { type: "json" };
import { Hex, encodeDeployData, size } from "viem";
import { getWorldContracts } from "./getWorldContracts";
import { getContractAddress } from "@latticexyz/common/internal";
Expand Down
1 change: 0 additions & 1 deletion packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
"devDependencies": {
"@types/debug": "^4.1.7",
"@viem/anvil": "^0.0.7",
"tsup": "^6.7.0",
"viem": "2.21.19",
"vitest": "0.34.6"
},
Expand Down
1 change: 0 additions & 1 deletion packages/config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
"tsx": "^4.19.1"
},
"devDependencies": {
"tsup": "^6.7.0",
"viem": "2.21.19"
},
"peerDependencies": {
Expand Down
4 changes: 0 additions & 4 deletions packages/create-mud/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@
"dependencies": {
"create-create-app": "git+https://github.com/holic/create-create-app#74376c59b48a04aabbe94d9cacfe9cb1cecccd63"
},
"devDependencies": {
"execa": "^7.0.0",
"tsup": "^6.7.0"
},
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org"
Expand Down
1 change: 0 additions & 1 deletion packages/dev-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
"autoprefixer": "^10.4.14",
"postcss": "^8.4.23",
"tailwindcss": "^3.3.2",
"tsup": "^6.7.0",
"viem": "2.21.19",
"vitest": "0.34.6"
},
Expand Down
1 change: 0 additions & 1 deletion packages/entrykit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
"react": "18.2.0",
"react-dom": "18.2.0",
"tailwindcss": "^3.4.13",
"tsup": "^6.7.0",
"viem": "2.21.19",
"vite": "^5.4.1",
"vite-plugin-dts": "^4.2.4",
Expand Down
6 changes: 3 additions & 3 deletions packages/entrykit/src/bin/deploy-local-prereqs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import {
getContractAddress,
waitForTransactions,
} from "@latticexyz/common/internal";
import entryPointArtifact from "@account-abstraction/contracts/artifacts/EntryPoint.json" assert { type: "json" };
import simpleAccountFactoryArtifact from "@account-abstraction/contracts/artifacts/SimpleAccountFactory.json" assert { type: "json" };
import paymasterArtifact from "@latticexyz/paymaster/out/GenerousPaymaster.sol/GenerousPaymaster.json" assert { type: "json" };
import entryPointArtifact from "@account-abstraction/contracts/artifacts/EntryPoint.json" with { type: "json" };
import simpleAccountFactoryArtifact from "@account-abstraction/contracts/artifacts/SimpleAccountFactory.json" with { type: "json" };
import paymasterArtifact from "@latticexyz/paymaster/out/GenerousPaymaster.sol/GenerousPaymaster.json" with { type: "json" };
import { getChainId } from "viem/actions";
import { writeContract } from "@latticexyz/common";

Expand Down
7 changes: 3 additions & 4 deletions packages/explorer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@rainbow-me/rainbowkit": "^2.1.5",
"@tanstack/react-query": "^5.51.3",
"@tanstack/react-table": "^8.19.3",
"better-sqlite3": "^8.6.0",
"better-sqlite3": "^11.8.0",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"cmdk": "1.0.0",
Expand All @@ -75,15 +75,14 @@
"sonner": "^1.5.0",
"sql-autocomplete": "^1.1.1",
"tailwind-merge": "^1.12.0",
"tsup": "^6.7.0",
"wagmi": "2.12.11",
"yargs": "^17.7.1",
"zod": "3.23.8",
"zustand": "^4.3.7"
},
"devDependencies": {
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/better-sqlite3": "^7.6.4",
"@types/better-sqlite3": "^7.6.12",
"@types/debug": "^4.1.7",
"@types/react": "18.2.22",
"@types/react-dom": "18.2.7",
Expand All @@ -102,7 +101,7 @@
},
"packageManager": "[email protected]",
"engines": {
"node": "20.x",
"node": "^22",
"pnpm": "^9"
}
}
1 change: 0 additions & 1 deletion packages/faucet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
},
"devDependencies": {
"@types/debug": "^4.1.7",
"tsup": "^6.7.0",
"viem": "2.21.19",
"vitest": "0.34.6"
},
Expand Down
1 change: 0 additions & 1 deletion packages/gas-report/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
"@types/yargs": "^17.0.10",
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
"forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
"tsup": "^6.7.0",
"vitest": "0.34.6"
}
}
1 change: 0 additions & 1 deletion packages/protocol-parser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
"abitype": "1.0.6"
},
"devDependencies": {
"tsup": "^6.7.0",
"viem": "2.21.19",
"vitest": "0.34.6"
},
Expand Down
1 change: 0 additions & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
"eslint-plugin-react-hooks": "4.6.0",
"jsdom": "^22.1.0",
"react-test-renderer": "^18.2.0",
"tsup": "^6.7.0",
"vite": "^4.3.6",
"vitest": "0.34.6"
}
Expand Down
1 change: 0 additions & 1 deletion packages/recs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
"@types/uuid": "^8.3.4",
"jest": "^29.3.1",
"ts-jest": "^29.0.5",
"tsup": "^6.7.0",
"type-fest": "^2.14.0"
}
}
1 change: 0 additions & 1 deletion packages/schema-type/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
"@latticexyz/gas-report": "workspace:*",
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
"forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
"tsup": "^6.7.0",
"viem": "2.21.19",
"vitest": "0.34.6"
},
Expand Down
3 changes: 0 additions & 3 deletions packages/solhint-config-mud/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
"clean": "pnpm run clean:js",
"clean:js": "shx rm -rf dist"
},
"devDependencies": {
"tsup": "^6.7.0"
},
"publishConfig": {
"access": "public"
}
Expand Down
3 changes: 0 additions & 3 deletions packages/solhint-plugin-mud/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
"dependencies": {
"@solidity-parser/parser": "^0.16.0"
},
"devDependencies": {
"tsup": "^6.7.0"
},
"publishConfig": {
"access": "public"
}
Expand Down
1 change: 0 additions & 1 deletion packages/stash/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
"fast-deep-equal": "^3.1.3",
"react": "18.2.0",
"react-dom": "18.2.0",
"tsup": "^6.7.0",
"viem": "2.21.19"
},
"peerDependencies": {
Expand Down
5 changes: 2 additions & 3 deletions packages/store-indexer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"@trpc/client": "10.34.0",
"@trpc/server": "10.34.0",
"accepts": "^1.3.8",
"better-sqlite3": "^8.6.0",
"better-sqlite3": "^11.8.0",
"debug": "^4.3.4",
"dotenv": "^16.0.3",
"drizzle-orm": "^0.28.5",
Expand All @@ -77,14 +77,13 @@
},
"devDependencies": {
"@types/accepts": "^1.3.7",
"@types/better-sqlite3": "^7.6.4",
"@types/better-sqlite3": "^7.6.12",
"@types/debug": "^4.1.7",
"@types/koa": "^2.13.12",
"@types/koa-compose": "^3.2.8",
"@types/koa__cors": "^4.0.3",
"@types/koa__router": "^12.0.4",
"concurrently": "^8.2.2",
"tsup": "^6.7.0",
"viem": "2.21.19",
"vitest": "0.34.6"
},
Expand Down
1 change: 0 additions & 1 deletion packages/store-sync/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@
"eslint-plugin-react-hooks": "4.6.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"tsup": "^6.7.0",
"viem": "2.21.19",
"vitest": "0.34.6",
"wagmi": "2.12.11"
Expand Down
2 changes: 1 addition & 1 deletion packages/store-sync/src/world/getWorldAbi.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Client, Abi, AbiItem, AbiFunction, Address, getAddress, toFunctionSelector } from "viem";
import IBaseWorldAbi from "@latticexyz/world/out/IBaseWorld.sol/IBaseWorld.abi.json" assert { type: "json" };
import IBaseWorldAbi from "@latticexyz/world/out/IBaseWorld.sol/IBaseWorld.abi.json" with { type: "json" };
import { functionSignatureToAbiItem } from "./functionSignatureToAbiItem";
import { getFunctions } from "./getFunctions";
import { isDefined } from "@latticexyz/common/utils";
Expand Down
2 changes: 1 addition & 1 deletion packages/store-sync/test/mockGame.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { execa } from "execa";
import { anvilRpcUrl } from "./common";
import { Hex, isHex } from "viem";
import config from "../../../test/mock-game-contracts/mud.config";
import worldAbi from "../../../test/mock-game-contracts/out/IWorld.sol/IWorld.abi.json";
import worldAbi from "../../../test/mock-game-contracts/out/IWorld.sol/IWorld.abi.json" with { type: "json" };

export { config, worldAbi };

Expand Down
1 change: 0 additions & 1 deletion packages/store/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
"forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
"solhint": "^3.3.7",
"tsup": "^6.7.0",
"viem": "2.21.19"
},
"peerDependencies": {
Expand Down
3 changes: 1 addition & 2 deletions packages/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
"devDependencies": {
"@types/jest": "^27.4.1",
"jest": "^29.3.1",
"ts-jest": "^29.0.5",
"tsup": "^6.7.0"
"ts-jest": "^29.0.5"
}
}
1 change: 0 additions & 1 deletion packages/vite-plugin-mud/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"clean:js": "shx rm -rf dist"
},
"devDependencies": {
"tsup": "^6.7.0",
"vite": "^6.0.7"
},
"peerDependencies": {
Expand Down
1 change: 0 additions & 1 deletion packages/world-module-erc20/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
"forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
"solhint": "^3.3.7",
"tsup": "^6.7.0",
"vitest": "0.34.6"
},
"publishConfig": {
Expand Down
Loading