Remove extraneous import from @ember/template-compiler

__tests__/tests.ts

@@ -1478,6 +1478,66 @@ describe('htmlbars-inline-precompile', function () {
       `);
     });
 
+    it('cleans up leftover imports when polyfilling rfc931 with hbs target', function () {
+      plugins = [
+        [
+          HTMLBarsInlinePrecompile,
+          {
+            targetFormat: 'hbs',
+          },
+        ],
+      ];
+      let code = `
+        import { template } from "@ember/template-compiler";
+        import Component from '@glimmer/component';
+        export default class Test extends Component {
+            foo = 1;
+            static{
+                template("<Icon />", {
+                    component: this,
+                    eval () {
+                        return eval(arguments[0]);
+                    }
+                });
+            }
+        }
+        const Icon = template("Icon", {
+            eval () {
+                return eval(arguments[0]);
+            }
+        });
+      `;
+
+      let transformed = transform(code);
+
+      expect(transformed).toEqualCode(`
+        import Component from "@glimmer/component";
+        import { precompileTemplate } from "@ember/template-compilation";
+        import { setComponentTemplate } from "@ember/component";
+        import templateOnly from "@ember/component/template-only";
+        export default class Test extends Component {
+          foo = 1;
+          static {
+            setComponentTemplate(
+              precompileTemplate("<Icon />", {
+                strictMode: true,
+                scope: () => ({
+                  Icon,
+                }),
+              }),
+              this
+            );
+          }
+        }
+        const Icon = setComponentTemplate(
+          precompileTemplate("Icon", {
+            strictMode: true,
+          }),
+          templateOnly()
+        );
+      `);
+    });
+
     it("respects user's strict option on template()", function () {
       plugins = [
         [

src/plugin.ts

@@ -629,13 +629,23 @@ function updateCallForm<EnvSpecificOptions>(
           ),
       ])
     );
+
     // we just wrapped the target callExpression in the call to
     // setComponentTemplate. Adjust `target` back to point at the
     // precompileTemplate call for the final updateScope below.
     //
     target = target.get('arguments.0') as NodePath<t.CallExpression>;
   }
 
+  // Changing imports/identifiers doesn't automatically update the scope.
+  //
+  // NOTE: https://github.com/babel/babel/issues/7974
+  //
+  // We need to refresh ourselves
+  // This is expensive, but required so that maybePruneImport
+  // has a chance to prune imports when their specifiers are no longer used.
+  state.program.scope.crawl();
+
   // We deliberately do updateScope at the end so that when it updates
   // references, those references will point to the accurate paths in the
   // final AST.