Merge branch 'main' into embroider-update

.github/workflows/ci.yml

@@ -14,12 +14,12 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v1
-      - uses: volta-cli/action@v1
+      - uses: actions/checkout@v4
+      - uses: volta-cli/action@v4
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -43,12 +43,12 @@ jobs:
       fail-fast: false
       matrix: ${{fromJson(needs.test.outputs.matrix)}}
     steps:
-      - uses: actions/checkout@v1
-      - uses: volta-cli/action@v1
+      - uses: actions/checkout@v4
+      - uses: volta-cli/action@v4
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

package.json

@@ -46,6 +46,7 @@
     "@babel/core": "^7.16.7",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
+    "@ember/string": "^3.1.1",
     "@embroider/addon-dev": "npm:@embroider/addon-dev@latest",
     "@embroider/compat": "npm:@embroider/compat@latest",
     "@embroider/core": "npm:@embroider/core@latest",
@@ -115,7 +116,7 @@
     }
   },
   "engines": {
-    "node": ">= 12"
+    "node": ">= 18"
   },
   "ember-addon": {
     "version": 2,
@@ -148,7 +149,8 @@
     }
   },
   "volta": {
-    "node": "14.17.5",
-    "yarn": "1.22.11"
-  }
+    "node": "18.20.3",
+    "yarn": "1.22.22"
+  },
+  "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

test-app/package.json

@@ -20,6 +20,7 @@
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
+    "@ember/string": "^3.1.1",
     "@embroider/test-setup": "npm:@embroider/test-setup@latest",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
@@ -61,13 +62,13 @@
     "webpack": "^5.65.0"
   },
   "engines": {
-    "node": "12.* || 14.* || >= 16"
+    "node": ">= 18"
   },
   "ember": {
     "edition": "octane"
   },
   "volta": {
-    "node": "14.17.5",
-    "yarn": "1.22.11"
+    "node": "18.20.3",
+    "yarn": "1.22.22"
   }
 }