From 106053d82ef6cf027adb9f639d55f5cdf2d9b1c1 Mon Sep 17 00:00:00 2001 From: maxnorm Date: Fri, 3 Apr 2026 17:20:28 -0400 Subject: [PATCH 1/3] fix hardhat ignition deployment --- .../default/hardhat/ts/mocha-ethers/hardhat.config.ts | 4 ++++ .../hardhat/ts/mocha-ethers/ignition/modules/Counter.ts | 7 ++----- .../default/hardhat/ts/node-runner-viem/hardhat.config.ts | 4 ++++ .../ts/node-runner-viem/ignition/modules/Counter.ts | 7 ++----- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/cli/src/templates/default/hardhat/ts/mocha-ethers/hardhat.config.ts b/cli/src/templates/default/hardhat/ts/mocha-ethers/hardhat.config.ts index 00733d97..a400f0d8 100644 --- a/cli/src/templates/default/hardhat/ts/mocha-ethers/hardhat.config.ts +++ b/cli/src/templates/default/hardhat/ts/mocha-ethers/hardhat.config.ts @@ -4,6 +4,10 @@ import { configVariable, defineConfig } from "hardhat/config"; export default defineConfig({ plugins: [hardhatToolboxMochaEthersPlugin], solidity: { + npmFilesToBuild: [ + "@perfect-abstractions/compose/diamond/DiamondInspectFacet.sol", + "@perfect-abstractions/compose/diamond/DiamondUpgradeFacet.sol", + ], profiles: { default: { version: "0.8.30", diff --git a/cli/src/templates/default/hardhat/ts/mocha-ethers/ignition/modules/Counter.ts b/cli/src/templates/default/hardhat/ts/mocha-ethers/ignition/modules/Counter.ts index 0f6234f4..e37b518c 100644 --- a/cli/src/templates/default/hardhat/ts/mocha-ethers/ignition/modules/Counter.ts +++ b/cli/src/templates/default/hardhat/ts/mocha-ethers/ignition/modules/Counter.ts @@ -1,12 +1,9 @@ import { buildModule } from "@nomicfoundation/hardhat-ignition/modules"; -import { DiamondInspectFacet } from "@perfect-abstractions/compose/diamond/DiamondInspectFacet.sol"; -import { DiamondUpgradeFacet } from "@perfect-abstractions/compose/diamond/DiamondUpgradeFacet.sol"; - export default buildModule("CounterDiamondModule", (m) => { const counterFacet = m.contract("CounterFacet"); - const inspectFacet = m.contract(DiamondInspectFacet); - const upgradeFacet = m.contract(DiamondUpgradeFacet); + const inspectFacet = m.contract("DiamondInspectFacet"); + const upgradeFacet = m.contract("DiamondUpgradeFacet"); const owner = m.getAccount(0); const diamond = m.contract("Diamond", [[counterFacet, inspectFacet, upgradeFacet], owner]); diff --git a/cli/src/templates/default/hardhat/ts/node-runner-viem/hardhat.config.ts b/cli/src/templates/default/hardhat/ts/node-runner-viem/hardhat.config.ts index 4874fc3e..f68b2fe6 100644 --- a/cli/src/templates/default/hardhat/ts/node-runner-viem/hardhat.config.ts +++ b/cli/src/templates/default/hardhat/ts/node-runner-viem/hardhat.config.ts @@ -4,6 +4,10 @@ import { configVariable, defineConfig } from "hardhat/config"; export default defineConfig({ plugins: [hardhatToolboxViemPlugin], solidity: { + npmFilesToBuild: [ + "@perfect-abstractions/compose/diamond/DiamondInspectFacet.sol", + "@perfect-abstractions/compose/diamond/DiamondUpgradeFacet.sol", + ], profiles: { default: { version: "0.8.30", diff --git a/cli/src/templates/default/hardhat/ts/node-runner-viem/ignition/modules/Counter.ts b/cli/src/templates/default/hardhat/ts/node-runner-viem/ignition/modules/Counter.ts index 0f6234f4..e37b518c 100644 --- a/cli/src/templates/default/hardhat/ts/node-runner-viem/ignition/modules/Counter.ts +++ b/cli/src/templates/default/hardhat/ts/node-runner-viem/ignition/modules/Counter.ts @@ -1,12 +1,9 @@ import { buildModule } from "@nomicfoundation/hardhat-ignition/modules"; -import { DiamondInspectFacet } from "@perfect-abstractions/compose/diamond/DiamondInspectFacet.sol"; -import { DiamondUpgradeFacet } from "@perfect-abstractions/compose/diamond/DiamondUpgradeFacet.sol"; - export default buildModule("CounterDiamondModule", (m) => { const counterFacet = m.contract("CounterFacet"); - const inspectFacet = m.contract(DiamondInspectFacet); - const upgradeFacet = m.contract(DiamondUpgradeFacet); + const inspectFacet = m.contract("DiamondInspectFacet"); + const upgradeFacet = m.contract("DiamondUpgradeFacet"); const owner = m.getAccount(0); const diamond = m.contract("Diamond", [[counterFacet, inspectFacet, upgradeFacet], owner]); From 3c9d8cc1664f7f8b5d73ab725dad9d51c5844ada Mon Sep 17 00:00:00 2001 From: maxnorm Date: Fri, 3 Apr 2026 17:36:08 -0400 Subject: [PATCH 2/3] update init text --- cli/src/commands/init.js | 3 ++- cli/src/utils/logger.js | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cli/src/commands/init.js b/cli/src/commands/init.js index 2bd22662..9a57f76d 100644 --- a/cli/src/commands/init.js +++ b/cli/src/commands/init.js @@ -139,7 +139,8 @@ async function runInitCommand(argv) { logger.plain(""); logger.info("You're all set. We hope you'll Compose something great!\n"); - logger.warn(`If this helped you, please give us a star on GitHub:\n${COMPOSE_REPO_URL}\n`); + logger.brightYellow(`If this helped you, please give us a star on GitHub:\n✨ ${COMPOSE_REPO_URL} ✨\n`); + logger.warn(`Please report any issues or feedback:\n${COMPOSE_REPO_URL}/issues\n`); } module.exports = { diff --git a/cli/src/utils/logger.js b/cli/src/utils/logger.js index 830be744..3d18bba6 100644 --- a/cli/src/utils/logger.js +++ b/cli/src/utils/logger.js @@ -10,6 +10,9 @@ const logger = { warn(message) { console.warn(pc.yellow(message)); }, + brightYellow(message) { + console.warn(pc.bold(pc.yellowBright(message))); + }, error(message) { console.error(pc.red(message)); }, From 404aafcf83b61212e373e23df1818c3859270af7 Mon Sep 17 00:00:00 2001 From: maxnorm Date: Fri, 3 Apr 2026 17:53:46 -0400 Subject: [PATCH 3/3] add changeset --- .changeset/rich-apples-check.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/rich-apples-check.md diff --git a/.changeset/rich-apples-check.md b/.changeset/rich-apples-check.md new file mode 100644 index 00000000..aa8b5ce6 --- /dev/null +++ b/.changeset/rich-apples-check.md @@ -0,0 +1,5 @@ +--- +"@perfect-abstractions/compose-cli": patch +--- + +fix deployment setup on hardhat