feat: integrate Yarn workspaces with Lerna for smoother DX without fa…

…lse positive type errors (#752) * feat: use yarn workspaces * chore: update CI scripts * feat: move example folder to the root * chore: this is in fact, not needed * feat: remove manual pin and use lerna instead * chore: docs were misleading
Uniswap · Feb 8, 2023 · b52f668 · b52f668
1 parent 88a5e0f
commit b52f668
Show file tree

Hide file tree

Showing 53 changed files with 661 additions and 11,390 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -29,12 +29,10 @@ jobs:
           cache: 'yarn'
 
       - run: yarn
-      - run: yarn bootstrap
 
       - run: yarn build
 
       - run: yarn lint
       - run: yarn test
 
       - run: yarn lerna exec 'yarn next build' --scope=example-next
-      - run: yarn lerna exec 'yarn react-scripts build' --scope=example-cra
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 node_modules/
 packages/*/dist/
-packages/example-next/.next/
+example/.next/
 .env.local
diff --git a/README.md b/README.md
@@ -28,7 +28,6 @@ This is a hosted version of [packages/example-next](packages/example-next).
 ## Get Started
 
 - `yarn`
-- `yarn bootstrap`
 - `yarn start`
 
 In addition to compiling each package in watch mode, this will also spin up [packages/example-next](packages/example-next) on [localhost:3000](http://localhost:3000/). (It will also spin up [packages/example-cra](packages/example-cra) on [localhost:3001](http://localhost:3001/), but this is just a skeleton app for testing compatibility.)
@@ -38,23 +37,9 @@ In addition to compiling each package in watch mode, this will also spin up [pac
 - `yarn build`
 - `yarn test --watch`
 
-## Add a Dependency
-
-- `yarn lerna add <DEPENDENCY> --scope <PACKAGE>`
-
-## Remove a Dependency
-
-- Delete the relevant `package.json` entry
-
-Because of a [lerna bug](https://github.com/lerna/lerna/issues/1883), it's not possible to prune `yarn.lock` programmatically, so regenerate it manually:
-
-- `yarn lerna exec "rm -f yarn.lock" --scope <SUBPACKAGE>`
-- `yarn clean --scope <SUBPACKAGE>`
-- `yarn bootstrap`
-
 ## Publish
 
-- `yarn lerna publish [--dist-tag]`
+- `yarn lerna publish [--dist-tag] `
 
 ## Documentation
 

diff --git a/packages/example-next/.env → example/.env b/packages/example-next/.env → example/.env
diff --git a/packages/example-next/README.md → example/README.md b/packages/example-next/README.md → example/README.md
diff --git a/packages/example-next/chains.ts → example/chains.ts b/packages/example-next/chains.ts → example/chains.ts
diff --git a/...ages/example-next/components/Accounts.tsx → example/components/Accounts.tsx b/...ages/example-next/components/Accounts.tsx → example/components/Accounts.tsx
diff --git a/packages/example-next/components/Card.tsx → example/components/Card.tsx b/packages/example-next/components/Card.tsx → example/components/Card.tsx
diff --git a/packages/example-next/components/Chain.tsx → example/components/Chain.tsx b/packages/example-next/components/Chain.tsx → example/components/Chain.tsx
diff --git a/...ple-next/components/ConnectWithSelect.tsx → example/components/ConnectWithSelect.tsx b/...ple-next/components/ConnectWithSelect.tsx → example/components/ConnectWithSelect.tsx
diff --git a/...ample-next/components/ProviderExample.tsx → example/components/ProviderExample.tsx b/...ample-next/components/ProviderExample.tsx → example/components/ProviderExample.tsx
diff --git a/packages/example-next/components/Status.tsx → example/components/Status.tsx b/packages/example-next/components/Status.tsx → example/components/Status.tsx
diff --git a/...nts/connectorCards/CoinbaseWalletCard.tsx → ...nts/connectorCards/CoinbaseWalletCard.tsx b/...nts/connectorCards/CoinbaseWalletCard.tsx → ...nts/connectorCards/CoinbaseWalletCard.tsx
diff --git a/...ponents/connectorCards/GnosisSafeCard.tsx → ...ponents/connectorCards/GnosisSafeCard.tsx b/...ponents/connectorCards/GnosisSafeCard.tsx → ...ponents/connectorCards/GnosisSafeCard.tsx
diff --git a/...omponents/connectorCards/MetaMaskCard.tsx → ...omponents/connectorCards/MetaMaskCard.tsx b/...omponents/connectorCards/MetaMaskCard.tsx → ...omponents/connectorCards/MetaMaskCard.tsx
diff --git a/...components/connectorCards/NetworkCard.tsx → ...components/connectorCards/NetworkCard.tsx b/...components/connectorCards/NetworkCard.tsx → ...components/connectorCards/NetworkCard.tsx
diff --git a/...ents/connectorCards/WalletConnectCard.tsx → ...ents/connectorCards/WalletConnectCard.tsx b/...ents/connectorCards/WalletConnectCard.tsx → ...ents/connectorCards/WalletConnectCard.tsx
diff --git a/...example-next/connectors/coinbaseWallet.ts → example/connectors/coinbaseWallet.ts b/...example-next/connectors/coinbaseWallet.ts → example/connectors/coinbaseWallet.ts
diff --git a/packages/example-next/connectors/eip1193.ts → example/connectors/eip1193.ts b/packages/example-next/connectors/eip1193.ts → example/connectors/eip1193.ts
diff --git a/packages/example-next/connectors/empty.ts → example/connectors/empty.ts b/packages/example-next/connectors/empty.ts → example/connectors/empty.ts
diff --git a/...ges/example-next/connectors/gnosisSafe.ts → example/connectors/gnosisSafe.ts b/...ges/example-next/connectors/gnosisSafe.ts → example/connectors/gnosisSafe.ts
diff --git a/packages/example-next/connectors/metaMask.ts → example/connectors/metaMask.ts b/packages/example-next/connectors/metaMask.ts → example/connectors/metaMask.ts
diff --git a/packages/example-next/connectors/network.ts → example/connectors/network.ts b/packages/example-next/connectors/network.ts → example/connectors/network.ts
diff --git a/packages/example-next/connectors/url.ts → example/connectors/url.ts b/packages/example-next/connectors/url.ts → example/connectors/url.ts
diff --git a/.../example-next/connectors/walletConnect.ts → example/connectors/walletConnect.ts b/.../example-next/connectors/walletConnect.ts → example/connectors/walletConnect.ts
diff --git a/packages/example-next/next-env.d.ts → example/next-env.d.ts b/packages/example-next/next-env.d.ts → example/next-env.d.ts
diff --git a/packages/example-next/next.config.js → example/next.config.js b/packages/example-next/next.config.js → example/next.config.js
diff --git a/packages/example-next/package.json → example/package.json b/packages/example-next/package.json → example/package.json
@@ -1,9 +1,9 @@
 {
   "private": true,
+  "version": "0.0.0",
   "name": "example-next",
   "scripts": {
-    "start": "next dev",
-    "pin": "sh -c '{ for X in {coinbase-wallet,core,eip1193,empty,gnosis-safe,metamask,network,types,url,walletconnect}; do lerna add @web3-react/$X --exact --no-bootstrap --scope=example-next; done }'"
+    "start": "next dev"
   },
   "dependencies": {
     "@ethersproject/bignumber": "^5.6.0",

diff --git a/packages/example-next/pages/index.tsx → example/pages/index.tsx b/packages/example-next/pages/index.tsx → example/pages/index.tsx
diff --git a/packages/example-next/tsconfig.json → example/tsconfig.json b/packages/example-next/tsconfig.json → example/tsconfig.json
diff --git a/packages/example-next/utils.ts → example/utils.ts b/packages/example-next/utils.ts → example/utils.ts
diff --git a/lerna.json b/lerna.json
@@ -1,8 +1,10 @@
 {
   "version": "independent",
   "packages": [
-    "packages/*"
+    "packages/*",
+    "example"
   ],
   "npmClient": "yarn",
-  "ignoreChanges": ["**/*.md", "**/*.spec.ts"]
+  "ignoreChanges": ["**/*.md", "**/*.spec.ts"],
+  "useWorkspaces": true
 }
diff --git a/package.json b/package.json
@@ -5,17 +5,18 @@
     "node": "^14 || ^16"
   },
   "scripts": {
-    "bootstrap": "lerna bootstrap",
     "clean": "lerna clean --yes",
     "lint": "yarn run eslint --ext .ts,.tsx .",
     "test": "jest",
     "build": "lerna run build",
     "prestart": "yarn build",
     "start": "lerna run start --parallel",
-    "pin": "lerna run pin && yarn bootstrap",
-    "version": "yarn pin && git add packages/example-{next,cra}/package.json",
     "prepack": "yarn build"
   },
+  "workspaces": [
+    "packages/*",
+    "example"
+  ],
   "devDependencies": {
     "@coinbase/wallet-sdk": "^3.3.0",
     "@testing-library/react-hooks": "^8.0.0",

diff --git a/packages/core/yarn.lock b/packages/core/yarn.lock