reduce changes

.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

ember-addon-main.js

@@ -12,6 +12,7 @@ module.exports = {
     let emberCliHtmlBars = new VersionChecker(this.project).for(
       'ember-cli-htmlbars'
     );
+    let emberCliBabel = new VersionChecker(this.project).for('ember-cli-babel');
 
     let errors = [];
 
@@ -23,6 +24,10 @@ module.exports = {
       errors.push('ember-cli-htmlbars 6.3.0 or higher');
     }
 
+    if (!emberCliBabel.gte('8.2.0')) {
+      errors.push('ember-cli-babel 8.2.0 or higher');
+    }
+
     if (errors.length > 0) {
       throw new Error(
         'ember-template-imports requires' + '\n\t' + errors.join('\n\t')

ember-cli-build.js

@@ -8,6 +8,11 @@ module.exports = function (defaults) {
     babel: {
       sourceMaps: 'inline',
     },
+    'ember-cli-babel': {
+      enableTypeScriptTransform: true,
+      // useBabelConfig: true,
+      // ember-cli-babel related options
+    },
   });
 
   /*

package.json

@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "broccoli-stew": "^3.0.0",
-    "content-tag": "^1.1.1",
+    "content-tag": "^1.1.2",
     "ember-cli-version-checker": "^5.1.2"
   },
   "devDependencies": {
@@ -40,7 +40,7 @@
     "@ember/string": "^3.0.1",
     "@ember/test-helpers": "^2.2.0",
     "@embroider/test-setup": "^3.0.2",
-    "@glimmer/component": "^1.1.2",
+    "@glimmer/component": "^1.0.3",
     "@glimmer/syntax": "0.84.3",
     "@glimmer/tracking": "^1.0.3",
     "@release-it-plugins/lerna-changelog": "^6.0.0",
@@ -55,7 +55,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "ember-auto-import": "^2.6.3",
     "ember-cli": "~4.12.1",
-    "ember-cli-babel": "^8.1.0",
+    "ember-cli-babel": "^8.2.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-cli-inject-live-reload": "^2.0.2",
@@ -84,9 +84,6 @@
     "typescript": "^4.5.2",
     "webpack": "^5.64.4"
   },
-  "resolutions": {
-    "@babel/generator": "~7.16.0"
-  },
   "engines": {
     "node": "16.* || >= 18"
   },
@@ -120,5 +117,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(