vite: do not optimize dynamic addons

packages/compat/src/v1-addon.ts

@@ -384,8 +384,12 @@ export default class V1Addon {
     );
   }
 
+  hasCustomizedTree(): boolean {
+    return this.customizes(...dynamicTreeHooks);
+  }
+
   hasAnyTrees(): boolean {
-    return Boolean(stockTreeNames.find(name => this.hasStockTree(name))) || this.customizes(...dynamicTreeHooks);
+    return Boolean(stockTreeNames.find(name => this.hasStockTree(name))) || this.hasCustomizedTree();
   }
 
   // we keep all these here to ensure that we always apply the same options to
@@ -557,6 +561,7 @@ export default class V1Addon {
         version: 2,
         'auto-upgraded': true,
         type: 'addon',
+        'is-dynamic': this.hasCustomizedTree(),
       },
       built.staticMeta,
       ...built.dynamicMeta.map(d => d())

packages/shared-internals/src/metadata.ts

@@ -26,6 +26,7 @@ export interface AddonMeta {
   main?: string;
   'order-index'?: number;
   'lazy-engine'?: boolean;
+  'is-dynamic'?: boolean;
 
   'auto-upgraded'?: true;
   'app-js'?: { [appName: string]: Filename };

packages/vite/src/optimize-deps.ts

@@ -1,16 +1,35 @@
 import { esBuildResolver } from './esbuild-resolver';
+import { ResolverLoader } from '@embroider/core';
 
 export interface OptimizeDeps {
   exclude?: string[];
   [key: string]: unknown;
 }
 
 export function optimizeDeps(): OptimizeDeps {
-  return {
-    exclude: ['@embroider/macros'],
+  let resolverLoader = new ResolverLoader(process.cwd());
+
+  const res = {
     extensions: ['.hbs', '.gjs', '.gts'],
     esbuildOptions: {
       plugins: [esBuildResolver()],
     },
   };
+
+  Object.defineProperty(res, 'exclude', {
+    get() {
+      const addons: string[] = [];
+      for (const engine of resolverLoader.resolver.options.engines) {
+        for (const activeAddon of engine.activeAddons) {
+          const pkg = resolverLoader.resolver.packageCache.get(activeAddon.root);
+          if (pkg.isV2Addon() && pkg.meta['is-dynamic']) {
+            addons.push(pkg.name);
+          }
+        }
+      }
+      return ['@embroider/macros', ...addons];
+    },
+  });
+
+  return res;
 }

packages/vite/tests/optimize-deps.test.ts

@@ -17,9 +17,6 @@ describe('optimizeDeps', function () {
             Any<Object>,
           ],
         },
-        "exclude": [
-          "@embroider/macros",
-        ],
         "extensions": [
           ".hbs",
           ".gjs",