Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,14 @@ GEM
erubi (1.13.1)
globalid (1.3.0)
activesupport (>= 6.1)
herb (0.9.1-aarch64-linux-gnu)
herb (0.9.1-aarch64-linux-musl)
herb (0.9.1-arm-linux-gnu)
herb (0.9.1-arm-linux-musl)
herb (0.9.1-arm64-darwin)
herb (0.9.1-x86_64-darwin)
herb (0.9.1-x86_64-linux-gnu)
herb (0.9.1-x86_64-linux-musl)
herb (0.9.2-aarch64-linux-gnu)
herb (0.9.2-aarch64-linux-musl)
herb (0.9.2-arm-linux-gnu)
herb (0.9.2-arm-linux-musl)
herb (0.9.2-arm64-darwin)
herb (0.9.2-x86_64-darwin)
herb (0.9.2-x86_64-linux-gnu)
herb (0.9.2-x86_64-linux-musl)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
io-console (0.8.1)
Expand Down
16 changes: 8 additions & 8 deletions gemfiles/rails_7_0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ GEM
drb (2.2.3)
erb (5.0.2)
erubi (1.13.1)
herb (0.9.1-aarch64-linux-gnu)
herb (0.9.1-aarch64-linux-musl)
herb (0.9.1-arm-linux-gnu)
herb (0.9.1-arm-linux-musl)
herb (0.9.1-arm64-darwin)
herb (0.9.1-x86_64-darwin)
herb (0.9.1-x86_64-linux-gnu)
herb (0.9.1-x86_64-linux-musl)
herb (0.9.2-aarch64-linux-gnu)
herb (0.9.2-aarch64-linux-musl)
herb (0.9.2-arm-linux-gnu)
herb (0.9.2-arm-linux-musl)
herb (0.9.2-arm64-darwin)
herb (0.9.2-x86_64-darwin)
herb (0.9.2-x86_64-linux-gnu)
herb (0.9.2-x86_64-linux-musl)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
io-console (0.8.1)
Expand Down
16 changes: 8 additions & 8 deletions gemfiles/rails_7_1.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ GEM
drb (2.2.3)
erb (5.0.2)
erubi (1.13.1)
herb (0.9.1-aarch64-linux-gnu)
herb (0.9.1-aarch64-linux-musl)
herb (0.9.1-arm-linux-gnu)
herb (0.9.1-arm-linux-musl)
herb (0.9.1-arm64-darwin)
herb (0.9.1-x86_64-darwin)
herb (0.9.1-x86_64-linux-gnu)
herb (0.9.1-x86_64-linux-musl)
herb (0.9.2-aarch64-linux-gnu)
herb (0.9.2-aarch64-linux-musl)
herb (0.9.2-arm-linux-gnu)
herb (0.9.2-arm-linux-musl)
herb (0.9.2-arm64-darwin)
herb (0.9.2-x86_64-darwin)
herb (0.9.2-x86_64-linux-gnu)
herb (0.9.2-x86_64-linux-musl)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
io-console (0.8.1)
Expand Down
16 changes: 8 additions & 8 deletions gemfiles/rails_7_2.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ GEM
drb (2.2.3)
erb (5.0.2)
erubi (1.13.1)
herb (0.9.1-aarch64-linux-gnu)
herb (0.9.1-aarch64-linux-musl)
herb (0.9.1-arm-linux-gnu)
herb (0.9.1-arm-linux-musl)
herb (0.9.1-arm64-darwin)
herb (0.9.1-x86_64-darwin)
herb (0.9.1-x86_64-linux-gnu)
herb (0.9.1-x86_64-linux-musl)
herb (0.9.2-aarch64-linux-gnu)
herb (0.9.2-aarch64-linux-musl)
herb (0.9.2-arm-linux-gnu)
herb (0.9.2-arm-linux-musl)
herb (0.9.2-arm64-darwin)
herb (0.9.2-x86_64-darwin)
herb (0.9.2-x86_64-linux-gnu)
herb (0.9.2-x86_64-linux-musl)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
io-console (0.8.1)
Expand Down
16 changes: 8 additions & 8 deletions gemfiles/rails_8_0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ GEM
drb (2.2.3)
erb (5.0.2)
erubi (1.13.1)
herb (0.9.1-aarch64-linux-gnu)
herb (0.9.1-aarch64-linux-musl)
herb (0.9.1-arm-linux-gnu)
herb (0.9.1-arm-linux-musl)
herb (0.9.1-arm64-darwin)
herb (0.9.1-x86_64-darwin)
herb (0.9.1-x86_64-linux-gnu)
herb (0.9.1-x86_64-linux-musl)
herb (0.9.2-aarch64-linux-gnu)
herb (0.9.2-aarch64-linux-musl)
herb (0.9.2-arm-linux-gnu)
herb (0.9.2-arm-linux-musl)
herb (0.9.2-arm64-darwin)
herb (0.9.2-x86_64-darwin)
herb (0.9.2-x86_64-linux-gnu)
herb (0.9.2-x86_64-linux-musl)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
io-console (0.8.1)
Expand Down
16 changes: 8 additions & 8 deletions gemfiles/rails_8_1.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ GEM
drb (2.2.3)
erb (5.0.2)
erubi (1.13.1)
herb (0.9.1-aarch64-linux-gnu)
herb (0.9.1-aarch64-linux-musl)
herb (0.9.1-arm-linux-gnu)
herb (0.9.1-arm-linux-musl)
herb (0.9.1-arm64-darwin)
herb (0.9.1-x86_64-darwin)
herb (0.9.1-x86_64-linux-gnu)
herb (0.9.1-x86_64-linux-musl)
herb (0.9.2-aarch64-linux-gnu)
herb (0.9.2-aarch64-linux-musl)
herb (0.9.2-arm-linux-gnu)
herb (0.9.2-arm-linux-musl)
herb (0.9.2-arm64-darwin)
herb (0.9.2-x86_64-darwin)
herb (0.9.2-x86_64-linux-gnu)
herb (0.9.2-x86_64-linux-musl)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
io-console (0.8.1)
Expand Down
16 changes: 8 additions & 8 deletions gemfiles/rails_8_2.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ GEM
drb (2.2.3)
erb (5.1.1)
erubi (1.13.1)
herb (0.9.1-aarch64-linux-gnu)
herb (0.9.1-aarch64-linux-musl)
herb (0.9.1-arm-linux-gnu)
herb (0.9.1-arm-linux-musl)
herb (0.9.1-arm64-darwin)
herb (0.9.1-x86_64-darwin)
herb (0.9.1-x86_64-linux-gnu)
herb (0.9.1-x86_64-linux-musl)
herb (0.9.2-aarch64-linux-gnu)
herb (0.9.2-aarch64-linux-musl)
herb (0.9.2-arm-linux-gnu)
herb (0.9.2-arm-linux-musl)
herb (0.9.2-arm64-darwin)
herb (0.9.2-x86_64-darwin)
herb (0.9.2-x86_64-linux-gnu)
herb (0.9.2-x86_64-linux-musl)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
io-console (0.8.1)
Expand Down
2 changes: 1 addition & 1 deletion javascript/packages/dev-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
},
"dependencies": {
"@herb-tools/dev-tools": "0.9.1"
"@herb-tools/dev-tools": "0.9.2"
},
"devDependencies": {
"@rollup/plugin-node-resolve": "^16.0.1",
Expand Down
6 changes: 3 additions & 3 deletions lib/reactionview/template/handlers/herb/herb.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ def initialize(input, properties = {})

# Disable all Herb escape functions - let ActionView::OutputBuffer handle escaping
properties[:escapefunc] = ""
properties[:attrfunc] = ""
properties[:jsfunc] = ""
properties[:cssfunc] = ""
properties[:attrfunc] = nil
properties[:jsfunc] = nil
properties[:cssfunc] = nil

super
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@output_buffer.safe_append='<div data-controller="combobox" data-combobox-choices-value="'.freeze; @output_buffer << ((@choices.to_json)); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer.safe_append='<div data-controller="combobox" data-combobox-choices-value="'.freeze; @output_buffer.append=(@choices.to_json); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@output_buffer.safe_append='<div data-holidays-current-value="'.freeze; @output_buffer << ((json_escape(@holidays.to_json))); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer.safe_append='<div data-holidays-current-value="'.freeze; @output_buffer.append=(json_escape(@holidays.to_json)); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@output_buffer.safe_append='<div data-config="'.freeze; @output_buffer << ((@config.to_json)); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer.safe_append='<div data-config="'.freeze; @output_buffer.append=(@config.to_json); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@output_buffer.safe_append='<div data-value="'.freeze; @output_buffer << ((@value.to_json)); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer.safe_append='<div data-value="'.freeze; @output_buffer.append=(@value.to_json); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@output_buffer.safe_append='<script>window.config = '.freeze; @output_buffer << ((raw @config.to_json)); @output_buffer.safe_append='</script>'.freeze;
@output_buffer.safe_append='<script>window.config = '.freeze; @output_buffer.append=(raw @config.to_json); @output_buffer.safe_append='</script>'.freeze;
@output_buffer
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@output_buffer.safe_append='<script type="application/json">'.freeze; @output_buffer << ((@data.to_json.html_safe)); @output_buffer.safe_append='</script>'.freeze;
@output_buffer.safe_append='<script type="application/json">'.freeze; @output_buffer.append=(@data.to_json.html_safe); @output_buffer.safe_append='</script>'.freeze;
@output_buffer
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@output_buffer.safe_append='<style>:root { --primary: '.freeze; @output_buffer << ((@primary)); @output_buffer.safe_append='; --secondary: '.freeze; @output_buffer << ((@secondary)); @output_buffer.safe_append='; }</style>'.freeze;
@output_buffer.safe_append='<style>:root { --primary: '.freeze; @output_buffer.append=(@primary); @output_buffer.safe_append='; --secondary: '.freeze; @output_buffer.append=(@secondary); @output_buffer.safe_append='; }</style>'.freeze;
@output_buffer
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@output_buffer.safe_append='<div data-empty-array="'.freeze; @output_buffer << ((@empty_array.to_json)); @output_buffer.safe_append='" data-empty-object="'.freeze; @output_buffer << ((@empty_object.to_json)); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer.safe_append='<div data-empty-array="'.freeze; @output_buffer.append=(@empty_array.to_json); @output_buffer.safe_append='" data-empty-object="'.freeze; @output_buffer.append=(@empty_object.to_json); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@output_buffer.safe_append='<div data-values="'.freeze; @output_buffer << ((@values.to_json)); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer.safe_append='<div data-values="'.freeze; @output_buffer.append=(@values.to_json); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@output_buffer.safe_append='<script>const data = '.freeze; @output_buffer << ((@data.to_json.html_safe)); @output_buffer.safe_append='; console.log(data);</script>'.freeze;
@output_buffer.safe_append='<script>const data = '.freeze; @output_buffer.append=(@data.to_json.html_safe); @output_buffer.safe_append='; console.log(data);</script>'.freeze;
@output_buffer
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@output_buffer.safe_append='<div data-value="'.freeze; @output_buffer << ((@data.to_json)); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer.safe_append='<div data-value="'.freeze; @output_buffer.append=(@data.to_json); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@output_buffer.safe_append='<script>window.data = '.freeze; @output_buffer << ((@data.to_json.html_safe)); @output_buffer.safe_append='</script>'.freeze;
@output_buffer.safe_append='<script>window.data = '.freeze; @output_buffer.append=(@data.to_json.html_safe); @output_buffer.safe_append='</script>'.freeze;
@output_buffer
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@output_buffer.safe_append='<script>
window.railsVariables = '.freeze; @output_buffer << ((@hash.to_json.html_safe)); @output_buffer.safe_append='
window.railsVariables = '.freeze; @output_buffer.append=(@hash.to_json.html_safe); @output_buffer.safe_append='
</script>
'.freeze;
@output_buffer
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@output_buffer.safe_append='<canvas
data-controller="chart"
data-chart-unit-type-value="'.freeze; @output_buffer << ((@unit_type)); @output_buffer.safe_append='"
data-chart-data-value="'.freeze; @output_buffer << ((@data.to_json)); @output_buffer.safe_append='"
data-chart-labels-value="'.freeze; @output_buffer << ((@labels.to_json)); @output_buffer.safe_append='"
data-chart-unit-value="'.freeze; @output_buffer << ((@unit_label)); @output_buffer.safe_append='"
data-chart-unit-type-value="'.freeze; @output_buffer.append=(@unit_type); @output_buffer.safe_append='"
data-chart-data-value="'.freeze; @output_buffer.append=(@data.to_json); @output_buffer.safe_append='"
data-chart-labels-value="'.freeze; @output_buffer.append=(@labels.to_json); @output_buffer.safe_append='"
data-chart-unit-value="'.freeze; @output_buffer.append=(@unit_label); @output_buffer.safe_append='"
></canvas>
'.freeze;
@output_buffer
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@output_buffer.safe_append='<div data-config="'.freeze; @output_buffer << ((raw @config.to_json)); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer.safe_append='<div data-config="'.freeze; @output_buffer.append=(raw @config.to_json); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@output_buffer.safe_append='<div data-config="'.freeze; @output_buffer << ((@config.to_json)); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer.safe_append='<div data-config="'.freeze; @output_buffer.safe_expr_append=(@config.to_json); @output_buffer.safe_append='"></div>'.freeze;
@output_buffer
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div data-config="{&quot;key&quot;:&quot;value&quot;}"></div>
<div data-config="{"key":"value"}"></div>
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -180,17 +180,17 @@
resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.9.tgz#585624dc829cfb6e7c0aa6c3ca7d7e6daa87e34f"
integrity sha512-PPOl1mi6lpLNQxnGoyAfschAodRFYXJ+9fs6WHXz7CSWKbOqiMZsubC+BQsVKuul+3vKLuwTHsS2c2y9EoKwxQ==

"@herb-tools/core@0.9.1":
version "0.9.1"
resolved "https://registry.yarnpkg.com/@herb-tools/core/-/core-0.9.1.tgz#64896788543472b6aab5edabec141ec0a0aab200"
integrity sha512-ymxpQ14IY3X76orKVUVDpHC3pvimcWCx/dHvXFMDah4gAu2FT7VFSf/e8cSsoIq3th76fTLfV/iEc2U8l2eiVA==
"@herb-tools/core@0.9.2":
version "0.9.2"
resolved "https://registry.yarnpkg.com/@herb-tools/core/-/core-0.9.2.tgz#f451418223dceaaaad85aec30e3008b61b1cdc72"
integrity sha512-Wcg59JIoM8VWWKXq8DQR0K0Oxg8IrwNPKCFBC11KWJketiN3pqApCgihhoB63Tk/pZNhmhJhfKnsiPLgvm99jQ==

"@herb-tools/dev-tools@0.9.1":
version "0.9.1"
resolved "https://registry.yarnpkg.com/@herb-tools/dev-tools/-/dev-tools-0.9.1.tgz#97e9d0e81c89be558e41a2aab07942c9fb37c702"
integrity sha512-NXn4QREgD8dohVxdhA+szKWWdULYViEG5OBSeZRMoeQaFy0E8D49AhXA8EIHCQOU1c1KxkNCnHiK+S7VC0xL0w==
"@herb-tools/dev-tools@0.9.2":
version "0.9.2"
resolved "https://registry.yarnpkg.com/@herb-tools/dev-tools/-/dev-tools-0.9.2.tgz#7f1e329d984265862f80b656a0e9d90defd8957f"
integrity sha512-kTtTxWspS6OsCFbMeYO1pjGbCDWe4aETXdnfy14SRekxV4Vd2waozNB7XiPhKjsPoI40xH7CE3VxR7Uwl84CFw==
dependencies:
"@herb-tools/core" "0.9.1"
"@herb-tools/core" "0.9.2"

"@iconify-json/logos@^1.2.4":
version "1.2.9"
Expand Down
Loading