diff --git a/package.json b/package.json index 1ce7799..17fdacf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "root", - "version": "0.0.3", + "version": "0.1.0", "author": "Electi Consulting LTD", "license": "See individual packages", "private": true, @@ -19,9 +19,10 @@ "web3": "^1.0.0-beta.36", "@nomiclabs/hardhat-web3": "^2.0.0", "@nomiclabs/hardhat-ethers": "^2.2.2", - "@vechain/hardhat-vechain": "0.1.0", - "@vechain/hardhat-ethers": "0.1.0", - "@vechain/hardhat-web3": "0.1.0", + "@types/debug": "^4.1.8", + "@vechain/hardhat-vechain": "^0.1.1", + "@vechain/hardhat-ethers": "^0.1.1", + "@vechain/hardhat-web3": "^0.1.1", "@types/jest": "^29.5.2", "ts-jest": "^29.1.0", "jest": "^29.5.0" diff --git a/packages/ethers/package.json b/packages/ethers/package.json index ab11845..31d94e4 100644 --- a/packages/ethers/package.json +++ b/packages/ethers/package.json @@ -1,10 +1,11 @@ { "name": "@vechain/hardhat-ethers", - "version": "0.1.0", + "version": "0.1.1", "license": "MIT", "description": "Hardhat Vechain Ethers Plugin", "repository": "github:vechainfoundation/hardhat-plugins", "author": "Electi Consulting LTD", + "main": "dist/index.js", "keywords": [ "thor", "vechain", @@ -14,11 +15,10 @@ "hardhat-plugin", "ethers" ], - "main": "src/index.js", - "typings": "./src/index.d.ts", "files": [ - "src/**/*.js", - "src/**/*.d.ts" + "dist", + "LICENSE", + "README.md" ], "scripts": { "prepack": "yarn build", @@ -29,12 +29,12 @@ "ethers": "^5.0.0", "hardhat": "^2.12.7", "@nomiclabs/hardhat-ethers": "^2.2.2", - "@vechain/hardhat-vechain": "^0.1.0" + "@vechain/hardhat-vechain": "^0.1.1" }, "peerDependencies": { "ethers": "^5.0.0", "hardhat": "^2.12.7", "@nomiclabs/hardhat-ethers": "^2.2.2", - "@vechain/hardhat-vechain": "^0.1.0" + "@vechain/hardhat-vechain": "^0.1.1" } } \ No newline at end of file diff --git a/packages/ethers/src/index.ts b/packages/ethers/src/index.ts index 123e20a..255d2ce 100644 --- a/packages/ethers/src/index.ts +++ b/packages/ethers/src/index.ts @@ -44,11 +44,11 @@ const modified = (provider: ConnexProviderWrapper) => { } extendEnvironment(hre => { - if (hre.vechain === undefined) { + if (!hre.network.name.includes("vechain")) { throw new VechainHardhatPluginError("vechain-ethers plugin requires hardhat-vechain"); } hre.ethers = lazyObject(() => { - if (hre.vechain === undefined) { + if (!hre.network.name.includes("vechain")) { throw new VechainHardhatPluginError("@vechain/hardhat-ethers expects @vechain/hardhat-vechain"); } diff --git a/packages/ethers/src/type-extensions.ts b/packages/ethers/src/type-extensions.ts index 83a2b02..f6c48e4 100644 --- a/packages/ethers/src/type-extensions.ts +++ b/packages/ethers/src/type-extensions.ts @@ -1,2 +1,2 @@ -import "@vechain/hardhat-vechain/src/type-extensions"; +import "@vechain/hardhat-vechain/dist/type-extensions"; import "@nomiclabs/hardhat-ethers/internal/type-extensions"; \ No newline at end of file diff --git a/packages/ethers/tsconfig.json b/packages/ethers/tsconfig.json index ed22472..b5174c7 100644 --- a/packages/ethers/tsconfig.json +++ b/packages/ethers/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": ".", - "rootDir": "." + "outDir": "./dist", + "rootDir": "./src" }, - "exclude": ["jest.config.ts", "test"] + "exclude": ["jest.config.ts", "test", "./dist"] } \ No newline at end of file diff --git a/packages/vechain/package.json b/packages/vechain/package.json index de5203e..e3b7d00 100644 --- a/packages/vechain/package.json +++ b/packages/vechain/package.json @@ -1,6 +1,6 @@ { "name": "@vechain/hardhat-vechain", - "version": "0.1.0", + "version": "0.1.1", "license": "MIT", "description": "Hardhat plugin for a VeChain provider", "homepage": "https://github.com/vechainfoundation/hardhat-plugins", @@ -14,11 +14,11 @@ "hardhat", "hardhat-plugin" ], - "main": "src/index.js", - "typings": "./src/index.d.ts", + "main": "dist/index.js", "files": [ - "src/**/*.js", - "src/**/*.d.ts" + "dist", + "LICENSE", + "README.md" ], "scripts": { "build": "tsc --build", diff --git a/packages/vechain/tsconfig.json b/packages/vechain/tsconfig.json index ed22472..b5174c7 100644 --- a/packages/vechain/tsconfig.json +++ b/packages/vechain/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": ".", - "rootDir": "." + "outDir": "./dist", + "rootDir": "./src" }, - "exclude": ["jest.config.ts", "test"] + "exclude": ["jest.config.ts", "test", "./dist"] } \ No newline at end of file diff --git a/packages/web3/package.json b/packages/web3/package.json index defb12d..75dc078 100644 --- a/packages/web3/package.json +++ b/packages/web3/package.json @@ -1,10 +1,11 @@ { "name": "@vechain/hardhat-web3", - "version": "0.1.0", + "version": "0.1.1", "license": "MIT", "description": "Hardhat Vechain Web3 Plugin", "repository": "github:vechainfoundation/hardhat-plugins", "author": "Electi Consulting LTD", + "main": "dist/index.js", "keywords": [ "thor", "vechain", @@ -14,11 +15,10 @@ "hardhat-plugin", "web3" ], - "main": "src/index.js", - "typings": "./src/index.d.ts", "files": [ - "src/**/*.js", - "src/**/*.d.ts" + "dist", + "LICENSE", + "README.md" ], "scripts": { "prepack": "yarn build", @@ -29,12 +29,12 @@ "web3": "^1.0.0-beta.36", "hardhat": "^2.12.7", "@nomiclabs/hardhat-web3": "^2.0.0", - "@vechain/hardhat-vechain": "^0.1.0" + "@vechain/hardhat-vechain": "^0.1.1" }, "peerDependencies": { "web3": "^1.0.0-beta.36", "hardhat": "^2.12.7", "@nomiclabs/hardhat-web3": "^2.0.0", - "@vechain/hardhat-vechain": "^0.1.0" + "@vechain/hardhat-vechain": "^0.1.1" } } \ No newline at end of file diff --git a/packages/web3/src/index.ts b/packages/web3/src/index.ts index 5f32859..018c126 100644 --- a/packages/web3/src/index.ts +++ b/packages/web3/src/index.ts @@ -5,7 +5,7 @@ import { VechainHardhatPluginError } from "@vechain/hardhat-vechain"; import "./type-extensions"; extendEnvironment(hre => { - if (hre.vechain === undefined) { + if (!hre.network.name.includes("vechain")) { throw new VechainHardhatPluginError("vechain-web3 plugin requires hardhat-vechain"); } hre.Web3 = lazyFunction(() => require("web3")); diff --git a/packages/web3/src/type-extensions.ts b/packages/web3/src/type-extensions.ts index 288f543..c1ae944 100644 --- a/packages/web3/src/type-extensions.ts +++ b/packages/web3/src/type-extensions.ts @@ -1,2 +1,2 @@ -import "@vechain/hardhat-vechain/src/type-extensions"; +import "@vechain/hardhat-vechain/dist/type-extensions"; import "@nomiclabs/hardhat-web3/src/type-extensions"; \ No newline at end of file diff --git a/packages/web3/tsconfig.json b/packages/web3/tsconfig.json index ed22472..b5174c7 100644 --- a/packages/web3/tsconfig.json +++ b/packages/web3/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": ".", - "rootDir": "." + "outDir": "./dist", + "rootDir": "./src" }, - "exclude": ["jest.config.ts", "test"] + "exclude": ["jest.config.ts", "test", "./dist"] } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index cfd4aed..8d3bb60 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1411,7 +1411,7 @@ "@types/node" "*" "@types/responselike" "^1.0.0" -"@types/debug@^4.1.7": +"@types/debug@^4.1.7", "@types/debug@^4.1.8": version "4.1.8" resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317" integrity sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ==