🚚 chore: Flatter package folder structure (#409)

## Description Make folder structure for evmts flatter so it's faster/easier to move between packages ## Testing CI ## Additional Information - [ ] I read the [contributing docs](../docs/contributing.md) (if this is your first contribution) Your ENS/address: Co-authored-by: Will Cory <[email protected]>
evmts · Jul 31, 2023 · a38c735 · a38c735 · vercel · Jul 31, 2023
1 parent c4403cc
commit a38c735
Show file tree

Hide file tree

Showing 247 changed files with 3,972 additions and 522 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -31,13 +31,13 @@ jobs:
         uses:  davelosert/vitest-coverage-report-action@v2
         with:
           name: "@evmts/core"
-          working-directory: "./runtime/core"
+          working-directory: "./core"
       - name: 'Report @evmts/ethers Coverage'
         if: always() # Also generate the report if tests are failing
         uses:  davelosert/vitest-coverage-report-action@v2
         with:
           name: "@evmts/ethers"
-          working-directory: "./runtime/ethers"
+          working-directory: "./ethers"
       - name: 'Report @evmts/bundler Coverage'
         if: always() # Also generate the report if tests are failing
         uses:  davelosert/vitest-coverage-report-action@v2
@@ -49,19 +49,19 @@ jobs:
         uses:  davelosert/vitest-coverage-report-action@v2
         with:
           name: "@evmts/esbuild-plugin"
-          working-directory: "./bundlers/esbuild-plugin"
+          working-directory: "./bundlers/esbuild"
       - name: 'Report @evmts/ts-plugin Coverage'
         if: always() # Also generate the report if tests are failing
         uses:  davelosert/vitest-coverage-report-action@v2
         with:
           name: "@evmts/ts-plugin"
-          working-directory: "./lsp/ts-plugin"
+          working-directory: "./ts-plugin"
       - name: 'Report @evmts/config Coverage'
         if: always() # Also generate the report if tests are failing
         uses:  davelosert/vitest-coverage-report-action@v2
         with:
           name: "@evmts/config"
-          working-directory: "./bundlers/config"
+          working-directory: "./config"
       - name: 'Report @evmts/esbuild Coverage'
         if: always() # Also generate the report if tests are failing
         uses:  davelosert/vitest-coverage-report-action@v2

diff --git a/bundlers/cli/.gitignore → bundlers/bundler/bundler/.gitignore b/bundlers/cli/.gitignore → bundlers/bundler/bundler/.gitignore
diff --git a/bundlers/bundler/bundler/CHANGELOG.md b/bundlers/bundler/bundler/CHANGELOG.md
@@ -0,0 +1,200 @@
+# @evmts/core
+
+## 0.6.0
+
+### Minor Changes
+
+- [#372](https://github.com/evmts/evmts-monorepo/pull/372) [`0a87d1a`](https://github.com/evmts/evmts-monorepo/commit/0a87d1a290e6cdd6902d6c1c84ea56d8bc227c45) Thanks [@roninjin10](https://github.com/roninjin10)! - Generalize and export module creators that create .d.ts .ts .cjs and .mjs modules from abis. These were previously private.
+
+### Patch Changes
+
+- [#378](https://github.com/evmts/evmts-monorepo/pull/378) [`97d7aec`](https://github.com/evmts/evmts-monorepo/commit/97d7aec9844b370129b9c46ab8c19fe9d13880ec) Thanks [@roninjin10](https://github.com/roninjin10)! - Fixed type bug of config being falsely marked as required
+
+- [#379](https://github.com/evmts/evmts-monorepo/pull/379) [`0ff53e7`](https://github.com/evmts/evmts-monorepo/commit/0ff53e71ff792ed4df1fa180f5a72dd5d65f4142) Thanks [@roninjin10](https://github.com/roninjin10)! - Updated build pipeline to generate .d.ts files
+
+- [#370](https://github.com/evmts/evmts-monorepo/pull/370) [`58862a6`](https://github.com/evmts/evmts-monorepo/commit/58862a6ebe6ec1e04961dbc2da6e846a02ef0692) Thanks [@roninjin10](https://github.com/roninjin10)! - Added 100% test coverage to bundler
+
+- Updated dependencies [[`6da3fe7`](https://github.com/evmts/evmts-monorepo/commit/6da3fe7fdec9bc2e4d35fc0558b79c65a105a516), [`6de12df`](https://github.com/evmts/evmts-monorepo/commit/6de12df39cf9da0635c246c685036e83a8e97255), [`0ff53e7`](https://github.com/evmts/evmts-monorepo/commit/0ff53e71ff792ed4df1fa180f5a72dd5d65f4142), [`e24901a`](https://github.com/evmts/evmts-monorepo/commit/e24901a7b503354af6174bac81a868a8598f143b), [`3a2dfae`](https://github.com/evmts/evmts-monorepo/commit/3a2dfae3a38ca7052b57b57e5c95a952a7f0be71), [`6dd223b`](https://github.com/evmts/evmts-monorepo/commit/6dd223b0b625bd7dcbea7537f053b32457761955), [`6da3fe7`](https://github.com/evmts/evmts-monorepo/commit/6da3fe7fdec9bc2e4d35fc0558b79c65a105a516)]:
+  - @evmts/core@0.6.0
+  - @evmts/config@0.6.0
+
+## 0.5.7
+
+### Patch Changes
+
+- [#361](https://github.com/evmts/evmts-monorepo/pull/361) [`4fc4872`](https://github.com/evmts/evmts-monorepo/commit/4fc48722380d4390ef527ccbb27a63f73503c750) Thanks [@roninjin10](https://github.com/roninjin10)! - Added warning when solc version does not match config
+
+- [#353](https://github.com/evmts/evmts-monorepo/pull/353) [`97cb0c1`](https://github.com/evmts/evmts-monorepo/commit/97cb0c1381f3a0b3ffa92dfcb09c397cff3190dd) Thanks [@roninjin10](https://github.com/roninjin10)! - Fixed bug with exporting private variables in .d.ts
+
+- [#351](https://github.com/evmts/evmts-monorepo/pull/351) [`ca58f7a`](https://github.com/evmts/evmts-monorepo/commit/ca58f7a66b01a68d93585d664a77a43f67ce5bbc) Thanks [@roninjin10](https://github.com/roninjin10)! - Added support for reload when any contract in the import graph changes
+
+## 0.5.6
+
+### Patch Changes
+
+- [#345](https://github.com/evmts/evmts-monorepo/pull/345) [`31186f7`](https://github.com/evmts/evmts-monorepo/commit/31186f749ce5cd3c6e0ca4d4885975aa74512c45) Thanks [@roninjin10](https://github.com/roninjin10)! - Fixed typo breaking TS language server
+
+- [#346](https://github.com/evmts/evmts-monorepo/pull/346) [`6d9365d`](https://github.com/evmts/evmts-monorepo/commit/6d9365db3ab197ea4ad53f777d755ee3ad562b21) Thanks [@roninjin10](https://github.com/roninjin10)! - Change naming to Evmts from EVMts
+
+- Updated dependencies [[`6d9365d`](https://github.com/evmts/evmts-monorepo/commit/6d9365db3ab197ea4ad53f777d755ee3ad562b21)]:
+  - @evmts/config@0.5.6
+  - @evmts/core@0.5.6
+
+## 0.5.5
+
+### Patch Changes
+
+- [#343](https://github.com/evmts/evmts-monorepo/pull/343) [`bec7e33`](https://github.com/evmts/evmts-monorepo/commit/bec7e3303e8b241213804c42f6673a38dc7a954c) Thanks [@roninjin10](https://github.com/roninjin10)! - Fixed bug with generated .d.ts file name param
+
+## 0.5.4
+
+### Patch Changes
+
+- [#339](https://github.com/evmts/evmts-monorepo/pull/339) [`c9dec08`](https://github.com/evmts/evmts-monorepo/commit/c9dec084df5c5a9999a8f917405a15b11a004c02) Thanks [@roninjin10](https://github.com/roninjin10)! - Upgraded all dependencies
+
+- Updated dependencies [[`0116537`](https://github.com/evmts/evmts-monorepo/commit/0116537d3423c8decfd0adaf490d37d33f8a540f), [`2b8b5ed`](https://github.com/evmts/evmts-monorepo/commit/2b8b5ed9852c32e15a7466f00f4ca9c0458cfeef)]:
+  - @evmts/config@0.5.4
+  - @evmts/core@0.5.4
+
+## 0.5.3
+
+### Patch Changes
+
+- Updated dependencies [[`2dc1950`](https://github.com/evmts/evmts-monorepo/commit/2dc19507c9d957948dcff8f65a359fc25b0ceb10)]:
+  - @evmts/core@0.5.3
+
+## 0.5.2
+
+### Patch Changes
+
+- Updated dependencies [[`cdbe2b1`](https://github.com/evmts/evmts-monorepo/commit/cdbe2b14d3a9b40ea37898829bc982b5e76e3c4c)]:
+  - @evmts/core@0.5.2
+
+## 0.5.1
+
+### Patch Changes
+
+- Updated dependencies [[`cec44b5`](https://github.com/evmts/evmts-monorepo/commit/cec44b5042bc76c21a9b695383714642c2b44da6)]:
+  - @evmts/core@0.5.1
+
+## 0.5.0
+
+### Minor Changes
+
+- [#283](https://github.com/evmts/evmts-monorepo/pull/283) [`05a8efe`](https://github.com/evmts/evmts-monorepo/commit/05a8efede4acad157e3820bdba24d92f598699e5) Thanks [@roninjin10](https://github.com/roninjin10)! - Updated config schema to support etherscan
+  - Solc version is now listed under `compiler.solcVersion` instead of `solc`
+  - Foundry projects are now listed under `compiler.foundryProject` instead of `forge`
+  - Local contracts are now specified under `localContracts.contracts` instead of `deployments`
+  - New external option (unimplemented) `externalContracts` which is used to specifify contracts imported from etherscan in the next release
+
+### Patch Changes
+
+- [#298](https://github.com/evmts/evmts-monorepo/pull/298) [`841d6a8`](https://github.com/evmts/evmts-monorepo/commit/841d6a89f4995e4f666902d27cb7dbfc3efd77e5) Thanks [@roninjin10](https://github.com/roninjin10)! - Fixed bug with etherscan links showing as undefined if they didn't exist
+
+- [#301](https://github.com/evmts/evmts-monorepo/pull/301) [`83bf23b`](https://github.com/evmts/evmts-monorepo/commit/83bf23b0cb2eb5860f9dfb63a773541e48c62abc) Thanks [@roninjin10](https://github.com/roninjin10)! - Upgraded all dependencies
+
+- Updated dependencies [[`700b3d0`](https://github.com/evmts/evmts-monorepo/commit/700b3d0907df243b29e96b1b3246b8c75cfb9900), [`720bfdb`](https://github.com/evmts/evmts-monorepo/commit/720bfdba790699e388c5ec1c68630b9f0f077158), [`05a8efe`](https://github.com/evmts/evmts-monorepo/commit/05a8efede4acad157e3820bdba24d92f598699e5), [`85c340d`](https://github.com/evmts/evmts-monorepo/commit/85c340dc4a63afdbc6bd92fb4b2cf3fe0ffdc6e7), [`0bd5b45`](https://github.com/evmts/evmts-monorepo/commit/0bd5b4511e292380a7ac87a898d22dbd32df9e35), [`720bfdb`](https://github.com/evmts/evmts-monorepo/commit/720bfdba790699e388c5ec1c68630b9f0f077158), [`2ab7c02`](https://github.com/evmts/evmts-monorepo/commit/2ab7c022520fe3c03f337d51dc0f7875830492f1)]:
+  - @evmts/config@0.5.0
+  - @evmts/core@0.5.0
+
+## 0.4.2
+
+### Patch Changes
+
+- [#279](https://github.com/evmts/evmts-monorepo/pull/279) [`fd6b482`](https://github.com/evmts/evmts-monorepo/commit/fd6b4825417fa81d601e9a3c5078131bc1f816c0) Thanks [@roninjin10](https://github.com/roninjin10)! - Fixed source file does not exist warning in @evmts/bundler
+
+## 0.4.1
+
+### Patch Changes
+
+- Updated dependencies [[`2a89e13`](https://github.com/evmts/evmts-monorepo/commit/2a89e136d8dfcd997ae5ff227a96de4702dfbe19)]:
+  - @evmts/config@0.2.1
+
+## 0.4.0
+
+### Minor Changes
+
+- [#268](https://github.com/evmts/evmts-monorepo/pull/268) [`a37844f`](https://github.com/evmts/evmts-monorepo/commit/a37844faa425d1eaca112b9a09640b7ec7e288de) Thanks [@roninjin10](https://github.com/roninjin10)! - Added support for detecting foundry.toml and remappings as tsconfig option. Set forge: true in plugin tsconfig options or forge: '/path/to/binary/forge' for a custom forge binary
+
+### Patch Changes
+
+- Updated dependencies [[`1f6919c`](https://github.com/evmts/evmts-monorepo/commit/1f6919cfc54648499129d3642ddbb64568b1e798), [`a37844f`](https://github.com/evmts/evmts-monorepo/commit/a37844faa425d1eaca112b9a09640b7ec7e288de)]:
+  - @evmts/core@0.3.1
+  - @evmts/config@0.2.0
+
+## 0.3.0
+
+### Minor Changes
+
+- [#259](https://github.com/evmts/evmts-monorepo/pull/259) [`7ad7463`](https://github.com/evmts/evmts-monorepo/commit/7ad746347d3e127f001abdc28fff2a10c1ffed65) Thanks [@roninjin10](https://github.com/roninjin10)! - Added bytecode to Evmts contracts
+
+### Patch Changes
+
+- [#258](https://github.com/evmts/evmts-monorepo/pull/258) [`9a9b963`](https://github.com/evmts/evmts-monorepo/commit/9a9b96327cd2f8415cf09a471a7589fa3df90394) Thanks [@roninjin10](https://github.com/roninjin10)! - Fixed bug with handling overloaded functions
+
+- Updated dependencies [[`7ad7463`](https://github.com/evmts/evmts-monorepo/commit/7ad746347d3e127f001abdc28fff2a10c1ffed65), [`9a9b963`](https://github.com/evmts/evmts-monorepo/commit/9a9b96327cd2f8415cf09a471a7589fa3df90394)]:
+  - @evmts/core@0.3.0
+
+## 0.2.0
+
+### Minor Changes
+
+- [#252](https://github.com/evmts/evmts-monorepo/pull/252) [`4b361ea`](https://github.com/evmts/evmts-monorepo/commit/4b361ea43fb34541bee4f75c8bea9d93543b1813) Thanks [@roninjin10](https://github.com/roninjin10)! - Changed Evmts configuration to be purely from tsconfig
+
+### Patch Changes
+
+- [#251](https://github.com/evmts/evmts-monorepo/pull/251) [`52732a1`](https://github.com/evmts/evmts-monorepo/commit/52732a1bcd59faa7970e5298d1e71a61c687fd67) Thanks [@roninjin10](https://github.com/roninjin10)! - Fixed missing src folder in npm packages
+
+- Updated dependencies [[`52732a1`](https://github.com/evmts/evmts-monorepo/commit/52732a1bcd59faa7970e5298d1e71a61c687fd67), [`4b361ea`](https://github.com/evmts/evmts-monorepo/commit/4b361ea43fb34541bee4f75c8bea9d93543b1813)]:
+  - @evmts/config@0.1.0
+  - @evmts/core@0.2.0
+
+## 0.1.0
+
+### Minor Changes
+
+- [#249](https://github.com/evmts/evmts-monorepo/pull/249) [`fda2523`](https://github.com/evmts/evmts-monorepo/commit/fda25237cea8a4e94fc6dc043174810ae441fb8e) Thanks [@roninjin10](https://github.com/roninjin10)! - Added etherscan links for most major EVM networks
+
+### Patch Changes
+
+- [#247](https://github.com/evmts/evmts-monorepo/pull/247) [`f7ba6e5`](https://github.com/evmts/evmts-monorepo/commit/f7ba6e5546263d7a94baf50ca1010a2b505580e0) Thanks [@roninjin10](https://github.com/roninjin10)! - Fixed incorrect peer dependency configuation for solc
+
+## 0.0.3
+
+### Patch Changes
+
+- Updated dependencies [[`ab40941`](https://github.com/evmts/evmts-monorepo/commit/ab40941221c4edacce16659ef88bdfdb90c325bb), [`058d904`](https://github.com/evmts/evmts-monorepo/commit/058d90474598ea790d4de9fd8501381a77edbcb6)]:
+  - @evmts/core@0.1.2
+
+## 0.0.2
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @evmts/core@0.1.1
+
+## 0.0.1
+
+### Patch Changes
+
+- [`2a31d64`](https://github.com/evmts/evmts-monorepo/commit/2a31d640b61a3e3eda63e0ca0442104ea27bfaec) - Init new changesets
+
+- Updated dependencies [[`e21f2f4`](https://github.com/evmts/evmts-monorepo/commit/e21f2f4fbdafc7d6d859f513afa319b9812826f0), [`88ec554`](https://github.com/evmts/evmts-monorepo/commit/88ec554a592d29aaba0a0d69ec61fd75118e817c), [`877c137`](https://github.com/evmts/evmts-monorepo/commit/877c137dfbe8a143099ddb0656236c35bceb2f87), [`2a31d64`](https://github.com/evmts/evmts-monorepo/commit/2a31d640b61a3e3eda63e0ca0442104ea27bfaec)]:
+  - @evmts/core@0.1.0
+  - @evmts/config@0.0.1
+
+## 0.0.1-next.0
+
+### Patch Changes
+
+- [`2a31d64`](https://github.com/evmts/evmts-monorepo/commit/2a31d640b61a3e3eda63e0ca0442104ea27bfaec) - Init new changesets
+
+- Updated dependencies [[`2a31d64`](https://github.com/evmts/evmts-monorepo/commit/2a31d640b61a3e3eda63e0ca0442104ea27bfaec)]:
+  - @evmts/config@0.0.1-next.0
+  - @evmts/core@0.0.4-next.0
+
+## 0.0.2
+
+### Patch Changes
+
+- Release working proof of concept
diff --git a/bundlers/config/LICENSE → bundlers/bundler/bundler/LICENSE b/bundlers/config/LICENSE → bundlers/bundler/bundler/LICENSE
diff --git a/bundlers/bundler/bundler/README.md b/bundlers/bundler/bundler/README.md
@@ -0,0 +1,48 @@
+<p align="center">
+  <a href="https://evmts.dev/">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/35039927/218812217-92f0f784-cb85-43b9-9ca6-e2b9effd9eb2.png">
+      <img alt="wagmi logo" src="https://user-images.githubusercontent.com/35039927/218812217-92f0f784-cb85-43b9-9ca6-e2b9effd9eb2.png" width="auto" height="300">
+    </picture>
+  </a>
+</p>
+
+<p align="center">
+  Execute solidity scripts in browser
+<p>
+
+[![CI](https://github.com/evmts/evmts-monorepo/actions/workflows/e2e.yml/badge.svg)](https://github.com/evmts/evmts-monorepo/actions/workflows/e2e.yml)
+[![CI](https://github.com/evmts/evmts-monorepo/actions/workflows/unit.yml/badge.svg)](https://github.com/evmts/evmts-monorepo/actions/workflows/unit.yml)
+<a href="https://www.npmjs.com/package/@evmts/core" target="\_parent">
+<img alt="" src="https://img.shields.io/npm/dm/@evmts/core.svg" />
+</a>
+<a href="https://bundlephobia.com/package/@evmts/core@latest" target="\_parent">
+<img alt="" src="https://badgen.net/bundlephobia/minzip/@evmts/core" />
+</a><a href="#badge">
+
+# @evmts/bundler
+
+Internal bundler for Evmts
+
+Used in the LSP
+
+- [@evmts/ts-plugin](../../lsp/ts-plugin/)
+
+And all bundlers
+
+- [@evmts/esbuild-plugin](../esbuild-plugin/)
+- [@evmts/rollup-plugin](../rollup-plugin/)
+- [@evmts/vite-plugin](../vite-plugin/)
+- [@evmts/webpack-plugin](../webpack-plugin/)
+
+## API
+
+#### bundler
+
+## Visit [Docs](https://evmts.dev/) for docs, guides, API and more!
+
+## See [Evmts Beta project board](https://github.com/orgs/evmts/projects/1) for progress on the upcoming beta release
+
+## License 📄
+
+<a href="./LICENSE"><img src="https://user-images.githubusercontent.com/35039927/231030761-66f5ce58-a4e9-4695-b1fe-255b1bceac92.png" width="200" /></a>
diff --git a/bundlers/bundler/bundler/package.json b/bundlers/bundler/bundler/package.json
@@ -0,0 +1,75 @@
+{
+  "name": "@evmts/bundler",
+  "version": "0.6.0",
+  "private": false,
+  "description": "Internal bundler for Evmts",
+  "keywords": [
+    "solidity",
+    "forge",
+    "foundry",
+    "sol",
+    "typescript",
+    "web3",
+    "blockchain"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/evmts/evmts-monorepo.git",
+    "directory": "bundlers/bundler"
+  },
+  "license": "MIT",
+  "contributors": [
+    "Will Cory <[email protected]>"
+  ],
+  "type": "module",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
+  "types": "types/src/index.d.ts",
+  "files": [
+    "dist",
+    "types",
+    "src"
+  ],
+  "scripts": {
+    "test": "vitest --coverage",
+    "test:coverage": "vitest run --coverage",
+    "test:run": "vitest run",
+    "test:ui": "vitest --ui",
+    "build": "nx run-many --targets=build:dist,build:types --projects=@evmts/bundler ",
+    "build:dist": "tsup",
+    "build:types": "tsc --emitDeclarationOnly",
+    "clean": "rm -rf node_modules && rm -rf artifacts && rm -rf dist && rm -rf cache",
+    "format": "rome format . --write",
+    "format:check": "rome format .",
+    "lint": "rome check . --apply-unsafe",
+    "lint:check": "rome check . --verbose",
+    "package:up": "pnpm up --latest"
+  },
+  "dependencies": {
+    "@evmts/config": "workspace:^",
+    "@evmts/core": "workspace:^",
+    "@evmts/tsconfig": "workspace:^",
+    "@types/resolve": "^1.20.2",
+    "glob": "^10.3.3",
+    "resolve": "^1.22.2",
+    "unplugin": "^1.4.0"
+  },
+  "devDependencies": {
+    "@vitest/coverage-v8": "^0.33.0",
+    "@vitest/ui": "^0.33.0",
+    "abitype": "^0.9.3",
+    "rome": "^12.1.3",
+    "solc": "0.8.20",
+    "tsup": "^7.1.0",
+    "typescript": "^5.1.6",
+    "vitest": "^0.33.0",
+    "wagmi": "^1.3.9",
+    "zod": "^3.21.4"
+  },
+  "peerDependencies": {
+    "solc": ">0.8.10"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
+}
diff --git a/bundlers/cli/rome.json → bundlers/bundler/bundler/rome.json b/bundlers/cli/rome.json → bundlers/bundler/bundler/rome.json