From 39d55a69cd62c6343371b053eec00afe3fd0fb18 Mon Sep 17 00:00:00 2001
From: Robbie Wagner <rwwagner90@gmail.com>
Date: Tue, 26 Mar 2024 09:24:51 -0400
Subject: [PATCH] Require node >= 18

---
 .github/workflows/ci.yml                      |  6 +++--
 .github/workflows/release.yml                 | 25 -------------------
 .tool-versions                                |  4 +--
 package.json                                  |  8 +++---
 packages/ember-cli-code-coverage/package.json |  5 +---
 test-packages/my-addon/package.json           |  2 +-
 .../package.json                              |  5 +---
 .../my-app-with-in-repo-addon/package.json    |  5 +---
 .../my-app-with-in-repo-engine/package.json   |  5 +---
 test-packages/my-app/package.json             |  5 +---
 .../-package-with-compat-2.json               |  2 +-
 test-packages/my-embroider-app/package.json   |  5 +---
 .../my-v2-addon-gjs-gts/test-app/package.json |  2 +-
 13 files changed, 19 insertions(+), 60 deletions(-)
 delete mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 515bcc75..cc9a42dc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,10 +17,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
       - uses: pnpm/action-setup@v2
         name: Install pnpm
         with:
-          version: 8.15.1
+          version: 8.15.5
           run_install: false
       - name: Get pnpm store directory
         shell: bash
@@ -33,7 +36,6 @@ jobs:
           key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
-      - uses: volta-cli/action@v4
       - run: pnpm install --frozen-lockfile
       - run: pnpm lint:js
         working-directory: packages/ember-cli-code-coverage
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 723e46d6..00000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: volta-cli/action@v4
-        with:
-          registry-url: 'https://registry.npmjs.org'
-      - name: auto-dist-tag
-        run: npx auto-dist-tag@1 --write
-        working-directory: packages/ember-cli-code-coverage
-
-      - run: npm publish
-        working-directory: packages/ember-cli-code-coverage
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.tool-versions b/.tool-versions
index 1c5cfd56..57e121cd 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 16.20.2
-pnpm 8.15.3
\ No newline at end of file
+nodejs 18.19.1
+pnpm 8.15.5
\ No newline at end of file
diff --git a/package.json b/package.json
index fee42281..1389901c 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,10 @@
     "vite": "^4.5.0",
     "vitest": "^1.0.0-beta.4"
   },
+  "engines": {
+    "node": ">= 18",
+    "pnpm": "^8.15.5"
+  },
   "release-it": {
     "plugins": {
       "@release-it-plugins/workspaces": {
@@ -41,9 +45,5 @@
       "tokenRef": "GITHUB_AUTH"
     },
     "npm": false
-  },
-  "volta": {
-    "node": "16.20.2",
-    "pnpm": "8.15.1"
   }
 }
diff --git a/packages/ember-cli-code-coverage/package.json b/packages/ember-cli-code-coverage/package.json
index e37dcfeb..4539c1ad 100644
--- a/packages/ember-cli-code-coverage/package.json
+++ b/packages/ember-cli-code-coverage/package.json
@@ -102,7 +102,7 @@
     }
   },
   "engines": {
-    "node": "14.* || 16.* || >= 18"
+    "node": ">= 18"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -113,8 +113,5 @@
   "ember-addon": {
     "configPath": "tests/dummy/config",
     "before": "ember-cli-typescript"
-  },
-  "volta": {
-    "extends": "../../package.json"
   }
 }
diff --git a/test-packages/my-addon/package.json b/test-packages/my-addon/package.json
index 9b4ba20c..0cd406b0 100644
--- a/test-packages/my-addon/package.json
+++ b/test-packages/my-addon/package.json
@@ -68,7 +68,7 @@
     "qunit-dom": "^1.6.0"
   },
   "engines": {
-    "node": "14.* || 16.* || >= 18"
+    "node": ">= 18"
   },
   "ember": {
     "edition": "octane"
diff --git a/test-packages/my-app-with-custom-path-in-repo-addon/package.json b/test-packages/my-app-with-custom-path-in-repo-addon/package.json
index 87b8227e..e6dd10a9 100644
--- a/test-packages/my-app-with-custom-path-in-repo-addon/package.json
+++ b/test-packages/my-app-with-custom-path-in-repo-addon/package.json
@@ -65,7 +65,7 @@
     "qunit-dom": "^1.6.0"
   },
   "engines": {
-    "node": "14.* || 16.* || >= 18"
+    "node": ">= 18"
   },
   "ember": {
     "edition": "octane"
@@ -74,8 +74,5 @@
     "paths": [
       "local-lib/addons/my-in-repo-addon"
     ]
-  },
-  "volta": {
-    "node": "16.20.2"
   }
 }
diff --git a/test-packages/my-app-with-in-repo-addon/package.json b/test-packages/my-app-with-in-repo-addon/package.json
index e430c94d..f6de3476 100644
--- a/test-packages/my-app-with-in-repo-addon/package.json
+++ b/test-packages/my-app-with-in-repo-addon/package.json
@@ -65,7 +65,7 @@
     "qunit-dom": "^1.6.0"
   },
   "engines": {
-    "node": "14.* || 16.* || >= 18"
+    "node": ">= 18"
   },
   "ember": {
     "edition": "octane"
@@ -74,8 +74,5 @@
     "paths": [
       "lib/my-in-repo-addon"
     ]
-  },
-  "volta": {
-    "node": "16.20.2"
   }
 }
diff --git a/test-packages/my-app-with-in-repo-engine/package.json b/test-packages/my-app-with-in-repo-engine/package.json
index 317cf44c..d7fb507e 100644
--- a/test-packages/my-app-with-in-repo-engine/package.json
+++ b/test-packages/my-app-with-in-repo-engine/package.json
@@ -66,14 +66,11 @@
     "qunit-dom": "^1.6.0"
   },
   "engines": {
-    "node": "14.* || 16.* || >= 18"
+    "node": ">= 18"
   },
   "ember": {
     "edition": "octane"
   },
-  "volta": {
-    "node": "16.20.2"
-  },
   "ember-addon": {
     "paths": [
       "lib/my-in-repo-engine"
diff --git a/test-packages/my-app/package.json b/test-packages/my-app/package.json
index 49072496..57b088f6 100644
--- a/test-packages/my-app/package.json
+++ b/test-packages/my-app/package.json
@@ -68,12 +68,9 @@
     "webpack": "^5.89.0"
   },
   "engines": {
-    "node": "14.* || 16.* || >= 18"
+    "node": ">= 18"
   },
   "ember": {
     "edition": "octane"
-  },
-  "volta": {
-    "node": "16.20.2"
   }
 }
diff --git a/test-packages/my-embroider-app/-package-with-compat-2.json b/test-packages/my-embroider-app/-package-with-compat-2.json
index 6ef425f7..541d6851 100644
--- a/test-packages/my-embroider-app/-package-with-compat-2.json
+++ b/test-packages/my-embroider-app/-package-with-compat-2.json
@@ -68,7 +68,7 @@
     "webpack": "^5.51.1"
   },
   "engines": {
-    "node": "14.* || 16.* || >= 18"
+    "node": ">= 18"
   },
   "ember": {
     "edition": "octane"
diff --git a/test-packages/my-embroider-app/package.json b/test-packages/my-embroider-app/package.json
index 731e62e9..c8305919 100644
--- a/test-packages/my-embroider-app/package.json
+++ b/test-packages/my-embroider-app/package.json
@@ -69,12 +69,9 @@
     "webpack": "^5.51.1"
   },
   "engines": {
-    "node": "14.* || 16.* || >= 18"
+    "node": ">= 18"
   },
   "ember": {
     "edition": "octane"
-  },
-  "volta": {
-    "node": "16.20.2"
   }
 }
diff --git a/test-packages/my-v2-addon-gjs-gts/test-app/package.json b/test-packages/my-v2-addon-gjs-gts/test-app/package.json
index 606ef29a..f5c1b8fb 100644
--- a/test-packages/my-v2-addon-gjs-gts/test-app/package.json
+++ b/test-packages/my-v2-addon-gjs-gts/test-app/package.json
@@ -109,7 +109,7 @@
     "webpack": "^5.88.2"
   },
   "engines": {
-    "node": "16.* || >= 18"
+    "node": ">= 18"
   },
   "ember": {
     "edition": "octane"