Merge pull request #573 from candunaj/added-babel-plugin-ember-templa…

…te-compilation added babel-plugin-ember-template-compilation
embroider-build · Apr 3, 2023 · cdb8c02 · cdb8c02
2 parents 22ffabc + 4567850
commit cdb8c02
Showing 1 changed file with 33 additions and 16 deletions.
diff --git a/packages/ember-auto-import/ts/package.ts b/packages/ember-auto-import/ts/package.ts
@@ -515,28 +515,45 @@ export default class Package {
     let templateCompilerPath: string = (emberSource as any).absolutePaths
       .templateCompiler;
 
+    const babelPluginPrecompile = ensureModuleApiPolyfill
+      ? [
+          require.resolve('babel-plugin-htmlbars-inline-precompile'),
+          {
+            ensureModuleApiPolyfill,
+            templateCompilerPath,
+            modules: {
+              'ember-cli-htmlbars': 'hbs',
+              '@ember/template-compilation': {
+                export: 'precompileTemplate',
+                disableTemplateLiteral: true,
+                shouldParseScope: true,
+                isProduction: process.env.EMBER_ENV === 'production',
+              },
+            },
+          },
+        ]
+      : [
+          require.resolve('babel-plugin-ember-template-compilation'),
+          {
+            // As above, we present the AST transforms in reverse order
+            // transforms: [...pluginInfo.plugins].reverse(),
+            compilerPath: require.resolve(templateCompilerPath),
+            enableLegacyModules: [
+              'ember-cli-htmlbars',
+              'ember-cli-htmlbars-inline-precompile',
+              'htmlbars-inline-precompile',
+            ],
+          },
+          'ember-cli-htmlbars:inline-precompile',
+        ];
+
     let plugins = [
       [require.resolve('@babel/plugin-proposal-decorators'), { legacy: true }],
       [
         require.resolve('@babel/plugin-proposal-class-properties'),
         { loose: false },
       ],
-      [
-        require.resolve('babel-plugin-htmlbars-inline-precompile'),
-        {
-          ensureModuleApiPolyfill,
-          templateCompilerPath,
-          modules: {
-            'ember-cli-htmlbars': 'hbs',
-            '@ember/template-compilation': {
-              export: 'precompileTemplate',
-              disableTemplateLiteral: true,
-              shouldParseScope: true,
-              isProduction: process.env.EMBER_ENV === 'production',
-            },
-          },
-        },
-      ],
+      babelPluginPrecompile,
       ...macrosConfig.babelPluginConfig(),
     ];