Update Builds Directories to Make Use of Both lib and dist

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)

packages/web3-core/.eslintignore

@@ -1,3 +1,4 @@
 dist
+lib
 jest.config.js
 .eslintrc.js

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)

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 '**/*'",

packages/web3-core/tsconfig.json

@@ -1,7 +1,7 @@
 {
 	"extends": "../../tsconfig",
 	"compilerOptions": {
-		"outDir": "dist"
+		"outDir": "lib"
 	},
 	"include": ["src/**/*"]
 }

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)

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 '**/*'",

packages/web3-eth-abi/.eslintignore

@@ -1,3 +1,4 @@
 dist
+lib
 jest.config.js
 .eslintrc.js

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)

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 '**/*'",

packages/web3-eth-abi/tsconfig.json

@@ -1,7 +1,7 @@
 {
 	"extends": "../../tsconfig",
 	"compilerOptions": {
-		"outDir": "dist"
+		"outDir": "lib"
 	},
 	"include": ["src/**/*"]
 }

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)

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 '**/*'",

packages/web3-eth-accounts/tsconfig.json

@@ -1,7 +1,7 @@
 {
 	"extends": "../../tsconfig",
 	"compilerOptions": {
-		"outDir": "dist",
+		"outDir": "lib",
 		"esModuleInterop": true
 	},
 	"include": ["src/**/*"]

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)

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 '**/*'",

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

packages/web3-eth-contract/tsconfig.json

@@ -1,7 +1,7 @@
 {
 	"extends": "../../tsconfig",
 	"compilerOptions": {
-		"outDir": "dist",
+		"outDir": "lib",
 		"esModuleInterop": true
 	},
 	"include": ["src/**/*"]

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)

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 '**/*'",

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)

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 '**/*'",

packages/web3-eth-personal/.eslintignore

@@ -0,0 +1 @@
+../../templates/.eslintignore.tmpl

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)

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 '**/*'",