Skip to content

Commit f3f630d

Browse files
authored
Merge pull request #1726 from sul-dlss/update-dependencies
Update dependencies
2 parents 6ad6da9 + f31ae3f commit f3f630d

File tree

3 files changed

+113
-12
lines changed

3 files changed

+113
-12
lines changed

.herb.yml

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
# This file configures Herb for your project and team.
2+
# Settings here take precedence over individual editor preferences.
3+
#
4+
# Herb is a suite of tools for HTML+ERB templates including:
5+
# - Linter: Validates templates and enforces best practices
6+
# - Formatter: Auto-formats templates with intelligent indentation
7+
# - Language Server: Provides IDE support (VS Code, Zed, Neovim, etc.)
8+
#
9+
# Website: https://herb-tools.dev
10+
# Configuration: https://herb-tools.dev/configuration
11+
# GitHub Repo: https://github.com/marcoroth/herb
12+
#
13+
14+
version: 0.9.0
15+
16+
# files:
17+
# # Additional patterns beyond the defaults (**.html, **.rhtml, **.html.erb, etc.)
18+
# include:
19+
# - '**/*.xml.erb'
20+
# - 'custom/**/*.html'
21+
#
22+
# # Patterns to exclude (can exclude defaults too)
23+
# exclude:
24+
# - 'public/**/*'
25+
# - 'tmp/**/*'
26+
27+
# engine:
28+
# validators:
29+
# security: true # default: true
30+
# nesting: true # default: true
31+
# accessibility: true # default: true
32+
33+
linter:
34+
enabled: true
35+
36+
# # Exit with error code when diagnostics of this severity or higher are present
37+
# # Valid values: error (default), warning, info, hint
38+
# failLevel: warning
39+
40+
# # Additional patterns beyond the defaults for linting
41+
# include:
42+
# - '**/*.xml.erb'
43+
#
44+
# # Patterns to exclude from linting
45+
# exclude:
46+
# - 'app/views/admin/**/*'
47+
48+
rules:
49+
erb-no-statement-in-script:
50+
exclude:
51+
- '**/layouts/application.html.erb'
52+
html-allowed-script-type:
53+
exclude:
54+
- '**/components/show/head_metadata_component.html.erb'
55+
erb-no-unsafe-raw:
56+
exclude:
57+
- '**/components/flash_message_component.html.erb'
58+
59+
# erb-no-extra-newline:
60+
# enabled: false
61+
#
62+
# # Rules can have 'include', 'only', and 'exclude' patterns
63+
# some-rule:
64+
# # Additional patterns to check (additive, ignored when 'only' is present)
65+
# include:
66+
# - 'app/components/**/*'
67+
# # Don't apply this rule to files matching these patterns
68+
# exclude:
69+
# - 'app/views/admin/**/*'
70+
#
71+
# another-rule:
72+
# # Only apply this rule to files matching these patterns (overrides all 'include')
73+
# only:
74+
# - 'app/views/**/*'
75+
# # Exclude still applies even with 'only'
76+
# exclude:
77+
# - 'app/views/admin/**/*'
78+
79+
formatter:
80+
enabled: false
81+
indentWidth: 2
82+
maxLineLength: 80
83+
84+
# # Additional patterns beyond the defaults for formatting
85+
# include:
86+
# - '**/*.xml.erb'
87+
#
88+
# # Patterns to exclude from formatting
89+
# exclude:
90+
# - 'app/views/admin/**/*'
91+
92+
# # Rewriters modify templates during formatting
93+
# rewriter:
94+
# # Pre-format rewriters (modify AST before formatting)
95+
# pre:
96+
# - tailwind-class-sorter
97+
# # Post-format rewriters (modify formatted output string)
98+
# post: []

Gemfile.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
action_text-trix (2.1.16)
4+
action_text-trix (2.1.17)
55
railties
66
actioncable (8.1.2)
77
actionpack (= 8.1.2)
@@ -81,7 +81,7 @@ GEM
8181
sshkit (>= 1.6.1, != 1.7.0)
8282
ast (2.4.3)
8383
aws-eventstream (1.4.0)
84-
aws-partitions (1.1223.0)
84+
aws-partitions (1.1226.0)
8585
aws-sdk-core (3.243.0)
8686
aws-eventstream (~> 1, >= 1.3.0)
8787
aws-partitions (~> 1, >= 1.992.0)
@@ -93,7 +93,7 @@ GEM
9393
aws-sdk-kms (1.122.0)
9494
aws-sdk-core (~> 3, >= 3.241.4)
9595
aws-sigv4 (~> 1.5)
96-
aws-sdk-s3 (1.215.0)
96+
aws-sdk-s3 (1.216.0)
9797
aws-sdk-core (~> 3, >= 3.243.0)
9898
aws-sdk-kms (~> 1)
9999
aws-sigv4 (~> 1.5)
@@ -250,7 +250,7 @@ GEM
250250
net-ssh (>= 5.0.0, < 8.0.0)
251251
net-smtp (0.5.1)
252252
net-protocol
253-
net-ssh (7.3.0)
253+
net-ssh (7.3.1)
254254
newrelic_rpm (10.2.0)
255255
logger
256256
nio4r (2.7.5)
@@ -344,14 +344,14 @@ GEM
344344
rspec-mocks (3.13.8)
345345
diff-lcs (>= 1.2.0, < 2.0)
346346
rspec-support (~> 3.13.0)
347-
rspec-rails (8.0.3)
347+
rspec-rails (8.0.4)
348348
actionpack (>= 7.2)
349349
activesupport (>= 7.2)
350350
railties (>= 7.2)
351-
rspec-core (~> 3.13)
352-
rspec-expectations (~> 3.13)
353-
rspec-mocks (~> 3.13)
354-
rspec-support (~> 3.13)
351+
rspec-core (>= 3.13.0, < 5.0.0)
352+
rspec-expectations (>= 3.13.0, < 5.0.0)
353+
rspec-mocks (>= 3.13.0, < 5.0.0)
354+
rspec-support (>= 3.13.0, < 5.0.0)
355355
rspec-support (3.13.7)
356356
rubocop (1.85.1)
357357
json (~> 2.3)
@@ -365,7 +365,7 @@ GEM
365365
rubocop-ast (>= 1.49.0, < 2.0)
366366
ruby-progressbar (~> 1.7)
367367
unicode-display_width (>= 2.4.0, < 4.0)
368-
rubocop-ast (1.49.0)
368+
rubocop-ast (1.49.1)
369369
parser (>= 3.3.7.2)
370370
prism (~> 1.7)
371371
rubocop-capybara (2.22.1)
@@ -419,7 +419,7 @@ GEM
419419
railties (>= 6.0.0)
420420
stringio (3.2.0)
421421
thor (1.5.0)
422-
timeout (0.6.0)
422+
timeout (0.6.1)
423423
tsort (0.2.0)
424424
turbo-rails (2.0.23)
425425
actionpack (>= 7.1.0)
@@ -508,4 +508,4 @@ DEPENDENCIES
508508
whenever
509509

510510
BUNDLED WITH
511-
4.0.7
511+
4.0.8

app/views/layouts/application.html.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
collection: document.querySelector('link[rel="up"]')?.getAttribute('href')
1919
}
2020

21+
<%# To turn off analytics debug mode, exclude the parameter altogether (cannot just set to false)
22+
See https://support.google.com/analytics/answer/7201382?hl=en#zippy=%2Cgoogle-tag-websites
23+
%>
2124
<% if Settings.analytics_debug %>
2225
config.debug_mode = true
2326
<% end %>

0 commit comments

Comments
 (0)