diff --git a/.eslintignore b/.eslintignore
index 03fdf3c63..9ec0e7c1f 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -34,6 +34,8 @@
 /packages/vite/index.d.ts
 /packages/vite/**/*.js
 /packages/vite/**/*.d.ts
+/packages/template-tag-codemod/**/*.js
+/packages/template-tag-codemod/**/*.d.ts
 /packages/reverse-exports/**/*.js
 /packages/reverse-exports/**/*.d.ts
 
diff --git a/.prettierignore b/.prettierignore
index 7db31a954..b6bd7152d 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -43,6 +43,8 @@
 /packages/vite/index.mjs
 /packages/vite/**/*.js
 /packages/vite/**/*.d.ts
+/packages/template-tag-codemod/**/*.js
+/packages/template-tag-codemod/**/*.d.ts
 /packages/reverse-exports/**/*.js
 /packages/reverse-exports/**/*.d.ts
 
diff --git a/packages/compat/src/index.ts b/packages/compat/src/index.ts
index ff459ffff..de84f3eb4 100644
--- a/packages/compat/src/index.ts
+++ b/packages/compat/src/index.ts
@@ -4,3 +4,4 @@ export { default as Options, recommendedOptions } from './options';
 export { default as V1Addon } from './v1-addon';
 export { prebuild, PipelineOptions } from './default-pipeline';
 export { PackageRules, ModuleRules } from './dependency-rules';
+export type { Options as ResolverTransformOptions } from './resolver-transform';
diff --git a/packages/compat/src/resolver-transform.ts b/packages/compat/src/resolver-transform.ts
index e7ed0ff2b..ea5528d97 100644
--- a/packages/compat/src/resolver-transform.ts
+++ b/packages/compat/src/resolver-transform.ts
@@ -415,7 +415,7 @@ class TemplateResolver implements ASTPlugin {
     return name;
   }
 
-  private targetComponent(name: string): ComponentResolution | null {
+  private targetComponent(name: string, nameHint: string): ComponentResolution | null {
     if (!this.staticComponentsEnabled) {
       return null;
     }
@@ -450,7 +450,7 @@ class TemplateResolver implements ASTPlugin {
       yieldsComponents: componentRules ? componentRules.yieldsSafeComponents : [],
       yieldsArguments: componentRules ? componentRules.yieldsArguments : [],
       argumentsAreComponents: componentRules ? componentRules.argumentsAreComponents : [],
-      nameHint: this.nameHint(name),
+      nameHint: this.nameHint(nameHint),
     };
   }
 
@@ -490,7 +490,7 @@ class TemplateResolver implements ASTPlugin {
       };
     }
 
-    return this.targetComponent(component.path);
+    return this.targetComponent(component.path, component.path);
   }
 
   private targetHelper(path: string): HelperResolution | null {
@@ -620,7 +620,7 @@ class TemplateResolver implements ASTPlugin {
     if (ownComponentRules?.disambiguate[path]) {
       switch (ownComponentRules.disambiguate[path]) {
         case 'component':
-          return this.targetComponent(path);
+          return this.targetComponent(path, path);
         case 'helper':
           return this.targetHelper(path);
         case 'data':
@@ -838,7 +838,7 @@ class TemplateResolver implements ASTPlugin {
         });
         return;
       }
-      let resolution = this.targetComponent(node.path.original);
+      let resolution = this.targetComponent(node.path.original, node.path.original);
       this.emit(path, resolution, (node, newId) => {
         node.path = newId;
       });
@@ -989,7 +989,7 @@ class TemplateResolver implements ASTPlugin {
           // if it starts with lower case, it can't be a component we need to
           // globally resolve
           if (node.tag[0] !== node.tag[0].toLowerCase()) {
-            resolution = this.targetComponent(dasherize(node.tag));
+            resolution = this.targetComponent(dasherize(node.tag), node.tag);
           }
 
           this.emit(path, resolution, (node, newId) => {
diff --git a/packages/core/src/module-resolver.ts b/packages/core/src/module-resolver.ts
index b0e7609a1..2cf5f8afa 100644
--- a/packages/core/src/module-resolver.ts
+++ b/packages/core/src/module-resolver.ts
@@ -18,7 +18,7 @@ import { exports as resolveExports } from 'resolve.exports';
 import { Memoize } from 'typescript-memoize';
 import { describeExports } from './describe-exports';
 import { readFileSync } from 'fs';
-import { nodeResolve } from './node-resolve';
+import { nodeResolve, type NodeResolveOpts } from './node-resolve';
 import type { Options, EngineConfig } from './module-resolver-options';
 import { satisfies } from 'semver';
 import { extractResolution, type ModuleRequest, type Resolution } from './module-request';
@@ -190,13 +190,14 @@ export class Resolver {
   // defaultResolve already configured to be "do the normal node thing".
   async nodeResolve(
     specifier: string,
-    fromFile: string
+    fromFile: string,
+    opts?: NodeResolveOpts
   ): Promise<
     | { type: 'virtual'; filename: string; content: string }
     | { type: 'real'; filename: string }
     | { type: 'not_found'; err: Error }
   > {
-    return nodeResolve(this, specifier, fromFile);
+    return nodeResolve(this, specifier, fromFile, opts);
   }
 
   get packageCache() {
@@ -1362,7 +1363,7 @@ export class Resolver {
   // check whether the given file with the given owningPackage is an addon's
   // appTree, and if so return the notional location within the app (or owning
   // engine) that it "logically" lives at.
-  private reverseSearchAppTree(
+  reverseSearchAppTree(
     owningPackage: Package,
     fromFile: string
   ): { owningEngine: EngineConfig; inAppName: string } | undefined {
diff --git a/packages/core/src/node-resolve.ts b/packages/core/src/node-resolve.ts
index 7b40efa2b..db08bff7c 100644
--- a/packages/core/src/node-resolve.ts
+++ b/packages/core/src/node-resolve.ts
@@ -9,20 +9,20 @@ import type { Resolver } from './module-resolver';
 
 export class NodeRequestAdapter implements RequestAdapter<Resolution<NodeResolution, Error>> {
   static create: RequestAdapterCreate<
-    { resolver: Resolver; specifier: string; fromFile: string },
+    { resolver: Resolver; specifier: string; fromFile: string; extensions: string[] },
     Resolution<NodeResolution, Error>
-  > = ({ resolver, specifier, fromFile }) => {
+  > = ({ resolver, specifier, fromFile, extensions }) => {
     return {
       initialState: {
         specifier,
         fromFile,
         meta: undefined,
       },
-      adapter: new NodeRequestAdapter(resolver),
+      adapter: new NodeRequestAdapter(resolver, extensions),
     };
   };
 
-  private constructor(private resolver: Resolver) {}
+  private constructor(private resolver: Resolver, private extensions: string[]) {}
 
   get debugType() {
     return 'node';
@@ -75,7 +75,7 @@ export class NodeRequestAdapter implements RequestAdapter<Resolution<NodeResolut
 
     let initialError;
 
-    for (let candidate of candidates(specifier)) {
+    for (let candidate of candidates(specifier, this.extensions)) {
       let filename;
       try {
         filename = require.resolve(candidate, {
@@ -92,6 +92,17 @@ export class NodeRequestAdapter implements RequestAdapter<Resolution<NodeResolut
 
         continue;
       }
+      if (filename.endsWith('.hbs') && !candidate.endsWith('.hbs')) {
+        // Evaluating the `handlebars` NPM package installs a Node extension
+        // that puts `*.hbs` in the automatic search path. But we can't control
+        // its priority, and it's really important to us that `.hbs` cannot
+        // shadow other extensions with higher priority. For example, when both
+        // `.ts` and `.hbs` exist, resolving is supposed to find the `.ts`.
+        //
+        // This covers the case where we found an hbs "by accident", when we
+        // weren't actually expecting it.
+        continue;
+      }
       return { type: 'found', filename, result: { type: 'real' as 'real', filename }, virtual: false };
     }
 
@@ -99,10 +110,10 @@ export class NodeRequestAdapter implements RequestAdapter<Resolution<NodeResolut
   }
 }
 
-function* candidates(specifier: string) {
-  yield specifier;
+const defaultExtensions = ['.hbs.js', '.hbs'];
 
-  const extensions = ['.hbs.js', '.hbs'];
+function* candidates(specifier: string, extensions: string[]) {
+  yield specifier;
 
   for (let ext of extensions) {
     yield `${specifier}${ext}`;
@@ -113,12 +124,22 @@ type NodeResolution = { type: 'virtual'; filename: string; content: string } | {
 
 type NodeResolutionError = { type: 'not_found'; err: Error };
 
+export interface NodeResolveOpts {
+  extensions?: string[];
+}
+
 export async function nodeResolve(
   resolver: Resolver,
   specifier: string,
-  fromFile: string
+  fromFile: string,
+  opts?: NodeResolveOpts
 ): Promise<NodeResolution | NodeResolutionError> {
-  let request = ModuleRequest.create(NodeRequestAdapter.create, { resolver, fromFile, specifier });
+  let request = ModuleRequest.create(NodeRequestAdapter.create, {
+    resolver,
+    fromFile,
+    specifier,
+    extensions: opts?.extensions ?? defaultExtensions,
+  });
   let resolution = await resolver.resolve(request!);
   switch (resolution.type) {
     case 'not_found':
diff --git a/packages/template-tag-codemod/.eslintignore b/packages/template-tag-codemod/.eslintignore
new file mode 100644
index 000000000..4336ad549
--- /dev/null
+++ b/packages/template-tag-codemod/.eslintignore
@@ -0,0 +1,7 @@
+# compiled output
+/src/**/*.js
+/src/**/*.d.ts
+
+# dependencies
+/node_modules/
+
diff --git a/packages/template-tag-codemod/.gitignore b/packages/template-tag-codemod/.gitignore
new file mode 100644
index 000000000..575705668
--- /dev/null
+++ b/packages/template-tag-codemod/.gitignore
@@ -0,0 +1,8 @@
+/node_modules
+/src/**/*.js
+/src/**/*.d.ts
+/src/**/*.map
+/*/tests/**/*.js
+/*/tests/**/*.d.ts
+/*/tests/**/*.map
+*.tsbuildinfo
\ No newline at end of file
diff --git a/packages/template-tag-codemod/package.json b/packages/template-tag-codemod/package.json
new file mode 100644
index 000000000..7d3e2b035
--- /dev/null
+++ b/packages/template-tag-codemod/package.json
@@ -0,0 +1,51 @@
+{
+  "name": "@embroider/template-tag-codemod",
+  "version": "0.4.0",
+  "private": false,
+  "type": "module",
+  "description": "Convert to HBS to GJS with <template></template>",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/embroider-build/embroider.git",
+    "directory": "packages/template-tag-codemod"
+  },
+  "license": "MIT",
+  "author": "Edward Faulkner <edward@eaf4.com>",
+  "exports": {
+    ".": "./src/index.js"
+  },
+  "bin": {
+    "template-tag-codemod": "./src/cli.js"
+  },
+  "files": [
+    "src/**/*.js",
+    "src/**/*.d.ts",
+    "src/**/*.js.map"
+  ],
+  "scripts": {},
+  "dependencies": {
+    "@babel/core": "^7.26.0",
+    "@babel/plugin-syntax-decorators": "^7.25.9",
+    "@babel/plugin-syntax-typescript": "^7.25.9",
+    "@embroider/compat": "workspace:^*",
+    "@embroider/core": "workspace:^*",
+    "@embroider/reverse-exports": "workspace:^*",
+    "@types/babel__core": "^7.20.5",
+    "@types/yargs": "^17.0.3",
+    "babel-plugin-ember-template-compilation": "^2.3.0",
+    "broccoli": "^3.5.2",
+    "console-ui": "^3.1.2",
+    "ember-cli": "^6.0.1",
+    "glob": "^11.0.0",
+    "yargs": "^17.0.1"
+  },
+  "devDependencies": {
+    "@glimmer/syntax": "^0.84.3",
+    "@types/glob": "^8.1.0",
+    "@types/node": "^22.9.3",
+    "typescript": "^5.4.5"
+  },
+  "engines": {
+    "node": ">= 20"
+  }
+}
diff --git a/packages/template-tag-codemod/src/cli.ts b/packages/template-tag-codemod/src/cli.ts
new file mode 100644
index 000000000..b91585e83
--- /dev/null
+++ b/packages/template-tag-codemod/src/cli.ts
@@ -0,0 +1,65 @@
+#!/usr/bin/env node
+import yargs from 'yargs/yargs';
+import { type Options, optionsWithDefaults, run } from './index.js';
+
+yargs(process.argv.slice(2))
+  .scriptName('template-tag-codemod')
+  .command(
+    '$0',
+    "Converts Ember's .hbs format to .gjs or .gts format.",
+    y =>
+      y
+        .option('relativeLocalPaths', {
+          default: optionsWithDefaults().relativeLocalPaths,
+          type: 'boolean',
+          describe: `When true, imports for other files in the same project will use relative paths with file extensions. This is the most compatible with modern Node ESM convensions, but it's not supported by Ember's classic build.`,
+        })
+        .option('extensions', {
+          array: true,
+          type: 'string',
+          default: optionsWithDefaults().extensions,
+          describe: `File extensions to search when resolving components, helpers, and modifiers inside your hbs files`,
+        })
+        .option('nativeRouteTemplates', {
+          default: optionsWithDefaults().nativeRouteTemplates,
+          type: 'boolean',
+          describe: `When true, assume we can use template-tag directly in route files (requires ember-source >= 6.3.0-beta.3). When false, assume we can use the ember-route-template addon instead.`,
+        })
+        .option('routeTemplates', {
+          array: true,
+          type: 'string',
+          default: optionsWithDefaults().routeTemplates,
+          describe: `Controls which route template files we will convert to template tag. Provide a list of globs.`,
+        })
+        .option('components', {
+          array: true,
+          type: 'string',
+          default: optionsWithDefaults().components,
+          describe: `Controls which component files we will convert to template tag. Provide a list of globs.`,
+        })
+        .option('defaultFormat', {
+          type: 'string',
+          default: optionsWithDefaults().defaultFormat,
+          describe: `When a .js or .ts file already exists, we necessarily convert to .gjs or .gts respectively. But when only an .hbs file exists, we have a choice of default.`,
+        })
+        .option('templateOnlyComponentSignature', {
+          type: 'string',
+          default: optionsWithDefaults().templateOnlyComponentSignature,
+          describe: `Snippet of typescript to use as the type signature of newly-converted template-only components.`,
+        })
+        .option('routeTemplateSignature', {
+          type: 'string',
+          default: optionsWithDefaults().routeTemplateSignature,
+          describe: `Snippet of typescript to use as the type signature of route templates.`,
+        })
+        .option('templateInsertion', {
+          type: 'string',
+          default: optionsWithDefaults().templateInsertion,
+          describe: `Where should <template> be inserted inside existing class bodies? Say "beginning" or "end".`,
+        }),
+
+    async argv => {
+      await run(argv as Options);
+    }
+  )
+  .parse();
diff --git a/packages/template-tag-codemod/src/extract-meta.ts b/packages/template-tag-codemod/src/extract-meta.ts
new file mode 100644
index 000000000..1ba8fdf3e
--- /dev/null
+++ b/packages/template-tag-codemod/src/extract-meta.ts
@@ -0,0 +1,104 @@
+import type * as Babel from '@babel/core';
+
+export interface MetaResult {
+  templateSource: string;
+  scope: Map<
+    string,
+    {
+      local: string;
+      imported: string;
+      module: string;
+    }
+  >;
+}
+
+export interface ExtractMetaOpts {
+  result: MetaResult | undefined;
+}
+
+/*
+  This only needs to be able to parse the output of our own transforms, it's not
+  necessary that it covers every possible way of expressing a template in
+  javascript
+*/
+export default function extractMetaPlugin(_babel: typeof Babel): Babel.PluginObj<{ opts: ExtractMetaOpts }> {
+  return {
+    visitor: {
+      CallExpression(path, state) {
+        if (path.get('callee').referencesImport('@ember/template-compilation', 'precompileTemplate')) {
+          let [arg0, arg1] = path.node.arguments;
+          if (arg0.type !== 'StringLiteral') {
+            throw new Error(`unexpected source: ${String(path)}`);
+          }
+
+          if (!arg1) {
+            // empty scope
+            let scope: MetaResult['scope'] = new Map();
+            state.opts.result = {
+              templateSource: arg0.value,
+              scope,
+            };
+            return;
+          }
+
+          if (arg1.type !== 'ObjectExpression') {
+            throw new Error(`unexpected source: ${String(path)}`);
+          }
+
+          let prop0 = arg1.properties[0];
+          if (prop0.type !== 'ObjectProperty') {
+            throw new Error(`unexpected source: ${String(path)}`);
+          }
+
+          let value = prop0.value;
+          if (value.type !== 'ArrowFunctionExpression') {
+            throw new Error(`unexpected source: ${String(path)}`);
+          }
+
+          let body = value.body;
+          if (body.type !== 'ObjectExpression') {
+            throw new Error(`unexpected source: ${String(path)}`);
+          }
+
+          let scope: MetaResult['scope'] = new Map();
+          for (let prop of body.properties) {
+            if (prop.type !== 'ObjectProperty') {
+              throw new Error(`unexpected source: ${String(path)}`);
+            }
+            let key = prop.key;
+            let value = prop.value;
+
+            if (key.type !== 'Identifier') {
+              throw new Error(`unexpected source: ${String(path)}`);
+            }
+            if (value.type !== 'Identifier') {
+              throw new Error(`unexpected source: ${String(path)}`);
+            }
+            let binding = path.scope.bindings[value.name];
+            if (binding?.path.type === 'ImportDefaultSpecifier') {
+              let dec = binding.path.parentPath as Babel.NodePath<Babel.types.ImportDeclaration>;
+              scope.set(key.name, { local: value.name, imported: 'default', module: dec.node.source.value });
+            } else if (binding?.path.type === 'ImportSpecifier') {
+              let dec = binding.path.parentPath as Babel.NodePath<Babel.types.ImportDeclaration>;
+              let specifier = binding.path.node as Babel.types.ImportSpecifier;
+              let imported: string;
+              if (specifier.imported.type === 'Identifier') {
+                imported = specifier.imported.name;
+              } else {
+                imported = specifier.imported.value;
+              }
+              scope.set(key.name, { local: value.name, imported, module: dec.node.source.value });
+            } else {
+              throw new Error(`unepxected binding.path.type: ${binding?.path.type}`);
+            }
+          }
+
+          state.opts.result = {
+            templateSource: arg0.value,
+            scope,
+          };
+        }
+      },
+    },
+  };
+}
diff --git a/packages/template-tag-codemod/src/index.ts b/packages/template-tag-codemod/src/index.ts
new file mode 100644
index 000000000..15abc7b5c
--- /dev/null
+++ b/packages/template-tag-codemod/src/index.ts
@@ -0,0 +1,484 @@
+import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'fs';
+import { globSync } from 'glob';
+import core, { type Package } from '@embroider/core';
+import { parseAsync, transformAsync, type types } from '@babel/core';
+import templateCompilation, { type Options as EtcOptions } from 'babel-plugin-ember-template-compilation';
+import { createRequire } from 'module';
+import extractMeta, { type ExtractMetaOpts, type MetaResult } from './extract-meta.js';
+import reverseExports from '@embroider/reverse-exports';
+import { dirname } from 'path';
+import type { ResolverTransformOptions } from '@embroider/compat';
+import { routeTemplateTransform } from './route-template-transform.js';
+
+const { explicitRelative, hbsToJS, ResolverLoader } = core;
+const { externalName } = reverseExports;
+const require = createRequire(import.meta.url);
+
+export interface Options {
+  // when true, imports for other files in the same project will use relative
+  // paths with file extensions. This is the most compatible with modern Node
+  // ESM convensions, but it's not supported by Ember's classic build.
+  relativeLocalPaths?: boolean;
+
+  // file extensions to search when resolving dependencies inside templates
+  extensions?: string[];
+
+  // when true, assume we can use https://github.com/emberjs/rfcs/pull/1046.
+  // Otherwise, assume we're using the ember-route-template addon.
+  nativeRouteTemplates?: boolean;
+
+  // list of globs of the route templates we should convert.
+  routeTemplates?: string[];
+
+  // list of globs of the components we should convert
+  components?: string[];
+
+  // when a .js or .ts file already exists, we necessarily convert to .gjs or
+  // .gts respectively. But when only an .hbs file exists, we have a choice of
+  // default.
+  defaultFormat?: 'gjs' | 'gts';
+
+  // snippet of typescript to use for the type signature of route templates.
+  // Defaults to `{ Args: { model: unknown, controller: unknown } }`
+  routeTemplateSignature?: string;
+
+  // snippet of typescript to use for the type signature of newly-converted
+  // template-only components. Defaults to `{ Args: {} }`
+  templateOnlyComponentSignature?: string;
+
+  templateInsertion?: 'beginning' | 'end';
+}
+
+export function optionsWithDefaults(options?: Options): OptionsWithDefaults {
+  return Object.assign(
+    {
+      relativeLocalPaths: true,
+      extensions: ['.gts', '.gjs', '.ts', '.js', '.hbs'],
+      nativeRouteTemplates: true,
+      routeTemplates: ['app/templates/**/*.hbs'],
+      components: ['app/components/**/*.{js,ts,hbs}'],
+      defaultFormat: 'gjs',
+      routeTemplateSignature: `{ Args: { model: unknown, controller: unknown } }`,
+      templateOnlyComponentSignature: `{ Args: {} }`,
+      templateInsertion: 'beginning',
+    },
+    options
+  );
+}
+
+type OptionsWithDefaults = Required<Options>;
+
+export async function ensurePrebuild() {
+  if (!existsSync('node_modules/.embroider')) {
+    console.log(`Running addon prebuild...`);
+    let { prebuild } = await import('./prebuild.js');
+    await prebuild();
+    console.log(`Completed addon prebuild.`);
+  } else {
+    console.log(`Reusing addon prebuild in node_modules/.embroider`);
+  }
+}
+
+export async function ensureAppSetup() {
+  let pkg: Package;
+  try {
+    pkg = resolverLoader.resolver.packageCache.get(process.cwd());
+  } catch (err) {
+    console.error(`Run template-tag-codemod inside a Ember app.`);
+    process.exit(-1);
+  }
+  if (!pkg.packageJSON.exports) {
+    throw new Error(`must use package.json exports for self-resolvability. Plase add this to package.json:
+
+ "exports": {
+    "./tests/*": "./tests/*",
+    "./*": "./app/*"
+  },
+
+`);
+  }
+}
+
+export async function processRouteTemplates(opts: OptionsWithDefaults) {
+  for (let pattern of opts.routeTemplates) {
+    for (let filename of globSync(pattern)) {
+      await processRouteTemplate(filename, opts);
+    }
+  }
+}
+
+const resolverLoader = new ResolverLoader(process.cwd());
+const resolutions = new Map<string, { type: 'real' } | { type: 'virtual'; content: string }>();
+
+export async function inspectContents(
+  filename: string,
+  isRouteTemplate: boolean,
+  opts: OptionsWithDefaults
+): Promise<{ templateSource: string; scope: MetaResult['scope'] }> {
+  let src = readFileSync(filename, 'utf8');
+  let strictSource = (await transformAsync(hbsToJS(src), {
+    filename,
+    plugins: [
+      [
+        templateCompilation,
+        {
+          targetFormat: 'hbs',
+          transforms: [
+            [
+              require.resolve('@embroider/compat/src/resolver-transform'),
+              {
+                appRoot: process.cwd(),
+                emberVersion: resolverLoader.resolver.options.emberVersion,
+                externalNameHint(name: string) {
+                  return name;
+                },
+              } satisfies ResolverTransformOptions,
+            ],
+            ...(isRouteTemplate ? [routeTemplateTransform()] : []),
+          ],
+        } satisfies EtcOptions,
+      ],
+    ],
+  }))!.code!;
+
+  const meta: ExtractMetaOpts = { result: undefined };
+  await transformAsync(strictSource, {
+    filename,
+    plugins: [[extractMeta, meta]],
+  });
+  if (!meta.result) {
+    throw new Error(`failed to extract metadata while processing ${filename}`);
+  }
+  let { templateSource, scope } = await resolveImports(filename, meta.result, opts);
+  return { templateSource, scope };
+}
+
+export async function processRouteTemplate(filename: string, opts: OptionsWithDefaults): Promise<void> {
+  let { templateSource, scope } = await inspectContents(filename, true, opts);
+
+  let outSource: string[] = [];
+
+  if (opts.nativeRouteTemplates) {
+    if (opts.defaultFormat === 'gts') {
+      outSource.unshift(`import type { TemplateOnlyComponent } from '@ember/component/template-only';`);
+      outSource.push(
+        `export default <template>${templateSource}</template> satisfies TemplateOnlyComponent<${opts.routeTemplateSignature}>`
+      );
+    } else {
+      outSource.push(`<template>${templateSource}</template>`);
+    }
+  } else {
+    scope.set('RouteTemplate', {
+      local: 'RouteTemplate',
+      imported: 'default',
+      module: 'ember-route-template',
+    });
+    if (opts.defaultFormat === 'gts') {
+      outSource.push(
+        `export default RouteTemplate<${opts.routeTemplateSignature}>(<template>${templateSource}</template>)`
+      );
+    } else {
+      outSource.push(`export default RouteTemplate(<template>${templateSource}</template>)`);
+    }
+  }
+
+  outSource.unshift(renderScopeImports(scope));
+
+  writeFileSync(filename.replace(/.hbs$/, '.' + opts.defaultFormat), outSource.join('\n'));
+  unlinkSync(filename);
+  console.log(`route template: ${filename} `);
+}
+
+export async function processComponents(opts: OptionsWithDefaults): Promise<void> {
+  let components = new Set<string>();
+  for (let pattern of opts.components) {
+    for (let filename of globSync(pattern)) {
+      components.add(withoutExtension(filename, opts.extensions));
+    }
+  }
+  for (let component of components) {
+    let presentExtensions = opts.extensions.filter(ext => existsSync(component + ext));
+    if (!presentExtensions.includes('.hbs')) {
+      continue;
+    }
+    let jsExtensions = presentExtensions.filter(ext => ext !== '.hbs');
+    if (jsExtensions.length > 1) {
+      throw new Error(
+        `while processing ${component}, found several files when we expected one: ${jsExtensions.join(', ')}`
+      );
+    }
+    let jsExtension = jsExtensions[0];
+    if (['.gjs', '.gts'].includes(jsExtension)) {
+      throw new Error(`found both hbs and gjs/gts for ${component}, having both is not well-defined.`);
+    }
+    await processComponent(component + '.hbs', jsExtension ? component + jsExtension : undefined, opts);
+  }
+}
+
+async function locateTemplateInsertionPoint(
+  jsSource: string,
+  jsPath: string,
+  opts: OptionsWithDefaults
+): Promise<number> {
+  let result = await parseAsync(jsSource, {
+    filename: jsPath,
+    plugins: [
+      [require.resolve('@babel/plugin-syntax-decorators'), { legacy: true }],
+      require.resolve('@babel/plugin-syntax-typescript'),
+    ],
+  });
+  if (!result) {
+    throw new Error(`unexpected failure to parse ${jsPath} with content\n${jsSource}`);
+  }
+  for (let statement of result.program.body) {
+    if (statement.type === 'ExportDefaultDeclaration') {
+      let dec = statement.declaration;
+      switch (dec.type) {
+        case 'ClassDeclaration':
+        case 'ClassExpression':
+          let loc = dec.body.loc;
+          if (!loc) {
+            throw new Error(`parser is missing source location info`);
+          }
+          if (opts.templateInsertion === 'beginning') {
+            return loc.start.index + 1;
+          } else {
+            return loc.end.index - 1;
+          }
+        default:
+          throw new Error(`unimplemented declaration: ${dec.type}`);
+      }
+    }
+    if (statement.type === 'ExportNamedDeclaration') {
+      throw new Error(`unimplemented`);
+    }
+  }
+  throw new Error(`found no export default in ${jsPath}`);
+}
+
+export async function processComponent(
+  hbsPath: string,
+  jsPath: string | undefined,
+  opts: OptionsWithDefaults
+): Promise<void> {
+  let { templateSource, scope } = await inspectContents(hbsPath, false, opts);
+
+  if (jsPath) {
+    let src = await renderJsComponent(templateSource, scope, jsPath, opts);
+    let outExt = jsPath.endsWith('.ts') ? '.gts' : '.gjs';
+    writeFileSync(hbsPath.replace(/.hbs$/, outExt), src);
+    unlinkSync(hbsPath);
+    unlinkSync(jsPath);
+  } else {
+    writeFileSync(
+      hbsPath.replace(/.hbs$/, '.' + opts.defaultFormat),
+      renderHbsOnlyComponent(templateSource, scope, opts)
+    );
+    unlinkSync(hbsPath);
+  }
+  console.log(`component: ${hbsPath}`);
+}
+
+async function renderJsComponent(
+  templateSource: string,
+  scope: MetaResult['scope'],
+  jsPath: string,
+  opts: OptionsWithDefaults
+): Promise<string> {
+  let jsSource = readFileSync(jsPath, 'utf8');
+  let offset = await locateTemplateInsertionPoint(jsSource, jsPath, opts);
+  let outSource: string[] = [];
+  outSource.push(jsSource.slice(0, offset));
+  outSource.push(`<template>${templateSource}</template>`);
+  outSource.push(jsSource.slice(offset));
+  outSource.unshift(renderScopeImports(scope));
+  return outSource.join('\n');
+}
+
+function renderHbsOnlyComponent(templateSource: string, scope: MetaResult['scope'], opts: OptionsWithDefaults): string {
+  let outSource: string[] = [];
+  if (opts.defaultFormat === 'gts') {
+    outSource.unshift(`import type { TemplateOnlyComponent } from '@ember/component/template-only';`);
+    outSource.push(
+      `export default <template>${templateSource}</template> satisfies TemplateOnlyComponent<${opts.templateOnlyComponentSignature}>`
+    );
+  } else {
+    outSource.push(`<template>${templateSource}</template>`);
+  }
+  outSource.unshift(renderScopeImports(scope));
+  return outSource.join('\n');
+}
+
+function load(filename: string): string {
+  let resolution = resolutions.get(filename);
+  if (!resolution) {
+    throw new Error(`${filename} was not resolved by us`);
+  }
+  if (resolution.type === 'real') {
+    return readFileSync(filename, 'utf8');
+  } else {
+    return resolution.content;
+  }
+}
+
+function isDefaultReexport(statement: types.Statement): statement is types.ExportNamedDeclaration {
+  if (statement.type !== 'ExportNamedDeclaration') {
+    return false;
+  }
+  for (let specifier of statement.specifiers) {
+    if (specifier.type === 'ExportSpecifier') {
+      if (
+        specifier.local.type === 'Identifier' &&
+        specifier.local.name === 'default' &&
+        specifier.exported.type === 'Identifier' &&
+        specifier.exported.name === 'default'
+      ) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+function withoutExtension(name: string, extensions: string[]): string {
+  let matched = extensions.find(ext => name.endsWith(ext));
+  if (matched) {
+    return name.slice(0, -1 * matched.length);
+  }
+  return name;
+}
+
+async function chooseImport(
+  fromFile: string,
+  targetFile: string,
+  importedModule: string,
+  importedName: string,
+  opts: OptionsWithDefaults
+): Promise<string> {
+  if (!importedModule.startsWith('@embroider/virtual')) {
+    return importedModule;
+  }
+  let pkg = resolverLoader.resolver.packageCache.ownerOfFile(targetFile);
+  if (!pkg) {
+    throw new Error(`Unexpected unowned file ${targetFile}`);
+  }
+
+  let importingPkg = resolverLoader.resolver.packageCache.ownerOfFile(fromFile);
+  if (!importingPkg) {
+    throw new Error(`Unexpected unowned file ${fromFile}`);
+  }
+  if (importingPkg === pkg) {
+    if (opts.relativeLocalPaths) {
+      return explicitRelative(dirname(fromFile), targetFile);
+    } else {
+      let external = externalName(pkg.packageJSON, explicitRelative(pkg.root, targetFile));
+      if (!external) {
+        throw new Error(`Found no publicly accessible name for ${targetFile} in package ${pkg.name}`);
+      }
+      return withoutExtension(external, opts.extensions);
+    }
+  }
+
+  // Look into javascript files that came from addons to attempt to skip over
+  // the classical "app tree reexport" path.
+  if (targetFile.endsWith('.js') && importedName === 'default') {
+    let match = resolverLoader.resolver.reverseSearchAppTree(pkg, targetFile);
+    if (match) {
+      // this file is in an addon's app tree. Check whether it is just a
+      // reexport.
+      let content = load(targetFile);
+      let result = await parseAsync(content, { filename: targetFile });
+      if (!result) {
+        throw new Error(`unexpected failure to parse ${targetFile} with content\n${content}`);
+      }
+      let statement = result.program.body.find(isDefaultReexport);
+      if (statement && statement.source) {
+        return statement.source.value;
+      }
+    }
+  }
+
+  let external = externalName(pkg.packageJSON, explicitRelative(pkg.root, targetFile));
+  if (!external) {
+    throw new Error(`Found no publicly accessible name for ${targetFile} in package ${pkg.name}`);
+  }
+  return external;
+}
+
+async function resolveImports(filename: string, result: MetaResult, opts: OptionsWithDefaults): Promise<MetaResult> {
+  let resolvedScope: MetaResult['scope'] = new Map();
+
+  for (let [templateName, { local, imported, module }] of result.scope) {
+    let resolution = await resolverLoader.resolver.nodeResolve(module, filename, {
+      extensions: opts.extensions,
+    });
+    let resolvedModule: string;
+    if (resolution.type === 'not_found') {
+      throw new Error(`Unable to resolve ${module} from ${filename}`);
+    } else {
+      resolutions.set(resolution.filename, resolution);
+      resolvedModule = await chooseImport(filename, resolution.filename, module, imported, opts);
+    }
+    resolvedScope.set(templateName, {
+      local,
+      imported,
+      module: resolvedModule,
+    });
+  }
+
+  return {
+    templateSource: result.templateSource,
+    scope: resolvedScope,
+  };
+}
+
+function renderScopeImports(scope: MetaResult['scope']) {
+  let modules = new Map<string, Map<string, string>>();
+  for (let entry of scope.values()) {
+    let module = modules.get(entry.module);
+    if (!module) {
+      module = new Map();
+      modules.set(entry.module, module);
+    }
+    module.set(entry.local, entry.imported);
+  }
+  return [...modules]
+    .sort()
+    .map(([module, names]) => {
+      let sections: string[] = [];
+      let entries = [...names.entries()];
+
+      let def = entries.find(e => e[1] === 'default');
+      if (def) {
+        sections.push(def[0]);
+      }
+
+      let named = entries.filter(e => e[1] !== 'default');
+      if (named.length > 0) {
+        sections.push(
+          '{' +
+            named
+              .map(([local, imported]) => {
+                if (local === imported) {
+                  return imported;
+                } else {
+                  return `${imported} as ${local}`;
+                }
+              })
+              .join(',') +
+            '}'
+        );
+      }
+
+      return `import ${sections.join(',')} from "${module}";`;
+    })
+    .join('\n');
+}
+
+export async function run(partialOpts: Options) {
+  let opts = optionsWithDefaults(partialOpts);
+  await ensureAppSetup();
+  await ensurePrebuild();
+  await processRouteTemplates(opts);
+  await processComponents(opts);
+}
diff --git a/packages/template-tag-codemod/src/prebuild.ts b/packages/template-tag-codemod/src/prebuild.ts
new file mode 100644
index 000000000..cb53ce708
--- /dev/null
+++ b/packages/template-tag-codemod/src/prebuild.ts
@@ -0,0 +1,37 @@
+import { readFileSync } from 'fs';
+import { createRequire } from 'node:module';
+import { join } from 'path';
+import broccoli from 'broccoli';
+const require = createRequire(import.meta.url);
+
+const EmberApp = require('ember-cli/lib/broccoli/ember-app.js');
+const Project = require('ember-cli/lib/models/project.js');
+const CLI = require('ember-cli/lib/cli/cli.js');
+const Compat = require('@embroider/compat');
+
+export async function prebuild() {
+  const root = process.cwd();
+  const pkg = JSON.parse(readFileSync(join(root, 'package.json'), 'utf8'));
+
+  const UI = require('console-ui');
+  let ui = new UI({
+    inputStream: process.stdin,
+    outputStream: process.stdout,
+  });
+
+  let cli = new CLI({
+    ui,
+    testing: true,
+    name: 'ember',
+    disableDependencyChecker: true,
+    root,
+    npmPackage: 'ember-cli',
+    initInstrumentation: undefined,
+  });
+
+  let project = new Project(root, pkg, ui, cli);
+  let app = new EmberApp({ project });
+  let builder = new broccoli.Builder(Compat.prebuild(app));
+
+  await builder.build();
+}
diff --git a/packages/template-tag-codemod/src/route-template-transform.ts b/packages/template-tag-codemod/src/route-template-transform.ts
new file mode 100644
index 000000000..5df1117b5
--- /dev/null
+++ b/packages/template-tag-codemod/src/route-template-transform.ts
@@ -0,0 +1,17 @@
+import type { ASTPluginBuilder } from '@glimmer/syntax';
+
+export function routeTemplateTransform(): ASTPluginBuilder {
+  const transform: ASTPluginBuilder = ({ syntax: { builders } }) => {
+    return {
+      name: 'template-tag-codemod-route-template',
+      visitor: {
+        PathExpression(node) {
+          if (node.head.type === 'ThisHead') {
+            return builders.path(`@controller.${node.tail.join('.')}`);
+          }
+        },
+      },
+    };
+  };
+  return transform;
+}
diff --git a/packages/template-tag-codemod/tsconfig.json b/packages/template-tag-codemod/tsconfig.json
new file mode 100644
index 000000000..820cf7065
--- /dev/null
+++ b/packages/template-tag-codemod/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "include": [
+    "src/**/*.ts",
+  ],
+  "compilerOptions": {
+    "composite": true,
+    "target": "es2020",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "declaration": true,
+    "typeRoots": ["types", "node_modules/@types"],
+    "esModuleInterop": false,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "sourceMap": true,
+    "inlineSources": true,
+    "experimentalDecorators": true,
+    "allowUnreachableCode": false,
+    "strict": true,
+    "skipLibCheck": true,
+    "useUnknownInCatchVariables": false,
+  },
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 93af31d4f..247640244 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -800,6 +800,64 @@ importers:
         specifier: ^5.4.5
         version: 5.7.2
 
+  packages/template-tag-codemod:
+    dependencies:
+      '@babel/core':
+        specifier: ^7.26.0
+        version: 7.26.0
+      '@babel/plugin-syntax-decorators':
+        specifier: ^7.25.9
+        version: 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-syntax-typescript':
+        specifier: ^7.25.9
+        version: 7.25.9(@babel/core@7.26.0)
+      '@embroider/compat':
+        specifier: workspace:^*
+        version: link:../compat
+      '@embroider/core':
+        specifier: workspace:^*
+        version: link:../core
+      '@embroider/reverse-exports':
+        specifier: workspace:^*
+        version: link:../reverse-exports
+      '@types/babel__core':
+        specifier: ^7.20.5
+        version: 7.20.5
+      '@types/yargs':
+        specifier: ^17.0.3
+        version: 17.0.33
+      babel-plugin-ember-template-compilation:
+        specifier: ^2.3.0
+        version: 2.3.0
+      broccoli:
+        specifier: ^3.5.2
+        version: 3.5.2
+      console-ui:
+        specifier: ^3.1.2
+        version: 3.1.2
+      ember-cli:
+        specifier: ^6.0.1
+        version: 6.0.1
+      glob:
+        specifier: ^11.0.0
+        version: 11.0.0
+      yargs:
+        specifier: ^17.0.1
+        version: 17.7.2
+    devDependencies:
+      '@glimmer/syntax':
+        specifier: ^0.84.3
+        version: 0.84.3
+      '@types/glob':
+        specifier: ^8.1.0
+        version: 8.1.0
+      '@types/node':
+        specifier: ^22.9.3
+        version: 22.9.3
+      typescript:
+        specifier: ^5.4.5
+        version: 5.7.2
+
   packages/test-setup:
     dependencies:
       broccoli-plugin:
@@ -7115,7 +7173,6 @@ packages:
   /@inquirer/figures@1.0.8:
     resolution: {integrity: sha512-tKd+jsmhq21AP1LhexC0pPwsCxEhGgAkg28byjJAd+xhmIs8LUX8JbUc3vBf3PhLxWiB5EvyBE5X7JSPAqMAqg==}
     engines: {node: '>=18'}
-    dev: true
 
   /@isaacs/cliui@8.0.2:
     resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
@@ -7127,7 +7184,6 @@ packages:
       strip-ansi-cjs: /strip-ansi@6.0.1
       wrap-ansi: 8.1.0
       wrap-ansi-cjs: /wrap-ansi@7.0.0
-    dev: true
 
   /@istanbuljs/load-nyc-config@1.1.0:
     resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==}
@@ -7706,7 +7762,6 @@ packages:
   /@pnpm/constants@7.1.1:
     resolution: {integrity: sha512-31pZqMtjwV+Vaq7MaPrT1EoDFSYwye3dp6BiHIGRJmVThCQwySRKM7hCvqqI94epNkqFAAYoWrNynWoRYosGdw==}
     engines: {node: '>=16.14'}
-    dev: true
 
   /@pnpm/constants@8.0.0:
     resolution: {integrity: sha512-yQosGUvYPpAjb1jOFcdbwekRjZRVxN6C0hHzfRCZrMKbxGjt/E0g0RcFlEDNVZ95tm4oMMcr7nEPa7H7LX3emw==}
@@ -7775,7 +7830,6 @@ packages:
     engines: {node: '>=16.14'}
     dependencies:
       '@pnpm/constants': 7.1.1
-    dev: true
 
   /@pnpm/error@6.0.1:
     resolution: {integrity: sha512-7yjO0RgmWYb4OKgcWC33yD4Z2CxE7Tm7vXX1SmS7GDifDT/bgZZhHeS2xq/+W6y9yhwIrRSA+7AlQL1NM2wIvw==}
@@ -7803,7 +7857,6 @@ packages:
     dependencies:
       '@pnpm/error': 5.0.3
       find-up: 5.0.0
-    dev: true
 
   /@pnpm/find-workspace-dir@7.0.2:
     resolution: {integrity: sha512-BAcRbWXNBeA9ur+d/ccO2dvxogHr6+6qtiM1AgXzJ6gSfNqJRb6tzgRDgIJGouve9s2P6Qsqr4TbFOltEKuLJg==}
@@ -8353,26 +8406,22 @@ packages:
       '@types/babel__generator': 7.6.8
       '@types/babel__template': 7.4.4
       '@types/babel__traverse': 7.20.6
-    dev: true
 
   /@types/babel__generator@7.6.8:
     resolution: {integrity: sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==}
     dependencies:
       '@babel/types': 7.26.0
-    dev: true
 
   /@types/babel__template@7.4.4:
     resolution: {integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==}
     dependencies:
       '@babel/parser': 7.26.2
       '@babel/types': 7.26.0
-    dev: true
 
   /@types/babel__traverse@7.20.6:
     resolution: {integrity: sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==}
     dependencies:
       '@babel/types': 7.26.0
-    dev: true
 
   /@types/babylon@6.16.9:
     resolution: {integrity: sha512-sEKyxMVEowhcr8WLfN0jJYe4gS4Z9KC2DGz0vqfC7+MXFbmvOF7jSjALC77thvAO2TLgFUPa9vDeOak+AcUrZA==}
@@ -9244,7 +9293,6 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       type-fest: 0.21.3
-    dev: true
 
   /ansi-html@0.0.7:
     resolution: {integrity: sha512-JoAxEa1DfP9m2xfB/y2r/aKcwXNlltr4+0QSBC4TrLfcxyvepX2Pv0t/xpgGV5bGsDzCYV8SzjWgyCW0T9yYbA==}
@@ -9270,7 +9318,6 @@ packages:
   /ansi-regex@6.1.0:
     resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==}
     engines: {node: '>=12'}
-    dev: true
 
   /ansi-split@1.0.1:
     resolution: {integrity: sha512-RRxQym4DFtDNmHIkW6aeFVvrXURb11lGAEPXNiryjCe8bK8RsANjzJ0M2aGOkvBYwP4Bl/xZ8ijtr6D3j1x/eg==}
@@ -9300,7 +9347,6 @@ packages:
   /ansi-styles@6.2.1:
     resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
     engines: {node: '>=12'}
-    dev: true
 
   /ansi-to-html@0.6.15:
     resolution: {integrity: sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ==}
@@ -9330,7 +9376,6 @@ packages:
     dependencies:
       normalize-path: 3.0.0
       picomatch: 2.3.1
-    dev: true
 
   /aproba@2.0.0:
     resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==}
@@ -10326,7 +10371,6 @@ packages:
       prettier: 2.8.8
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /babel-runtime@6.26.0:
     resolution: {integrity: sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==}
@@ -10393,7 +10437,6 @@ packages:
 
   /base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
-    dev: true
 
   /base64id@2.0.0:
     resolution: {integrity: sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==}
@@ -10455,7 +10498,6 @@ packages:
       buffer: 5.7.1
       inherits: 2.0.4
       readable-stream: 3.6.2
-    dev: true
 
   /blank-object@1.0.2:
     resolution: {integrity: sha512-kXQ19Xhoghiyw66CUiGypnuRpWlbHAzY/+NyvqTEdTfhfQGH1/dbEMYiXju7fYKIFePpzp/y9dsu5Cu/PkmawQ==}
@@ -11242,7 +11284,6 @@ packages:
     dependencies:
       base64-js: 1.5.1
       ieee754: 1.2.1
-    dev: true
 
   /builtin-modules@3.3.0:
     resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==}
@@ -11536,7 +11577,6 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       restore-cursor: 3.1.0
-    dev: true
 
   /cli-highlight@2.1.11:
     resolution: {integrity: sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==}
@@ -11588,7 +11628,6 @@ packages:
   /cli-width@4.1.0:
     resolution: {integrity: sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==}
     engines: {node: '>= 12'}
-    dev: true
 
   /cliui@7.0.4:
     resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
@@ -12628,7 +12667,6 @@ packages:
 
   /eastasianwidth@0.2.0:
     resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
-    dev: true
 
   /editions@1.3.4:
     resolution: {integrity: sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==}
@@ -13184,7 +13222,6 @@ packages:
       debug: 4.3.7(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /ember-cli-sri@2.1.1:
     resolution: {integrity: sha512-YG/lojDxkur9Bnskt7xB6gUOtJ6aPl/+JyGYm9HNDk3GECVHB3SMN3rlGhDKHa1ndS5NK2W2TSLb9bzRbGlMdg==}
@@ -15013,7 +15050,6 @@ packages:
       - velocityjs
       - walrus
       - whiskers
-    dev: true
 
   /ember-cli@6.1.0-beta.0:
     resolution: {integrity: sha512-shUq0TjJxlN7vjWUlwTR+H3rLkbqp5GLocMPtFsFP5J3+r8Ug/H/Cq81SN+rEEYbXy+WTMGoEoCPNtcUBIG2AA==}
@@ -16999,7 +17035,6 @@ packages:
 
   /emoji-regex@9.2.2:
     resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
-    dev: true
 
   /emojis-list@3.0.0:
     resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==}
@@ -17079,7 +17114,6 @@ packages:
   /entities@3.0.1:
     resolution: {integrity: sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==}
     engines: {node: '>=0.12'}
-    dev: true
 
   /entities@4.5.0:
     resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
@@ -18214,7 +18248,6 @@ packages:
   /filesize@10.1.6:
     resolution: {integrity: sha512-sJslQKU2uM33qH5nqewAwVB2QgR6w1aMNsYUp3aN5rMRyXEwJGmZvaWzeJFNTOXWlHQyBFCWrdj3fV/fsTOX8w==}
     engines: {node: '>= 10.4.0'}
-    dev: true
 
   /filesize@6.4.0:
     resolution: {integrity: sha512-mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ==}
@@ -18511,7 +18544,6 @@ packages:
     dependencies:
       cross-spawn: 7.0.6
       signal-exit: 4.1.0
-    dev: true
 
   /form-data@4.0.1:
     resolution: {integrity: sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==}
@@ -18575,7 +18607,6 @@ packages:
       graceful-fs: 4.2.11
       jsonfile: 6.1.0
       universalify: 2.0.1
-    dev: true
 
   /fs-extra@3.0.1:
     resolution: {integrity: sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg==}
@@ -18860,6 +18891,19 @@ packages:
       path-scurry: 1.11.1
     dev: true
 
+  /glob@11.0.0:
+    resolution: {integrity: sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==}
+    engines: {node: 20 || >=22}
+    hasBin: true
+    dependencies:
+      foreground-child: 3.3.0
+      jackspeak: 4.0.2
+      minimatch: 10.0.1
+      minipass: 7.1.2
+      package-json-from-dist: 1.0.1
+      path-scurry: 2.0.0
+    dev: false
+
   /glob@5.0.15:
     resolution: {integrity: sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==}
     deprecated: Glob versions prior to v9 are no longer supported
@@ -19250,7 +19294,6 @@ packages:
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
       lru-cache: 7.18.3
-    dev: true
 
   /hosted-git-info@7.0.2:
     resolution: {integrity: sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==}
@@ -19422,7 +19465,6 @@ packages:
 
   /ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
-    dev: true
 
   /ignore-walk@5.0.1:
     resolution: {integrity: sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==}
@@ -19622,7 +19664,6 @@ packages:
       strip-ansi: 6.0.1
       wrap-ansi: 6.2.0
       yoctocolors-cjs: 2.1.2
-    dev: true
 
   /internal-slot@1.0.7:
     resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
@@ -19648,7 +19689,6 @@ packages:
   /invert-kv@3.0.1:
     resolution: {integrity: sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw==}
     engines: {node: '>=8'}
-    dev: true
 
   /ip-address@9.0.5:
     resolution: {integrity: sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==}
@@ -19817,7 +19857,6 @@ packages:
   /is-interactive@1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
-    dev: true
 
   /is-lambda@1.0.1:
     resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==}
@@ -19830,7 +19869,6 @@ packages:
     resolution: {integrity: sha512-zJdQ3QTeLye+iphMeK3wks+vXSRFKh68/Pnlw7aOfApFSEIOhYa8P9vwwa6QrImNNBMJTiL1PpYF0f4BxDuEgA==}
     dependencies:
       '@babel/runtime': 7.26.0
-    dev: true
 
   /is-map@2.0.3:
     resolution: {integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==}
@@ -19962,7 +20000,6 @@ packages:
   /is-unicode-supported@0.1.0:
     resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
     engines: {node: '>=10'}
-    dev: true
 
   /is-weakmap@2.0.2:
     resolution: {integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==}
@@ -20006,7 +20043,6 @@ packages:
   /isbinaryfile@5.0.4:
     resolution: {integrity: sha512-YKBKVkKhty7s8rxddb40oOkuP0NbaeXrQvLin6QMHL7Ypiy2RW9LwOVrVgZRyOrhQlayMd9t+D8yDy8MKFTSDQ==}
     engines: {node: '>= 18.0.0'}
-    dev: true
 
   /isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
@@ -20116,6 +20152,13 @@ packages:
       '@pkgjs/parseargs': 0.11.0
     dev: true
 
+  /jackspeak@4.0.2:
+    resolution: {integrity: sha512-bZsjR/iRjl1Nk1UkjGpAzLNfQtzuijhn2g+pbZb98HQ1Gk8vM9hfbxeMBP+M2/UUdwj0RqGG3mlvk2MsAqwvEw==}
+    engines: {node: 20 || >=22}
+    dependencies:
+      '@isaacs/cliui': 8.0.2
+    dev: false
+
   /jest-changed-files@29.7.0:
     resolution: {integrity: sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -20822,7 +20865,6 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       invert-kv: 3.0.1
-    dev: true
 
   /leek@0.0.24:
     resolution: {integrity: sha1-5ADlfw5g2O8r1NBo3EKKVDRdvNo=}
@@ -20869,7 +20911,6 @@ packages:
     resolution: {integrity: sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==}
     dependencies:
       uc.micro: 1.0.6
-    dev: true
 
   /livereload-js@3.4.1:
     resolution: {integrity: sha512-5MP0uUeVCec89ZbNOT/i97Mc+q3SxXmiUGhRFOTmhrGPn//uWVQdCvcLJDy64MSBR5MidFdOR7B9viumoavy6g==}
@@ -21065,7 +21106,6 @@ packages:
     dependencies:
       chalk: 4.1.2
       is-unicode-supported: 0.1.0
-    dev: true
 
   /loose-envify@1.4.0:
     resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
@@ -21098,6 +21138,11 @@ packages:
     resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
     dev: true
 
+  /lru-cache@11.0.2:
+    resolution: {integrity: sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==}
+    engines: {node: 20 || >=22}
+    dev: false
+
   /lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
     dependencies:
@@ -21112,7 +21157,6 @@ packages:
   /lru-cache@7.18.3:
     resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==}
     engines: {node: '>=12'}
-    dev: true
 
   /magic-string@0.25.9:
     resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==}
@@ -21216,7 +21260,6 @@ packages:
       cli-table: 0.3.11
       lodash.merge: 4.6.2
       markdown-it: 13.0.2
-    dev: true
 
   /markdown-it@12.3.2:
     resolution: {integrity: sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==}
@@ -21237,7 +21280,6 @@ packages:
       linkify-it: 4.0.1
       mdurl: 1.0.1
       uc.micro: 1.0.6
-    dev: true
 
   /markdown-it@8.4.2:
     resolution: {integrity: sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==}
@@ -21306,7 +21348,6 @@ packages:
       map-age-cleaner: 0.1.3
       mimic-fn: 2.1.0
       p-is-promise: 2.1.0
-    dev: true
 
   /mem@8.1.1:
     resolution: {integrity: sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==}
@@ -21470,6 +21511,13 @@ packages:
       tapable: 2.2.1
       webpack: 5.96.1
 
+  /minimatch@10.0.1:
+    resolution: {integrity: sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==}
+    engines: {node: 20 || >=22}
+    dependencies:
+      brace-expansion: 2.0.1
+    dev: false
+
   /minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
     dependencies:
@@ -21486,7 +21534,6 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       brace-expansion: 2.0.1
-    dev: true
 
   /minimatch@8.0.4:
     resolution: {integrity: sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==}
@@ -21582,7 +21629,6 @@ packages:
   /minipass@7.1.2:
     resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
     engines: {node: '>=16 || 14 >=14.17'}
-    dev: true
 
   /minizlib@2.1.2:
     resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
@@ -21670,7 +21716,6 @@ packages:
   /mute-stream@1.0.0:
     resolution: {integrity: sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dev: true
 
   /mz@2.7.0:
     resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
@@ -21872,7 +21917,6 @@ packages:
       proc-log: 3.0.0
       semver: 7.6.3
       validate-npm-package-name: 5.0.1
-    dev: true
 
   /npm-package-arg@11.0.3:
     resolution: {integrity: sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==}
@@ -22154,7 +22198,6 @@ packages:
       log-symbols: 4.1.0
       strip-ansi: 6.0.1
       wcwidth: 1.0.1
-    dev: true
 
   /os-homedir@1.0.2:
     resolution: {integrity: sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==}
@@ -22167,7 +22210,6 @@ packages:
       execa: 4.1.0
       lcid: 3.1.1
       mem: 5.1.1
-    dev: true
 
   /os-tmpdir@1.0.2:
     resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
@@ -22220,7 +22262,6 @@ packages:
   /p-is-promise@2.1.0:
     resolution: {integrity: sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==}
     engines: {node: '>=6'}
-    dev: true
 
   /p-limit@1.3.0:
     resolution: {integrity: sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==}
@@ -22311,7 +22352,6 @@ packages:
 
   /package-json-from-dist@1.0.1:
     resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
-    dev: true
 
   /package-json@10.0.1:
     resolution: {integrity: sha512-ua1L4OgXSBdsu1FPb7F3tYH0F48a6kxvod4pLUlGY9COeJAJQNX/sNH2IiEmsxw7lqYiAwrdHMjz1FctOsyDQg==}
@@ -22459,6 +22499,14 @@ packages:
       minipass: 7.1.2
     dev: true
 
+  /path-scurry@2.0.0:
+    resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==}
+    engines: {node: 20 || >=22}
+    dependencies:
+      lru-cache: 11.0.2
+      minipass: 7.1.2
+    dev: false
+
   /path-temp@2.1.0:
     resolution: {integrity: sha512-cMMJTAZlion/RWRRC48UbrDymEIt+/YSD/l8NqjneyDw2rDOBQcP5yRkMB4CYGn47KMhZvbblBP7Z79OsMw72w==}
     engines: {node: '>=8.15'}
@@ -22708,7 +22756,6 @@ packages:
   /proc-log@3.0.0:
     resolution: {integrity: sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dev: true
 
   /proc-log@4.2.0:
     resolution: {integrity: sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==}
@@ -22825,7 +22872,6 @@ packages:
     engines: {node: '>=0.6.0', teleport: '>=0.2.0'}
     deprecated: |-
       You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.
-
       (For a CapTP with native promises, see @endo/eventual-send and @endo/captp)
     dev: true
 
@@ -23374,7 +23420,6 @@ packages:
     dependencies:
       onetime: 5.1.2
       signal-exit: 3.0.7
-    dev: true
 
   /ret@0.1.15:
     resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
@@ -23505,7 +23550,6 @@ packages:
   /run-async@3.0.0:
     resolution: {integrity: sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==}
     engines: {node: '>=0.12.0'}
-    dev: true
 
   /run-parallel@1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
@@ -23575,7 +23619,6 @@ packages:
   /safe-stable-stringify@2.5.0:
     resolution: {integrity: sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==}
     engines: {node: '>=10'}
-    dev: true
 
   /safer-buffer@2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
@@ -23612,7 +23655,6 @@ packages:
       micromatch: 4.0.8
       minimist: 1.2.8
       walker: 1.0.8
-    dev: true
 
   /sax@1.2.4:
     resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==}
@@ -24200,7 +24242,6 @@ packages:
       eastasianwidth: 0.2.0
       emoji-regex: 9.2.2
       strip-ansi: 7.1.0
-    dev: true
 
   /string.prototype.matchall@4.0.11:
     resolution: {integrity: sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==}
@@ -24296,7 +24337,6 @@ packages:
     engines: {node: '>=12'}
     dependencies:
       ansi-regex: 6.1.0
-    dev: true
 
   /strip-bom@3.0.0:
     resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
@@ -25064,7 +25104,6 @@ packages:
   /type-fest@0.21.3:
     resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
     engines: {node: '>=10'}
-    dev: true
 
   /type-fest@0.6.0:
     resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
@@ -25384,7 +25423,6 @@ packages:
   /validate-npm-package-name@5.0.1:
     resolution: {integrity: sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dev: true
 
   /validate-npm-package-name@6.0.0:
     resolution: {integrity: sha512-d7KLgL1LD3U3fgnvWEY1cQXoO/q6EQ1BSz48Sa149V/5zVTAbgmZIpyI8TRi6U9/JNyeYLlTKsEMPtLC27RFUg==}
@@ -25771,7 +25809,6 @@ packages:
       ansi-styles: 4.3.0
       string-width: 4.2.3
       strip-ansi: 6.0.1
-    dev: true
 
   /wrap-ansi@7.0.0:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
@@ -25788,7 +25825,6 @@ packages:
       ansi-styles: 6.2.1
       string-width: 5.1.2
       strip-ansi: 7.1.0
-    dev: true
 
   /wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
@@ -25931,4 +25967,3 @@ packages:
   /yoctocolors-cjs@2.1.2:
     resolution: {integrity: sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==}
     engines: {node: '>=18'}
-    dev: true
diff --git a/tests/scenarios/compat-resolver-test.ts b/tests/scenarios/compat-resolver-test.ts
index 5c48a609b..837368746 100644
--- a/tests/scenarios/compat-resolver-test.ts
+++ b/tests/scenarios/compat-resolver-test.ts
@@ -246,11 +246,11 @@ Scenarios.fromProject(() => new Project())
         await configure({ staticComponents: true });
         expectTranspiled('templates/application.hbs').equalsCode(`
           import { precompileTemplate } from "@ember/template-compilation";
-          import helloWorld_ from "@embroider/virtual/components/hello-world";
-          export default precompileTemplate("<helloWorld_ /><helloWorld_ />", {
+          import HelloWorld_ from "@embroider/virtual/components/hello-world";
+          export default precompileTemplate("<HelloWorld_ /><HelloWorld_ />", {
             moduleName: "my-app/templates/application.hbs",
             scope: () => ({
-              helloWorld_
+              HelloWorld_
             })
           });
         `);
@@ -267,11 +267,11 @@ Scenarios.fromProject(() => new Project())
         });
         expectTranspiled('templates/application.hbs').equalsCode(`
           import { precompileTemplate } from "@ember/template-compilation";
-          import thing_ from "@embroider/virtual/components/thing";
-          export default precompileTemplate("<thing_ @foo={{1}} />", {
+          import Thing_ from "@embroider/virtual/components/thing";
+          export default precompileTemplate("<Thing_ @foo={{1}} />", {
             moduleName: "my-app/templates/application.hbs",
             scope: () => ({
-              thing_
+              Thing_
             })
           });
         `);
@@ -301,11 +301,11 @@ Scenarios.fromProject(() => new Project())
         await configure({ staticComponents: true });
         expectTranspiled('templates/application.hbs').equalsCode(`
           import { precompileTemplate } from "@ember/template-compilation";
-          import helloWorld_ from "@embroider/virtual/components/hello-world";
-          export default precompileTemplate("<helloWorld_ />", {
+          import HelloWorld_ from "@embroider/virtual/components/hello-world";
+          export default precompileTemplate("<HelloWorld_ />", {
             moduleName: "my-app/templates/application.hbs",
             scope: () => ({
-              helloWorld_
+              HelloWorld_
             })
           });
         `);
@@ -318,11 +318,11 @@ Scenarios.fromProject(() => new Project())
         await configure({ staticComponents: true });
         expectTranspiled('templates/application.hbs').equalsCode(`
           import { precompileTemplate } from "@ember/template-compilation";
-          import helloWorld_ from "@embroider/virtual/components/hello/world";
-          export default precompileTemplate("<helloWorld_ />", {
+          import HelloWorld_ from "@embroider/virtual/components/hello/world";
+          export default precompileTemplate("<HelloWorld_ />", {
             moduleName: "my-app/templates/application.hbs",
             scope: () => ({
-              helloWorld_
+              HelloWorld_
             })
           });
         `);
@@ -335,11 +335,11 @@ Scenarios.fromProject(() => new Project())
         await configure({ staticComponents: true });
         expectTranspiled('templates/application.hbs').equalsCode(`
           import { precompileTemplate } from "@ember/template-compilation";
-          import helloWorld_ from "@embroider/virtual/components/hello-world";
-          export default precompileTemplate("<helloWorld_></helloWorld_>", {
+          import HelloWorld_ from "@embroider/virtual/components/hello-world";
+          export default precompileTemplate("<HelloWorld_></HelloWorld_>", {
             moduleName: "my-app/templates/application.hbs",
             scope: () => ({
-              helloWorld_
+              HelloWorld_
             })
           });
         `);
@@ -529,13 +529,13 @@ Scenarios.fromProject(() => new Project())
 
         expectTranspiled('templates/application.hbs').equalsCode(`
           import { precompileTemplate } from "@ember/template-compilation";
-          import helloWorld_ from "@embroider/virtual/components/hello-world";
+          import HelloWorld_ from "@embroider/virtual/components/hello-world";
           import firstTarget_ from "@embroider/virtual/components/first-target";
           import secondTarget_ from "@embroider/virtual/components/second-target";
-          export default precompileTemplate("<helloWorld_ @iAmAComponent={{firstTarget_}} /><helloWorld_ @iAmAComponent={{secondTarget_}} />", {
+          export default precompileTemplate("<HelloWorld_ @iAmAComponent={{firstTarget_}} /><HelloWorld_ @iAmAComponent={{secondTarget_}} />", {
             moduleName: "my-app/templates/application.hbs",
             scope: () => ({
-              helloWorld_,
+              HelloWorld_,
               firstTarget_,
               secondTarget_,
             }),
@@ -1275,11 +1275,11 @@ Scenarios.fromProject(() => new Project())
         );
         expectTranspiled('templates/application.hbs').equalsCode(`
           import { precompileTemplate } from "@ember/template-compilation";
-          import myAddonThing_ from "@embroider/virtual/components/my-addon$thing";
-          export default precompileTemplate("<myAddonThing_ />", {
+          import MyAddonThing_ from "@embroider/virtual/components/my-addon$thing";
+          export default precompileTemplate("<MyAddonThing_ />", {
             moduleName: "my-app/templates/application.hbs",
             scope: () => ({
-              myAddonThing_
+              MyAddonThing_
             })
           });
       `);
@@ -1670,11 +1670,11 @@ Scenarios.fromProject(() => new Project())
         );
         expectTranspiled('templates/application.hbs').equalsCode(`
         import { precompileTemplate } from "@ember/template-compilation";
-        import formBuilder_ from "@embroider/virtual/components/form-builder";
-        export default precompileTemplate("<formBuilder_ as |field|>{{component field}}</formBuilder_>", {
+        import FormBuilder_ from "@embroider/virtual/components/form-builder";
+        export default precompileTemplate("<FormBuilder_ as |field|>{{component field}}</FormBuilder_>", {
           moduleName: "my-app/templates/application.hbs",
           scope: () => ({
-            formBuilder_
+            FormBuilder_
           })
         });
       `);
@@ -1770,12 +1770,12 @@ Scenarios.fromProject(() => new Project())
         );
         expectTranspiled('templates/application.hbs').equalsCode(`
         import { precompileTemplate } from "@ember/template-compilation";
-        import formBuilder_ from "@embroider/virtual/components/form-builder";
+        import FormBuilder_ from "@embroider/virtual/components/form-builder";
         import fancyTitle_ from "@embroider/virtual/components/fancy-title";
-        export default precompileTemplate("<formBuilder_ @title={{fancyTitle_}}></formBuilder_>", {
+        export default precompileTemplate("<FormBuilder_ @title={{fancyTitle_}}></FormBuilder_>", {
           moduleName: "my-app/templates/application.hbs",
           scope: () => ({
-            formBuilder_,
+            FormBuilder_,
             fancyTitle_
           })
         });
@@ -1872,12 +1872,12 @@ Scenarios.fromProject(() => new Project())
         );
         expectTranspiled('templates/application.hbs').equalsCode(`
         import { precompileTemplate } from "@ember/template-compilation";
-        import formBuilder_ from "@embroider/virtual/components/form-builder";
+        import FormBuilder_ from "@embroider/virtual/components/form-builder";
         import fancyTitle_ from "@embroider/virtual/components/fancy-title";
-        export default precompileTemplate("<formBuilder_ @title={{component fancyTitle_}} />", {
+        export default precompileTemplate("<FormBuilder_ @title={{component fancyTitle_}} />", {
           moduleName: "my-app/templates/application.hbs",
           scope: () => ({
-            formBuilder_,
+            FormBuilder_,
             fancyTitle_
           })
         });
@@ -1929,12 +1929,12 @@ Scenarios.fromProject(() => new Project())
         );
         expectTranspiled('components/form-builder.hbs').equalsCode(`
         import { precompileTemplate } from "@ember/template-compilation";
-        import formBuilder_ from "@embroider/virtual/components/form-builder";
+        import FormBuilder_ from "@embroider/virtual/components/form-builder";
         import fancyNavbar_ from "@embroider/virtual/components/fancy-navbar";
-        export default precompileTemplate("\\n        <formBuilder_ @navbar={{component fancyNavbar_}} as |bar|>\\n          {{component bar}}\\n        </formBuilder_>", {
+        export default precompileTemplate("\\n        <FormBuilder_ @navbar={{component fancyNavbar_}} as |bar|>\\n          {{component bar}}\\n        </FormBuilder_>", {
           moduleName: "my-app/components/form-builder.hbs",
           scope: () => ({
-            formBuilder_,
+            FormBuilder_,
             fancyNavbar_
           })
         });
@@ -2027,7 +2027,7 @@ Scenarios.fromProject(() => new Project())
           }
         );
         expectTranspiled('components/form-builder.hbs').failsToTransform(
-          `argument "navbar" to component "formBuilder_" is treated as a component, but the value you're passing is dynamic: this.unknown`
+          `argument "navbar" to component "FormBuilder_" is treated as a component, but the value you're passing is dynamic: this.unknown`
         );
       });