From 8c5a01f194693a755d81433290239ccf9f1ce21d Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Tue, 5 Oct 2021 23:08:36 -0500
Subject: [PATCH 1/5] Updates to fix tests

---
 .../integration/components/angle-bracket-invocation-test.js     | 2 +-
 .../glimmer/tests/integration/custom-component-manager-test.js  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
index 34a696ab571..1bb86b5c4c2 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
@@ -9,7 +9,7 @@ import { Component } from '../../utils/helpers';
 
 class CustomModifierManager {
   constructor(owner) {
-    this.capabilities = modifierCapabilities('3.13');
+    this.capabilities = modifierCapabilities('3.22');
     this.owner = owner;
   }
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
index c4d6552f3cd..62e9b576a3b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
@@ -463,6 +463,7 @@ moduleFor(
           return EmberObject.create({
             capabilities: componentCapabilities('3.13', {
               asyncLifecycleCallbacks: true,
+              updateHook: true,
             }),
 
             createComponent(factory, args) {
@@ -668,6 +669,7 @@ moduleFor(
         capabilities: componentCapabilities('3.13', {
           destructor: true,
           asyncLifecycleCallbacks: true,
+          updateHook: true,
         }),
 
         createComponent(factory, args) {

From 3f62037ed588b36e06c9389fbb066a120fb0de91 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Wed, 6 Oct 2021 08:26:29 -0500
Subject: [PATCH 2/5] bump to 0.82 glimmer-vm

---
 package.json |  26 +++---
 yarn.lock    | 252 +++++++++++++++++++++++++--------------------------
 2 files changed, 139 insertions(+), 139 deletions(-)

diff --git a/package.json b/package.json
index 1ce8b0066a7..d2566253918 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "@babel/helper-module-imports": "^7.8.3",
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.81.0",
+    "@glimmer/vm-babel-plugins": "0.82.0",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.4",
@@ -75,19 +75,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.81.0",
-    "@glimmer/destroyable": "0.81.0",
+    "@glimmer/compiler": "0.82.0",
+    "@glimmer/destroyable": "0.82.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.81.0",
-    "@glimmer/interfaces": "0.81.0",
-    "@glimmer/manager": "0.81.0",
-    "@glimmer/node": "0.81.0",
-    "@glimmer/opcode-compiler": "0.81.0",
-    "@glimmer/owner": "0.81.0",
-    "@glimmer/program": "0.81.0",
-    "@glimmer/reference": "0.81.0",
-    "@glimmer/runtime": "0.81.0",
-    "@glimmer/validator": "0.81.0",
+    "@glimmer/global-context": "0.82.0",
+    "@glimmer/interfaces": "0.82.0",
+    "@glimmer/manager": "0.82.0",
+    "@glimmer/node": "0.82.0",
+    "@glimmer/opcode-compiler": "0.82.0",
+    "@glimmer/owner": "0.82.0",
+    "@glimmer/program": "0.82.0",
+    "@glimmer/reference": "0.82.0",
+    "@glimmer/runtime": "0.82.0",
+    "@glimmer/validator": "0.82.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.1",
     "@types/rsvp": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index 7baa2a04b4f..cc0b761742e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1581,52 +1581,52 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.81.0.tgz#3a6cd299ec83f91037a44ef1a3cba63cbefedf8d"
-  integrity sha512-XOZpxUYDnmGZPcCKDv4FFaVKBoOPF7jN9R54eOsadCiDMyEw/8/dh/s0wmbFgVdrf9nwH/LkpB/98h7sCKZ8Fw==
-  dependencies:
-    "@glimmer/interfaces" "0.81.0"
-    "@glimmer/syntax" "0.81.0"
-    "@glimmer/util" "0.81.0"
-    "@glimmer/wire-format" "0.81.0"
+"@glimmer/compiler@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.82.0.tgz#02c8b8224e9614eb9963bc5f1bcf9c1bccdc0888"
+  integrity sha512-4OmIawohbhz8HkIiiB9+G+oUoaSF+PDICV6hr3hF4NMRf16pNQL5ZIdh1iqDcu/tEs3CPRl8ap1F4MvzGndy0w==
+  dependencies:
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/syntax" "0.82.0"
+    "@glimmer/util" "0.82.0"
+    "@glimmer/wire-format" "0.82.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.81.0.tgz#3c3655cfde805865417c4407307193de783bd076"
-  integrity sha512-H8CHflcs7oxlwmhdR3VONXR2GEFoLMKbgkZxoHV3HQ/Pt0hbsrqcV3/o56b/pvzARoUYFIlCA1p+dxEX3qbgsg==
+"@glimmer/destroyable@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.82.0.tgz#6ed8fcadd6196b79080860f0d53200cad24a0854"
+  integrity sha512-wQVFePVx6O0Gqn/vCR+2/64X2G7U9NgPzXLVK1a5gdILBzb64A22c/XoHLvm2nGzOQu7FSlLZSiy0yG7wJ3daA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.81.0"
-    "@glimmer/interfaces" "0.81.0"
-    "@glimmer/util" "0.81.0"
+    "@glimmer/global-context" "0.82.0"
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/util" "0.82.0"
 
-"@glimmer/encoder@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.81.0.tgz#55e1b75a99d72b8ae97ec3ad11fc8632d4f41197"
-  integrity sha512-GJVSMZNmYw83hUwb0DqxBMLdTds37zVnhUE5ro2M/s0+gW/1VvdxjYDbMr7RmRn7B2F2/nEbHqNtGY3CcLuUiw==
+"@glimmer/encoder@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.82.0.tgz#40c9f54a36fb0a983ed18e1afb57922fd29c47dc"
+  integrity sha512-U4GWeZsSf8kuxRFEH7/ozzp8beuWkwLUZQAOKxH8yRi/8P6A4BPEvLZ5BA3rcxr6WP1kY35btp034d2ReIIC9Q==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.81.0"
-    "@glimmer/vm" "0.81.0"
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/vm" "0.82.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.81.0.tgz#eeed96265d8b3c7cd5c3f2c5855ad20a301d56ad"
-  integrity sha512-avKZlDVGG32VtjMltR6xZ0ZR4bvSgcxwh0r0llc5mm4Sxro70kmu59ABWUTXCG7Iqc7vFfPRCwcTGDBy81f/QQ==
+"@glimmer/global-context@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.82.0.tgz#628cf1ed33a8a956d884a462d382bb8923cbe802"
+  integrity sha512-dgm0yOP89ycRZvz8Qs5GE+z51sPvQBpzvnxM6hgFXxqs6dq6q3YU+kgPoh1FLZ2biTvFTamTIfodtQjmlIKT/g==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.81.0.tgz#a2e8fb829d90f531b5c8021e51412002d5e60812"
-  integrity sha512-ZhdQrMLMHaIU0ReWWNo5uKE8c6E3r98ekknSFOzGqDOq1337yBAUE1nQIA1Ao1sipZuo9ug51E6eoS3NskObGg==
+"@glimmer/interfaces@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.82.0.tgz#e3f21e51a421b4c1ee34dcb682c719832f4a36f5"
+  integrity sha512-Cdr2uWSNHBBf2fnm4QjkjHWgxGoT4SdrD+RDQBMwYWSaysqqsXYU3+toOLKFmaMJuyDa28Zeq17lCab7zOg43g==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
@@ -1635,140 +1635,140 @@
   resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
   integrity sha512-0S6TWOOd0fzLLysw1pWZN0TgasaHmYs1Sjz9Til1mTByIXU1S+1rhdyr2veSQPO/aRjPuEQyKXZQHvx23Zax6w==
 
-"@glimmer/manager@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.81.0.tgz#8d0ea015572d7d910311d1973f88c66401f3b676"
-  integrity sha512-1Cr5/8tTr+pVCNWMjq6qw6qgC4pzMbEt96Cyb2F5+2tyc8SmcZC2zTndPSOdaml0zBmo+VRyr33V57XWI9J99A==
+"@glimmer/manager@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.82.0.tgz#a1866c4c5710a489d7ebfdcc70bce21855aae45a"
+  integrity sha512-UpUzN5kjJwjBapFA8lOH3T7hLi0UWYWLZmzAnKE3EpfeP5IlVJnO+UqR/0SKD/RJgjmqOdiE/3AZJJA/EyNnWw==
   dependencies:
-    "@glimmer/destroyable" "0.81.0"
+    "@glimmer/destroyable" "0.82.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.81.0"
-    "@glimmer/reference" "0.81.0"
-    "@glimmer/util" "0.81.0"
-    "@glimmer/validator" "0.81.0"
-
-"@glimmer/node@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.81.0.tgz#f3a24216369fe53a804b2381e3ce9284bacd373e"
-  integrity sha512-prlWB/mxRlCYZzHtwHfa2kgMG93vZhEiEKzgYjY2q4hVjtlIeXCN8ufYAtnAvIfP90A87CK46WeO7F4+LSHskQ==
-  dependencies:
-    "@glimmer/interfaces" "0.81.0"
-    "@glimmer/runtime" "0.81.0"
-    "@glimmer/util" "0.81.0"
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/reference" "0.82.0"
+    "@glimmer/util" "0.82.0"
+    "@glimmer/validator" "0.82.0"
+
+"@glimmer/node@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.82.0.tgz#45d44f87234e49dabcb080f8586e9a6e39f88e4b"
+  integrity sha512-GTEdjaxyfxvWZC3A+a2kWVrnHIk9JEw/5ZQO3zFC14t3NJ9hAy03Rny0alB8SWXlkB+VRisrkKhkipU+67wCqw==
+  dependencies:
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/runtime" "0.82.0"
+    "@glimmer/util" "0.82.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.81.0.tgz#c3c3cf142116691fbe1cc7485b4fafede9ddc6fb"
-  integrity sha512-6aIynVkqZieZ2iphEiNPkR482C5cEcNgUtE2w16ZDBiPFC5O39Sf/QdYylbyhKU0E2I+O6Uw+rj23Uc1dy8v7A==
+"@glimmer/opcode-compiler@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.82.0.tgz#4b7d0565a9d9ee941be104628f5e9afce4dbabc6"
+  integrity sha512-2m0MePmirxSwZWEH6lTWEgtTKTytBy+dpOWM+UzMFKziEgP+7Vc+aacdC9aC0CYkcf47NMJ4ukS8ctUL+Lc7RA==
   dependencies:
-    "@glimmer/encoder" "0.81.0"
+    "@glimmer/encoder" "0.82.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.81.0"
-    "@glimmer/reference" "0.81.0"
-    "@glimmer/util" "0.81.0"
-    "@glimmer/vm" "0.81.0"
-    "@glimmer/wire-format" "0.81.0"
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/reference" "0.82.0"
+    "@glimmer/util" "0.82.0"
+    "@glimmer/vm" "0.82.0"
+    "@glimmer/wire-format" "0.82.0"
 
-"@glimmer/owner@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.81.0.tgz#9d8598ae6a6f2a57ed899d06969dce35f7e840e0"
-  integrity sha512-VXRCMwERvmj7AAIlHxPySNZV3SVfYj/6801c/u4hs/iCE4vadQaH2f9xXAwwNG6+h+mKHfBT6Xi1FiJlwgXYtQ==
+"@glimmer/owner@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.82.0.tgz#4ac384bf52ab9ef1ffcea2e665de07b5701658d8"
+  integrity sha512-cTUWo3DHCP8mwzHhGZ0tBpwq0KQOhpFAPlC3fjmLXBK0f1VwzOtNYP50SAAyux4g4oeWcA3cgbErd67M2db3vA==
   dependencies:
-    "@glimmer/util" "0.81.0"
+    "@glimmer/util" "0.82.0"
 
-"@glimmer/program@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.81.0.tgz#f5c1a4dae91b656dcbc41fd0a5c3621c4272effe"
-  integrity sha512-Y7oxN6rxwyKDqEP2/Rx3ikVBfBUTB5/FhdVeOPS3xgC/7oAF/myukm1XN4RPxS440bpbr35tMr5UXFtBZ8Jpgw==
+"@glimmer/program@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.82.0.tgz#76964390ac42a029d3a9f521a50a58ba8514b2f6"
+  integrity sha512-Md/WTdj9HiodRMOa/1L3wPMImmMKyklWS/mkj4A3A5k6h5rDcM6lvcHfFwikv0RN+mQ0ogRbNio9D5HCFRQS6g==
   dependencies:
-    "@glimmer/encoder" "0.81.0"
+    "@glimmer/encoder" "0.82.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.81.0"
-    "@glimmer/manager" "0.81.0"
-    "@glimmer/opcode-compiler" "0.81.0"
-    "@glimmer/util" "0.81.0"
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/manager" "0.82.0"
+    "@glimmer/opcode-compiler" "0.82.0"
+    "@glimmer/util" "0.82.0"
 
-"@glimmer/reference@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.81.0.tgz#c54d9bd27aaf7373513f07ff440a634b0ac5e6cb"
-  integrity sha512-Lp6EtltOOC362jZWiBdWcecrQ2eGirqyRVQB11Z9+JHUphNBSirmPPBCFej4uKeWVmetWK9tdbe8O6Qo+16PVg==
+"@glimmer/reference@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.82.0.tgz#f688be8272a71b314a023ded83d3d3afeb5b65e9"
+  integrity sha512-bL+nrB+480v8sHpbdHC6vCln+AFdJixlVi3zMu633KWWfPs5869ZiLZOiXnPBNoMK4FkMuaRwpOlke7rAbKPbw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.81.0"
-    "@glimmer/interfaces" "0.81.0"
-    "@glimmer/util" "0.81.0"
-    "@glimmer/validator" "0.81.0"
+    "@glimmer/global-context" "0.82.0"
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/util" "0.82.0"
+    "@glimmer/validator" "0.82.0"
 
-"@glimmer/runtime@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.81.0.tgz#be56596d798af9d54b92a03a62ec96edaebce9e0"
-  integrity sha512-RcibIT7tqTU6mkPCq34209BueCiKHOXk3j2Mhiy/TQ6sHn3nF/WITcr3gv0tI+awOHFAxEzkSHT9ZN9ai+ZVaw==
+"@glimmer/runtime@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.82.0.tgz#9974e91cb38551d523a993684e81775fd68be945"
+  integrity sha512-LXy8lcR4bt/tbcYOfptT2tJrVHUiO5drePqBxccEcFWoSydN/4KbpWkg6ueDCTQrGqy6eyN8u3bWJyySZayJJw==
   dependencies:
-    "@glimmer/destroyable" "0.81.0"
+    "@glimmer/destroyable" "0.82.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.81.0"
-    "@glimmer/interfaces" "0.81.0"
+    "@glimmer/global-context" "0.82.0"
+    "@glimmer/interfaces" "0.82.0"
     "@glimmer/low-level" "0.78.2"
-    "@glimmer/owner" "0.81.0"
-    "@glimmer/program" "0.81.0"
-    "@glimmer/reference" "0.81.0"
-    "@glimmer/util" "0.81.0"
-    "@glimmer/validator" "0.81.0"
-    "@glimmer/vm" "0.81.0"
-    "@glimmer/wire-format" "0.81.0"
+    "@glimmer/owner" "0.82.0"
+    "@glimmer/program" "0.82.0"
+    "@glimmer/reference" "0.82.0"
+    "@glimmer/util" "0.82.0"
+    "@glimmer/validator" "0.82.0"
+    "@glimmer/vm" "0.82.0"
+    "@glimmer/wire-format" "0.82.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.81.0.tgz#8c9b959e06213dfdcd8378dbdc5c3105ae5fb2e8"
-  integrity sha512-96XFYXuhCN8M22yeX1RBahnQuBPVtDFWUr5uqAHAZ/zElpAJxD5cMmx6emjf7c3k2G3Gx8/A/SM2ZuvEcvB18Q==
+"@glimmer/syntax@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.82.0.tgz#b45d932a3c3de83710324a676af49d02a0940cf3"
+  integrity sha512-KjtLyJ0EZLLDMsPOgDtPXClMK1zgi1vNUI3VIk02L6plFV/ACus0YTgkZ/DJZptnHTEAj2Ip9dSUS8otC6pzsg==
   dependencies:
-    "@glimmer/interfaces" "0.81.0"
-    "@glimmer/util" "0.81.0"
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/util" "0.82.0"
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.11"
 
-"@glimmer/util@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.81.0.tgz#2cb45d10a6cbd3d835ee4478608c2909a05bb937"
-  integrity sha512-uheYr2j9T7EKOzKlSIGO/ePeWj0knWebGIm6VJAe5hTKnx5fw0R0iiV6x1whLrbfS/6feVtKTopF4lSN0arELQ==
+"@glimmer/util@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.82.0.tgz#d6ae4985f70343898d4b2297a4b3b1f5feda1934"
+  integrity sha512-/13rKFiFG8P4eXuiwnu0Y5OX0B8DkPI+4M9eH/vWp32WbhEngKwtYpVdKpjK0SEZ6DTmqFYdUQr17bwQHSDh2Q==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.81.0"
+    "@glimmer/interfaces" "0.82.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.81.0.tgz#44f315e1c690980a669f8800e88014723fb738c4"
-  integrity sha512-zU86bQHqoTIlBl5QKo3uWY80bvAXIYHQBsFIkjUKHn9txg/u8cFrBcxM2J/sFnuC0faeHAN2ihQC0zNF5fuUpQ==
+"@glimmer/validator@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.82.0.tgz#924f378e61e8a54081b1174313650f1938174d93"
+  integrity sha512-Dci5iB/WKSoLp0DyuIxf2+Um+8EI2UXIyalC76ZGMMf+iXV6N4H1guXGaunwp/J7dmJvdpGsWJ3NpILrATeWwQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.81.0"
+    "@glimmer/global-context" "0.82.0"
 
-"@glimmer/vm-babel-plugins@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.81.0.tgz#97c1b3b79f47331dd4617faf7e7f0f0461d2f4cf"
-  integrity sha512-Pm/TDdFP0EOCNJeBDbAT0CHyakXOD36Pww7T5zkQt6Sk2jf4I4BYuMHK7uZAG4CiL5tsvH0xUHkhXiUqgC20ow==
+"@glimmer/vm-babel-plugins@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.82.0.tgz#43710fc180965cc7d29a52621db597400bc80b1f"
+  integrity sha512-nVczio8/tbZ7zQSTJRG07BGcZrU0zJLGUqItulqDreet2IbVgW01xeCAqbl9MvKyxaX6NrAOLIV8JcglG1F+UQ==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.81.0.tgz#da457d6378084bf8a406bb0ff1a77ce324be37f7"
-  integrity sha512-VPC+EWujOdbR7E/sWltmVVceR+7TCRQQdiWUOxlEMp0KxFti8kTMcbmuhm/Bv5wcoKPOawA7/Ta5UhGNXCRCwQ==
+"@glimmer/vm@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.82.0.tgz#c146b48b4359c94c26574129f3745b76f20e4918"
+  integrity sha512-XbiExuyxwY/80UJPJyQKpYEzVuEeGBEvM/OHi3yg0NYMvvTEhhFv4D7lmkRgxobSWAjK4HSROrcLdO069LJ64Q==
   dependencies:
-    "@glimmer/interfaces" "0.81.0"
-    "@glimmer/util" "0.81.0"
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/util" "0.82.0"
 
-"@glimmer/wire-format@0.81.0":
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.81.0.tgz#f2fb8a330c4afa3f477f2ba5a89ac4bc4bb6a00a"
-  integrity sha512-pIknwfhQ40BZzyI32sehAJSsUy4VfDbpOsT2ej9IqOipf2z0R8bxxJqvyO42IHZsjXRGGemJAYXK8puLFWJxGQ==
+"@glimmer/wire-format@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.82.0.tgz#2ead3e9ce82ae21296ae592f6b2278576e092110"
+  integrity sha512-DGugtx+UiJjqlCYecAzfmxynkFrC+fRiS1tJW6JPjfLIAY0pyjuFpLE4xyQ2RZ3J4WBIiz5Kbi/ZAtcdUkj08w==
   dependencies:
-    "@glimmer/interfaces" "0.81.0"
-    "@glimmer/util" "0.81.0"
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/util" "0.82.0"
 
 "@handlebars/parser@~2.0.0":
   version "2.0.0"

From c82ac22803bdc9dcf9bbafa1412aa26bdc91ced7 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Mon, 30 Aug 2021 08:31:42 -0500
Subject: [PATCH 3/5] update tests

---
 .../integration/application/engine-test.js    | 10 +---
 .../integration/application/rendering-test.js | 60 ++-----------------
 .../components/curly-components-test.js       | 18 ------
 .../template-only-components-test.js          |  6 +-
 .../integration/helpers/custom-helper-test.js |  4 --
 .../tests/integration/syntax/each-test.js     | 35 ++++-------
 .../tests/integration/syntax/let-test.js      | 37 ++++--------
 7 files changed, 27 insertions(+), 143 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index 71bc1b74107..d4d1b8b48ea 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -178,7 +178,7 @@ moduleFor(
     }
 
     ['@test sharing a template between engine and application has separate refinements']() {
-      this.assert.expect(2);
+      this.assert.expect(1);
 
       let sharedTemplate = compile(strip`
       <h1>{{this.contextType}}</h1>
@@ -187,10 +187,6 @@ moduleFor(
       {{outlet}}
     `);
 
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       this.add('template:application', sharedTemplate);
       this.add(
         'controller:application',
@@ -238,10 +234,6 @@ moduleFor(
     ['@test sharing a layout between engine and application has separate refinements']() {
       this.assert.expect(2);
 
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       let sharedLayout = compile(strip`
         {{ambiguous-curlies}}
       `);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
index ba43210274c..2eee0f6cf63 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
@@ -105,47 +105,7 @@ moduleFor(
       });
     }
 
-    ['@test it can access the model provided by the route via implicit this fallback']() {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
-      this.add(
-        'route:application',
-        Route.extend({
-          model() {
-            return ['red', 'yellow', 'blue'];
-          },
-        })
-      );
-
-      this.addTemplate(
-        'application',
-        strip`
-        <ul>
-          {{#each model as |item|}}
-            <li>{{item}}</li>
-          {{/each}}
-        </ul>
-        `
-      );
-
-      return this.visit('/').then(() => {
-        this.assertInnerHTML(strip`
-        <ul>
-          <li>red</li>
-          <li>yellow</li>
-          <li>blue</li>
-        </ul>
-      `);
-      });
-    }
-
     async ['@test interior mutations on the model with set'](assert) {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       this.router.map(function () {
         this.route('color', { path: '/:color' });
       });
@@ -164,7 +124,7 @@ moduleFor(
         strip`
         [@model: {{@model.color}}]
         [this.model: {{this.model.color}}]
-        [model: {{model.color}}]
+        [model: {{this.model.color}}]
         `
       );
 
@@ -203,10 +163,6 @@ moduleFor(
     }
 
     async ['@test interior mutations on the model with tracked properties'](assert) {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       class Model {
         @tracked color;
 
@@ -233,7 +189,7 @@ moduleFor(
         strip`
         [@model: {{@model.color}}]
         [this.model: {{this.model.color}}]
-        [model: {{model.color}}]
+        [model: {{this.model.color}}]
         `
       );
 
@@ -271,10 +227,6 @@ moduleFor(
     }
 
     async ['@test exterior mutations on the model with set'](assert) {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       this.router.map(function () {
         this.route('color', { path: '/:color' });
       });
@@ -293,7 +245,7 @@ moduleFor(
         strip`
         [@model: {{@model}}]
         [this.model: {{this.model}}]
-        [model: {{model}}]
+        [model: {{this.model}}]
         `
       );
 
@@ -332,10 +284,6 @@ moduleFor(
     }
 
     async ['@test exterior mutations on the model with tracked properties'](assert) {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       this.router.map(function () {
         this.route('color', { path: '/:color' });
       });
@@ -361,7 +309,7 @@ moduleFor(
         strip`
         [@model: {{@model}}]
         [this.model: {{this.model}}]
-        [model: {{model}}]
+        [model: {{this.model}}]
         `
       );
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 5fdd2305aff..84c620de3fa 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -3515,24 +3515,6 @@ moduleFor(
       this.assertComponentElement(this.firstChild, { content: 'hello' });
     }
 
-    ['@test can use `{{component.foo}}` in a template GH#19313']() {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
-      this.registerComponent('foo-bar', {
-        template: '{{component.foo}}',
-      });
-
-      this.render('{{foo-bar component=(hash foo="bar")}}');
-
-      this.assertComponentElement(this.firstChild, { content: 'bar' });
-
-      runTask(() => this.rerender());
-
-      this.assertComponentElement(this.firstChild, { content: 'bar' });
-    }
-
     ['@test can use `{{@component.foo}}` in a template GH#19313']() {
       this.registerComponent('foo-bar', {
         template: '{{@component.foo}}',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
index 22896382648..033188083ac 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
@@ -197,11 +197,7 @@ if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
       }
 
       ['@test it renders named arguments as reflected properties']() {
-        expectDeprecation(
-          /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-        );
-
-        this.registerTemplateOnlyComponent('foo-bar', '|{{foo}}|{{this.bar}}|');
+        this.registerTemplateOnlyComponent('foo-bar', '|{{this.foo}}|{{this.bar}}|');
 
         this.render('{{foo-bar foo=this.foo bar=this.bar}}', {
           foo: 'foo',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
index fc6a7fcfb73..1e1a066c0ce 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
@@ -34,10 +34,6 @@ moduleFor(
     }
 
     ['@test it does not resolve helpers with a `.` (period)']() {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       this.registerHelper('hello.world', () => 'hello world');
 
       this.render('{{hello.world}}', {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
index 2959fda9f77..0a13ec3b556 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
@@ -725,34 +725,28 @@ class EachTest extends AbstractEachTest {
   }
 
   ['@test the scoped variable is not available outside the {{#each}} block.']() {
-    expectDeprecation(
-      /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-    );
-
     this.makeList(['Yehuda']);
 
-    this.render(`{{name}}-{{#each this.list as |name|}}{{name}}{{/each}}-{{name}}`, {
-      name: 'Stef',
-    });
+    this.render(`{{name}}-{{#each this.list as |name|}}{{name}}{{/each}}-{{name}}`);
 
-    this.assertText('Stef-Yehuda-Stef');
+    this.assertText('-Yehuda-Stef');
 
     runTask(() => this.rerender());
 
-    this.assertText('Stef-Yehuda-Stef');
+    this.assertText('-Yehuda-');
 
     runTask(() => this.pushObjects([' ', 'Katz']));
 
-    this.assertText('Stef-Yehuda Katz-Stef');
+    this.assertText('-Yehuda Katz-');
 
     runTask(() => set(this.context, 'name', 'Tom'));
 
-    this.assertText('Tom-Yehuda Katz-Tom');
+    this.assertText('-Yehuda Katz-');
 
     runTask(() => set(this.context, 'name', 'Stef'));
     this.replaceList(['Yehuda']);
 
-    this.assertText('Stef-Yehuda-Stef');
+    this.assertText('-Yehuda-');
   }
 
   ['@test inverse template is displayed with context']() {
@@ -946,10 +940,6 @@ class EachTest extends AbstractEachTest {
   }
 
   ['@test the scoped variable is not available outside the {{#each}} block']() {
-    expectDeprecation(
-      /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-    );
-
     let first = this.createList(['Limbo']);
     let fifth = this.createList(['Wrath']);
     let ninth = this.createList(['Treachery']);
@@ -957,41 +947,38 @@ class EachTest extends AbstractEachTest {
     this.render(
       `{{ring}}-{{#each this.first as |ring|}}{{ring}}-{{#each this.fifth as |ring|}}{{ring}}-{{#each this.ninth as |ring|}}{{ring}}-{{/each}}{{ring}}-{{/each}}{{ring}}-{{/each}}{{ring}}`,
       {
-        ring: 'Greed',
         first: first.list,
         fifth: fifth.list,
         ninth: ninth.list,
       }
     );
 
-    this.assertText('Greed-Limbo-Wrath-Treachery-Wrath-Limbo-Greed');
+    this.assertText('-Limbo-Wrath-Treachery-Wrath-Limbo-');
 
     runTask(() => this.rerender());
 
-    this.assertText('Greed-Limbo-Wrath-Treachery-Wrath-Limbo-Greed');
+    this.assertText('-Limbo-Wrath-Treachery-Wrath-Limbo-');
 
     runTask(() => {
-      set(this.context, 'ring', 'O');
       fifth.delegate.insertAt(0, 'D');
     });
 
-    this.assertText('O-Limbo-D-Treachery-D-Wrath-Treachery-Wrath-Limbo-O');
+    this.assertText('-Limbo-D-Treachery-D-Wrath-Treachery-Wrath-Limbo-');
 
     runTask(() => {
       first.delegate.pushObject('I');
       ninth.delegate.replace(0, 1, ['K']);
     });
 
-    this.assertText('O-Limbo-D-K-D-Wrath-K-Wrath-Limbo-I-D-K-D-Wrath-K-Wrath-I-O');
+    this.assertText('-Limbo-D-K-D-Wrath-K-Wrath-Limbo-I-D-K-D-Wrath-K-Wrath-I-');
 
     runTask(() => {
-      set(this.context, 'ring', 'Greed');
       set(this.context, 'first', this.createList(['Limbo']).list);
       set(this.context, 'fifth', this.createList(['Wrath']).list);
       set(this.context, 'ninth', this.createList(['Treachery']).list);
     });
 
-    this.assertText('Greed-Limbo-Wrath-Treachery-Wrath-Limbo-Greed');
+    this.assertText('-Limbo-Wrath-Treachery-Wrath-Limbo-');
   }
 
   ['@test it should support {{#each this.name as |foo|}}, then {{#each foo as |bar|}}']() {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
index a08c411f2a9..f7cb1ee8049 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
@@ -96,35 +96,29 @@ moduleFor(
     }
 
     ['@test the scoped variable is not available outside the {{#let}} block.']() {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       this.render(`{{name}}-{{#let this.other as |name|}}{{name}}{{/let}}-{{name}}`, {
-        name: 'Stef',
         other: 'Yehuda',
       });
 
-      this.assertText('Stef-Yehuda-Stef');
+      this.assertText('-Yehuda-');
 
       runTask(() => this.rerender());
 
-      this.assertText('Stef-Yehuda-Stef');
+      this.assertText('-Yehuda-');
 
       runTask(() => set(this.context, 'other', 'Chad'));
 
-      this.assertText('Stef-Chad-Stef');
+      this.assertText('-Chad-');
 
       runTask(() => set(this.context, 'name', 'Tom'));
 
-      this.assertText('Tom-Chad-Tom');
+      this.assertText('-Chad-');
 
       runTask(() => {
-        set(this.context, 'name', 'Stef');
         set(this.context, 'other', 'Yehuda');
       });
 
-      this.assertText('Stef-Yehuda-Stef');
+      this.assertText('-Yehuda-');
     }
 
     ['@test can access alias of a proxy']() {
@@ -246,48 +240,41 @@ moduleFor(
     }
 
     ['@test the scoped variable is not available outside the {{#let}} block']() {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       this.render(
         `{{ring}}-{{#let this.first as |ring|}}{{ring}}-{{#let this.fifth as |ring|}}{{ring}}-{{#let this.ninth as |ring|}}{{ring}}-{{/let}}{{ring}}-{{/let}}{{ring}}-{{/let}}{{ring}}`,
         {
-          ring: 'Greed',
           first: 'Limbo',
           fifth: 'Wrath',
           ninth: 'Treachery',
         }
       );
 
-      this.assertText('Greed-Limbo-Wrath-Treachery-Wrath-Limbo-Greed');
+      this.assertText('-Limbo-Wrath-Treachery-Wrath-Limbo-');
 
       runTask(() => this.rerender());
 
-      this.assertText('Greed-Limbo-Wrath-Treachery-Wrath-Limbo-Greed');
+      this.assertText('-Limbo-Wrath-Treachery-Wrath-Limbo-');
 
       runTask(() => {
-        set(this.context, 'ring', 'O');
         set(this.context, 'fifth', 'D');
       });
 
-      this.assertText('O-Limbo-D-Treachery-D-Limbo-O');
+      this.assertText('-Limbo-D-Treachery-D-Limbo-');
 
       runTask(() => {
         set(this.context, 'first', 'I');
         set(this.context, 'ninth', 'K');
       });
 
-      this.assertText('O-I-D-K-D-I-O');
+      this.assertText('-I-D-K-D-I-');
 
       runTask(() => {
-        set(this.context, 'ring', 'Greed');
         set(this.context, 'first', 'Limbo');
         set(this.context, 'fifth', 'Wrath');
         set(this.context, 'ninth', 'Treachery');
       });
 
-      this.assertText('Greed-Limbo-Wrath-Treachery-Wrath-Limbo-Greed');
+      this.assertText('-Limbo-Wrath-Treachery-Wrath-Limbo-');
     }
 
     ['@test it should support {{#let name as |foo|}}, then {{#let foo as |bar|}}']() {
@@ -331,10 +318,6 @@ moduleFor(
     }
 
     ['@test nested {{#let}} blocks should have access to root context']() {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       this.render(
         strip`
         {{name}}

From dafc25e11d6ec22a02003ec42b2c70e45e9761a9 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Sun, 29 Aug 2021 07:29:42 -0500
Subject: [PATCH 4/5] [cleanup]: this. property fallback
 id:this-property-fallback

---
 .../@ember/-internals/environment/lib/env.ts    | 17 -----------------
 .../-internals/glimmer/lib/environment.ts       | 10 ----------
 tests/docs/expected.js                          |  1 -
 3 files changed, 28 deletions(-)

diff --git a/packages/@ember/-internals/environment/lib/env.ts b/packages/@ember/-internals/environment/lib/env.ts
index 93f3d1ac326..f8b196b7aad 100644
--- a/packages/@ember/-internals/environment/lib/env.ts
+++ b/packages/@ember/-internals/environment/lib/env.ts
@@ -155,23 +155,6 @@ export const ENV = {
    */
   _RERENDER_LOOP_LIMIT: 1000,
 
-  /**
-    Allows disabling the implicit this property fallback deprecation. This could be useful
-    as a way to control the volume of deprecations that are issued by temporarily disabling
-    the implicit this fallback deprecations, which would allow the other deprecations to be more easily
-    identified in the console).
-
-    NOTE: The fallback behavior **will be removed** in Ember 4.0.0, disabling **_IS NOT_**
-    a viable strategy for handling this deprecation.
-
-    @property _DISABLE_PROPERTY_FALLBACK_DEPRECATION
-    @for EmberENV
-    @type boolean
-    @default false
-    @private
-   */
-  _DISABLE_PROPERTY_FALLBACK_DEPRECATION: false,
-
   EMBER_LOAD_HOOKS: {} as {
     [hook: string]: Function[];
   },
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 013ac499285..35700fd1a2e 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -98,16 +98,6 @@ const VM_DEPRECATION_OVERRIDES: (DeprecationOptions & {
   disabled?: boolean;
   message?: string;
 })[] = [
-  {
-    id: 'this-property-fallback',
-    disabled: ENV._DISABLE_PROPERTY_FALLBACK_DEPRECATION,
-    url: 'https://deprecations.emberjs.com/v3.x#toc_this-property-fallback',
-    until: '4.0.0',
-    for: 'ember-source',
-    since: {
-      enabled: '3.26.0',
-    },
-  },
   {
     id: 'argument-less-helper-paren-less-invocation',
     url: 'https://deprecations.emberjs.com/v3.x#toc_argument-less-helper-paren-less-invocation',
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 3b98b3f264d..b97f44edb28 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -9,7 +9,6 @@ module.exports = {
     'LOG_VERSION',
     '[]',
     '_APPLICATION_TEMPLATE_WRAPPER',
-    '_DISABLE_PROPERTY_FALLBACK_DEPRECATION',
     '_DEBUG_RENDER_TREE',
     '_DEFAULT_ASYNC_OBSERVERS',
     '_RERENDER_LOOP_LIMIT',

From 27140cc6f5551ca9c57e9fc509dc79c922de2386 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Wed, 6 Oct 2021 15:58:05 -0500
Subject: [PATCH 5/5] moar test fixes

---
 .../tests/integration/application/engine-test.js |  6 +++---
 .../tests/integration/syntax/each-test.js        |  2 +-
 .../glimmer/tests/integration/syntax/let-test.js | 16 ++++++----------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index d4d1b8b48ea..e321647ffe9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -227,12 +227,12 @@ moduleFor(
       );
 
       return this.visit('/blog').then(() => {
-        this.assertText('ApplicationController Data!EngineComponent!');
+        this.assertText('ApplicationEngineComponent!');
       });
     }
 
     ['@test sharing a layout between engine and application has separate refinements']() {
-      this.assert.expect(2);
+      this.assert.expect(1);
 
       let sharedLayout = compile(strip`
         {{ambiguous-curlies}}
@@ -285,7 +285,7 @@ moduleFor(
       );
 
       return this.visit('/blog').then(() => {
-        this.assertText('ApplicationLocal Data!EngineComponent!');
+        this.assertText('ApplicationEngineComponent!');
       });
     }
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
index 0a13ec3b556..0781841d78c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
@@ -729,7 +729,7 @@ class EachTest extends AbstractEachTest {
 
     this.render(`{{name}}-{{#each this.list as |name|}}{{name}}{{/each}}-{{name}}`);
 
-    this.assertText('-Yehuda-Stef');
+    this.assertText('-Yehuda-');
 
     runTask(() => this.rerender());
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
index f7cb1ee8049..a3f8ef73c9f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
@@ -345,30 +345,26 @@ moduleFor(
         }
       );
 
-      this.assertText('ebryn[trek[machty]trek]ebryn[machty[trek]machty]ebryn');
+      this.assertText('[trek[machty]trek][machty[trek]machty]');
 
       runTask(() => this.rerender());
 
-      this.assertText('ebryn[trek[machty]trek]ebryn[machty[trek]machty]ebryn');
+      this.assertText('[trek[machty]trek][machty[trek]machty]');
 
       runTask(() => set(this.context, 'name', 'chancancode'));
 
-      this.assertText('chancancode[trek[machty]trek]chancancode[machty[trek]machty]chancancode');
+      this.assertText('[trek[machty]trek][machty[trek]machty]');
 
       runTask(() => set(this.context, 'committer1', { name: 'krisselden' }));
 
-      this.assertText(
-        'chancancode[krisselden[machty]krisselden]chancancode[machty[krisselden]machty]chancancode'
-      );
+      this.assertText('[krisselden[machty]krisselden][machty[krisselden]machty]');
 
       runTask(() => {
         set(this.context, 'committer1.name', 'wycats');
         set(this.context, 'committer2', { name: 'rwjblue' });
       });
 
-      this.assertText(
-        'chancancode[wycats[rwjblue]wycats]chancancode[rwjblue[wycats]rwjblue]chancancode'
-      );
+      this.assertText('[wycats[rwjblue]wycats][rwjblue[wycats]rwjblue]');
 
       runTask(() => {
         set(this.context, 'name', 'ebryn');
@@ -376,7 +372,7 @@ moduleFor(
         set(this.context, 'committer2', { name: 'machty' });
       });
 
-      this.assertText('ebryn[trek[machty]trek]ebryn[machty[trek]machty]ebryn');
+      this.assertText('[trek[machty]trek][machty[trek]machty]');
     }
   }
 );