From 9fd2e8bc9b7f0dd8779bec5dc2ea85c12ba87c10 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 12 Aug 2026 18:43:37 -0400
Subject: [PATCH] Remove @glimmer/env from @glimmer/component, because it is
 compiled away

---
 packages/@glimmer/component/package.json  | 11 +++++++----
 packages/@glimmer/component/tsconfig.json |  3 ++-
 pnpm-lock.yaml                            |  3 ---
 rollup.config.mjs                         | 14 ++++++++++----
 tsconfig.json                             |  6 +++++-
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/packages/@glimmer/component/package.json b/packages/@glimmer/component/package.json
index 24e58c7f907..8f21753a69d 100644
--- a/packages/@glimmer/component/package.json
+++ b/packages/@glimmer/component/package.json
@@ -3,8 +3,12 @@
   "version": "2.1.1",
   "description": "Glimmer component library",
   "exports": {
-    ".": "./dist/index.js",
-    "./*": "./*.ts"
+    ".": {
+      "types": "./dist/component/src/index.d.ts",
+      "development": "./dist/dev/index.js",
+      "production": "./dist/prod/index.js",
+      "default": "./dist/prod/index.js"
+    }
   },
   "keywords": [
     "ember-addon"
@@ -18,8 +22,7 @@
   "repository": "https://github.com/emberjs/ember.js",
   "scripts": {},
   "dependencies": {
-    "@embroider/addon-shim": "^1.10.2",
-    "@glimmer/env": "workspace:*"
+    "@embroider/addon-shim": "^1.10.2"
   },
   "devDependencies": {
     "@ember/component": "workspace:*",
diff --git a/packages/@glimmer/component/tsconfig.json b/packages/@glimmer/component/tsconfig.json
index 265793b7582..716feab388e 100644
--- a/packages/@glimmer/component/tsconfig.json
+++ b/packages/@glimmer/component/tsconfig.json
@@ -9,7 +9,8 @@
       "@ember/owner": ["../../../types/stable/@ember/owner/index.d.ts"],
       "@ember/destroyable": ["../../../types/stable/@ember/destroyable/index.d.ts"],
       "@ember/component": ["../../../types/stable/@ember/component/index.d.ts"],
-      "@ember/runloop": ["../../../types/stable/@ember/runloop/index.d.ts"]
+      "@ember/runloop": ["../../../types/stable/@ember/runloop/index.d.ts"],
+      "@glimmer/env": ["../env/index.ts"]
     },
     "target": "esnext",
     "module": "esnext",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8739ac454d6..16dd2028eef 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1572,9 +1572,6 @@ importers:
       '@embroider/addon-shim':
         specifier: ^1.10.2
         version: 1.10.2
-      '@glimmer/env':
-        specifier: workspace:*
-        version: link:../env
     devDependencies:
       '@ember/component':
         specifier: workspace:*
diff --git a/rollup.config.mjs b/rollup.config.mjs
index a677a6510c7..23b639ceceb 100644
--- a/rollup.config.mjs
+++ b/rollup.config.mjs
@@ -27,7 +27,8 @@ const testDependencies = [
 let configs = [
   esmConfig(),
   esmProdConfig(),
-  glimmerComponent(),
+  glimmerComponent({ prod: false }),
+  glimmerComponent({ prod: true }),
   glimmerSyntaxESM(),
   glimmerSyntaxCJS(),
 ];
@@ -168,7 +169,11 @@ function glimmerSyntaxCJS() {
   };
 }
 
-function glimmerComponent() {
+function glimmerComponent({ prod }) {
+  let babelConfig = { ...sharedBabelConfig };
+  let outputDir = prod ? 'dist/prod' : 'dist/dev';
+  let isDebug = !prod;
+
   return {
     onLog: handleRollupWarnings,
     input: {
@@ -176,7 +181,7 @@ function glimmerComponent() {
     },
     output: {
       format: 'es',
-      dir: 'packages/@glimmer/component/dist',
+      dir: `packages/@glimmer/component/${outputDir}`,
       hoistTransitiveImports: false,
       generatedCode: 'es2015',
     },
@@ -185,7 +190,8 @@ function glimmerComponent() {
         babelHelpers: 'bundled',
         extensions: ['.js', '.ts'],
         configFile: false,
-        ...sharedBabelConfig,
+        ...babelConfig,
+        plugins: [...babelConfig.plugins, ...buildDebugMacroPlugin(isDebug)],
       }),
       resolveTS(),
       externalizePackages({ ...exposedDependencies(), ...hiddenDependencies() }),
diff --git a/tsconfig.json b/tsconfig.json
index fb94bf9d432..8f035a792d5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,7 +2,11 @@
   "extends": "./tsconfig/compiler-options.json",
   "compilerOptions": {
     "outDir": "dist",
-    "noEmit": true
+    "noEmit": true,
+    "paths": {
+      // We compile away @glimmer/env during all our builds
+      "@glimmer/env": ["./packages/@glimmer/env/index.ts"]
+    }
   },
   "include": ["packages/**/*.ts"],
   "exclude": ["dist", "node_modules", "tmp", "types"]