Have to switch to pnpm, because of pending PRs on other repos, and ya…

…rn not being able to handle patch-package across multiple copies of dependincies

.github/workflows/ci.yml

@@ -54,7 +54,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [16.x, 18.18.1]
 
     steps:
       - uses: actions/checkout@v3

package.json

@@ -16,6 +16,7 @@
     "test": "tests"
   },
   "scripts": {
+    "postinstall": "patch-package",
     "lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
     "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
     "lint:hbs": "ember-template-lint .",
@@ -30,7 +31,8 @@
   "dependencies": {
     "broccoli-stew": "^3.0.0",
     "content-tag": "^1.1.2",
-    "ember-cli-version-checker": "^5.1.2"
+    "ember-cli-version-checker": "^5.1.2",
+    "postinstall-postinstall": "^2.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.22.20",
@@ -122,5 +124,12 @@
       "release": true,
       "tokenRef": "GITHUB_AUTH"
     }
+  },
+  "pnpm": {
+    "patchedDependencies": {
+      "[email protected]": "patches/[email protected]",
+      "[email protected]": "patches/[email protected]",
+      "[email protected]": "patches/[email protected]"
+    }
   }
 }

patches/ember-cli-typescript@2.0.2.patch

@@ -0,0 +1,14 @@
+diff --git a/js/addon.js b/js/addon.js
+index 2c168efe48b0fefcb9ffdbf1a1f2019074f6535a..0e1b744807569ce3d1838ffa7f552a029977ae5d 100644
+--- a/js/addon.js
++++ b/js/addon.js
+@@ -91,7 +91,8 @@ exports.default = ember_cli_entities_1.addon({
+     _checkBabelVersion() {
+         let babel = this.parent.addons.find(addon => addon.name === 'ember-cli-babel');
+         let version = babel && babel.pkg.version;
+-        if (!babel || !(semver_1.default.gte(version, '7.1.0') && semver_1.default.lt(version, '8.0.0'))) {
++        // https://github.com/typed-ember/ember-cli-typescript/issues/1567
++        if (!babel || !(semver_1.default.gte(version, '7.1.0'))) {
+             let versionString = babel ? `version ${babel.pkg.version}` : `no instance of ember-cli-babel`;
+             this.ui.writeWarnLine(`ember-cli-typescript requires ember-cli-babel ^7.1.0, but you have ${versionString} installed; ` +
+                 'your TypeScript files may not be transpiled correctly.');

patches/ember-cli-typescript@3.0.0.patch

@@ -0,0 +1,14 @@
+diff --git a/js/addon.js b/js/addon.js
+index eb1fc77735a0795addd8b87c353e4773c04d35a5..19755534dfd7ac04cb052218047dab1a92f9ce2d 100644
+--- a/js/addon.js
++++ b/js/addon.js
+@@ -83,7 +83,8 @@ exports.default = ember_cli_entities_1.addon({
+     _checkBabelVersion() {
+         let babel = this.parent.addons.find(addon => addon.name === 'ember-cli-babel');
+         let version = babel && babel.pkg.version;
+-        if (!babel || !(semver_1.default.gte(version, '7.7.3') && semver_1.default.lt(version, '8.0.0'))) {
++        // https://github.com/typed-ember/ember-cli-typescript/issues/1567
++        if (!babel || !(semver_1.default.gte(version, '7.7.3'))) {
+             let versionString = babel ? `version ${babel.pkg.version}` : `no instance of ember-cli-babel`;
+             this.ui.writeWarnLine(`ember-cli-typescript requires ember-cli-babel ^7.7.3, but you have ${versionString} installed; ` +
+                 'your TypeScript files may not be transpiled correctly.');

patches/ember-compatibility-helpers@1.2.6.patch

@@ -0,0 +1,14 @@
+diff --git a/index.js b/index.js
+index c4c64a8c50480c3c453686492de8f87fa54ae139..255bf8e3901901fce9689eaf8981a4338553ba32 100644
+--- a/index.js
++++ b/index.js
+@@ -52,7 +52,8 @@ module.exports = {
+     const emberBabelChecker = this.parentChecker.for('ember-cli-babel', 'npm');
+
+     this._usingBabel6 = emberBabelChecker.satisfies('^6.0.0-beta.1');
+-    this._usingBabel7 = emberBabelChecker.satisfies('^7.0.0-beta.1');
++    // https://github.com/ember-cli/ember-compatibility-helpers/pull/57
++    this._usingBabel7 = emberBabelChecker.satisfies('>= 7.0.0-beta.1');
+
+     if (!this._usingBabel6 && !this._usingBabel7) {
+       host.project.ui.writeWarnLine(