From ac21b298afb152c85f4ae7461172f42e3817305f Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Mon, 24 May 2021 15:50:29 -0700
Subject: [PATCH 1/2] chore: use pnpm workspaces

---
 package.json        | 1 -
 pnpm-workspace.yaml | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 pnpm-workspace.yaml

diff --git a/package.json b/package.json
index e6a4775..9aeb1ee 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,6 @@
     "url": "https://lukeed.com"
   },
   "scripts": {
-    "pretest": "lerna bootstrap",
     "build": "lerna exec bundt index.js",
     "test": "uvu -r esm tests -i public -i helpers"
   },
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
new file mode 100644
index 0000000..600b4bb
--- /dev/null
+++ b/pnpm-workspace.yaml
@@ -0,0 +1,2 @@
+packages:
+  - 'packages/**'

From 093194a0d7be8f681c5d9162e10c75392345412a Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Mon, 24 May 2021 15:54:50 -0700
Subject: [PATCH 2/2] chore(action): separate coverage steps

---
 .github/workflows/ci.yml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 98429f0..a0ce511 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,20 +19,27 @@ jobs:
       run: curl -L https://raw.githubusercontent.com/pnpm/self-installer/master/install.js | node
 
     - name: Install
-      run: |
-        pnpm install
-        pnpm add -g nyc
+      run: pnpm install
+
+    - name: (coverage) Install
+      if: matrix.nodejs >= 14
+      run: pnpm add -g c8
 
     - name: Build
       run: pnpm run build
 
-    - name: Test w/ Coverage
-      run: nyc --include=packages pnpm test
+    - name: Test
+      if: matrix.nodejs < 14
+      run: pnpm test
+
+    - name: (coverage) Test
+      if: matrix.nodejs >= 14
+      run: c8 --include=packages pnpm test
 
-    - name: Report
+    - name: (coverage) Report
       if: matrix.nodejs >= 14
       run: |
-        nyc report --reporter=text-lcov > coverage.lcov
+        c8 report --reporter=text-lcov > coverage.lcov
         bash <(curl -s https://codecov.io/bash)
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}