Update ember-cli-htmlbars to v7 for ember 7 compatibility

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           fetch-depth: 1
       - uses: wyvox/action-setup-pnpm@v3
-      - run: pnpm build 
+      - run: pnpm build
       - name: Lint
         run: pnpm lint
 
@@ -37,7 +37,7 @@ jobs:
         with:
           fetch-depth: 1
       - uses: wyvox/action-setup-pnpm@v3
-      - run: pnpm build 
+      - run: pnpm build
       - name: Test
         run: pnpm test:ember --launch ${{ matrix.browser }}
         working-directory: test-app
@@ -59,14 +59,14 @@ jobs:
           fetch-depth: 1
       - uses: wyvox/action-setup-pnpm@v3
         with:
-          pnpm-args: '--no-lockfile'
-      - run: pnpm build 
+          pnpm-args: "--no-lockfile"
+      - run: pnpm build
       - name: Test
         run: pnpm test:ember --launch ${{ matrix.browser }}
         working-directory: test-app
 
   typecheck:
-    name: '${{ matrix.typescript-scenario }}'
+    name: "${{ matrix.typescript-scenario }}"
     runs-on: ubuntu-latest
     timeout-minutes: 2
     continue-on-error: true
@@ -78,35 +78,41 @@ jobs:
           - [email protected]
           - [email protected]
           - [email protected]
+          - [email protected]
+          - [email protected]
+          - [email protected]
+          - [email protected]
+          - [email protected]
+          - [email protected]
+          - [email protected]
           - typescript@next
 
     steps:
       - uses: actions/checkout@v4
       - uses: wyvox/action-setup-pnpm@v3
       - run: pnpm build
       - run: pnpm i -f # just in case
-      - name: 'test-types : ${{ matrix.typescript-scenario }}'
+      - name: "test-types : ${{ matrix.typescript-scenario }}"
         working-directory: ./test-types
-        run: 'pnpm add --save-dev ${{ matrix.typescript-scenario}}'
+        run: "pnpm add --save-dev ${{ matrix.typescript-scenario}}"
 
-      - name: 'docs : ${{ matrix.typescript-scenario }}'
+      - name: "docs : ${{ matrix.typescript-scenario }}"
         working-directory: ./docs
-        run: 'pnpm add --save-dev ${{ matrix.typescript-scenario}}'
+        run: "pnpm add --save-dev ${{ matrix.typescript-scenario}}"
 
-      - name: 'test-types'
+      - name: "test-types"
         working-directory: ./test-types
         run: |
           pnpm tsc -v
           pnpm tsc --noEmit
 
-      - name: 'Glint in the docs app'
+      - name: "Glint in the docs app"
         working-directory: ./docs
         run: |
           pnpm tsc -v
           pnpm glint --version
           pnpm glint
 
-
   try-scenarios:
     name: Tests - ${{ matrix.ember-try-scenario }}
     runs-on: ubuntu-latest
@@ -124,8 +130,8 @@ jobs:
             ember-lts-4.12,
             ember-lts-5.12,
             ember-release,
-            ember-beta
-            ember-canary
+            ember-beta,
+            ember-canary,
           ]
         allow-failure: [false]
         include:
@@ -137,11 +143,11 @@ jobs:
         with:
           fetch-depth: 1
       - uses: wyvox/action-setup-pnpm@v3
-      - run: pnpm build 
+      - run: pnpm build
       - name: Test
         env:
           EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
-        run: node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
+        run: node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
         working-directory: test-app
 
   docs:
@@ -154,7 +160,7 @@ jobs:
         with:
           fetch-depth: 1
       - uses: wyvox/action-setup-pnpm@v3
-      - run: pnpm build 
+      - run: pnpm build
 
       - name: Test
         run: pnpm test:ember

addon/package.json

@@ -63,15 +63,15 @@
     "start": "rollup --config --watch --no-watch.clearScreen"
   },
   "dependencies": {
-    "@embroider/addon-shim": "^1.8.7",
+    "@embroider/addon-shim": "^1.10.2",
     "@simple-dom/document": "^1.4.0"
   },
   "devDependencies": {
     "@babel/core": "^7.23.6",
     "@babel/eslint-parser": "^7.23.3",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-decorators": "^7.23.6",
-    "@embroider/addon-dev": "^4.1.3",
+    "@embroider/addon-dev": "^4.3.1",
     "@glint/core": "^1.5.2",
     "@glint/environment-ember-loose": "^1.5.2",
     "@glint/environment-ember-template-imports": "^1.5.2",
@@ -97,9 +97,6 @@
     "rollup": "^4.9.1",
     "typescript": "^5.3.3"
   },
-  "engines": {
-    "node": "16.* || >= 18"
-  },
   "ember-addon": {
     "demoURL": "https://ember-cli.github.io/ember-page-title",
     "main": "addon-main.js",

addon/src/services/page-title.ts

@@ -44,7 +44,7 @@ export default class PageTitleService extends Service {
 
   // in fastboot context "document" is instance of
   // ember-fastboot/simple-dom document
-  @service('-document') private declare document: FastBootDocument;
+  @service('-document') declare private document: FastBootDocument;
 
   tokens: PageTitleToken[] = [];
 

docs/package.json

@@ -40,8 +40,9 @@
     "@babel/eslint-parser": "^7.23.3",
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.1.1",
-    "@ember/test-helpers": "^3.2.1",
-    "@glimmer/component": "^1.0.4",
+    "@ember/test-helpers": "^5.4.1",
+    "@embroider/macros": "^1.20.2",
+    "@glimmer/component": "^2.0.0",
     "@glimmer/tracking": "^1.0.4",
     "@glint/core": "^1.5.2",
     "@glint/environment-ember-loose": "^1.5.2",
@@ -53,13 +54,13 @@
     "@typescript-eslint/eslint-plugin": "^6.16.0",
     "@typescript-eslint/parser": "^6.16.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^2.7.2",
-    "ember-cli": "~4.12.1",
+    "ember-auto-import": "^2.13.1",
+    "ember-cli": "~5.12.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-code-coverage": "^2.0.3",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-github-pages": "^0.2.2",
-    "ember-cli-htmlbars": "^6.3.0",
+    "ember-cli-htmlbars": "^7.0.1",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sass": "^11.0.1",
     "ember-cli-terser": "^4.0.2",
@@ -68,9 +69,9 @@
     "ember-inline-svg": "^1.0.0",
     "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator": "^1.0.0",
-    "ember-qunit": "^8.0.2",
-    "ember-resolver": "^11.0.1",
-    "ember-source": "~5.5.0",
+    "ember-qunit": "^9.0.4",
+    "ember-resolver": "^13.1.0",
+    "ember-source": "~5.12.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-imports": "^4.0.0",
     "ember-template-lint": "^6.1.0",
@@ -93,7 +94,7 @@
     "webpack": "^5.0.0"
   },
   "engines": {
-    "node": "16.* || >= 18"
+    "node": ">= 18"
   },
   "ember": {
     "edition": "octane"

docs/tests/test-helper.js

@@ -2,7 +2,20 @@ import Application from 'docs/app';
 import config from 'docs/config/environment';
 import { setApplication } from '@ember/test-helpers';
 import { start } from 'ember-qunit';
+import {
+  macroCondition,
+  dependencySatisfies,
+  importSync,
+} from '@embroider/macros';
 
 setApplication(Application.create(config.APP));
 
+if (macroCondition(dependencySatisfies('ember-qunit', '>= 9.0.0'))) {
+  const { loadTests } = importSync('ember-qunit/test-loader');
+  const { setupEmberOnerrorValidation } = importSync('ember-qunit');
+
+  setupEmberOnerrorValidation();
+  loadTests();
+}
+
 start();

package.json

@@ -7,6 +7,7 @@
   },
   "scripts": {
     "build": "pnpm --filter 'ember-page-title' build",
+    "prepare": "pnpm --filter 'ember-page-title' build",
     "lint": "pnpm --filter '*' lint",
     "lint:fix": "pnpm --filter '*' lint:fix",
     "test": "pnpm --filter '*' test"
@@ -15,7 +16,7 @@
     "release-plan": "^0.6.0"
   },
   "volta": {
-    "node": "20.10.0",
+    "node": "24.14.0",
     "pnpm": "8.10.0"
   },
   "publishConfig": {
@@ -37,7 +38,8 @@
     },
     "overrides": {
       "@glimmer/manager": ">= 0.84.3",
-      "@glimmer/validator": ">= 0.84.3"
+      "@glimmer/validator": ">= 0.84.3",
+      "ember-cli-htmlbars": "^7.0.1"
     },
     "notes": {
       "overrides": {