Skip to content

Commit b3da009

Browse files
shgysk8zer0shgysk8zer0
authored
Merge pull request #637 from kernvalley/patch/updates
Update `@kernvalley/components` & embeds
2 parents e36823b + a2f6503 commit b3da009

File tree

11 files changed

+34
-26
lines changed

11 files changed

+34
-26
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [v3.0.6] - 2024-01-21
11+
1012
### Added
1113
- Add `/mayors/events.json`
12-
- Add `/mayors/embed/` using `@kernvalley/wfd/mayor-events.js` / `<wfd-mayor-events>`
14+
- Add `/mayors/embed/` using `@kernvalley/components/wfd/mayor-events.js` / `<wfd-mayor-events>`
1315

1416
### Changed
1517
- Add missing CORS headers to `/mayors/events.json`
18+
- Update `@kernvalley/components`
19+
- Update embed styles and directory structure
1620

1721
## [v3.0.5] - 2024-01-15
1822

‎_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ author: Chris Zuber
22
title: Whiskey Flat Days
33
url: 'https://whiskeyflatdays.com'
44
markdown: kramdown
5-
version: 3.0.5
5+
version: 3.0.6
66
timezone: America/Los_Angeles
77
lang: en
88
dir: ltr

‎_data/app.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Whiskey Flat Days
33
shortName: WFD App
44
id: WhiskeyFlatDays
5-
version: 3.0.5
5+
version: 3.0.6
66
start_url: /?utm_source=homescreen&utm_medium=pwa
77
display: standalone
88
description: "Map, events, store, and news app for Whiskey Flat Days"

‎_data/importmap.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ imports:
1010
'@shgysk8zer0/jswaggersheets/': https://unpkg.com/@shgysk8zer0/jswaggersheets@1.1.0/
1111
'@shgysk8zer0/http-status': https://unpkg.com/@shgysk8zer0/http-status@1.1.1/http-status.js
1212
'@shgysk8zer0/components/': https://unpkg.com/@shgysk8zer0/components@0.1.6/
13-
'@kernvalley/components/': https://unpkg.com/@kernvalley/components@1.1.0/
13+
'@kernvalley/components/': https://unpkg.com/@kernvalley/components@1.1.3/
1414
'@webcomponents/custom-elements': >-
1515
https://unpkg.com/@webcomponents/custom-elements@1.6.0/custom-elements.min.js
1616
leaflet: https://unpkg.com/leaflet@1.9.4/dist/leaflet-src.esm.js

‎_headers‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
Link: <https://unpkg.com/@shgysk8zer0/polyfills@0.3.0/all.min.js> rel=preload; as=script; crossorigin=anonymous; referrerpolicy=no-referrer;
3636
Link: <https://unpkg.com/@shgysk8zer0/kazoo@0.3.1/harden.js> rel=preload; as=script; crossorigin=anonymous; referrerpolicy=no-referrer;
3737
Link: </events.json>; rel=preload; as=fetch; type=application/json; referrerpolicy=no-referrer;
38-
Content-Security-Policy: default-src 'none'; img-src 'self' *; style-src 'self' unpkg.com/@shgysk8zer0/ unpkg.com/@kernvalley/ blob:; script-src 'self' unpkg.com/@shgysk8zer0/ unpkg.com/@kernvalley/ 'nonce-c23ddb4e-a8ec-44f0-ad77-d1ac60938c7e'; font-src cdn.kernvalley.us/fonts/; connect-src 'self' whiskeyflatdays.com/events.json unpkg.com/@shgysk8zer0/ unpkg.com/@kernvalley/; frame-ancestors *; upgrade-insecure-requests; block-all-mixed-content; disown-opener; trusted-types empty#html empty#script sanitizer-raw#html wfd-events#html; require-trusted-types-for 'script';
38+
Content-Security-Policy: default-src 'none'; img-src 'self' *; style-src 'self' unpkg.com/@shgysk8zer0/ unpkg.com/@kernvalley/ blob:; script-src 'self' unpkg.com/@shgysk8zer0/ unpkg.com/@kernvalley/; font-src cdn.kernvalley.us/fonts/; connect-src 'self' whiskeyflatdays.com/events.json unpkg.com/@shgysk8zer0/ unpkg.com/@kernvalley/; frame-ancestors *; upgrade-insecure-requests; block-all-mixed-content; disown-opener; trusted-types empty#html empty#script sanitizer-raw#html wfd-events#html; require-trusted-types-for 'script';
3939

4040
/events.json
4141
Access-Control-Allow-Origin: *
@@ -45,7 +45,7 @@
4545
/mayors/embed/
4646
Referrer-Policy: no-referrer
4747
X-Frame-Options: ALLOW
48-
Content-Security-Policy: default-src 'none'; img-src 'self' *; style-src 'self' unpkg.com/@shgysk8zer0/ unpkg.com/@kernvalley/ blob:; script-src 'self' unpkg.com/@shgysk8zer0/ unpkg.com/@kernvalley/; font-src cdn.kernvalley.us/fonts/; connect-src 'self' whiskeyflatdays.com/mayors/events.json; frame-ancestors *; upgrade-insecure-requests; block-all-mixed-content; disown-opener; trusted-types empty#html empty#script; require-trusted-types-for 'script';
48+
Content-Security-Policy: default-src 'none'; img-src 'self' *; style-src 'self' unpkg.com/@shgysk8zer0/ unpkg.com/@kernvalley/ blob:; script-src 'self' unpkg.com/@shgysk8zer0/ unpkg.com/@kernvalley/; font-src cdn.kernvalley.us/fonts/; connect-src 'self' whiskeyflatdays.com/mayors/events.json; frame-ancestors *; upgrade-insecure-requests; block-all-mixed-content; disown-opener; trusted-types empty#html empty#script sanitizer-raw#html; require-trusted-types-for 'script';
4949

5050
/mayors/events.json
5151
Content-Security-Policy: default-src 'none'
@@ -65,3 +65,4 @@
6565
/*
6666
X-Content-Type-Options: nosniff
6767

68+

css/mayor-events.css renamed to css/embed.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
color-scheme: light dark;
33
}
44

5+
body {
6+
margin: 0;
7+
min-height: 100dvh;
8+
}
9+
510
:root[data-theme="dark"] {
611
color-scheme: dark;
712
}

‎embed/index.html‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
<meta name="viewport" content="width=device-width" />
1010
<meta name="color-scheme" content="light dark" />
1111
<meta name="referrer" content="no-referrer" />
12+
<meta name="robots" content="noindex" />
13+
<script type="application/javascript" referrerpolicy="no-referrer" crossorigin="anonymous" integrity="sha384-h2kgNESJV1KN7BmHtXZv1j5WMcwFojESsbaNydwul3t6bqHOmzVMDaDXAEe6XLC+" src="https://unpkg.com/@shgysk8zer0/polyfills@0.3.0/all.min.js" fetchpriority="high" defer=""></script>
14+
<script type="application/javascript" defer="" referrerpolicy="no-referrer" crossorigin="anonymous" integrity="sha384-55L/wO9o0uIVTeubRIDQB4bewfNqyxrj4OXuxlW24NMEk+ioZwMHVw/tFV78mM+k" src="https://unpkg.com/@shgysk8zer0/kazoo@0.3.1/harden.js" fetchpriority="auto"></script>
15+
<script type="application/javascript" referrerpolicy="no-referrer" crossorigin="anonymous" integrity="sha384-lI+quqJh7m5K4aKso/EUsbh1rMi2u7P5cQqf6oeBTSkkivqCcsKcIJaPsdrpS+/u" src="https://unpkg.com/@kernvalley/components@1.1.3/wfd/events.min.js" fetchpriority="auto" defer=""></script>
16+
<script src="/js/embed.js" referrerpolicy="no-referrer" defer=""></script>
1217
<link rel="icon" href="/img/favicon.svg" type="image/svg+xml" sizes="any" referrerpolicy="no-referrer" />
13-
<script src="{{ site.data.importmap.imports['@shgysk8zer0/polyfills'] }}" referrerpolicy="no-referrer" crossorigin="anonymous" fetchpriority="high" defer=""></script>
14-
<script src="{{ site.data.importmap.imports['@shgysk8zer0/kazoo/']}}harden.js" referrerpolicy="no-referrer" crossorigin="anonymous" fetchpriority="high" defer=""></script>
15-
<script src="{{ site.data.importmaps.imports['custom-elements'] }}" crossorigin="anonymous" referrerpolicy="no-referrer" defer="" nomodule=""></script>
16-
<script src="{{ site.data.importmap.imports['@kernvalley/components/'] }}wfd/events.min.js" crossorigin="anonymous" referrerpolicy="no-referrer" defer=""></script>
17-
<script src="./index.js" referrerpolicy="no-referrer" defer=""></script>
18+
<link rel="stylesheet" href="/css/embed.css" referrerpolicy="no-referrer" />
19+
<link rel="preload" as="fetch" href="https://whiskeyflatdays.com/events.json" type="application/json" referrerpolicy="no-referrer" crossorigin="anonymous" />
1820
</head>
1921
<body></body>
2022
</html>

embed/index.js renamed to js/embed.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
customElements.whenDefined('wfd-events').then(() => {
2-
const WFDEvents = customElements.get('wfd-events');
1+
customElements.whenDefined('wfd-events').then(WFDEvents => {
32
const params = new URLSearchParams(location.search);
43
const events = new WFDEvents();
54

@@ -9,13 +8,7 @@ customElements.whenDefined('wfd-events').then(() => {
98

109
if (params.has('theme')) {
1110
events.theme = params.get('theme');
12-
13-
try {
14-
document.querySelector('meta[name="color-scheme"]')
15-
.setAttribute('content', params.get('theme'));
16-
} catch(err) {
17-
console.error(err);
18-
}
11+
document.documentElement.dataset.theme = params.get('theme');
1912
}
2013

2114
events.images = params.has('images');

‎mayors/embed.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,21 @@
33
layout: null
44
---
55
<!DOCTYPE html>
6-
<html lang="en" dir="ltr">
6+
<html lang="en" dir="ltr" data-trusted-policies="empty#html empty#script sanitizer-raw#html">
77
<head>
88
<meta charset="utf-8" />
99
<meta name="viewport" content="width=device-width" />
1010
<meta name="color-scheme" content="light dark" />
11+
<meta name="referrer" content="no-referrer" />
12+
<meta name="robots" content="noindex" />
1113
<title>Whiskey Flat Mayor Race Embed</title>
1214
<script type="application/javascript" referrerpolicy="no-referrer" crossorigin="anonymous" integrity="sha384-h2kgNESJV1KN7BmHtXZv1j5WMcwFojESsbaNydwul3t6bqHOmzVMDaDXAEe6XLC+" src="https://unpkg.com/@shgysk8zer0/polyfills@0.3.0/all.min.js" fetchpriority="high" defer=""></script>
13-
<script type="application/javascript" referrerpolicy="no-referrer" crossorigin="anonymous" integrity="sha384-qeRhshdygZxaXThPbJF9xnGy1k33AIJ1p8pHjPJNC6uzABZ+693lEjIduVuA154y" src="https://unpkg.com/@kernvalley/components@1.1.2/wfd/mayor-events.min.js" fetchpriority="high" defer=""></script>
15+
<script type="application/javascript" defer="" referrerpolicy="no-referrer" crossorigin="anonymous" integrity="sha384-55L/wO9o0uIVTeubRIDQB4bewfNqyxrj4OXuxlW24NMEk+ioZwMHVw/tFV78mM+k" src="https://unpkg.com/@shgysk8zer0/kazoo@0.3.1/harden.js" fetchpriority="auto"></script>
16+
<script type="application/javascript" referrerpolicy="no-referrer" crossorigin="anonymous" integrity="sha384-4bvWx90pvspl1OvEHvBxVbktXn9+rfwtUdP3TFfGQllBZhCceb211St4jr5Qr0nF" src="https://unpkg.com/@kernvalley/components@1.1.3/wfd/mayor-events.min.js" fetchpriority="auto" defer=""></script>
1417
<script type="application/javascript" referrerpolicy="no-referrer" src="/js/mayor-events.js" defer=""></script>
1518
<link rel="icon" href="/img/favicon.svg" type="image/svg+xml" sizes="150x150" />
1619
<link rel="shortcut icon" href="/favicon.ico" />
17-
<link rel="stylesheet" href="/css/mayor-events.css" referrerpolicy="no-referrer" />
20+
<link rel="stylesheet" href="/css/embed.css" referrerpolicy="no-referrer" />
1821
<link rel="preload" as="fetch" href="https://whiskeyflatdays.com/mayors/events.json" type="application/json" referrerpolicy="no-referrer" crossorigin="anonymous" />
1922
</head>
2023
<body></body>

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)