From 12edf885482d32c4324b710f36625af79a01a1b2 Mon Sep 17 00:00:00 2001 From: Jan-Felix Date: Tue, 2 May 2023 16:49:57 +0200 Subject: [PATCH 1/4] add module entrypoint, fix main and typings entrypoints --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 54b7c416..fe141cfd 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,12 @@ { "name": "@gnosis.pm/zodiac", - "version": "3.3.0", + "version": "3.3.1", "description": "Zodiac is a composable design philosophy and collection of standards for building DAO ecosystem tooling.", "author": "Auryn Macmillan ", "license": "LGPL-3.0+", - "main": "./dist/sdk/index.js", - "typings": "./dist/sdk/index.d.ts", + "main": "./dist/cjs/index.js", + "module": "./dist/esm/index.js", + "typings": "./dist/cjs/index.d.ts", "files": [ "package.json", "LICENSE", From eb6ff275d3105ee658a48577609eb7477d0bdc7a Mon Sep 17 00:00:00 2001 From: Jan-Felix Date: Tue, 2 May 2023 16:50:10 +0200 Subject: [PATCH 2/4] remove obsolete peer dep --- package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/package.json b/package.json index fe141cfd..82a18b74 100644 --- a/package.json +++ b/package.json @@ -88,8 +88,5 @@ "@openzeppelin/contracts": "^4.8.1", "@openzeppelin/contracts-upgradeable": "^4.8.1", "ethers": "^5.7.1" - }, - "peerDependencies": { - "ethers": "^5.7.1" } } From d3f9a23751da56789cff204923ea9b030bb62340 Mon Sep 17 00:00:00 2001 From: Jan-Felix Date: Wed, 3 May 2023 09:51:43 +0200 Subject: [PATCH 3/4] cleanup --- sdk/test.json | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 sdk/test.json diff --git a/sdk/test.json b/sdk/test.json deleted file mode 100644 index c3bbd502..00000000 --- a/sdk/test.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "metaGuard": "0xe2847462a574bfd43014d1c7BB6De5769C294691", - "realityETH": "0x4e35DA39Fa5893a70A40Ce964F993d891E607cC0", - "realityERC20": "0x7276813b21623d89BA8984B225d5792943DD7dbF", - "bridge": "0x03B5eBD2CB2e3339E93774A1Eb7c8634B8C393A9", - "delay": "0xD62129BF40CD1694b3d9D9847367783a1A4d5cB4", - "factory": "0x000000000000aDdB49795b0f9bA5BC298cDda236", - "exit": "0x3ed380a282aDfA3460da28560ebEB2F6D967C9f5", - "exitERC721": "0xE0eCE32Eb4BE4E9224dcec6a4FcB335c1fe05CDe", - "circulatingSupplyERC20": "0x5Ed57C291a184cc244F5c9B5E9F11a8DD08BBd12", - "circulatingSupplyERC721": "0xBD34D00dC0ae37C687F784A11FA6a0F2c5726Ba3", - "scopeGuard": "0xeF27fcd3965a866b22Fb2d7C689De9AB7e611f1F", - "roles": "0xD8DfC1d938D7D163C5231688341e9635E9011889", - "permissions": "0x33D1C5A5B6a7f3885c7467e829aaa21698937597", - "tellor": "0xcc4C0ED5958770B5036189394360C33DDECf8414", - "optimisticGovernor": "", - "ozGovernor": "0xe28c39FAC73cce2B33C4C003049e2F3AE43f77d5", - "erc20Votes": "0x752c61de75ADA0F8a33e048d2F773f51172f033e", - "erc721Votes": "0xeFf38b2eBB95ACBA09761246045743f40e762568", - "multisendEncoder": "0xb67EDe523171325345780fA3016b7F5221293df0", - "connext": "0x7dE07b9De0bf0FABf31A188DE1527034b2aF36dB" -} From 4b47a6412f67db753846cfb992672f07a577d2e9 Mon Sep 17 00:00:00 2001 From: Jan-Felix Date: Wed, 3 May 2023 10:24:24 +0200 Subject: [PATCH 4/4] adjust package config so it can be consumed in CRA --- package.json | 11 ++++++++--- tsconfig.esm.json | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 82a18b74..6c579df8 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,14 @@ "description": "Zodiac is a composable design philosophy and collection of standards for building DAO ecosystem tooling.", "author": "Auryn Macmillan ", "license": "LGPL-3.0+", - "main": "./dist/cjs/index.js", - "module": "./dist/esm/index.js", - "typings": "./dist/cjs/index.d.ts", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", + "exports": { + ".": { + "require": "./dist/cjs/index.js", + "import": "./dist/esm/index.js" + } + }, "files": [ "package.json", "LICENSE", diff --git a/tsconfig.esm.json b/tsconfig.esm.json index 0f5a68f8..d55c9d29 100644 --- a/tsconfig.esm.json +++ b/tsconfig.esm.json @@ -1,9 +1,9 @@ { "extends": "./tsconfig", "compilerOptions": { - "target": "esnext", + "target": "es2020", "outDir": "dist/esm", - "module": "esnext" + "module": "es2020" }, "include": ["sdk/**/*.ts"] }