Skip to content

Commit df01009

Browse files
authored
Merge pull request #113 from gethinode/develop
fix: merge non-src CSP directives using union instead of overwriting
2 parents a553a1b + a76c619 commit df01009

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
os: [macos-latest, windows-latest, ubuntu-latest]
16-
node-version: [20.x, 22.x]
16+
node-version: [22.x, 24.x]
1717
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
1818

1919
runs-on: ${{ matrix.os }}

layouts/partials/assets/server-headers.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@
5555
{{- end -}}
5656

5757
{{- if not (hasSuffix $key "-src") -}}
58-
{{- $settings = merge $settings (dict $key $vals) -}}
58+
{{- $current := index $settings $key | default slice -}}
59+
{{- $target := union $current $vals -}}
60+
{{- $settings = merge $settings (dict $key $target) -}}
5961
{{- end -}}
6062
{{- end -}}
6163
{{- end -}}

0 commit comments

Comments
 (0)