-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[BUGFIX canary] Fix "splattributes" class merging
- Loading branch information
1 parent
b59a643
commit 388a831
Showing
2 changed files
with
101 additions
and
101 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -747,122 +747,122 @@ | |
| lodash "^4.17.11" | ||
| to-fast-properties "^2.0.0" | ||
|
|
||
| "@glimmer/[email protected].2-alpha.2": | ||
| version "0.38.2-alpha.2" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.38.2-alpha.2.tgz#bd13b1194c622cdc03a85cf606ffc3adff6bd4c7" | ||
| integrity sha512-63uiXrYgHUPSexnHZZy5gSXzUgwL/RC8JJMVE3i8Uf0I3vouf6hAob3YpmpPnmnhqANZsQwn0bAUO5qpF1c5rA== | ||
| "@glimmer/[email protected].4-alpha.1": | ||
| version "0.38.4-alpha.1" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.38.4-alpha.1.tgz#e7572c0b566b5418a0b3fb3e7f2e429428237032" | ||
| integrity sha512-GGBCY2iEaAhU+JlE6R/BZIFbmHNPHJArH9NEF11GRN0TOA5XFjoqAcB8LARGf6RuvMYsJ1aEIHLU9GgyF+VVOQ== | ||
| dependencies: | ||
| "@glimmer/interfaces" "^0.38.2-alpha.2" | ||
| "@glimmer/syntax" "^0.38.2-alpha.2" | ||
| "@glimmer/util" "^0.38.2-alpha.2" | ||
| "@glimmer/wire-format" "^0.38.2-alpha.2" | ||
| "@glimmer/interfaces" "^0.38.4-alpha.1" | ||
| "@glimmer/syntax" "^0.38.4-alpha.1" | ||
| "@glimmer/util" "^0.38.4-alpha.1" | ||
| "@glimmer/wire-format" "^0.38.4-alpha.1" | ||
|
|
||
| "@glimmer/encoder@^0.38.2-alpha.2": | ||
| version "0.38.2-alpha.2" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.38.2-alpha.2.tgz#3e1e015aa4e01018ae7c92b0523c58921879854d" | ||
| integrity sha512-mXLJndVeOgflOZUfVBrQiljHc7rMAyqm3Fr8cuTmgLiJmleU6thMpo5MrvqrLEag1sr4tAUpfh8kyHgEhXuaRg== | ||
| "@glimmer/encoder@^0.38.4-alpha.1": | ||
| version "0.38.4-alpha.1" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.38.4-alpha.1.tgz#a1179d6e4d1daabb3ac2445eeb2af7ca5c7cf1b1" | ||
| integrity sha512-iH9jDQiUdyhmO68Juz9Yj6RlFEEoCfI/kdfXULBm1mG6VAnTVWjmVGpUHT2vo3SgmbVteSDLohSVSpr9amqIhQ== | ||
| dependencies: | ||
| "@glimmer/interfaces" "^0.38.2-alpha.2" | ||
| "@glimmer/vm" "^0.38.2-alpha.2" | ||
| "@glimmer/interfaces" "^0.38.4-alpha.1" | ||
| "@glimmer/vm" "^0.38.4-alpha.1" | ||
|
|
||
| "@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/[email protected].2-alpha.2", "@glimmer/interfaces@^0.38.2-alpha.2": | ||
| version "0.38.2-alpha.2" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.38.2-alpha.2.tgz#10d3deadbf2393ff989373124962c36fe78fa74f" | ||
| integrity sha512-McCv9kzbV8UN97cscCetgNEV6RMRSisZPhD5bF6OSX8cfhAgWrdAt43Ba/RdzfKCtN+cXV8P2a9U9/LZ++NZOA== | ||
| "@glimmer/[email protected].4-alpha.1", "@glimmer/interfaces@^0.38.4-alpha.1": | ||
| version "0.38.4-alpha.1" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.38.4-alpha.1.tgz#2ec22756c1efe80c2f663fb66a3748c6a790662d" | ||
| integrity sha512-Vq/WzayUWqRG5XEYAG3kE9OXTJXLrRWyOI8vViNWDf65eJ/JqAEiQwC0nd2SAflxrrb370e1hxxfpzQfb5wKHg== | ||
| dependencies: | ||
| "@glimmer/wire-format" "^0.38.2-alpha.2" | ||
| "@glimmer/wire-format" "^0.38.4-alpha.1" | ||
| "@simple-dom/interface" "1.4.0" | ||
|
|
||
| "@glimmer/low-level@^0.38.2-alpha.2": | ||
| version "0.38.2-alpha.2" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.38.2-alpha.2.tgz#166f72f0c5e531db4b2b55999b6aca2004b7006f" | ||
| integrity sha512-5I1n1aaqdlBalsmoMAnUnM8SunUIH6Vt1EXmRyzyT5FaieBuOswnzeBL0wSndtM72Ly7Q1nDm18VItXKCHjr6A== | ||
|
|
||
| "@glimmer/[email protected].2-alpha.2": | ||
| version "0.38.2-alpha.2" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.38.2-alpha.2.tgz#6c11e9a833143fd192af6c61e4390964094b7b78" | ||
| integrity sha512-RD3mlNh0fKtZ3lILaWE5QqG3NX2oses62/d/c3Jn5xY5jmRwQUj0UQMVDkD2xNTWt3zM6SIZLDDU19tUhIuPow== | ||
| dependencies: | ||
| "@glimmer/interfaces" "^0.38.2-alpha.2" | ||
| "@glimmer/runtime" "^0.38.2-alpha.2" | ||
|
|
||
| "@glimmer/[email protected].2-alpha.2": | ||
| version "0.38.2-alpha.2" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.38.2-alpha.2.tgz#ef68e0404106cee05eaa3473cb21ff51a0dfc08d" | ||
| integrity sha512-gZmG46GFQPI0vwGAxKuRTDBF5ibudxUBye/8gmOs1LVnEaE+rA9jgzSR6pTfTL56PBPO4GCD5tCRAeHJ867XOg== | ||
| dependencies: | ||
| "@glimmer/encoder" "^0.38.2-alpha.2" | ||
| "@glimmer/interfaces" "^0.38.2-alpha.2" | ||
| "@glimmer/program" "^0.38.2-alpha.2" | ||
| "@glimmer/reference" "^0.38.2-alpha.2" | ||
| "@glimmer/util" "^0.38.2-alpha.2" | ||
| "@glimmer/vm" "^0.38.2-alpha.2" | ||
| "@glimmer/wire-format" "^0.38.2-alpha.2" | ||
|
|
||
| "@glimmer/[email protected].2-alpha.2", "@glimmer/program@^0.38.2-alpha.2": | ||
| version "0.38.2-alpha.2" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.38.2-alpha.2.tgz#c5e428ee66a7a46cafaf0907e3a1829ba2a79605" | ||
| integrity sha512-9jckpJdtYFB7arBBTehNbO34UaGybeqg7ym713yLKW5HptVEw+MfC1DAghUciZIugSY2RLxAsiJW8F9IUYFqcA== | ||
| dependencies: | ||
| "@glimmer/encoder" "^0.38.2-alpha.2" | ||
| "@glimmer/interfaces" "^0.38.2-alpha.2" | ||
| "@glimmer/util" "^0.38.2-alpha.2" | ||
|
|
||
| "@glimmer/[email protected].2-alpha.2", "@glimmer/reference@^0.38.2-alpha.2": | ||
| version "0.38.2-alpha.2" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.38.2-alpha.2.tgz#c4f9930904739ca0db47426bbd757a9124956be6" | ||
| integrity sha512-AxlGMCET0LWWRkhVkMFXWHSgLOmBndbxAyBo2aGYDfNS0DalSyT+NuZXiIj9LEQwnx0dnx+OILrGx6EADZ+xYw== | ||
| dependencies: | ||
| "@glimmer/util" "^0.38.2-alpha.2" | ||
|
|
||
| "@glimmer/[email protected].2-alpha.2", "@glimmer/runtime@^0.38.2-alpha.2": | ||
| version "0.38.2-alpha.2" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.38.2-alpha.2.tgz#48b27620f0835979c774cb12789b9ea4d1119f8d" | ||
| integrity sha512-ERBCBOa80rMjuHPBrxdxeYmHdTTo38rGBWg6XjL/snbeCj+NmLoFRA7E+GMXEhUevwyjoO/p3yTIxZBjyP2BCA== | ||
| dependencies: | ||
| "@glimmer/interfaces" "^0.38.2-alpha.2" | ||
| "@glimmer/low-level" "^0.38.2-alpha.2" | ||
| "@glimmer/program" "^0.38.2-alpha.2" | ||
| "@glimmer/reference" "^0.38.2-alpha.2" | ||
| "@glimmer/util" "^0.38.2-alpha.2" | ||
| "@glimmer/vm" "^0.38.2-alpha.2" | ||
| "@glimmer/wire-format" "^0.38.2-alpha.2" | ||
| "@glimmer/low-level@^0.38.4-alpha.1": | ||
| version "0.38.4-alpha.1" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.38.4-alpha.1.tgz#8b407bdcf9b736413cfb506e59fe3b0d0f8cfeb6" | ||
| integrity sha512-iw0M4t3bfjHI5ibmXll2ZyRM34gIf9LDLk42/eMlEKL2sgZHIkSJS77vD7GmJ3Eucy2flDPnFdjP9JR3yvDd3g== | ||
|
|
||
| "@glimmer/[email protected].4-alpha.1": | ||
| version "0.38.4-alpha.1" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.38.4-alpha.1.tgz#b4e7aa0ff11bb86e3927f8abd932219a4439ea96" | ||
| integrity sha512-GbZ7wJxTVNhZFehEUjeTbvL/OHQpE0tU+Fui8/qE8pyQNiqiLPIJW0cio1+i+AMt01VGzb2u4wdhe0VC5gUxqw== | ||
| dependencies: | ||
| "@glimmer/interfaces" "^0.38.4-alpha.1" | ||
| "@glimmer/runtime" "^0.38.4-alpha.1" | ||
|
|
||
| "@glimmer/[email protected].4-alpha.1": | ||
| version "0.38.4-alpha.1" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.38.4-alpha.1.tgz#963a953b7ce50337a8c0efa647f7542d0b0a6fcb" | ||
| integrity sha512-u5glLlg0a4QgZqd3EOczkwodBvR2sxqdCoN7z+jat90wFf8Z909yhmhht8CdkSDCu/MG5CIFFTYHFD6yck5TLA== | ||
| dependencies: | ||
| "@glimmer/encoder" "^0.38.4-alpha.1" | ||
| "@glimmer/interfaces" "^0.38.4-alpha.1" | ||
| "@glimmer/program" "^0.38.4-alpha.1" | ||
| "@glimmer/reference" "^0.38.4-alpha.1" | ||
| "@glimmer/util" "^0.38.4-alpha.1" | ||
| "@glimmer/vm" "^0.38.4-alpha.1" | ||
| "@glimmer/wire-format" "^0.38.4-alpha.1" | ||
|
|
||
| "@glimmer/[email protected].4-alpha.1", "@glimmer/program@^0.38.4-alpha.1": | ||
| version "0.38.4-alpha.1" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.38.4-alpha.1.tgz#eff80e4f22a1a329d629ebb667ee371ad537ad0a" | ||
| integrity sha512-0dGbaek/jrlpKvPhMIdsgKcEFh5IyMD8A41uGkfusxbyWUkJ35vuwQ5PAcjl3mugqPnVHTnNfLdTDlIGvonuSQ== | ||
| dependencies: | ||
| "@glimmer/encoder" "^0.38.4-alpha.1" | ||
| "@glimmer/interfaces" "^0.38.4-alpha.1" | ||
| "@glimmer/util" "^0.38.4-alpha.1" | ||
|
|
||
| "@glimmer/[email protected].4-alpha.1", "@glimmer/reference@^0.38.4-alpha.1": | ||
| version "0.38.4-alpha.1" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.38.4-alpha.1.tgz#07433b2882bcc109a7762034af718b904c1f039d" | ||
| integrity sha512-YX+hwkcZ31m7hhaG5Q/2vtV/p6R+S1/d4KPfi1DAtMRevYVLbtGQCat/DyTFv6EOYAxRVvCyouuV1yRIn8Z5uw== | ||
| dependencies: | ||
| "@glimmer/util" "^0.38.4-alpha.1" | ||
|
|
||
| "@glimmer/[email protected].4-alpha.1", "@glimmer/runtime@^0.38.4-alpha.1": | ||
| version "0.38.4-alpha.1" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.38.4-alpha.1.tgz#6c5c5e640061a7e6f4b7fb261a82359617c1c6b3" | ||
| integrity sha512-5LWbsVDWhXdcoStE8rqtDGokGZC/8tyqlLn+wwLxitexPQe2eB71+NDmZLk8QoY3OtQGEK8d0DMBAM2+nNSPcw== | ||
| dependencies: | ||
| "@glimmer/interfaces" "^0.38.4-alpha.1" | ||
| "@glimmer/low-level" "^0.38.4-alpha.1" | ||
| "@glimmer/program" "^0.38.4-alpha.1" | ||
| "@glimmer/reference" "^0.38.4-alpha.1" | ||
| "@glimmer/util" "^0.38.4-alpha.1" | ||
| "@glimmer/vm" "^0.38.4-alpha.1" | ||
| "@glimmer/wire-format" "^0.38.4-alpha.1" | ||
| "@simple-dom/interface" "^1.4.0" | ||
|
|
||
| "@glimmer/syntax@^0.38.2-alpha.2": | ||
| version "0.38.2-alpha.2" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.38.2-alpha.2.tgz#035f7c9e4fd07c1e0f3bf276e2b657bbc7261a67" | ||
| integrity sha512-RkVVKFINZvlHdU8sv3hWkTMmaFAGv9CKaTgKiNF94OH4GW9OBHpl4LQsT6B11cswxsQ28SQkVl6XkHJVy4Tekg== | ||
| "@glimmer/syntax@^0.38.4-alpha.1": | ||
| version "0.38.4-alpha.1" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.38.4-alpha.1.tgz#d9db05316055c5d1f5cd68865c4fc223b80dc3bd" | ||
| integrity sha512-zCfrwP8lvNaH5gGEOQErSi3cXmVJ1vxxT1xj7hfaPIey+4h6HJblbeOzjeqBe1w/i+fdo2cC0Rn0ea/n2cngoA== | ||
| dependencies: | ||
| "@glimmer/interfaces" "^0.38.2-alpha.2" | ||
| "@glimmer/util" "^0.38.2-alpha.2" | ||
| "@glimmer/interfaces" "^0.38.4-alpha.1" | ||
| "@glimmer/util" "^0.38.4-alpha.1" | ||
| handlebars "^4.0.6" | ||
| simple-html-tokenizer "^0.5.6" | ||
|
|
||
| "@glimmer/util@^0.38.2-alpha.2": | ||
| version "0.38.2-alpha.2" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.38.2-alpha.2.tgz#139c0aed8736fa95d2a27b78d702be13406d6ec6" | ||
| integrity sha512-KqdR/mj58UdCW93gW45BnyrfuhR2YsmeKivJSYP5B2DTwpfMl1FYUtXhLV6VUoh3ryejCOmaJM5RmyLtUyIODA== | ||
| "@glimmer/util@^0.38.4-alpha.1": | ||
| version "0.38.4-alpha.1" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.38.4-alpha.1.tgz#6e69ec53f07b7e8df142546c656f9fa0c8932c80" | ||
| integrity sha512-sTKr9NXpXj5CIJY2gkWtwG2Im7i6pYiLp3oao2tas7Z2C9ygng5MOXCfH4K8ydwyGxtfXn8aA/kEd67bvKyqHw== | ||
|
|
||
| "@glimmer/vm@^0.38.2-alpha.2": | ||
| version "0.38.2-alpha.2" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.38.2-alpha.2.tgz#3599017df6e2014d546f97830c590948504250c2" | ||
| integrity sha512-WQdlOwC+2cMUTDZynI/KmJDn9bnorEwqezwOyHBc2YYgqsJlv/ie5TF4MnuQSmGLvGt0tehr70J6UTapdPLDmA== | ||
| "@glimmer/vm@^0.38.4-alpha.1": | ||
| version "0.38.4-alpha.1" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.38.4-alpha.1.tgz#21930d9d607477d32d807c674f592d1bd123433c" | ||
| integrity sha512-vw2tteiGFC8iATEOTY1Nwff/zpbGPPuek6GswsYbReA94rQqKdYX13LFy2ZyBRBUv5lGsR8F9nysd67LRJMP2A== | ||
| dependencies: | ||
| "@glimmer/interfaces" "^0.38.2-alpha.2" | ||
| "@glimmer/util" "^0.38.2-alpha.2" | ||
| "@glimmer/interfaces" "^0.38.4-alpha.1" | ||
| "@glimmer/util" "^0.38.4-alpha.1" | ||
|
|
||
| "@glimmer/wire-format@^0.38.2-alpha.2": | ||
| version "0.38.2-alpha.2" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.38.2-alpha.2.tgz#a580f9079b164f9db37cbde4169dc1aecd6d1015" | ||
| integrity sha512-g3zKL3xjLfhrQmSArKivz65FLWEhL8Y5T+UIjbnisEUp1vC8HKwM9+LfceaUFsop9o6OLE/7ZyE8YE3iCWjgTQ== | ||
| "@glimmer/wire-format@^0.38.4-alpha.1": | ||
| version "0.38.4-alpha.1" | ||
| resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.38.4-alpha.1.tgz#e909066f901038a5ebfced99f3dbac527ae202f9" | ||
| integrity sha512-MXt21XmAIqJpGTw6Ov2Nu9WQE1DjHD0QO5jblxknfMNK6F4KU/jMU+IgYgqVmfy8GLpEQQ/+lixUWbP7inCsaA== | ||
| dependencies: | ||
| "@glimmer/util" "^0.38.2-alpha.2" | ||
| "@glimmer/util" "^0.38.4-alpha.1" | ||
|
|
||
| "@simple-dom/document@^1.4.0": | ||
| version "1.4.0" | ||
|
|
||