Skip to content

Commit 2ef87f8

Browse files
rwjbluerwjblue
authored
Merge pull request #18713 from rwjblue/backport-sht-update
Backport updates to @glimmer/syntax for simple-html-tokenizer.
2 parents deefc2e + f050531 commit 2ef87f8

File tree

2 files changed

+106
-106
lines changed

2 files changed

+106
-106
lines changed

‎package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@
7474
},
7575
"devDependencies": {
7676
"@babel/preset-env": "^7.6.0",
77-
"@glimmer/compiler": "0.38.5-alpha.4",
77+
"@glimmer/compiler": "0.38.5-alpha.5",
7878
"@glimmer/env": "^0.1.7",
79-
"@glimmer/interfaces": "0.38.5-alpha.4",
80-
"@glimmer/node": "0.38.5-alpha.4",
81-
"@glimmer/opcode-compiler": "0.38.5-alpha.4",
82-
"@glimmer/program": "0.38.5-alpha.4",
83-
"@glimmer/reference": "0.38.5-alpha.4",
84-
"@glimmer/runtime": "0.38.5-alpha.4",
79+
"@glimmer/interfaces": "0.38.5-alpha.5",
80+
"@glimmer/node": "0.38.5-alpha.5",
81+
"@glimmer/opcode-compiler": "0.38.5-alpha.5",
82+
"@glimmer/program": "0.38.5-alpha.5",
83+
"@glimmer/reference": "0.38.5-alpha.5",
84+
"@glimmer/runtime": "0.38.5-alpha.5",
8585
"@types/qunit": "^2.5.4",
8686
"@types/rsvp": "^4.0.3",
8787
"@typescript-eslint/parser": "^2.7.0",

‎yarn.lock

Lines changed: 99 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -775,122 +775,122 @@
775775
resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.1.1.tgz#d5732c3da593f202e6e1ac6dbee56a758242403f"
776776
integrity sha512-GEhri78jdQp/xxPpM6z08KlB0wrHfnfrJ9dmQk7JeQ4XCiMzXsJci7yooQgg/IcTKCM/PxE/IkGCQAo80adMkw==
777777

778-
"@glimmer/[email protected].4":
779-
version "0.38.5-alpha.4"
780-
resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.38.5-alpha.4.tgz#531fcc5c986dae48a306bcef04c3b8677194559d"
781-
integrity sha512-29PPAQjipqGM7uxhuAlK3fyJAcIeLlWZx/Ud00S+FRZUHhyGeoAIonFz/bXsNTLlJEcrizpl6qvu2sQFHMgYiA==
778+
"@glimmer/[email protected].5":
779+
version "0.38.5-alpha.5"
780+
resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.38.5-alpha.5.tgz#b2d0146b16f2461297deb56ac7eef9ff456c2bb8"
781+
integrity sha512-wVryXx6bZF4UOxiBO92Gf9wHJ3ZXtF1DHPQUz534/9NV1OxFkDaJ6haPkAWsorjl85IoNtKJo9Lg9Pt9H1tBZw==
782782
dependencies:
783-
"@glimmer/interfaces" "^0.38.5-alpha.4"
784-
"@glimmer/syntax" "^0.38.5-alpha.4"
785-
"@glimmer/util" "^0.38.5-alpha.4"
786-
"@glimmer/wire-format" "^0.38.5-alpha.4"
783+
"@glimmer/interfaces" "^0.38.5-alpha.5"
784+
"@glimmer/syntax" "^0.38.5-alpha.5"
785+
"@glimmer/util" "^0.38.5-alpha.5"
786+
"@glimmer/wire-format" "^0.38.5-alpha.5"
787787

788-
"@glimmer/encoder@^0.38.5-alpha.4":
789-
version "0.38.5-alpha.4"
790-
resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.38.5-alpha.4.tgz#98313396d5d24429734221b93d9bff7295e92c96"
791-
integrity sha512-pNlIqgT6HJXLnfAMr86oBhjkOxyQns6A/9Y8YbWTsp+/lqITo3hIOVV+rYeyDongUIFmNPBpYgOM0vC9wm5sPA==
788+
"@glimmer/encoder@^0.38.5-alpha.5":
789+
version "0.38.5-alpha.5"
790+
resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.38.5-alpha.5.tgz#d596cecd25e0610df19d94aa1fd70f17eb7b97d5"
791+
integrity sha512-yHZ9AUIPVKTZKVdMswlrwrcVHIBi3z9V9MH2j1A6hOXEum/MK6zW5bsn0L4L51K4gEQ+kJkzxgHGfsKydkS9ig==
792792
dependencies:
793-
"@glimmer/interfaces" "^0.38.5-alpha.4"
794-
"@glimmer/vm" "^0.38.5-alpha.4"
793+
"@glimmer/interfaces" "^0.38.5-alpha.5"
794+
"@glimmer/vm" "^0.38.5-alpha.5"
795795

796796
"@glimmer/env@^0.1.7":
797797
version "0.1.7"
798798
resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
799799
integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
800800

801-
"@glimmer/[email protected].4", "@glimmer/interfaces@^0.38.5-alpha.4":
802-
version "0.38.5-alpha.4"
803-
resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.38.5-alpha.4.tgz#539c52952f7cc7cdd5baf56d2f58872a94c84145"
804-
integrity sha512-DZgg5uq5bXf6mlmumAPk7Z1TJn+K251kecNcN+mK8xSGYUSWvYN31EEJZERvapZhMgf76ylKiJdKvXMcwMDhcg==
801+
"@glimmer/[email protected].5", "@glimmer/interfaces@^0.38.5-alpha.5":
802+
version "0.38.5-alpha.5"
803+
resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.38.5-alpha.5.tgz#e33d59d5f5cd98316023ecd62f0585e76614104d"
804+
integrity sha512-A+NAfQDVeOG0gWPBCvuDbUz47Q7xwEdrTVA7Z5Dc4B2o5Z3zl8r4ZsEtENv0Lz3gOEO4hb2TI+5YYVz1uD/1Tw==
805805
dependencies:
806-
"@glimmer/wire-format" "^0.38.5-alpha.4"
806+
"@glimmer/wire-format" "^0.38.5-alpha.5"
807807
"@simple-dom/interface" "1.4.0"
808808

809-
"@glimmer/low-level@^0.38.5-alpha.4":
810-
version "0.38.5-alpha.4"
811-
resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.38.5-alpha.4.tgz#2528dac131dff95c2f401e4f05b27bbf0c6adcf0"
812-
integrity sha512-MWRtqZGhQBdmCqQXjqHltJTEtxPqw/xMVPJh0Hj8OdILCldmo7E7uYMUejO7+JmKe/b+IJZH0Pm2+R3ZT5mT6g==
813-
814-
"@glimmer/[email protected].4":
815-
version "0.38.5-alpha.4"
816-
resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.38.5-alpha.4.tgz#a29aaf9c8a1b73f18298938fdc29ffbea4bcff14"
817-
integrity sha512-pPL6E4bo4gbdWjAS68Q1qSudhDLPlB5TpC7dXTlBwYzVXKoZKHoccVT6LuoUYGxeKuSb4adEZV8FRXIy7gfkZQ==
818-
dependencies:
819-
"@glimmer/interfaces" "^0.38.5-alpha.4"
820-
"@glimmer/runtime" "^0.38.5-alpha.4"
821-
822-
"@glimmer/[email protected].4":
823-
version "0.38.5-alpha.4"
824-
resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.38.5-alpha.4.tgz#b67b7feb683bc11337380541d056937d07e8a45c"
825-
integrity sha512-VtwBqLEyAwgE6rDIZ9s0RyZw//OkK0tmHxp4XDKO+RbL3jxxkdNSXXNfN7k0gUvu3810X9rkDNnJdHJvTOWgZQ==
826-
dependencies:
827-
"@glimmer/encoder" "^0.38.5-alpha.4"
828-
"@glimmer/interfaces" "^0.38.5-alpha.4"
829-
"@glimmer/program" "^0.38.5-alpha.4"
830-
"@glimmer/reference" "^0.38.5-alpha.4"
831-
"@glimmer/util" "^0.38.5-alpha.4"
832-
"@glimmer/vm" "^0.38.5-alpha.4"
833-
"@glimmer/wire-format" "^0.38.5-alpha.4"
834-
835-
"@glimmer/[email protected].4", "@glimmer/program@^0.38.5-alpha.4":
836-
version "0.38.5-alpha.4"
837-
resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.38.5-alpha.4.tgz#9bf15574e894f1eb0e9da0dad53fd9ffc218502b"
838-
integrity sha512-BlJF82FVaDObiuYaK05aZ2RCcGOKbSWbcQgww4QtNhg7I4h6kGV9gSpk4FAhDqBdVv/O+wkzeRlF9k8FRiBjIA==
839-
dependencies:
840-
"@glimmer/encoder" "^0.38.5-alpha.4"
841-
"@glimmer/interfaces" "^0.38.5-alpha.4"
842-
"@glimmer/util" "^0.38.5-alpha.4"
843-
844-
"@glimmer/[email protected].4", "@glimmer/reference@^0.38.5-alpha.4":
845-
version "0.38.5-alpha.4"
846-
resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.38.5-alpha.4.tgz#ac81aa3013d5a73ab01a0a3e6d664c0e9d606dcd"
847-
integrity sha512-zswmfnOpoZJUWhqitogfMRY7qDSzBdwmDKrKe0OWypJdQT7z8d4+i4NsL0UQNJLwvlGyOgB0iMrLUOGwS/Yrvg==
848-
dependencies:
849-
"@glimmer/util" "^0.38.5-alpha.4"
850-
851-
"@glimmer/[email protected].4", "@glimmer/runtime@^0.38.5-alpha.4":
852-
version "0.38.5-alpha.4"
853-
resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.38.5-alpha.4.tgz#a82ab278eb81d02b85e6aacca9267ed8b64df0b5"
854-
integrity sha512-D/G9VkefvZalKyNSSYpTzpU9f95Gd3m4zN0bafCh39i5qxBhYP2tmiOAFGhLU2dRF5C6VZentFN8mSS3gXvVlw==
855-
dependencies:
856-
"@glimmer/interfaces" "^0.38.5-alpha.4"
857-
"@glimmer/low-level" "^0.38.5-alpha.4"
858-
"@glimmer/program" "^0.38.5-alpha.4"
859-
"@glimmer/reference" "^0.38.5-alpha.4"
860-
"@glimmer/util" "^0.38.5-alpha.4"
861-
"@glimmer/vm" "^0.38.5-alpha.4"
862-
"@glimmer/wire-format" "^0.38.5-alpha.4"
809+
"@glimmer/low-level@^0.38.5-alpha.5":
810+
version "0.38.5-alpha.5"
811+
resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.38.5-alpha.5.tgz#482a79920821f77cc7db6c294ffc1f1451dc48a8"
812+
integrity sha512-IjPlXSithEoWIWBTQmijihzemJvizlUDNfW9gfscliT9HxJUGl7VzHNVSYCcwDPVmQEkOKZ4U6Fg3Ey9+HTDOA==
813+
814+
"@glimmer/[email protected].5":
815+
version "0.38.5-alpha.5"
816+
resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.38.5-alpha.5.tgz#9149e4255525836b22626075298c4f9100c7c2ce"
817+
integrity sha512-Rvw2n6ltLaO/Wk7PwerA/k35NYO1jmYox6k0enU/HWg3dJq93c0QeXSQssXks95on2MYzQvBCVNAG058IY0g0Q==
818+
dependencies:
819+
"@glimmer/interfaces" "^0.38.5-alpha.5"
820+
"@glimmer/runtime" "^0.38.5-alpha.5"
821+
822+
"@glimmer/[email protected].5":
823+
version "0.38.5-alpha.5"
824+
resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.38.5-alpha.5.tgz#0cd95d782e8900dbbc1f6a3b52aada3e8af7136c"
825+
integrity sha512-T6rLluFUome//U87qH+0lu/uBn2435rhbid01yrt4yLwqCr3N9N9hSttJiW/nIkrcQT2LCnVsf4gVR/qRLCnIQ==
826+
dependencies:
827+
"@glimmer/encoder" "^0.38.5-alpha.5"
828+
"@glimmer/interfaces" "^0.38.5-alpha.5"
829+
"@glimmer/program" "^0.38.5-alpha.5"
830+
"@glimmer/reference" "^0.38.5-alpha.5"
831+
"@glimmer/util" "^0.38.5-alpha.5"
832+
"@glimmer/vm" "^0.38.5-alpha.5"
833+
"@glimmer/wire-format" "^0.38.5-alpha.5"
834+
835+
"@glimmer/[email protected].5", "@glimmer/program@^0.38.5-alpha.5":
836+
version "0.38.5-alpha.5"
837+
resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.38.5-alpha.5.tgz#4af197fbf4f8546efc8339b8427d0156c6dba074"
838+
integrity sha512-9Pww06p+soiZ9Kvy5L0caGCXpoSbpZHvc3Tk25HYmHMjnODA3INnJ4eLV0OQuvyq+xpVZPdqE8TFw8jdGBaiMA==
839+
dependencies:
840+
"@glimmer/encoder" "^0.38.5-alpha.5"
841+
"@glimmer/interfaces" "^0.38.5-alpha.5"
842+
"@glimmer/util" "^0.38.5-alpha.5"
843+
844+
"@glimmer/[email protected].5", "@glimmer/reference@^0.38.5-alpha.5":
845+
version "0.38.5-alpha.5"
846+
resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.38.5-alpha.5.tgz#674fe344bf6cf64468e82560318b411b73e9af9b"
847+
integrity sha512-jH/zqiX+tASfoQsnQzzPp1HeKR37D/QltJA1r1Nag1YOfPlydZjzUPxx3GRC+SR3uVFXweo49nLSH3B+82og/Q==
848+
dependencies:
849+
"@glimmer/util" "^0.38.5-alpha.5"
850+
851+
"@glimmer/[email protected].5", "@glimmer/runtime@^0.38.5-alpha.5":
852+
version "0.38.5-alpha.5"
853+
resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.38.5-alpha.5.tgz#37971a8b46ef16428b000b1291c136f45e35b06a"
854+
integrity sha512-OahZTFfAhYpui886MPZ0z3KAKVFHhjjIB4zBjkKNDWZ1TXvTCne0YdiMhnLzc94m2sJ/LNmOqDMzgB8MF4DrbQ==
855+
dependencies:
856+
"@glimmer/interfaces" "^0.38.5-alpha.5"
857+
"@glimmer/low-level" "^0.38.5-alpha.5"
858+
"@glimmer/program" "^0.38.5-alpha.5"
859+
"@glimmer/reference" "^0.38.5-alpha.5"
860+
"@glimmer/util" "^0.38.5-alpha.5"
861+
"@glimmer/vm" "^0.38.5-alpha.5"
862+
"@glimmer/wire-format" "^0.38.5-alpha.5"
863863
"@simple-dom/interface" "^1.4.0"
864864

865-
"@glimmer/syntax@^0.38.5-alpha.4":
866-
version "0.38.5-alpha.4"
867-
resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.38.5-alpha.4.tgz#95352c1732827080630c454a94d105d3368e8bcc"
868-
integrity sha512-i7ODFOhFE1RIfYMMBVlcDLAW1ycb+lNyoEdzhNAqbQLXl+E9BmbJ+HHJAKvmA6w2kgllQ5weXLhrn4ITkVohiA==
865+
"@glimmer/syntax@^0.38.5-alpha.5":
866+
version "0.38.5-alpha.5"
867+
resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.38.5-alpha.5.tgz#a4c6f246b1c930bbfe657e3fa6da921192722054"
868+
integrity sha512-ZdbVKeCYD7oTRQqQcj7kvD7PZ5iVgzG0xWkKs6K/LGjKnlODReEHlIPWXydu/bAEaDjmCH8hjlQlsxt4mzLvCg==
869869
dependencies:
870-
"@glimmer/interfaces" "^0.38.5-alpha.4"
871-
"@glimmer/util" "^0.38.5-alpha.4"
870+
"@glimmer/interfaces" "^0.38.5-alpha.5"
871+
"@glimmer/util" "^0.38.5-alpha.5"
872872
handlebars "^4.0.6"
873-
simple-html-tokenizer "^0.5.8"
873+
simple-html-tokenizer "^0.5.9"
874874

875-
"@glimmer/util@^0.38.5-alpha.4":
876-
version "0.38.5-alpha.4"
877-
resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.38.5-alpha.4.tgz#8d858049aaa87b03da84b73ae163ef2935b39114"
878-
integrity sha512-pOJX72PgvKFw9PVjtOKlrtPJ6QEY5xfSXvvX7zCBZoJevGhN+saasan/kDy9Kj7sQjicSOCkbK16WxX3LSV1ZQ==
875+
"@glimmer/util@^0.38.5-alpha.5":
876+
version "0.38.5-alpha.5"
877+
resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.38.5-alpha.5.tgz#d2bb691aa0d8dc80a9cf7e4a0877c40dace8631f"
878+
integrity sha512-/8UtYiEKSfcNoGxrcfspFl4wRrfNHkTu6iZiFAgrcW7CbaSX7LLp6ouJVbvpFTfSrIIMcDu0cSPgo59cKDN1vA==
879879

880-
"@glimmer/vm@^0.38.5-alpha.4":
881-
version "0.38.5-alpha.4"
882-
resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.38.5-alpha.4.tgz#ae03429ba001a703e1b9ebbbbeb9b635966afa8d"
883-
integrity sha512-7lWC0c9qgl7NfcT6eqDplfsH/yT3yHbwKwuf2LyRotIUK20jKklBNrzfEqIzsMDHn9qK/fLpJPeCuS7vZAamYg==
880+
"@glimmer/vm@^0.38.5-alpha.5":
881+
version "0.38.5-alpha.5"
882+
resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.38.5-alpha.5.tgz#1f46726134de3e07aed2c33b68ec3614e93e27f4"
883+
integrity sha512-Ri8WimEtfPyM/Ur+elHqGT0ZQvKRYUZ/TykqInN0ZIm1hf0UPnF/naCoHJnSvBjHSFzqziPCYxCfo9sE2UBK9A==
884884
dependencies:
885-
"@glimmer/interfaces" "^0.38.5-alpha.4"
886-
"@glimmer/util" "^0.38.5-alpha.4"
885+
"@glimmer/interfaces" "^0.38.5-alpha.5"
886+
"@glimmer/util" "^0.38.5-alpha.5"
887887

888-
"@glimmer/wire-format@^0.38.5-alpha.4":
889-
version "0.38.5-alpha.4"
890-
resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.38.5-alpha.4.tgz#91c173371c5e7cd77f2fc3d32c92c70ddfc81da5"
891-
integrity sha512-mS1RW6eIT++BOox++i2VJ6w7z62MdPUnvcCGHtT9V1lmnxB0eJEtdKx+i/wV7F8+L4PkbKsc3BblWGEg+Ut9cw==
888+
"@glimmer/wire-format@^0.38.5-alpha.5":
889+
version "0.38.5-alpha.5"
890+
resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.38.5-alpha.5.tgz#b8e00950dae19c377d0fdd269be3687b1bed0619"
891+
integrity sha512-mXbWv62rryHo+7L3Iiovi1byYE7v0BCSdKPovvH+UocVHIIlnFKtljHo89h53iAOGLuiasJhU7HpZTl6b6Qj+Q==
892892
dependencies:
893-
"@glimmer/util" "^0.38.5-alpha.4"
893+
"@glimmer/util" "^0.38.5-alpha.5"
894894

895895
"@simple-dom/document@^1.4.0":
896896
version "1.4.0"
@@ -7486,10 +7486,10 @@ simple-dom@^1.4.0:
74867486
"@simple-dom/serializer" "^1.4.0"
74877487
"@simple-dom/void-map" "^1.4.0"
74887488

7489-
simple-html-tokenizer@^0.5.8:
7490-
version "0.5.8"
7491-
resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.8.tgz#3417382f75954ee34515cc4fd32d9918e693f173"
7492-
integrity sha512-0Sq4FvLlQEQODVA6PH2MIrc7tzYO0KT2HzzwvaVLYClWgIsuvaNUOrhrAvTi1pZHrcq7GDB4WiI3ukjqBMxcGQ==
7489+
simple-html-tokenizer@^0.5.9:
7490+
version "0.5.9"
7491+
resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.9.tgz#1a83fe97f5a3e39b335fddf71cfe9b0263b581c2"
7492+
integrity sha512-w/3FEDN94r4JQ9WoYrIr8RqDIPZdyNkdpbK9glFady1CAEyD97XWCv8HFetQO21w81e7h7Nh59iYTyG1mUJftg==
74937493

74947494
slice-ansi@^2.1.0:
74957495
version "2.1.0"

0 commit comments

Comments
 (0)