diff --git a/packages/addon-dev/src/rollup-app-reexports.ts b/packages/addon-dev/src/rollup-app-reexports.ts
index 5010c191c6..b0c9f7cd5f 100644
--- a/packages/addon-dev/src/rollup-app-reexports.ts
+++ b/packages/addon-dev/src/rollup-app-reexports.ts
@@ -13,7 +13,7 @@ export default function appReexports(opts: {
       let pkg = readJsonSync('package.json');
       let appJS: Record<string, string> = {};
       for (let filename of Object.keys(bundle)) {
-        if (opts.include.some((glob) => minimatch(filename, glob))) {
+        if (opts.include.some((glob) => minimatch(filename, glob)) && !minimatch(filename, '**/*.d.ts')) {
           appJS[`./${filename}`] = `./dist/_app_/${filename}`;
           this.emitFile({
             type: 'asset',
diff --git a/packages/addon-dev/src/rollup-public-entrypoints.ts b/packages/addon-dev/src/rollup-public-entrypoints.ts
index d7afb2236e..c7759cb55f 100644
--- a/packages/addon-dev/src/rollup-public-entrypoints.ts
+++ b/packages/addon-dev/src/rollup-public-entrypoints.ts
@@ -2,6 +2,10 @@ import walkSync from 'walk-sync';
 import type { Plugin } from 'rollup';
 import { join } from 'path';
 
+function normalizeFileExt(fileName: string) {
+  return fileName.replace(/\.ts|\.gts|\.gjs$/, '.js')
+}
+
 export default function publicEntrypoints(args: {
   srcDir: string;
   include: string[];
@@ -15,7 +19,7 @@ export default function publicEntrypoints(args: {
         this.emitFile({
           type: 'chunk',
           id: join(args.srcDir, name),
-          fileName: name,
+          fileName: normalizeFileExt(name),
         });
       }
     },