From 30bf1a5db5a9d5e11f389d2425f554a92296587e Mon Sep 17 00:00:00 2001
From: patricklx <patricklx@users.noreply.github.com>
Date: Thu, 1 Sep 2022 10:44:20 +0200
Subject: [PATCH 1/2] extend existing EmberENV for ember-inspector

fixes #1251
---
 packages/core/src/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/app.ts b/packages/core/src/app.ts
index de3f0a53b..31926a05c 100644
--- a/packages/core/src/app.ts
+++ b/packages/core/src/app.ts
@@ -290,7 +290,7 @@ export class AppBuilder<TreeNames> {
       result.unshift({
         kind: 'in-memory',
         relativePath: '_ember_env_.js',
-        source: `window.EmberENV=${JSON.stringify(emberENV, null, 2)};`,
+        source: `window.EmberENV=Object.assign(window.EmberENV || {}, ${JSON.stringify(emberENV, null, 2)});`,
       });
 
       result.push({

From 98d82bb34f2e7da83b4ef1edb4a4670fa0e4694b Mon Sep 17 00:00:00 2001
From: patricklx <patricklx@users.noreply.github.com>
Date: Mon, 5 Sep 2022 23:56:02 +0200
Subject: [PATCH 2/2] use spread operator

---
 packages/core/src/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/app.ts b/packages/core/src/app.ts
index 31926a05c..dc76b8972 100644
--- a/packages/core/src/app.ts
+++ b/packages/core/src/app.ts
@@ -290,7 +290,7 @@ export class AppBuilder<TreeNames> {
       result.unshift({
         kind: 'in-memory',
         relativePath: '_ember_env_.js',
-        source: `window.EmberENV=Object.assign(window.EmberENV || {}, ${JSON.stringify(emberENV, null, 2)});`,
+        source: `window.EmberENV={ ...(window.EmberENV || {}), ...${JSON.stringify(emberENV, null, 2)} };`,
       });
 
       result.push({