From 7038c2a178f5a46eddf46dd8c5ee00c8baaf613e Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Wed, 24 Jul 2024 16:42:34 -0400 Subject: [PATCH 01/10] create js instead of ts for publishing --- scripts/prepublish.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/prepublish.sh b/scripts/prepublish.sh index b0cd4224..cd8bdb2b 100755 --- a/scripts/prepublish.sh +++ b/scripts/prepublish.sh @@ -6,7 +6,7 @@ npm run test npx hardhat export --export-all deployments.json -rm index.ts +rm index.js rm -rf publish && mkdir publish # Step 1: Remove the `abi`, `name`, and `chainId` keys @@ -30,7 +30,7 @@ rm abis.json rm deployments.json -cat << EOF > index.ts +cat << EOF > index.js import abis from "./publish/abis"; import addresses from "./publish/addresses"; export { abis, addresses }; From 270bc9c9851623831c0274bec6b14ff78a9a9a56 Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Wed, 24 Jul 2024 16:46:00 -0400 Subject: [PATCH 02/10] update package.json and lock-file --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 69743670..4fbe2b3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "@fractal-framework/fractal-contracts", - "version": "1.3.0", + "version": "1.2.1", "license": "MIT", "devDependencies": { "@gnosis.pm/zodiac": "^1.1.4", diff --git a/package.json b/package.json index d6abc584..f4e225e2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@fractal-framework/fractal-contracts", "version": "1.2.1", "files": [ - "index.ts", + "index.js", "publish", "contracts", "!contracts/mock" From 2079aa00ecaa1135e50b1bb20506e0e42746d403 Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:46:20 -0400 Subject: [PATCH 03/10] revert js switch and add typescript compile command --- scripts/prepublish.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/prepublish.sh b/scripts/prepublish.sh index cd8bdb2b..e0f3d9c9 100755 --- a/scripts/prepublish.sh +++ b/scripts/prepublish.sh @@ -6,7 +6,7 @@ npm run test npx hardhat export --export-all deployments.json -rm index.js +rm index.ts rm -rf publish && mkdir publish # Step 1: Remove the `abi`, `name`, and `chainId` keys @@ -30,8 +30,11 @@ rm abis.json rm deployments.json -cat << EOF > index.js +cat << EOF > index.ts import abis from "./publish/abis"; import addresses from "./publish/addresses"; export { abis, addresses }; EOF + +# Run TypeScript compilation +tsc index.ts From aee3bc49f595cd396f1d001932593f3465edc7e9 Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:46:52 -0400 Subject: [PATCH 04/10] v1.2.11 --- package-lock.json | 4 ++-- package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4fbe2b3a..48b6beb7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@fractal-framework/fractal-contracts", - "version": "1.2.1", + "version": "1.2.11", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@fractal-framework/fractal-contracts", - "version": "1.2.1", + "version": "1.2.11", "license": "MIT", "devDependencies": { "@gnosis.pm/zodiac": "^1.1.4", diff --git a/package.json b/package.json index f4e225e2..c8145fe7 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "@fractal-framework/fractal-contracts", - "version": "1.2.1", + "version": "1.2.11", "files": [ - "index.js", + "dist", "publish", "contracts", "!contracts/mock" From 3cdad0765eeec2f25c1bc344eb3639fd1d8a7962 Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:56:40 -0400 Subject: [PATCH 05/10] move file into `publish` directory --- package.json | 1 + scripts/prepublish.sh | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index c8145fe7..029580f7 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "contracts", "!contracts/mock" ], + "main": "publish/index.js", "repository": { "type": "git", "url": "git+https://github.com/decentdao/fractal-contracts.git" diff --git a/scripts/prepublish.sh b/scripts/prepublish.sh index e0f3d9c9..6729ecd5 100755 --- a/scripts/prepublish.sh +++ b/scripts/prepublish.sh @@ -6,7 +6,6 @@ npm run test npx hardhat export --export-all deployments.json -rm index.ts rm -rf publish && mkdir publish # Step 1: Remove the `abi`, `name`, and `chainId` keys @@ -30,11 +29,11 @@ rm abis.json rm deployments.json -cat << EOF > index.ts +cat << EOF > publish/index.ts import abis from "./publish/abis"; import addresses from "./publish/addresses"; export { abis, addresses }; EOF # Run TypeScript compilation -tsc index.ts +tsc publish/index.ts --outDir publish From 56ed04a399cf2ea00b5e926aa03f85fa58e59399 Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:56:52 -0400 Subject: [PATCH 06/10] v1.2.12 --- package-lock.json | 4 ++-- package.json | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 48b6beb7..e0056dcd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@fractal-framework/fractal-contracts", - "version": "1.2.11", + "version": "1.2.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@fractal-framework/fractal-contracts", - "version": "1.2.11", + "version": "1.2.12", "license": "MIT", "devDependencies": { "@gnosis.pm/zodiac": "^1.1.4", diff --git a/package.json b/package.json index 029580f7..77b6637f 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,7 @@ { "name": "@fractal-framework/fractal-contracts", - "version": "1.2.11", + "version": "1.2.12", "files": [ - "dist", "publish", "contracts", "!contracts/mock" From 4aa97ddd2b38d047c2f577ac5ffc8984231fcc93 Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Wed, 24 Jul 2024 21:01:24 -0400 Subject: [PATCH 07/10] correct path --- scripts/prepublish.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/prepublish.sh b/scripts/prepublish.sh index 6729ecd5..64d3530f 100755 --- a/scripts/prepublish.sh +++ b/scripts/prepublish.sh @@ -36,4 +36,4 @@ export { abis, addresses }; EOF # Run TypeScript compilation -tsc publish/index.ts --outDir publish +tsc ./publish/index.ts From 15ce8006aa77e2ec0ca3061fe360fdaca95d68c2 Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Wed, 24 Jul 2024 21:07:39 -0400 Subject: [PATCH 08/10] fix imports --- scripts/prepublish.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/prepublish.sh b/scripts/prepublish.sh index 64d3530f..b02c00a3 100755 --- a/scripts/prepublish.sh +++ b/scripts/prepublish.sh @@ -30,8 +30,8 @@ rm abis.json rm deployments.json cat << EOF > publish/index.ts -import abis from "./publish/abis"; -import addresses from "./publish/addresses"; +import abis from "./abis"; +import addresses from "./addresses"; export { abis, addresses }; EOF From 2e9ee66d6b113593505b796c8d70ca57e57423b9 Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Wed, 24 Jul 2024 22:57:06 -0400 Subject: [PATCH 09/10] add npx to tsc command --- scripts/prepublish.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/prepublish.sh b/scripts/prepublish.sh index b02c00a3..e7cb86a3 100755 --- a/scripts/prepublish.sh +++ b/scripts/prepublish.sh @@ -36,4 +36,4 @@ export { abis, addresses }; EOF # Run TypeScript compilation -tsc ./publish/index.ts +npx tsc ./publish/index.ts From 80ef83933a0edca1f26c0a3bd7199e1647fa2645 Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Wed, 24 Jul 2024 23:40:55 -0400 Subject: [PATCH 10/10] bump version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e0056dcd..cafcc640 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@fractal-framework/fractal-contracts", - "version": "1.2.12", + "version": "1.2.13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@fractal-framework/fractal-contracts", - "version": "1.2.12", + "version": "1.2.13", "license": "MIT", "devDependencies": { "@gnosis.pm/zodiac": "^1.1.4", diff --git a/package.json b/package.json index 77b6637f..d5b518b4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@fractal-framework/fractal-contracts", - "version": "1.2.12", + "version": "1.2.13", "files": [ "publish", "contracts",