diff --git a/CHANGELOG.md b/CHANGELOG.md index f2e1c219adc..035712bdc3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -961,6 +961,78 @@ should use 4.0.1-alpha.0 for testing. ### Changed +#### web3 + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) + +#### web3-core + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) + +#### web3-errors + +- `main` and `files` entries in `package.json` changed to `lib/` directory from `dist/` (#5739) + +#### web3-eth + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) + +#### web3-eth-abi + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) + +#### web3-eth-accounts + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) + +#### web3-eth-contract + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) + +#### web3-eth-ens + +- `main` and `files` entries in `package.json` changed to `lib/` directory from `dist/` (#5739) + +#### web3-eth-iban + +- `main` and `files` entries in `package.json` changed to `lib/` directory from `dist/` (#5739) + +#### web3-eth-personal + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) + +#### web3-net + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) + +#### web3-providers-http + +- `main` and `files` entries in `package.json` changed to `lib/` directory from `dist/` (#5739) + +#### web3-providers-ipc + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) + +#### web3-providers-ws + +- `main` and `files` entries in `package.json` changed to `lib/` directory from `dist/` (#5739) + +#### web3-rpc-methods + +- `main` and `files` entries in `package.json` changed to `lib/` directory from `dist/` (#5739) + +#### web3-types + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) + +#### web3-utils + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) + +#### web3-validator + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) + #### web3-providers-ipc - Refactor to use common SocketProvider class (#5683) diff --git a/packages/web3-core/.eslintignore b/packages/web3-core/.eslintignore index 61692fa813f..e3d7e665285 100644 --- a/packages/web3-core/.eslintignore +++ b/packages/web3-core/.eslintignore @@ -1,3 +1,4 @@ dist +lib jest.config.js .eslintrc.js diff --git a/packages/web3-core/CHANGELOG.md b/packages/web3-core/CHANGELOG.md index afc465d8c84..af009334b11 100644 --- a/packages/web3-core/CHANGELOG.md +++ b/packages/web3-core/CHANGELOG.md @@ -65,3 +65,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated dependencies (#5725) ## [Unreleased] + +### Changed + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) diff --git a/packages/web3-core/package.json b/packages/web3-core/package.json index 1f973438ee4..36c3355f368 100644 --- a/packages/web3-core/package.json +++ b/packages/web3-core/package.json @@ -2,18 +2,18 @@ "name": "web3-core", "version": "4.0.1-alpha.3", "description": "Web3 core tools for sub-packages. This is an internal package.", - "main": "dist/index.js", + "main": "lib/index.js", "repository": "https://github.com/ChainSafe/web3.js", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3-core/tsconfig.json b/packages/web3-core/tsconfig.json index 7ed7f6b23a4..fb299296e1f 100644 --- a/packages/web3-core/tsconfig.json +++ b/packages/web3-core/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "dist" + "outDir": "lib" }, "include": ["src/**/*"] } diff --git a/packages/web3-errors/CHANGELOG.md b/packages/web3-errors/CHANGELOG.md index ba46723a526..94dcc1b4e86 100644 --- a/packages/web3-errors/CHANGELOG.md +++ b/packages/web3-errors/CHANGELOG.md @@ -60,3 +60,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated Web3.js dependencies (#5664) ## [Unreleased] + +### Changed + +- `main` and `files` entries in `package.json` changed to `lib/` directory from `dist/` (#5739) diff --git a/packages/web3-errors/package.json b/packages/web3-errors/package.json index 3656d323b1b..36685db2616 100644 --- a/packages/web3-errors/package.json +++ b/packages/web3-errors/package.json @@ -2,18 +2,18 @@ "name": "web3-errors", "version": "0.1.1-alpha.2", "description": "This package has web3 error classes", - "main": "dist/index.js", + "main": "lib/index.js", "repository": "https://github.com/ChainSafe/web3.js", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3-eth-abi/.eslintignore b/packages/web3-eth-abi/.eslintignore index 61692fa813f..e3d7e665285 100644 --- a/packages/web3-eth-abi/.eslintignore +++ b/packages/web3-eth-abi/.eslintignore @@ -1,3 +1,4 @@ dist +lib jest.config.js .eslintrc.js diff --git a/packages/web3-eth-abi/CHANGELOG.md b/packages/web3-eth-abi/CHANGELOG.md index ae545f7e17d..356861a8e71 100644 --- a/packages/web3-eth-abi/CHANGELOG.md +++ b/packages/web3-eth-abi/CHANGELOG.md @@ -67,3 +67,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated dependencies (#5725) ## [Unreleased] + +### Changed + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) diff --git a/packages/web3-eth-abi/package.json b/packages/web3-eth-abi/package.json index 10dee99ec04..a246e4dff7c 100644 --- a/packages/web3-eth-abi/package.json +++ b/packages/web3-eth-abi/package.json @@ -2,18 +2,18 @@ "name": "web3-eth-abi", "version": "4.0.1-alpha.3", "description": "Web3 module encode and decode EVM in/output.", - "main": "dist/index.js", + "main": "lib/index.js", "repository": "https://github.com/ethereum/web3.js/tree/4.x/packages/web3-eth-abi", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3-eth-abi/tsconfig.json b/packages/web3-eth-abi/tsconfig.json index 7ed7f6b23a4..fb299296e1f 100644 --- a/packages/web3-eth-abi/tsconfig.json +++ b/packages/web3-eth-abi/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "dist" + "outDir": "lib" }, "include": ["src/**/*"] } diff --git a/packages/web3-eth-accounts/CHANGELOG.md b/packages/web3-eth-accounts/CHANGELOG.md index 30c5dec5b48..05d4e6b5315 100644 --- a/packages/web3-eth-accounts/CHANGELOG.md +++ b/packages/web3-eth-accounts/CHANGELOG.md @@ -54,3 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated dependencies (#5725) ## [Unreleased] + +### Changed + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) diff --git a/packages/web3-eth-accounts/package.json b/packages/web3-eth-accounts/package.json index ba79df9c8cf..dda70f4cd7d 100644 --- a/packages/web3-eth-accounts/package.json +++ b/packages/web3-eth-accounts/package.json @@ -2,18 +2,18 @@ "name": "web3-eth-accounts", "version": "4.0.1-alpha.3", "description": "Package for managing Ethereum accounts and signing", - "main": "dist/index.js", + "main": "lib/index.js", "repository": "https://github.com/ChainSafe/web3.js", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3-eth-accounts/tsconfig.json b/packages/web3-eth-accounts/tsconfig.json index 33b9f1c8116..7af3885edd9 100644 --- a/packages/web3-eth-accounts/tsconfig.json +++ b/packages/web3-eth-accounts/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "dist", + "outDir": "lib", "esModuleInterop": true }, "include": ["src/**/*"] diff --git a/packages/web3-eth-contract/CHANGELOG.md b/packages/web3-eth-contract/CHANGELOG.md index 5edefad155c..8820419e170 100644 --- a/packages/web3-eth-contract/CHANGELOG.md +++ b/packages/web3-eth-contract/CHANGELOG.md @@ -203,3 +203,7 @@ const transactionHash = receipt.transactionHash; - Updated dependencies (#5725) ## [Unreleased] + +### Changed + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) diff --git a/packages/web3-eth-contract/package.json b/packages/web3-eth-contract/package.json index 1be21429a58..e276f6f0b85 100644 --- a/packages/web3-eth-contract/package.json +++ b/packages/web3-eth-contract/package.json @@ -2,18 +2,18 @@ "name": "web3-eth-contract", "version": "4.0.1-alpha.3", "description": "Web3 module to interact with Ethereum smart contracts.", - "main": "dist/index.js", + "main": "lib/index.js", "repository": "https://github.com/ethereum/web3.js/tree/4.x/packages/web3-eth-contract", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3-eth-contract/src/encoding.ts b/packages/web3-eth-contract/src/encoding.ts index 7489b67df5f..749863b22ad 100644 --- a/packages/web3-eth-contract/src/encoding.ts +++ b/packages/web3-eth-contract/src/encoding.ts @@ -35,7 +35,7 @@ import { jsonInterfaceMethodToString, } from 'web3-eth-abi'; -import { blockSchema, logSchema } from 'web3-eth/dist/schemas'; +import { blockSchema, logSchema } from 'web3-eth'; import { Eip838ExecutionError, Web3ContractError } from 'web3-errors'; // eslint-disable-next-line import/no-cycle diff --git a/packages/web3-eth-contract/tsconfig.json b/packages/web3-eth-contract/tsconfig.json index 33b9f1c8116..7af3885edd9 100644 --- a/packages/web3-eth-contract/tsconfig.json +++ b/packages/web3-eth-contract/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "dist", + "outDir": "lib", "esModuleInterop": true }, "include": ["src/**/*"] diff --git a/packages/web3-eth-ens/CHANGELOG.md b/packages/web3-eth-ens/CHANGELOG.md index ae6bbeee8b3..c1d91c8be7f 100644 --- a/packages/web3-eth-ens/CHANGELOG.md +++ b/packages/web3-eth-ens/CHANGELOG.md @@ -54,3 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated dependencies (#5725) ## [Unreleased] + +### Changed + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) diff --git a/packages/web3-eth-ens/package.json b/packages/web3-eth-ens/package.json index 6ae8d4eefe4..69796b14243 100644 --- a/packages/web3-eth-ens/package.json +++ b/packages/web3-eth-ens/package.json @@ -2,18 +2,18 @@ "name": "web3-eth-ens", "version": "4.0.1-alpha.3", "description": "This package has ENS functions for interacting with Ethereum Name Service.", - "main": "dist/index.js", + "main": "lib/index.js", "repository": "https://github.com/ChainSafe/web3.js", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3-eth-iban/CHANGELOG.md b/packages/web3-eth-iban/CHANGELOG.md index 5e211c3684f..f06a9b83059 100644 --- a/packages/web3-eth-iban/CHANGELOG.md +++ b/packages/web3-eth-iban/CHANGELOG.md @@ -48,3 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated dependencies (#5725) ## [Unreleased] + +### Changed + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) diff --git a/packages/web3-eth-iban/package.json b/packages/web3-eth-iban/package.json index 8ceee49c5e6..abd1631918b 100644 --- a/packages/web3-eth-iban/package.json +++ b/packages/web3-eth-iban/package.json @@ -2,18 +2,18 @@ "name": "web3-eth-iban", "version": "4.0.1-alpha.3", "description": "This package converts Ethereum addresses to IBAN addresses and vice versa.", - "main": "dist/index.js", + "main": "lib/index.js", "repository": "https://github.com/ChainSafe/web3.js", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3-eth-personal/.eslintignore b/packages/web3-eth-personal/.eslintignore deleted file mode 100644 index 61692fa813f..00000000000 --- a/packages/web3-eth-personal/.eslintignore +++ /dev/null @@ -1,3 +0,0 @@ -dist -jest.config.js -.eslintrc.js diff --git a/packages/web3-eth-personal/.eslintignore b/packages/web3-eth-personal/.eslintignore new file mode 120000 index 00000000000..94760d2888d --- /dev/null +++ b/packages/web3-eth-personal/.eslintignore @@ -0,0 +1 @@ +../../templates/.eslintignore.tmpl \ No newline at end of file diff --git a/packages/web3-eth-personal/CHANGELOG.md b/packages/web3-eth-personal/CHANGELOG.md index 23e5f9e6a26..c6b9ace47b4 100644 --- a/packages/web3-eth-personal/CHANGELOG.md +++ b/packages/web3-eth-personal/CHANGELOG.md @@ -64,3 +64,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated dependencies (#5725) ## [Unreleased] + +### Changed + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) diff --git a/packages/web3-eth-personal/package.json b/packages/web3-eth-personal/package.json index c4e66f3cec6..cf4a2aa61ee 100644 --- a/packages/web3-eth-personal/package.json +++ b/packages/web3-eth-personal/package.json @@ -2,18 +2,18 @@ "name": "web3-eth-personal", "version": "4.0.1-alpha.3", "description": "Web3 module to interact with the Ethereum blockchain accounts stored in the node.", - "main": "dist/index.js", + "main": "lib/index.js", "repository": "https://github.com/ChainSafe/web3.js", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3-eth-personal/tsconfig.json b/packages/web3-eth-personal/tsconfig.json index 33b9f1c8116..7af3885edd9 100644 --- a/packages/web3-eth-personal/tsconfig.json +++ b/packages/web3-eth-personal/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "dist", + "outDir": "lib", "esModuleInterop": true }, "include": ["src/**/*"] diff --git a/packages/web3-eth/CHANGELOG.md b/packages/web3-eth/CHANGELOG.md index 520dc6d5271..dabaae1b171 100644 --- a/packages/web3-eth/CHANGELOG.md +++ b/packages/web3-eth/CHANGELOG.md @@ -74,3 +74,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated dependencies (#5725) ## [Unreleased] + +### Changed + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) diff --git a/packages/web3-eth/package.json b/packages/web3-eth/package.json index 5b94b222bfe..197ffa477b7 100644 --- a/packages/web3-eth/package.json +++ b/packages/web3-eth/package.json @@ -2,18 +2,18 @@ "name": "web3-eth", "version": "4.0.1-alpha.3", "description": "Web3 module to interact with the Ethereum blockchain and smart contracts.", - "main": "dist/index.js", + "main": "lib/index.js", "repository": "https://github.com/ChainSafe/web3.js", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3-eth/test/integration/unsubscribe.test.ts b/packages/web3-eth/test/integration/unsubscribe.test.ts index 6f60bf16c56..f4243248aea 100644 --- a/packages/web3-eth/test/integration/unsubscribe.test.ts +++ b/packages/web3-eth/test/integration/unsubscribe.test.ts @@ -14,7 +14,7 @@ GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with web3.js. If not, see . */ -import WebSocketProvider from 'web3-providers-ws/dist'; +import WebSocketProvider from 'web3-providers-ws'; import { Web3BaseProvider } from 'web3-types'; /* eslint-disable import/no-extraneous-dependencies */ import IpcProvider from 'web3-providers-ipc'; diff --git a/packages/web3-eth/tsconfig.json b/packages/web3-eth/tsconfig.json index 33b9f1c8116..7af3885edd9 100644 --- a/packages/web3-eth/tsconfig.json +++ b/packages/web3-eth/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "dist", + "outDir": "lib", "esModuleInterop": true }, "include": ["src/**/*"] diff --git a/packages/web3-net/.eslintignore b/packages/web3-net/.eslintignore index 61692fa813f..e3d7e665285 100644 --- a/packages/web3-net/.eslintignore +++ b/packages/web3-net/.eslintignore @@ -1,3 +1,4 @@ dist +lib jest.config.js .eslintrc.js diff --git a/packages/web3-net/CHANGELOG.md b/packages/web3-net/CHANGELOG.md index 8aafb61b6ed..5ab274a2bd3 100644 --- a/packages/web3-net/CHANGELOG.md +++ b/packages/web3-net/CHANGELOG.md @@ -64,3 +64,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated dependencies (#5725) ## [Unreleased] + +### Changed + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) diff --git a/packages/web3-net/package.json b/packages/web3-net/package.json index 2a1b87c319b..22da370a383 100644 --- a/packages/web3-net/package.json +++ b/packages/web3-net/package.json @@ -2,18 +2,18 @@ "name": "web3-net", "version": "4.0.1-alpha.3", "description": "Web3 module to interact with the Ethereum nodes networking properties.", - "main": "dist/index.js", + "main": "lib/index.js", "repository": "https://github.com/ChainSafe/web3.js", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3-net/tsconfig.json b/packages/web3-net/tsconfig.json index 7ed7f6b23a4..fb299296e1f 100644 --- a/packages/web3-net/tsconfig.json +++ b/packages/web3-net/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "dist" + "outDir": "lib" }, "include": ["src/**/*"] } diff --git a/packages/web3-providers-http/CHANGELOG.md b/packages/web3-providers-http/CHANGELOG.md index 5e211c3684f..78fd33a1522 100644 --- a/packages/web3-providers-http/CHANGELOG.md +++ b/packages/web3-providers-http/CHANGELOG.md @@ -48,3 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated dependencies (#5725) ## [Unreleased] + +### Changed + +- `main` and `files` entries in `package.json` changed to `lib/` directory from `dist/` (#5739) diff --git a/packages/web3-providers-http/package.json b/packages/web3-providers-http/package.json index 5862aa2b6a8..a1d1de74d68 100644 --- a/packages/web3-providers-http/package.json +++ b/packages/web3-providers-http/package.json @@ -2,18 +2,18 @@ "name": "web3-providers-http", "version": "4.0.1-alpha.3", "description": "HTTP provider for Web3 4.x.x", - "main": "dist/index.js", + "main": "lib/index.js", "repository": "https://github.com/ChainSafe/web3.js", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3-providers-ipc/.eslintignore b/packages/web3-providers-ipc/.eslintignore index 61692fa813f..e3d7e665285 100644 --- a/packages/web3-providers-ipc/.eslintignore +++ b/packages/web3-providers-ipc/.eslintignore @@ -1,3 +1,4 @@ dist +lib jest.config.js .eslintrc.js diff --git a/packages/web3-providers-ipc/CHANGELOG.md b/packages/web3-providers-ipc/CHANGELOG.md index 0cf612b53d3..eb89ecb5ed3 100644 --- a/packages/web3-providers-ipc/CHANGELOG.md +++ b/packages/web3-providers-ipc/CHANGELOG.md @@ -57,4 +57,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) - Refactor to use common SocketProvider class (#5683) diff --git a/packages/web3-providers-ipc/package.json b/packages/web3-providers-ipc/package.json index 90343a09d0c..a737170742e 100644 --- a/packages/web3-providers-ipc/package.json +++ b/packages/web3-providers-ipc/package.json @@ -2,18 +2,18 @@ "name": "web3-providers-ipc", "version": "4.0.1-alpha.3", "description": "IPC provider for Web3 4.x.x", - "main": "dist/index.js", + "main": "lib/index.js", "repository": "https://github.com/ChainSafe/web3.js", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3-providers-ipc/tsconfig.json b/packages/web3-providers-ipc/tsconfig.json index 7ed7f6b23a4..fb299296e1f 100644 --- a/packages/web3-providers-ipc/tsconfig.json +++ b/packages/web3-providers-ipc/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "dist" + "outDir": "lib" }, "include": ["src/**/*"] } diff --git a/packages/web3-providers-ws/CHANGELOG.md b/packages/web3-providers-ws/CHANGELOG.md index 6f1e0884a71..266688b0a61 100644 --- a/packages/web3-providers-ws/CHANGELOG.md +++ b/packages/web3-providers-ws/CHANGELOG.md @@ -51,4 +51,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- `main` and `files` entries in `package.json` changed to `lib/` directory from `dist/` (#5739) - Refactor to use common SocketProvider class (#5683) diff --git a/packages/web3-providers-ws/package.json b/packages/web3-providers-ws/package.json index c5dd254b27e..011af6599a9 100644 --- a/packages/web3-providers-ws/package.json +++ b/packages/web3-providers-ws/package.json @@ -2,18 +2,18 @@ "name": "web3-providers-ws", "version": "4.0.1-alpha.3", "description": "Websocket provider for Web3 4.x.x", - "main": "dist/index.js", + "main": "lib/index.js", "repository": "https://github.com/ChainSafe/web3.js", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3-rpc-methods/CHANGELOG.md b/packages/web3-rpc-methods/CHANGELOG.md index d2eb22bf67f..836a66c06b1 100644 --- a/packages/web3-rpc-methods/CHANGELOG.md +++ b/packages/web3-rpc-methods/CHANGELOG.md @@ -48,3 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated dependencies (#5725) ## [Unreleased] + +### Changed + +- `main` and `files` entries in `package.json` changed to `lib/` directory from `dist/` (#5739) diff --git a/packages/web3-rpc-methods/package.json b/packages/web3-rpc-methods/package.json index 541d3986c36..c5847ab9c5a 100644 --- a/packages/web3-rpc-methods/package.json +++ b/packages/web3-rpc-methods/package.json @@ -2,18 +2,18 @@ "name": "web3-rpc-methods", "version": "0.1.0-alpha.2", "description": "Ethereum RPC methods for Web3 4.x.x", - "main": "dist/index.js", + "main": "lib/index.js", "repository": "https://github.com/ChainSafe/web3.js", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3-types/.eslintignore b/packages/web3-types/.eslintignore index 61692fa813f..e3d7e665285 100644 --- a/packages/web3-types/.eslintignore +++ b/packages/web3-types/.eslintignore @@ -1,3 +1,4 @@ dist +lib jest.config.js .eslintrc.js diff --git a/packages/web3-types/CHANGELOG.md b/packages/web3-types/CHANGELOG.md index 0ce4a80b3dc..0811b210612 100644 --- a/packages/web3-types/CHANGELOG.md +++ b/packages/web3-types/CHANGELOG.md @@ -61,4 +61,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) - These types were added: ProviderRpcError, EthSubscription, ProviderMessage, ProviderConnectInfo (#5683) diff --git a/packages/web3-types/package.json b/packages/web3-types/package.json index d08f45bd431..eb338d4e039 100644 --- a/packages/web3-types/package.json +++ b/packages/web3-types/package.json @@ -2,18 +2,18 @@ "name": "web3-types", "version": "0.1.1-alpha.2", "description": "Provide the common data structures and interfaces for web3 modules.", - "main": "dist/index.js", + "main": "lib/index.js", "repository": "https://github.com/ChainSafe/web3.js", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3-types/src/web3_api_types.ts b/packages/web3-types/src/web3_api_types.ts index 1cb7bcf5a4f..6edc5c24a5b 100644 --- a/packages/web3-types/src/web3_api_types.ts +++ b/packages/web3-types/src/web3_api_types.ts @@ -21,6 +21,7 @@ export interface ProviderMessage { readonly type: string; readonly data: unknown; } + export interface EthSubscription extends ProviderMessage { readonly type: 'eth_subscription'; readonly data: { @@ -28,13 +29,16 @@ export interface EthSubscription extends ProviderMessage { readonly result: unknown; }; } + export interface ProviderRpcError extends Error { code: number; data?: unknown; } + export interface ProviderConnectInfo { readonly chainId: string; } +// eslint-disable-next-line @typescript-eslint/no-explicit-any export type Web3APISpec = Record any> | unknown; export type Web3APIMethod = string & keyof Exclude; export type Web3APIParams< @@ -57,4 +61,5 @@ export interface Web3APIPayload, + // eslint-disable-next-line @typescript-eslint/no-explicit-any > = API extends Record any> ? ReturnType : any; diff --git a/packages/web3-types/tsconfig.json b/packages/web3-types/tsconfig.json index 7ed7f6b23a4..fb299296e1f 100644 --- a/packages/web3-types/tsconfig.json +++ b/packages/web3-types/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "dist" + "outDir": "lib" }, "include": ["src/**/*"] } diff --git a/packages/web3-utils/.eslintignore b/packages/web3-utils/.eslintignore index 61692fa813f..e3d7e665285 100644 --- a/packages/web3-utils/.eslintignore +++ b/packages/web3-utils/.eslintignore @@ -1,3 +1,4 @@ dist +lib jest.config.js .eslintrc.js diff --git a/packages/web3-utils/CHANGELOG.md b/packages/web3-utils/CHANGELOG.md index 85abfc870af..89e24250fa2 100644 --- a/packages/web3-utils/CHANGELOG.md +++ b/packages/web3-utils/CHANGELOG.md @@ -63,4 +63,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) - Add SocketProvider class and Eip1193Provider abstract class (#5683) diff --git a/packages/web3-utils/package.json b/packages/web3-utils/package.json index 65164e31d61..aab683752d4 100644 --- a/packages/web3-utils/package.json +++ b/packages/web3-utils/package.json @@ -3,18 +3,18 @@ "sideEffects": false, "version": "4.0.1-alpha.3", "description": "Collection of utility functions used in web3.js.", - "main": "dist/index.js", + "main": "lib/index.js", "repository": "https://github.com/ChainSafe/web3.js", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3-utils/tsconfig.json b/packages/web3-utils/tsconfig.json index 7ed7f6b23a4..fb299296e1f 100644 --- a/packages/web3-utils/tsconfig.json +++ b/packages/web3-utils/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "dist" + "outDir": "lib" }, "include": ["src/**/*"] } diff --git a/packages/web3-validator/.eslintignore b/packages/web3-validator/.eslintignore index 0204aab9ff1..042635799ba 100644 --- a/packages/web3-validator/.eslintignore +++ b/packages/web3-validator/.eslintignore @@ -1,4 +1,5 @@ dist +lib jest.config.js .eslintrc.js webpack.config.js \ No newline at end of file diff --git a/packages/web3-validator/CHANGELOG.md b/packages/web3-validator/CHANGELOG.md index 4379049029b..ff3a0a8f8bc 100644 --- a/packages/web3-validator/CHANGELOG.md +++ b/packages/web3-validator/CHANGELOG.md @@ -58,3 +58,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fix issue when importing `web3-validator` package within browser environments (Webpack minified filename changed from `index.min.js` to `web3-validator.min.js`) (#5710) ## [Unreleased] + +### Changed + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) diff --git a/packages/web3-validator/package.json b/packages/web3-validator/package.json index 545c643e679..ea6e1a6eb8c 100644 --- a/packages/web3-validator/package.json +++ b/packages/web3-validator/package.json @@ -2,20 +2,21 @@ "name": "web3-validator", "version": "0.1.1-alpha.3", "description": "JSON-Schema compatible validator for web3", - "main": "dist/index.js", + "main": "lib/index.js", "browser": "dist/web3-validator.min.js", "repository": "https://github.com/ChainSafe/web3.js", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ + "lib/**/*", "dist/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", "build:web": "npx webpack", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3-validator/tsconfig.json b/packages/web3-validator/tsconfig.json index 7ed7f6b23a4..fb299296e1f 100644 --- a/packages/web3-validator/tsconfig.json +++ b/packages/web3-validator/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "dist" + "outDir": "lib" }, "include": ["src/**/*"] } diff --git a/packages/web3/.eslintignore b/packages/web3/.eslintignore index dfebf4291ee..11cdd24703b 100644 --- a/packages/web3/.eslintignore +++ b/packages/web3/.eslintignore @@ -1,4 +1,5 @@ dist +lib hardhat.config.js jest.config.js webpack.config.js diff --git a/packages/web3/CHANGELOG.md b/packages/web3/CHANGELOG.md index 3ddbb76a884..021bc6d2b8b 100644 --- a/packages/web3/CHANGELOG.md +++ b/packages/web3/CHANGELOG.md @@ -52,3 +52,9 @@ But this internal behavior is not exposed any further. Though you can achieve sa ```ts web3.currentProvider.disconnect(); ``` + +## [Unreleased] + +### Changed + +- `tsc` compiled files moved to `lib/` directory from `dist/` (#5739) diff --git a/packages/web3/package.json b/packages/web3/package.json index 17bb5288265..8c65753307a 100644 --- a/packages/web3/package.json +++ b/packages/web3/package.json @@ -2,7 +2,7 @@ "name": "web3", "version": "4.0.1-alpha.3", "description": "Ethereum JavaScript API", - "main": "dist/index.js", + "main": "lib/index.js", "browser": "dist/web3.min.js", "repository": "https://github.com/ChainSafe/web3.js", "engines": { @@ -16,15 +16,16 @@ "API" ], "files": [ + "lib/**/*", "dist/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "yarn version:output && tsc --build", "version:output": "[ -z $npm_package_version ] && rm ./src/version.ts || echo \"/* eslint-disable header/header */ export const Web3PkgInfo = { version: '$npm_package_version' };\" > ./src/version.ts", "build:web": "npx webpack", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/packages/web3/tsconfig.json b/packages/web3/tsconfig.json index 33b9f1c8116..7af3885edd9 100644 --- a/packages/web3/tsconfig.json +++ b/packages/web3/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "dist", + "outDir": "lib", "esModuleInterop": true }, "include": ["src/**/*"] diff --git a/templates/.eslintignore.tmpl b/templates/.eslintignore.tmpl index 75f492134d0..fea9beae6d6 100644 --- a/templates/.eslintignore.tmpl +++ b/templates/.eslintignore.tmpl @@ -1,4 +1,5 @@ dist +lib jest.config.js .eslintrc.js cypress diff --git a/templates/.prettierignore.tmpl b/templates/.prettierignore.tmpl index fa43f2f42ec..a555afa7e28 100644 --- a/templates/.prettierignore.tmpl +++ b/templates/.prettierignore.tmpl @@ -32,6 +32,7 @@ REVISION # project specific paths coverage/ dist/ +lib/ tmp/ browsertest.build/ .coverage diff --git a/templates/tsconfig.json.tmpl b/templates/tsconfig.json.tmpl index 33b9f1c8116..7af3885edd9 100644 --- a/templates/tsconfig.json.tmpl +++ b/templates/tsconfig.json.tmpl @@ -1,7 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "dist", + "outDir": "lib", "esModuleInterop": true }, "include": ["src/**/*"] diff --git a/tools/web3-packagetemplate/package.json b/tools/web3-packagetemplate/package.json index 4f62aa22d0e..3bdf6b5cc1b 100644 --- a/tools/web3-packagetemplate/package.json +++ b/tools/web3-packagetemplate/package.json @@ -2,18 +2,18 @@ "name": "web3-packagetemplate", "version": "0.1.1-alpha.0", "description": "Package template for Web3 4.x.x", - "main": "dist/index.js", + "main": "lib/index.js", "repository": "https://github.com/ChainSafe/web3.js", "author": "ChainSafe Systems", "license": "LGPL-3.0", "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/tools/web3-plugin-example/.eslintignore b/tools/web3-plugin-example/.eslintignore index 7601e9c18b5..a40b49b7ba2 100644 --- a/tools/web3-plugin-example/.eslintignore +++ b/tools/web3-plugin-example/.eslintignore @@ -1,4 +1,5 @@ dist +lib jest.config.js webpack.config.js .eslintrc.js diff --git a/tools/web3-plugin-example/package.json b/tools/web3-plugin-example/package.json index 0a9acf59b9e..97dc2c4b2be 100644 --- a/tools/web3-plugin-example/package.json +++ b/tools/web3-plugin-example/package.json @@ -14,13 +14,13 @@ "API" ], "files": [ - "dist/**/*" + "lib/**/*" ], "scripts": { - "clean": "rimraf dist", - "prebuild": "rimraf dist", + "clean": "rimraf dist && rimraf lib", + "prebuild": "yarn clean", "build": "tsc --build", - "build:check": "node -e \"require('./dist')\"", + "build:check": "node -e \"require('./lib')\"", "lint": "eslint --ext .js,.ts .", "lint:fix": "eslint --fix --ext .js,.ts .", "format": "prettier --write '**/*'", diff --git a/tools/web3-plugin-example/tsconfig.json b/tools/web3-plugin-example/tsconfig.json index 33b9f1c8116..7af3885edd9 100644 --- a/tools/web3-plugin-example/tsconfig.json +++ b/tools/web3-plugin-example/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "dist", + "outDir": "lib", "esModuleInterop": true }, "include": ["src/**/*"]