diff --git a/.changeset/soft-ravens-serve.md b/.changeset/soft-ravens-serve.md new file mode 100644 index 0000000000..b53eba323a --- /dev/null +++ b/.changeset/soft-ravens-serve.md @@ -0,0 +1,7 @@ +--- +"@latticexyz/cli": patch +"@latticexyz/entrykit": patch +"@latticexyz/store-sync": patch +--- + +Updated JSON imports to use `with` annotation instead of `assert`. diff --git a/docs/pages/_meta.js b/docs/pages/_meta.js index e4d2a62807..f6ac9238d4 100644 --- a/docs/pages/_meta.js +++ b/docs/pages/_meta.js @@ -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: { diff --git a/packages/cli/src/commands/set-version.ts b/packages/cli/src/commands/set-version.ts index 48758352a1..71776ec822 100644 --- a/packages/cli/src/commands/set-version.ts +++ b/packages/cli/src/commands/set-version.ts @@ -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"; diff --git a/packages/cli/src/deploy/common.ts b/packages/cli/src/deploy/common.ts index b489105d18..fb09812f8e 100644 --- a/packages/cli/src/deploy/common.ts +++ b/packages/cli/src/deploy/common.ts @@ -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"; diff --git a/packages/cli/src/deploy/configToModules.ts b/packages/cli/src/deploy/configToModules.ts index 18dae7590f..f9cc341503 100644 --- a/packages/cli/src/deploy/configToModules.ts +++ b/packages/cli/src/deploy/configToModules.ts @@ -7,7 +7,7 @@ import { createPrepareDeploy } from "./createPrepareDeploy"; import { World } from "@latticexyz/world"; import { importContractArtifact } from "../utils/importContractArtifact"; import { resolveWithContext } from "@latticexyz/world/internal"; -import callWithSignatureModule from "@latticexyz/world-module-callwithsignature/out/CallWithSignatureModule.sol/CallWithSignatureModule.json" assert { type: "json" }; +import callWithSignatureModule from "@latticexyz/world-module-callwithsignature/out/CallWithSignatureModule.sol/CallWithSignatureModule.json" with { type: "json" }; import { getContractArtifact } from "../utils/getContractArtifact"; import { excludeCallWithSignatureModule } from "./compat/excludeUnstableCallWithSignatureModule"; import { moduleArtifactPathFromName } from "./compat/moduleArtifactPathFromName"; diff --git a/packages/cli/src/deploy/deployWorld.ts b/packages/cli/src/deploy/deployWorld.ts index 054a859a22..e2a6f02268 100644 --- a/packages/cli/src/deploy/deployWorld.ts +++ b/packages/cli/src/deploy/deployWorld.ts @@ -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"; diff --git a/packages/cli/src/deploy/ensureResourceTags.ts b/packages/cli/src/deploy/ensureResourceTags.ts index d294600bb4..588a288f24 100644 --- a/packages/cli/src/deploy/ensureResourceTags.ts +++ b/packages/cli/src/deploy/ensureResourceTags.ts @@ -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"; diff --git a/packages/cli/src/deploy/getWorldContracts.ts b/packages/cli/src/deploy/getWorldContracts.ts index f0de3388be..a32e193f6e 100644 --- a/packages/cli/src/deploy/getWorldContracts.ts +++ b/packages/cli/src/deploy/getWorldContracts.ts @@ -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"; diff --git a/packages/cli/src/deploy/getWorldFactoryContracts.ts b/packages/cli/src/deploy/getWorldFactoryContracts.ts index 572fabfe55..fb5a9591ac 100644 --- a/packages/cli/src/deploy/getWorldFactoryContracts.ts +++ b/packages/cli/src/deploy/getWorldFactoryContracts.ts @@ -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"; diff --git a/packages/cli/src/deploy/getWorldProxyFactoryContracts.ts b/packages/cli/src/deploy/getWorldProxyFactoryContracts.ts index d291dbf2ab..a89f52d938 100644 --- a/packages/cli/src/deploy/getWorldProxyFactoryContracts.ts +++ b/packages/cli/src/deploy/getWorldProxyFactoryContracts.ts @@ -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"; diff --git a/packages/entrykit/src/bin/deploy.ts b/packages/entrykit/src/bin/deploy.ts index d9b503f701..1c07a9e973 100644 --- a/packages/entrykit/src/bin/deploy.ts +++ b/packages/entrykit/src/bin/deploy.ts @@ -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 localPaymasterArtifact 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 localPaymasterArtifact from "@latticexyz/paymaster/out/GenerousPaymaster.sol/GenerousPaymaster.json" with { type: "json" }; import { getChainId } from "viem/actions"; import { writeContract } from "@latticexyz/common"; import { entryPoint07Address } from "viem/account-abstraction"; diff --git a/packages/store-sync/src/world/getWorldAbi.test.ts b/packages/store-sync/src/world/getWorldAbi.test.ts index 6cd577e5a1..2341a27f09 100644 --- a/packages/store-sync/src/world/getWorldAbi.test.ts +++ b/packages/store-sync/src/world/getWorldAbi.test.ts @@ -1,7 +1,7 @@ import { createTestClient, http, parseAbi } from "viem"; import { foundry } from "viem/chains"; import { describe, expect, it, vi } from "vitest"; -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 { mockError, mockMetadata, mockWorldFn, mockWorldFn2 } from "./test/mocks"; vi.doMock("./getFunctions", () => { diff --git a/packages/store-sync/src/world/getWorldAbi.ts b/packages/store-sync/src/world/getWorldAbi.ts index dde85fa57a..f9d647936c 100644 --- a/packages/store-sync/src/world/getWorldAbi.ts +++ b/packages/store-sync/src/world/getWorldAbi.ts @@ -10,7 +10,7 @@ import { parseAbi, stringToHex, } 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 metadataConfig from "@latticexyz/world-module-metadata/mud.config"; import { functionSignatureToAbiItem } from "./functionSignatureToAbiItem"; import { isDefined } from "@latticexyz/common/utils"; diff --git a/templates/phaser/packages/art/scripts/cli.mjs b/templates/phaser/packages/art/scripts/cli.mjs index 5f8ef194a8..91ec919d68 100644 --- a/templates/phaser/packages/art/scripts/cli.mjs +++ b/templates/phaser/packages/art/scripts/cli.mjs @@ -5,7 +5,7 @@ import chalk from "chalk"; const { yellowBright, redBright, white, magentaBright, greenBright } = chalk; import texturePacker from "free-tex-packer-core"; -import appInfo from "../package.json" assert { type: "json" }; +import appInfo from "../package.json" with { type: "json" }; function isExists(path) { return existsSync(path);