From edce20a822dd87f437d9c55b557e9b945586db9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Mar 2021 18:03:38 +0000 Subject: [PATCH] Build(deps): Bump @glimmer/syntax from 0.77.1 to 0.77.2 (#10550) --- changelog_unreleased/handlebars/10550.md | 13 +++++++ package.json | 2 +- .../escape/__snapshots__/jsfmt.spec.js.snap | 27 +++++++++++++ tests/handlebars/escape/numeric-entities.hbs | 9 +++++ .../__snapshots__/jsfmt.spec.js.snap | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 6 +-- yarn.lock | 38 ++++++------------- 7 files changed, 65 insertions(+), 32 deletions(-) create mode 100644 changelog_unreleased/handlebars/10550.md create mode 100644 tests/handlebars/escape/numeric-entities.hbs diff --git a/changelog_unreleased/handlebars/10550.md b/changelog_unreleased/handlebars/10550.md new file mode 100644 index 000000000..1d334f225 --- /dev/null +++ b/changelog_unreleased/handlebars/10550.md @@ -0,0 +1,13 @@ +#### Preserve numeric character references (#10550 by @rwjblue and @thorn0) + + +```hbs +{{! Input }} + + +{{! Prettier stable }} + + +{{! Prettier main }} + +``` diff --git a/package.json b/package.json index 29dd9ee0e..44e7c681d 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@angular/compiler": "11.2.5", "@babel/code-frame": "7.12.13", "@babel/parser": "7.13.10", - "@glimmer/syntax": "0.77.1", + "@glimmer/syntax": "0.77.2", "@iarna/toml": "2.2.5", "@typescript-eslint/typescript-estree": "4.16.1", "angular-estree-parser": "2.3.0", diff --git a/tests/handlebars/escape/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/escape/__snapshots__/jsfmt.spec.js.snap index c300b89ae..9348648cb 100644 --- a/tests/handlebars/escape/__snapshots__/jsfmt.spec.js.snap +++ b/tests/handlebars/escape/__snapshots__/jsfmt.spec.js.snap @@ -26,3 +26,30 @@ printWidth: 80
\\{{
================================================================================ `; + +exports[`numeric-entities.hbs format 1`] = ` +====================================options===================================== +parsers: ["glimmer"] +printWidth: 80 + | printWidth +=====================================input====================================== + + +Σ: Σ Σ Σ Σ Σ + +[&nbsp;] [&#160;] + +
+ + + +=====================================output===================================== + + +Σ: Σ Σ Σ Σ Σ [&nbsp;] [&#160;] + +
+ + +================================================================================ +`; diff --git a/tests/handlebars/escape/numeric-entities.hbs b/tests/handlebars/escape/numeric-entities.hbs new file mode 100644 index 000000000..b2d756a95 --- /dev/null +++ b/tests/handlebars/escape/numeric-entities.hbs @@ -0,0 +1,9 @@ + + +Σ: Σ Σ Σ Σ Σ + +[&nbsp;] [&#160;] + +
+ + diff --git a/tests/handlebars/text-wrap/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/text-wrap/__snapshots__/jsfmt.spec.js.snap index 7f322201e..f3f95ba16 100644 --- a/tests/handlebars/text-wrap/__snapshots__/jsfmt.spec.js.snap +++ b/tests/handlebars/text-wrap/__snapshots__/jsfmt.spec.js.snap @@ -238,7 +238,7 @@ printWidth: 80
- First
+ First
Second
Third diff --git a/tests/handlebars/whitespace/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/whitespace/__snapshots__/jsfmt.spec.js.snap index fbd622509..a268a0c7c 100644 --- a/tests/handlebars/whitespace/__snapshots__/jsfmt.spec.js.snap +++ b/tests/handlebars/whitespace/__snapshots__/jsfmt.spec.js.snap @@ -231,9 +231,9 @@ printWidth: 40 our primary goal. Consumers own 60% of the cooperative and worker members 40%. Consumer and worker members share - proportionately in the cooperative’s - profits through our annual patronage - dividends. + proportionately in the + cooperative’s profits through + our annual patronage dividends.

================================================================================ `; diff --git a/yarn.lock b/yarn.lock index 726c768ef..39862c75f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1073,13 +1073,6 @@ dependencies: "@glimmer/env" "^0.1.7" -"@glimmer/interfaces@0.77.1": - version "0.77.1" - resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.77.1.tgz#845a62ff6dc6a3646642cfbeec84b13a8a66ea1c" - integrity sha512-Dp0hebviZpcqEPjuNA5kGa/gl5nfYv+XEI0e9ozF5d1FD5yGPdvwQ9D+sQ4Dn888XCCmTWzKME4iRsVHK5aJoA== - dependencies: - "@simple-dom/interface" "^1.4.0" - "@glimmer/interfaces@0.77.2": version "0.77.2" resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.77.2.tgz#9e0f732439ac140d485d9c155ca9cc9ecfb73029" @@ -1098,25 +1091,16 @@ "@glimmer/util" "0.77.2" "@glimmer/validator" "0.77.2" -"@glimmer/syntax@0.77.1": - version "0.77.1" - resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.77.1.tgz#155109c2e62a3dc94cf0ae7ccf2e840fe8875c7c" - integrity sha512-Jbfr34s0D70OlXeGzHzzK0aTRoXR0KtC6klVw5IQQlxvJIrHlZuRDpIueByL5sxhyYh9KQc13lMcHXUFaIPEtA== +"@glimmer/syntax@0.77.2": + version "0.77.2" + resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.77.2.tgz#0e37085c8b81228590396a7fe7365513a0d64798" + integrity sha512-LJYShzftktJoFLZ2r5C9RbFxGGXWwTAExsKTXCgbxUPUtNjFwJeNddnkbJOe/Ko6QhKP+mkCYyjECIiKwn8A8A== dependencies: - "@glimmer/interfaces" "0.77.1" - "@glimmer/util" "0.77.1" - "@handlebars/parser" "^2.0.0" + "@glimmer/interfaces" "0.77.2" + "@glimmer/util" "0.77.2" + "@handlebars/parser" "~2.0.0" simple-html-tokenizer "^0.5.10" -"@glimmer/util@0.77.1": - version "0.77.1" - resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.77.1.tgz#9dfa721a3e3d06d7ec84488ef2e1a0107ea7cf3f" - integrity sha512-9BHDbmc/z7wzre+esFI+UPR2bx2Z+NYS5SxH10zgdYMDaN7qAQ63lIt+20AasQjC49JH4GxoPTettSknMQ6F1A== - dependencies: - "@glimmer/env" "0.1.7" - "@glimmer/interfaces" "0.77.1" - "@simple-dom/interface" "^1.4.0" - "@glimmer/util@0.77.2": version "0.77.2" resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.77.2.tgz#4673867c83a090c0eac501d07b1816ed7645709c" @@ -1134,10 +1118,10 @@ "@glimmer/env" "^0.1.7" "@glimmer/global-context" "0.77.2" -"@handlebars/parser@^2.0.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.1.0.tgz#100e625d53c339e2b571c91fa93a455e93670fe2" - integrity sha512-R14NuNaSKZ6eE9y4t0fg/1f8iKd5ZJtSOTIseGFzXINTV17XffhLG2Y0CvdKOgyVQ7+UnXi89YGzRo/xsgwHIA== +"@handlebars/parser@~2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5" + integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA== "@iarna/toml@2.2.5": version "2.2.5"