Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump haml from 5.2.2 to 6.0.12 #39

Closed
wants to merge 1 commit into from

Conversation

dependabot[bot]
Copy link

@dependabot dependabot bot commented on behalf of github Nov 27, 2022

Bumps haml from 5.2.2 to 6.0.12.

Release notes

Sourced from haml's releases.

6.0.1

  • Unescape HTML-safe interpolation on Rails #1084
  • Resurrect Haml 5's AttributeParser.available? for syntax_tree-haml #1085

6.0.0

Haml 6 became 1.7x faster than Haml 5, and it's now faster than Slim and Erubi in this benchmark that was originally written by Slim developers.

$ bundle exec ruby benchmark/slim/run-benchmarks.rb
Calculating -------------------------------------
       erubi v1.11.0    34.595k i/100ms
         slim v4.1.0    30.931k i/100ms
  haml v6.0.0.beta.1    35.621k i/100ms
-------------------------------------------------
       erubi v1.11.0    411.827k (± 0.4%) i/s -      2.076M
         slim v4.1.0    361.660k (± 0.4%) i/s -      1.825M
  haml v6.0.0.beta.1    427.207k (± 0.6%) i/s -      2.137M

Comparison: haml v6.0.0.beta.1: 427206.9 i/s erubi v1.11.0: 411826.6 i/s - 1.04x slower slim v4.1.0: 361659.8 i/s - 1.18x slower

Changes

  • Replace the implementation with Hamlit
    • Haml 6 is about 1.7x faster than Haml 5 in this benchmark.
    • The parser is kept as is, but everything else is replaced.
    • The haml CLI interface was also replaced.
    • The interface of Haml::Engine is changed. Haml::Template is most likely what you need now.
    • Most Haml helpers are removed.
      • Rails:
        • Kept: find_and_reserve, preserve, surround, precede, succeed, capture_haml
        • Removed: block_is_haml?, flatten, haml_concat, haml_indent, haml_tag, haml_tag_if, html_attrs, html_escape, init_haml_helpers, is_haml?, list_of, non_haml, tab_down, tab_up, with_tabs
      • Tilt:
        • Kept: preserve
        • Removed: block_is_haml?, capture_haml, escape_once, find_and_preserve, flatten, haml_concat, haml_indent, haml_tag, haml_tag_if, html_attrs, html_escape, init_haml_helpers, is_haml?, list_of, non_haml, precede, succeed, surround, tab_down, tab_up, with_tabs
    • Only the attributes in Haml::AttributeBuilder::BOOLEAN_ATTRIBUTES are handled as boolean attributes.
    • Some legacy Rails integration is removed.

6.0.0.beta.1

Haml 6 became 1.7x faster than Haml 5, and it's now faster than Slim and Erubi in this benchmark that was originally written by Slim developers.

$ bundle exec ruby benchmark/slim/run-benchmarks.rb
</tr></table> 

... (truncated)

Changelog

Sourced from haml's changelog.

6.0.12

  • Fix a whitespace removal with > and an if-else statement #1114

6.0.11

  • Fix a whitespace removal with > and an if statement #1114

6.0.10

  • Evaluate :erb filter in the template context like Haml 5

6.0.9

  • Support sass-embedded #1112

6.0.8

  • Support interpolation in HTML comments, which has not been working since 6.0.0 #1107

6.0.7

  • Haml::Engine and Haml::Template use StringBuffer instead of ArrayBuffer
    • It seems more performant in many cases with recent Ruby versions.
    • Haml::RailsTemplate is not affected.

6.0.6

  • Prevent CRuby from accidentally using the Ruby implementation fallback
    • Reversing what v6.0.3 and v6.0.4 did, but still supporting Wasm.

6.0.5

  • Resurrect #haml_object_ref support in an object reference #1097
    • This was removed in 6.0.0, and added back in this version.
  • Stop warning remove_whitespace: true option.

6.0.4

Released on October 2, 2022 (diff).

  • Fix a parse failure of % in attributes #1096
  • Add another fallback from C to Ruby for Wasm.

6.0.3

Released on September 28, 2022 (diff).

... (truncated)

Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot added the dependencies Pull requests that update a dependency file label Nov 27, 2022
@dependabot dependabot bot force-pushed the dependabot/bundler/haml-6.0.12 branch from d3748a2 to bb346df Compare December 4, 2022 14:46
Bumps [haml](https://github.com/haml/haml) from 5.2.2 to 6.0.12.
- [Release notes](https://github.com/haml/haml/releases)
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md)
- [Commits](haml/haml@v5.2.2...v6.0.12)

---
updated-dependencies:
- dependency-name: haml
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot force-pushed the dependabot/bundler/haml-6.0.12 branch from bb346df to 98058d9 Compare December 4, 2022 14:46
@froderik
Copy link
Owner

froderik commented Dec 7, 2022

This is not working though. The markup is escaped - looks like the layout is ok but when yielding partials it breaks. And it should work since this PR was included in 3.0.4 of sinatra.

@dependabot @github
Copy link
Author

dependabot bot commented on behalf of github Dec 7, 2022

Looks like haml is up-to-date now, so this is no longer needed.

@dependabot dependabot bot closed this Dec 7, 2022
@dependabot dependabot bot deleted the dependabot/bundler/haml-6.0.12 branch December 7, 2022 12:17
@froderik
Copy link
Owner

froderik commented Dec 7, 2022

Sorted it in this commit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant