Merge pull request #2661 from embroider-build/template-compiler-deprecation

ef4 · web-flow · commit 9409fa6a80bf · 2026-03-24T11:16:52.000-04:00
cleaning up AMD template compiler deprecation
diff --git a/packages/compat/package.json b/packages/compat/package.json
@@ -38,7 +38,7 @@
     "assert-never": "^1.1.0",
     "babel-import-util": "^3.0.1",
     "babel-plugin-debug-macros": "^2.0.0",
-    "babel-plugin-ember-template-compilation": "^3.0.0",
+    "babel-plugin-ember-template-compilation": "^3.1.0",
     "babel-plugin-ember-template-compilation-2": "npm:babel-plugin-ember-template-compilation@^2.4.0",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babylon": "^6.18.0",
diff --git a/packages/compat/src/v1-addon.ts b/packages/compat/src/v1-addon.ts
@@ -13,7 +13,7 @@ import semver from 'semver';
 import rewriteAddonTree from './rewrite-addon-tree';
 import { mergeWithAppend } from './merges';
 import type { AddonMeta, PackageCache, AddonInstance, AddonTreePath } from '@embroider/core';
-import { debug, findTopmostAddon } from '@embroider/core';
+import { debug } from '@embroider/core';
 import walkSync from 'walk-sync';
 import ObserveTree from './observe-tree';
 import { isEmbroiderMacrosPlugin } from '@embroider/macros/src/node';
@@ -120,11 +120,7 @@ export default class V1Addon {
     // our macros don't run here in stage1
     plugins = plugins.filter((p: any) => !isEmbroiderMacrosPlugin(p));
     if (plugins.length > 0 || hasTemplateTag) {
-      let compilerPath = require.resolve('ember-source/dist/ember-template-compiler.js', {
-        paths: [findTopmostAddon(this.addonInstance).parent.root],
-      });
       let opts: EtcOptions = {
-        compilerPath,
         targetFormat: 'hbs',
         enableLegacyModules: [
           'ember-cli-htmlbars',
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -48,7 +48,7 @@
     "@embroider/reverse-exports": "workspace:*",
     "@embroider/shared-internals": "workspace:*",
     "assert-never": "^1.2.1",
-    "babel-plugin-ember-template-compilation": "^3.0.0",
+    "babel-plugin-ember-template-compilation": "^3.1.0",
     "broccoli-node-api": "^1.7.0",
     "broccoli-persistent-filter": "^3.1.2",
     "broccoli-plugin": "^4.0.7",
diff --git a/packages/macros/README.md b/packages/macros/README.md
@@ -39,7 +39,6 @@ module.exports = {
     [
       "babel-plugin-ember-template-compilation",
       {
-        compilerPath: "ember-source/dist/ember-template-compiler.js",
         transforms: [...macros.templateMacros],
       },
     ],
diff --git a/packages/macros/package.json b/packages/macros/package.json
@@ -55,7 +55,7 @@
     "@types/node": "^22.9.3",
     "@types/resolve": "^1.20.0",
     "@types/semver": "^7.3.6",
-    "babel-plugin-ember-template-compilation": "^3.0.0",
+    "babel-plugin-ember-template-compilation": "^3.1.0",
     "code-equality-assertions": "^1.0.1",
     "scenario-tester": "^3.0.1",
     "typescript": "^5.4.5",
diff --git a/packages/template-tag-codemod/package.json b/packages/template-tag-codemod/package.json
@@ -37,7 +37,7 @@
     "@humanwhocodes/module-importer": "^1.0.1",
     "@types/babel__core": "^7.20.5",
     "babel-import-util": "^3.0.1",
-    "babel-plugin-ember-template-compilation": "^3.0.0",
+    "babel-plugin-ember-template-compilation": "^3.1.0",
     "broccoli": "^4.0.0",
     "chalk": "^5.4.1",
     "commander": "^13.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/addon-template/babel.config.cjs b/tests/addon-template/babel.config.cjs
@@ -8,7 +8,6 @@ module.exports = {
     [
       "babel-plugin-ember-template-compilation",
       {
-        compilerPath: "ember-source/dist/ember-template-compiler.js",
         enableLegacyModules: [
           "ember-cli-htmlbars",
           "ember-cli-htmlbars-inline-precompile",
diff --git a/tests/app-template-minimal/babel.config.cjs b/tests/app-template-minimal/babel.config.cjs
@@ -7,7 +7,6 @@ module.exports = {
     [
       'babel-plugin-ember-template-compilation',
       {
-        compilerPath: 'ember-source/dist/ember-template-compiler.js',
         enableLegacyModules: ['ember-cli-htmlbars'],
         transforms: [...macros.templateMacros],
       },
diff --git a/tests/app-template-minimal/package.json b/tests/app-template-minimal/package.json
@@ -37,7 +37,7 @@
     "@glimmer/component": "^2.0.0",
     "@glimmer/tracking": "^1.1.2",
     "@rollup/plugin-babel": "^5.3.1",
-    "babel-plugin-ember-template-compilation": "^3.0.0",
+    "babel-plugin-ember-template-compilation": "^3.1.0",
     "decorator-transforms": "^2.0.0",
     "ember-cli": "^6.2.2",
     "ember-modifier": "^4.1.0",
diff --git a/tests/app-template/babel.config.cjs b/tests/app-template/babel.config.cjs
@@ -8,7 +8,6 @@ module.exports = {
     [
       "babel-plugin-ember-template-compilation",
       {
-        compilerPath: "ember-source/dist/ember-template-compiler.js",
         enableLegacyModules: [
           "ember-cli-htmlbars",
           "ember-cli-htmlbars-inline-precompile",
diff --git a/tests/app-template/package.json b/tests/app-template/package.json
@@ -45,7 +45,7 @@
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@rollup/plugin-babel": "^5.3.1",
-    "babel-plugin-ember-template-compilation": "^3.0.0",
+    "babel-plugin-ember-template-compilation": "^3.1.0",
     "concurrently": "^8.2.0",
     "decorator-transforms": "^2.0.0",
     "ember-cli": "~5.0.0",
diff --git a/tests/scenarios/package.json b/tests/scenarios/package.json
@@ -61,7 +61,7 @@
     "@types/lodash": "^4.14.170",
     "@types/node-fetch": "^2.6.11",
     "@types/semver": "^7.3.6",
-    "babel-plugin-ember-template-compilation": "^3.0.0",
+    "babel-plugin-ember-template-compilation": "^3.1.0",
     "bootstrap": "^4.3.1",
     "broccoli-funnel": "^3.0.5",
     "broccoli-merge-trees": "^3.0.2",
diff --git a/tests/scenarios/v2-addon-dev-test.ts b/tests/scenarios/v2-addon-dev-test.ts
@@ -36,7 +36,6 @@ appScenarios
             "@babel/plugin-transform-class-static-block",
             ["babel-plugin-ember-template-compilation", {
               targetFormat: 'hbs',
-              compilerPath: 'ember-source/dist/ember-template-compiler.js',
               transforms: [
                 './lib/custom-transform.js',
               ],
@@ -243,7 +242,6 @@ appScenarios
             "@babel/plugin-transform-class-static-block",
             ["babel-plugin-ember-template-compilation", {
               targetFormat: 'hbs',
-              compilerPath: 'ember-source/dist/ember-template-compiler.js',
             }],
             ["@babel/plugin-proposal-decorators", { "legacy": true }],
             [ "@babel/plugin-transform-class-properties" ]
@@ -304,7 +302,6 @@ appScenarios
             "@babel/plugin-transform-class-static-block",
             ["babel-plugin-ember-template-compilation", {
               targetFormat: 'hbs',
-              compilerPath: 'ember-source/dist/ember-template-compiler.js',
             }],
             ["@babel/plugin-proposal-decorators", { "legacy": true }],
             [ "@babel/plugin-transform-class-properties" ]
diff --git a/tests/ts-app-template-classic/babel.config.cjs b/tests/ts-app-template-classic/babel.config.cjs
@@ -5,7 +5,6 @@ module.exports = {
     [
       'babel-plugin-ember-template-compilation',
       {
-        compilerPath: 'ember-source/dist/ember-template-compiler.js',
         enableLegacyModules: [
           'ember-cli-htmlbars',
           'ember-cli-htmlbars-inline-precompile',
diff --git a/tests/ts-app-template/babel.config.cjs b/tests/ts-app-template/babel.config.cjs
@@ -6,7 +6,6 @@ module.exports = {
     [
       'babel-plugin-ember-template-compilation',
       {
-        compilerPath: 'ember-source/dist/ember-template-compiler.js',
         enableLegacyModules: [
           'ember-cli-htmlbars',
           'ember-cli-htmlbars-inline-precompile',
diff --git a/tests/ts-app-template/package.json b/tests/ts-app-template/package.json
@@ -55,7 +55,7 @@
     "@types/htmlbars-inline-precompile": "^3.0.0",
     "@types/qunit": "2.19.10",
     "@types/rsvp": "^4.0.4",
-    "babel-plugin-ember-template-compilation": "^3.0.0",
+    "babel-plugin-ember-template-compilation": "^3.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^8.2.1",
     "decorator-transforms": "^2.0.0",

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ module.exports = {`
`39`	`39`	`[`
`40`	`40`	`"babel-plugin-ember-template-compilation",`
`41`	`41`	`{`
`42`		`- compilerPath: "ember-source/dist/ember-template-compiler.js",`
`43`	`42`	`transforms: [...macros.templateMacros],`
`44`	`43`	`},`
`45`	`44`	`],`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ module.exports = {`
`8`	`8`	`[`
`9`	`9`	`"babel-plugin-ember-template-compilation",`
`10`	`10`	`{`
`11`		`- compilerPath: "ember-source/dist/ember-template-compiler.js",`
`12`	`11`	`enableLegacyModules: [`
`13`	`12`	`"ember-cli-htmlbars",`
`14`	`13`	`"ember-cli-htmlbars-inline-precompile",`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ module.exports = {`
`7`	`7`	`[`
`8`	`8`	`'babel-plugin-ember-template-compilation',`
`9`	`9`	`{`
`10`		`- compilerPath: 'ember-source/dist/ember-template-compiler.js',`
`11`	`10`	`enableLegacyModules: ['ember-cli-htmlbars'],`
`12`	`11`	`transforms: [...macros.templateMacros],`
`13`	`12`	`},`