From acb05b80fd8e0dcf61d25c75554ee282a01ab6fe Mon Sep 17 00:00:00 2001 From: Robert Wagner Date: Wed, 5 Nov 2025 12:06:55 -0500 Subject: [PATCH 1/2] Require node 22+ --- .github/workflows/addon-docs.yml | 2 +- .github/workflows/ci-cd.yml | 8 ++++---- .tool-versions | 4 ++-- README.md | 2 +- lib/utils/compile-markdown.js | 3 +-- package.json | 3 +-- pnpm-lock.yaml | 3 --- test-apps/new-addon/package.json | 2 +- tests/dummy/app/templates/docs/deploying.md | 2 +- 9 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.github/workflows/addon-docs.yml b/.github/workflows/addon-docs.yml index d3efce815..35b3fca95 100644 --- a/.github/workflows/addon-docs.yml +++ b/.github/workflows/addon-docs.yml @@ -37,7 +37,7 @@ jobs: - uses: actions/setup-node@v4 if: env.SHORT_CIRCUIT == 'false' with: - node-version: 20.19.x + node-version: 22 cache: pnpm - name: Install Dependencies if: env.SHORT_CIRCUIT == 'false' diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 551806f3c..0540b42d4 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -21,7 +21,7 @@ jobs: - name: Install Node uses: actions/setup-node@v4 with: - node-version: 20.19.x + node-version: 22 - uses: pnpm/action-setup@v4 with: version: 10 @@ -46,7 +46,7 @@ jobs: - name: Install Node uses: actions/setup-node@v4 with: - node-version: 20.19.x + node-version: 22 - uses: pnpm/action-setup@v4 with: version: 10 @@ -71,7 +71,7 @@ jobs: - name: Install Node uses: actions/setup-node@v4 with: - node-version: 20.19.x + node-version: 22 - uses: pnpm/action-setup@v4 with: version: 10 @@ -103,7 +103,7 @@ jobs: - name: Install Node uses: actions/setup-node@v4 with: - node-version: 20.19.x + node-version: 22 - uses: pnpm/action-setup@v4 with: version: 10 diff --git a/.tool-versions b/.tool-versions index f89eef94e..125123fde 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -nodejs 20.19.5 -pnpm 10.18.2 +nodejs 22.21.1 +pnpm 10.20.0 diff --git a/README.md b/README.md index e06144d02..fc3f0849a 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Compatibility * Ember.js v4.4 or above * Ember CLI v4.4 or above -* Node.js v18 or above +* Node.js v22 or above The original maintainers of AddonDocs have moved on, but this addon is still very much actively maintained and is still being used by many addons. We are currently working on embroider and fastboot support, and would love help, if anyone would like to help out! diff --git a/lib/utils/compile-markdown.js b/lib/utils/compile-markdown.js index bfe9452cb..632a80fea 100644 --- a/lib/utils/compile-markdown.js +++ b/lib/utils/compile-markdown.js @@ -1,2 +1 @@ -const esmRequire = require('esm')(module, { cjs: true }); -module.exports = esmRequire('../../addon/utils/compile-markdown').default; +module.exports = require('../../addon/utils/compile-markdown').default; diff --git a/package.json b/package.json index 553b016f1..2fb41224c 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,6 @@ "ember-svg-jar": "^2.6.0", "ember-tether": "^3.1.0", "ember-truth-helpers": "^4.0.3", - "esm": "^3.2.25", "execa": "5.1.1", "fs-extra": "^11.2.0", "git-repo-info": "^2.1.1", @@ -188,7 +187,7 @@ } }, "engines": { - "node": ">= 20.19" + "node": ">= 22" }, "publishConfig": { "registry": "https://registry.npmjs.org" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e42a77865..a57761bd4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -116,9 +116,6 @@ importers: ember-truth-helpers: specifier: ^4.0.3 version: 4.0.3(ember-source@5.11.1(@glimmer/component@1.1.2(@babel/core@7.26.0))(rsvp@4.8.5)(webpack@5.97.1)) - esm: - specifier: ^3.2.25 - version: 3.2.25 execa: specifier: 5.1.1 version: 5.1.1 diff --git a/test-apps/new-addon/package.json b/test-apps/new-addon/package.json index 1e8a0bcf2..b67927116 100644 --- a/test-apps/new-addon/package.json +++ b/test-apps/new-addon/package.json @@ -52,7 +52,7 @@ "webpack": "^5.96.1" }, "engines": { - "node": ">= 20.19" + "node": ">= 22" }, "ember": { "edition": "octane" diff --git a/tests/dummy/app/templates/docs/deploying.md b/tests/dummy/app/templates/docs/deploying.md index 46657249c..0ba012cca 100644 --- a/tests/dummy/app/templates/docs/deploying.md +++ b/tests/dummy/app/templates/docs/deploying.md @@ -132,7 +132,7 @@ jobs: - uses: actions/setup-node@v4 if: env.SHORT_CIRCUIT == 'false' with: - node-version: 20 + node-version: 22 cache: pnpm - name: Install Dependencies if: env.SHORT_CIRCUIT == 'false' From 8e9aacd679e2737b3427296b796c6571a258e6e5 Mon Sep 17 00:00:00 2001 From: Robert Wagner Date: Wed, 5 Nov 2025 12:09:41 -0500 Subject: [PATCH 2/2] Set specifically 22.21.1+ --- README.md | 2 +- package.json | 2 +- test-apps/new-addon/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fc3f0849a..bd2025fb8 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Compatibility * Ember.js v4.4 or above * Ember CLI v4.4 or above -* Node.js v22 or above +* Node.js v22.21.1 or above The original maintainers of AddonDocs have moved on, but this addon is still very much actively maintained and is still being used by many addons. We are currently working on embroider and fastboot support, and would love help, if anyone would like to help out! diff --git a/package.json b/package.json index 2fb41224c..6d8205445 100644 --- a/package.json +++ b/package.json @@ -187,7 +187,7 @@ } }, "engines": { - "node": ">= 22" + "node": ">= 22.21.1" }, "publishConfig": { "registry": "https://registry.npmjs.org" diff --git a/test-apps/new-addon/package.json b/test-apps/new-addon/package.json index b67927116..ae9e4c316 100644 --- a/test-apps/new-addon/package.json +++ b/test-apps/new-addon/package.json @@ -52,7 +52,7 @@ "webpack": "^5.96.1" }, "engines": { - "node": ">= 22" + "node": ">= 22.21.1" }, "ember": { "edition": "octane"