From 917331298a67fc57d5e21ed18d4d87b4a9e6e74e Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Fri, 5 Apr 2019 18:07:31 -0700
Subject: [PATCH] [BUGFIX beta] Fix "splattributes" class merging

Closes #17533, #17692.

(cherry picked from commit 2a96c789ea0acf1f69bb7cb734af98f2cad6afe9)
(cherry picked from commit 61c18309f8ebe256af4e954eb078382c64c980a1)
---
 package.json |  14 ++--
 yarn.lock    | 188 +++++++++++++++++++++++++--------------------------
 2 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/package.json b/package.json
index 181f18c8119..3a6f3fe0d7f 100644
--- a/package.json
+++ b/package.json
@@ -89,14 +89,14 @@
     "@babel/plugin-transform-shorthand-properties": "^7.2.0",
     "@babel/plugin-transform-spread": "^7.2.2",
     "@babel/plugin-transform-template-literals": "^7.2.0",
-    "@glimmer/compiler": "^0.38.1",
+    "@glimmer/compiler": "^0.38.4",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/interfaces": "^0.38.1",
-    "@glimmer/node": "^0.38.1",
-    "@glimmer/opcode-compiler": "^0.38.1",
-    "@glimmer/program": "^0.38.1",
-    "@glimmer/reference": "^0.38.1",
-    "@glimmer/runtime": "^0.38.1",
+    "@glimmer/interfaces": "^0.38.4",
+    "@glimmer/node": "^0.38.4",
+    "@glimmer/opcode-compiler": "^0.38.4",
+    "@glimmer/program": "^0.38.4",
+    "@glimmer/reference": "^0.38.4",
+    "@glimmer/runtime": "^0.38.4",
     "@types/qunit": "^2.5.4",
     "@types/rsvp": "^4.0.2",
     "auto-dist-tag": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 9fdcf34d962..2f17a6685f2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -655,122 +655,122 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
-"@glimmer/compiler@^0.38.1":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.38.1.tgz#03b43a2a8a04b1ed39517862158e8897d0f6798b"
-  integrity sha512-V4wRYRPH6FSVZw9dNfZn3IRxBofUBL0oGeBLm7wNdUOg4oXE26BMmxRVtYzTsBmmSj7SqB+B6VKuH1jEuvOOhQ==
+"@glimmer/compiler@^0.38.4":
+  version "0.38.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.38.4.tgz#ea5f39b9681a652dd96c48eeb55cd95aa6f6eddd"
+  integrity sha512-AQdDqInUM0yrUUEFdkNI2GR/WPfWN4HvbZYwgBet7TGicvfWXXLe76TI65H03SnPzoh835FDq2XcWLqlgwYt9w==
   dependencies:
-    "@glimmer/interfaces" "^0.38.1"
-    "@glimmer/syntax" "^0.38.1"
-    "@glimmer/util" "^0.38.1"
-    "@glimmer/wire-format" "^0.38.1"
+    "@glimmer/interfaces" "^0.38.4"
+    "@glimmer/syntax" "^0.38.4"
+    "@glimmer/util" "^0.38.4"
+    "@glimmer/wire-format" "^0.38.4"
 
-"@glimmer/encoder@^0.38.1":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.38.1.tgz#1b7fd08a83e4412148126d50cbc9c6a08739caa7"
-  integrity sha512-E5d15cy0F/qiFCJ67KVOxJLkbV5pebiiczjzf/zHTmL250Fj4reISoKsBt0SBWc2IJAj2En3RLEyq6WS8U1sZQ==
+"@glimmer/encoder@^0.38.4":
+  version "0.38.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.38.4.tgz#dc0784f156841682d3eb03315f6f6583f14b169d"
+  integrity sha512-u3vHT0odZrw6pM6c39zQnL5aGNWacg4ouTHNjktkd19eVeFh/FC+agQqe53tsvXpIS1vjKMsL+JPQCf//+hPiA==
   dependencies:
-    "@glimmer/interfaces" "^0.38.1"
-    "@glimmer/vm" "^0.38.1"
+    "@glimmer/interfaces" "^0.38.4"
+    "@glimmer/vm" "^0.38.4"
 
 "@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/interfaces@^0.38.1":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.38.1.tgz#5b1c174363396b99d6a6bddb35538151e4c4c989"
-  integrity sha512-YXnzRR7IviHdN+k2Llp8rQ+ADrdzme++A5EFZRxcUoD14Eu1u2S3al7FlLLfwHhp5R2leO+x3zSYoWsuzfvsqw==
+"@glimmer/interfaces@^0.38.4":
+  version "0.38.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.38.4.tgz#437663eb07b97a22c8348a47b25191b5c5198bf3"
+  integrity sha512-Kuc2BNOZMnwmdZh3jOLUktVu9V0BASCRAslPmVfhzgPjD3j9VzqNOifD7eBz/ZvWqpS1e7CgBEc42CBlCBUfnQ==
   dependencies:
-    "@glimmer/wire-format" "^0.38.1"
+    "@glimmer/wire-format" "^0.38.4"
     "@simple-dom/interface" "1.4.0"
 
-"@glimmer/low-level@^0.38.1":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.38.1.tgz#101147d71a4f1ca1874e45e16a7a777fa8f65d46"
-  integrity sha512-XydeZ5XzLFKLxtnwsy4Zu3WHJfL4/XYzs24KLaW4HeDxKfhVnJxr2hVWfpF17I3Q35yCOLdbSWp+igVHFA4/7w==
-
-"@glimmer/node@^0.38.1":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.38.1.tgz#46d18041207953218bf841110b5c4d1db11eb3ac"
-  integrity sha512-okAyjPhrUy4d4txuz2qXxo5z2gGZg3e4gjFPpTDKOZRGhWZMAa1mu0KEtnCHtJ4unvhJBBNI7TdSHQX+492Tlw==
-  dependencies:
-    "@glimmer/interfaces" "^0.38.1"
-    "@glimmer/runtime" "^0.38.1"
-
-"@glimmer/opcode-compiler@^0.38.1":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.38.1.tgz#da4e871e13ca87c8d80ebb905d0ff2c51c7d9a84"
-  integrity sha512-p5VdtZDWrW8F3gKS6/DoFGIwpWoquiswAP2XyyQPlXI7IsbnxUhwLd0uQa/rjTPkOIH3okDW/h6ZVAEqEdwTKg==
-  dependencies:
-    "@glimmer/encoder" "^0.38.1"
-    "@glimmer/interfaces" "^0.38.1"
-    "@glimmer/program" "^0.38.1"
-    "@glimmer/reference" "^0.38.1"
-    "@glimmer/util" "^0.38.1"
-    "@glimmer/vm" "^0.38.1"
-    "@glimmer/wire-format" "^0.38.1"
-
-"@glimmer/program@^0.38.1":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.38.1.tgz#cb50934749fc88843f925d5c9c43ba673de9f473"
-  integrity sha512-nipMJiYx9ufZkt2iKlNdoi22U2asZ16NUhEllsd/fVw07+CwjI2Ylf93CFtWGDxjQ0qr9ZGPWFk1D7O7Gm6kmA==
-  dependencies:
-    "@glimmer/encoder" "^0.38.1"
-    "@glimmer/interfaces" "^0.38.1"
-    "@glimmer/util" "^0.38.1"
-
-"@glimmer/reference@^0.38.1":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.38.1.tgz#555bcf90b7e5ea8d39d1089e2bd6a2da14b56184"
-  integrity sha512-iGuTZhHc0NTw9i7eVdCnbENPGHzJecfPCNNQ1GUm5rsY1/NnLB4tNAEioDz81HAJygOHhnMZgb9YqLEwcwnONw==
-  dependencies:
-    "@glimmer/util" "^0.38.1"
-
-"@glimmer/runtime@^0.38.1":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.38.1.tgz#abe0b4affbe29dfe5b15307713a1c03a83fdc41b"
-  integrity sha512-zArtVsLNXV7VY+1Y8iaouOKvvAdNx1Ios5od7EH3RqAvkx4wxXNBKEAEG4ecj2avxELw+SwhajB/eGBbgBB8ng==
-  dependencies:
-    "@glimmer/interfaces" "^0.38.1"
-    "@glimmer/low-level" "^0.38.1"
-    "@glimmer/program" "^0.38.1"
-    "@glimmer/reference" "^0.38.1"
-    "@glimmer/util" "^0.38.1"
-    "@glimmer/vm" "^0.38.1"
-    "@glimmer/wire-format" "^0.38.1"
+"@glimmer/low-level@^0.38.4":
+  version "0.38.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.38.4.tgz#8e6b61c05698f115b81ef1565048d13eb3086f11"
+  integrity sha512-w2gZ+oSFTGzCu6jov+g2Snzog79TO9JQsyhDmi4KyFUwmfK+7hjH0/BFMoCbkHOAY9EFhKaVfn0Eu0lOdCHRkg==
+
+"@glimmer/node@^0.38.4":
+  version "0.38.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.38.4.tgz#79f4f55659cc619886a91d1ba1889e4309997ae6"
+  integrity sha512-QzK7VYuybXqHBLpsl3dMQoX3aP5Lx3rM+Koq/C5zYun/nXU5LhMiSx/8FqpGwpK3ZQC1hhFegZBg+xMsIKsidA==
+  dependencies:
+    "@glimmer/interfaces" "^0.38.4"
+    "@glimmer/runtime" "^0.38.4"
+
+"@glimmer/opcode-compiler@^0.38.4":
+  version "0.38.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.38.4.tgz#160eb7c9c74dd4dc3bce6174e0c7369e2a845c0c"
+  integrity sha512-kMhXkBZbu3FyoL5+V5h1AuSmkZmqUQil+6rmduY8nIY+UgPwjISMYpiOKKeetlymPX8sZ9exacZ//9ufVHKW4Q==
+  dependencies:
+    "@glimmer/encoder" "^0.38.4"
+    "@glimmer/interfaces" "^0.38.4"
+    "@glimmer/program" "^0.38.4"
+    "@glimmer/reference" "^0.38.4"
+    "@glimmer/util" "^0.38.4"
+    "@glimmer/vm" "^0.38.4"
+    "@glimmer/wire-format" "^0.38.4"
+
+"@glimmer/program@^0.38.4":
+  version "0.38.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.38.4.tgz#1d8f704509a08b22e71132a582fbd7af0c968b5e"
+  integrity sha512-A7fja1X5b3q0A+ogIriT7PE8ju9XF53U0sqHai/dHV0lFvomfrZ22FwXsZAjt14ntz+DI+TIgaohLbEmtOYgWg==
+  dependencies:
+    "@glimmer/encoder" "^0.38.4"
+    "@glimmer/interfaces" "^0.38.4"
+    "@glimmer/util" "^0.38.4"
+
+"@glimmer/reference@^0.38.4":
+  version "0.38.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.38.4.tgz#358226494845fbceee74fb1e687e89fb38731e99"
+  integrity sha512-zI+UtC3Vap1ZtDYZq6OVFf5znxeqbFT/NidJkcD0hugH9/JEpYCYTHbG7kYel2t6iz49yFlxWIa42QMAGHnfIQ==
+  dependencies:
+    "@glimmer/util" "^0.38.4"
+
+"@glimmer/runtime@^0.38.4":
+  version "0.38.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.38.4.tgz#6807dd724e5bbff1333038aab7faf205661ab64a"
+  integrity sha512-7eM4gbs6bdC4Z3bv3FQjwVJ09osjNx2RxYRnuyBPY/LLuoW3c1yv5T9NT3d0XtkhHnxuvI2dlRlfEtevVB0Fmw==
+  dependencies:
+    "@glimmer/interfaces" "^0.38.4"
+    "@glimmer/low-level" "^0.38.4"
+    "@glimmer/program" "^0.38.4"
+    "@glimmer/reference" "^0.38.4"
+    "@glimmer/util" "^0.38.4"
+    "@glimmer/vm" "^0.38.4"
+    "@glimmer/wire-format" "^0.38.4"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.38.1":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.38.1.tgz#625875da5f1e827ad5806fdaa23e2cd00369fda8"
-  integrity sha512-tzc1NeUd7hbBWqIlgSY5Oq8bEiMpp7ClawVt8hWUarbr9G+qR0toDEQYqZmeRtCXjHAIh9M9oYbpbzLP6+iiag==
+"@glimmer/syntax@^0.38.4":
+  version "0.38.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.38.4.tgz#eac34167cfa80daabb5db25fece1982c17a063f1"
+  integrity sha512-aB5vNC4ADCFXQWORFnx1kG8DtaWqS9E2zkynnj8/GqfYjO4yBtM0HFqBHAEIfcD8Zm+zK4osghs2YGrKvIsEdg==
   dependencies:
-    "@glimmer/interfaces" "^0.38.1"
-    "@glimmer/util" "^0.38.1"
+    "@glimmer/interfaces" "^0.38.4"
+    "@glimmer/util" "^0.38.4"
     handlebars "^4.0.6"
     simple-html-tokenizer "^0.5.6"
 
-"@glimmer/util@^0.38.1":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.38.1.tgz#41ca0544f95ec980bc492f4f0e5a85564964c028"
-  integrity sha512-WAe+bqJSFBR8EmA/NsxcqWmyi2AfOyW9x1jpWczZHJiBkvssiRF6nre39CJVwwMPlFDtdKzvnRQkWVl8ZBhcNw==
+"@glimmer/util@^0.38.4":
+  version "0.38.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.38.4.tgz#43b4fbdf98c8c244ac7d1bfd95fef9c8f7761ad5"
+  integrity sha512-qFU96hAcDjK3ZD8lVJMB+FOJjCm+qZydiUICDj/CYTx82bSOfkzpHLNQ5OivJpsVl1+jFqJolQwrjqFC1bQJHA==
 
-"@glimmer/vm@^0.38.1":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.38.1.tgz#30f5bb659c42fbe69a6b5cf42a06c6bd815721ac"
-  integrity sha512-pxmdJp0GskbwBz7WFvBNWaeoP1+977A0cFnEc3U+GbLBCmyrCq7mRQwFYSRBI8B5/6CkzWhsGXj42Qrkk34m3Q==
+"@glimmer/vm@^0.38.4":
+  version "0.38.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.38.4.tgz#edb6810ab97d56e0d74a225bd3d1a662e826f113"
+  integrity sha512-8QCD5cNnKfQcAOx4dUCXTr/z/wruJ/hjOdixs77Qur0ejLzLgrohXfZqSoy5hpnQSzXSErp1ny7oh1nYUvjCzw==
   dependencies:
-    "@glimmer/interfaces" "^0.38.1"
-    "@glimmer/util" "^0.38.1"
+    "@glimmer/interfaces" "^0.38.4"
+    "@glimmer/util" "^0.38.4"
 
-"@glimmer/wire-format@^0.38.1":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.38.1.tgz#a77963cf7193ab23cbce242116aac613f17cd3dc"
-  integrity sha512-AT1dToybQxbY29XpkNra9/j7svq65ZNnSXmRs1zUKAarvgh6qxOBsnYeVBNrxBFduNuNJOxP8G0Y+nXEGrUoRQ==
+"@glimmer/wire-format@^0.38.4":
+  version "0.38.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.38.4.tgz#efbfe757b05e32344855b01804cc19dcca0d0828"
+  integrity sha512-1K8N+mbUtqJ1/MR+E/kDekC53HJNecU1i0TUAz5Vh24cvBcPCWP63YtwyCOxfnn7MLFdl8/QvHuo3+8Uxw+oVg==
   dependencies:
-    "@glimmer/util" "^0.38.1"
+    "@glimmer/util" "^0.38.4"
 
 "@simple-dom/document@^1.4.0":
   version "1.4.0"