Skip to content

Commit 7c9fcd0

Browse files
authored
Merge pull request #543 from kernvalley/patch/updates
Implement importmaps
2 parents 0f48f50 + 2cae184 commit 7c9fcd0

22 files changed

+279
-484
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
## [Unreleased]
99

1010
### Added
11+
- Implements import maps
1112
- Add support and enforcement of `TrustedTypes`
1213

1314
## [v2.3.1] - 2023-01-21

_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: 2.3.1
5+
version: 3.0.0
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: 2.3.1-2023-03-08
5+
version: 3.0.0
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.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
nonce: c23ddb4e-a8ec-44f0-ad77-d1ac60938c7e
3+
imports:
4+
'std-js/': https://cdn.kernvalley.us/js/std-js/
5+
'@shgysk8zer0/kazoo/': https://unpkg.com/@shgysk8zer0/kazoo@0.0.5/
6+
'@shgysk8zer0/konami': https://unpkg.com/@shgysk8zer0/konami/konami.js
7+
'@shgysk8zer0/polyfills': https://unpkg.com/@shgysk8zer0/polyfills@0.0.5/all.min.js
8+
'@shgysk8zer0/polyfills/': https://unpkg.com/@shgysk8zer0/polyfills/
9+
'@shgysk8zer0/components/': https://cdn.kernvalley.us/components/
10+
'@kernvalley/components/': https://cdn.kernvalley.us/components/krv/
11+
'leaflet': https://unpkg.com/leaflet@1.9.3/dist/leaflet-src.esm.js
12+
'firebase/': https://www.gstatic.com/firebasejs/9.16.0/
13+
'url-pattern': https://unpkg.com/urlpattern-polyfill@1.0.0-rc1/dist/index.modern.js
14+
'custom-elements': https://unpkg.com/@webcomponents/custom-elements@1.4.2/custom-elements.min.js

_data/scripts/development.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
- src: https://cdn.kernvalley.us/js/shims.min.js
1+
- src: https://unpkg.com/@shgysk8zer0/polyfills@0.0.5/all.min.js
22
crossOrigin: anonymous
33
referrerPolicy: no-referrer
4+
integrity: sha384-xoY6kDRPTvbDfGdGA3S6Ercudev5mWGBWZIErLB38f7TeN6hV7zof6WBpzMdx/z0
45
defer: true
5-
- src: https://cdn.kernvalley.us/js/std-js/harden.js
6+
- src: https://unpkg.com/@shgysk8zer0/kazoo@0.0.5/harden.js
67
crossOrigin: anonymous
78
referrerPolicy: no-referrer
9+
integrity: sha384-55L/wO9o0uIVTeubRIDQB4bewfNqyxrj4OXuxlW24NMEk+ioZwMHVw/tFV78mM+k
810
defer: true
11+
912
- src: /js/index.js
1013
type: module
1114
referrerPolicy: no-referrer

_data/scripts/production.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@
99
noModule: true
1010
defer: true
1111
integrity: sha384-xyhN4T4+9VPh8uXl6uWjGzsqwNXN9C2tla8b6zSrSqYlMFUoeCdoxiEJU0js+GNE
12-
- src: https://cdn.kernvalley.us/js/shims.min.js
12+
- src: https://unpkg.com/@shgysk8zer0/polyfills@0.0.5/all.min.js
1313
crossOrigin: anonymous
1414
referrerPolicy: no-referrer
15+
integrity: sha384-xoY6kDRPTvbDfGdGA3S6Ercudev5mWGBWZIErLB38f7TeN6hV7zof6WBpzMdx/z0
1516
defer: true
16-
- src: https://cdn.kernvalley.us/js/std-js/harden.js
17+
- src: https://unpkg.com/@shgysk8zer0/kazoo@0.0.5/harden.js
1718
crossOrigin: anonymous
1819
referrerPolicy: no-referrer
20+
integrity: sha384-55L/wO9o0uIVTeubRIDQB4bewfNqyxrj4OXuxlW24NMEk+ioZwMHVw/tFV78mM+k
1921
defer: true
22+
2023
- src: /js/index.min.js
2124
referrerPolicy: no-referrer
2225
defer: true

_headers

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
X-XSS-Protection: 1; mode=block
55
Referrer-Policy: no-referrer
66
Link: </css/index.min.css>; rel=preload; as=style; referrerpolicy=no-referrrer;
7-
Link: <//cdn.kernvalley.us/js/shims.min.js>; rel=preload; as=script; referrerpolicy=no-referrrer; crossorigin=anonymous;
8-
Link: <//cdn.kernvalley.us/js/std-js/harden.js>; rel=preload; as=script; referrerpolicy=no-referrrer; crossorigin=anonymous;
7+
Link: <https://unpkg.com/@shgysk8zer0/polyfills@0.0.5/all.min.js>; rel=preload; as=script; referrerpolicy=no-referrrer; crossorigin=anonymous;
8+
Link: <https://unpkg.com/@shgysk8zer0/kazoo@0.0.5/harden.js>; rel=preload; as=script; referrerpolicy=no-referrrer; crossorigin=anonymous;
99
Link: </js/index.min.js>; rel=preload; as=script; referrerpolicy=no-referrrer;
10-
Content-Security-Policy: default-src 'self'; img-src *; script-src 'self' cdn.kernvalley.us unpkg.com/ www.google-analytics.com www.googletagmanager.com cdn.polyfill.io/v3/polyfill.min.js www.gstatic.com/firebasejs/; style-src 'self' cdn.kernvalley.us unpkg.com/; connect-src 'self' cdn.kernvalley.us store.kernvalley.us apps.kernvalley.us ads.kernvalley.us/api/ api.github.com/users/ api.openweathermap.org/data/2.5/weather www.google-analytics.com/ www.googletagmanager.com/gtag/ firestore.googleapis.com; font-src cdn.kernvalley.us; media-src *; frame-src www.youtube-nocookie.com; form-action 'self'; manifest-src 'self'; worker-src 'self'; reflected-xss block; upgrade-insecure-requests; block-all-mixed-content; disown-opener; trusted-types default empty#html empty#script sanitizer-raw#html purify-raw#html purify#html weather-current#html youtube#embed pwa-install share-to-buttons#html github-user#html ga#script-url goog#html; require-trusted-types-for 'script';
10+
Content-Security-Policy: default-src 'self'; img-src *; script-src 'self' cdn.kernvalley.us unpkg.com/ www.google-analytics.com www.googletagmanager.com cdn.polyfill.io/v3/polyfill.min.js www.gstatic.com/firebasejs/ 'nonce-c23ddb4e-a8ec-44f0-ad77-d1ac60938c7e'; style-src 'self' cdn.kernvalley.us unpkg.com/; connect-src 'self' cdn.kernvalley.us store.kernvalley.us apps.kernvalley.us ads.kernvalley.us/api/ api.github.com/users/ api.openweathermap.org/data/2.5/weather www.google-analytics.com/ www.googletagmanager.com/gtag/ firestore.googleapis.com; font-src cdn.kernvalley.us; media-src *; frame-src www.youtube-nocookie.com; form-action 'self'; manifest-src 'self'; worker-src 'self'; reflected-xss block; upgrade-insecure-requests; block-all-mixed-content; disown-opener; trusted-types default empty#html empty#script sanitizer-raw#html purify-raw#html purify#html weather-current#html youtube#embed pwa-install share-to-buttons#html github-user#html ga#script-url goog#html; require-trusted-types-for 'script';
1111

1212
/:placeholder/
1313
X-Content-Type-Options: nosniff
@@ -16,10 +16,10 @@
1616
Referrer-Policy: no-referrer
1717
Feature-Policy: geolocation 'self';
1818
Link: </css/index.min.css>; rel=preload; as=style; referrerpolicy=no-referrrer;
19-
Link: <//cdn.kernvalley.us/js/shims.min.js>; rel=preload; as=script; referrerpolicy=no-referrrer; crossorigin=anonymous;
19+
Link: <https://unpkg.com/@shgysk8zer0/polyfills@0.0.5/all.min.js>; rel=preload; as=script; referrerpolicy=no-referrrer; crossorigin=anonymous;
2020
Link: <//cdn.kernvalley.us/js/std-js/harden.js>; rel=preload; as=script; referrerpolicy=no-referrrer; crossorigin=anonymous;
2121
Link: </js/index.min.js>; rel=preload; as=script; referrerpolicy=no-referrrer;
22-
Content-Security-Policy: default-src 'self'; img-src * data: blob:; script-src 'self' cdn.kernvalley.us unpkg.com/ www.google-analytics.com www.googletagmanager.com cdn.polyfill.io/v3/polyfill.min.js js.stripe.com/v3/ www.gstatic.com/firebasejs/; style-src 'self' cdn.kernvalley.us unpkg.com/; connect-src 'self' cdn.kernvalley.us store.kernvalley.us apps.kernvalley.us ads.kernvalley.us/api/ api.github.com/users/ api.openweathermap.org/data/2.5/weather www.google-analytics.com/ www.googletagmanager.com/gtag/ firestore.googleapis.com; font-src cdn.kernvalley.us; media-src *; frame-src www.youtube-nocookie.com maps.kernvalley.us/embed js.stripe.com/v3/; form-action 'self'; manifest-src 'self'; worker-src 'self'; reflected-xss block; upgrade-insecure-requests; block-all-mixed-content; disown-opener; trusted-types default empty#html empty#script sanitizer-raw#html purify-raw#html purify#html weather-current#html youtube#embed github-user#html pwa-install share-to-buttons#html ga#script-url goog#html; require-trusted-types-for 'script';
22+
Content-Security-Policy: default-src 'self'; img-src * data: blob:; script-src 'self' cdn.kernvalley.us unpkg.com/ www.google-analytics.com www.googletagmanager.com cdn.polyfill.io/v3/polyfill.min.js js.stripe.com/v3/ www.gstatic.com/firebasejs/ 'nonce-c23ddb4e-a8ec-44f0-ad77-d1ac60938c7e'; style-src 'self' cdn.kernvalley.us unpkg.com/; connect-src 'self' cdn.kernvalley.us store.kernvalley.us apps.kernvalley.us ads.kernvalley.us/api/ api.github.com/users/ api.openweathermap.org/data/2.5/weather www.google-analytics.com/ www.googletagmanager.com/gtag/ firestore.googleapis.com; font-src cdn.kernvalley.us; media-src *; frame-src www.youtube-nocookie.com maps.kernvalley.us/embed js.stripe.com/v3/; form-action 'self'; manifest-src 'self'; worker-src 'self'; reflected-xss block; upgrade-insecure-requests; block-all-mixed-content; disown-opener; trusted-types default empty#html empty#script sanitizer-raw#html purify-raw#html purify#html weather-current#html youtube#embed github-user#html pwa-install share-to-buttons#html ga#script-url goog#html; require-trusted-types-for 'script';
2323

2424
/reset
2525
Referrer-Policy: no-referrer
@@ -29,8 +29,8 @@
2929
/embed/
3030
Referrer-Policy: no-referrer
3131
X-Frame-Options: ALLOW
32-
Content-Security-Policy: default-src 'none'; img-src 'self' *; style-src 'self' cdn.kernvalley.us/components/wfd/events.css; script-src 'self' cdn.kernvalley.us/js/ cdn.kernvalley.us/components/wfd/events.min.js; font-src cdn.kernvalley.us/fonts/; connect-src 'self' whiskeyflatdays.com/events.json cdn.kernvalley.us/components/wfd/events.html; Cross-Origin-Embedder-Policy: unsafe-none; 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';
33-
Link: <//cdn.kernvalley.us/js/shims.min.js> rel=preload; as=script; crossorigin=anonymous; referrerpolicy=no-referrer;
32+
Content-Security-Policy: default-src 'none'; img-src 'self' *; style-src 'self' cdn.kernvalley.us/components/wfd/events.css; script-src 'self' cdn.kernvalley.us/js/ cdn.kernvalley.us/components/wfd/events.min.js 'nonce-c23ddb4e-a8ec-44f0-ad77-d1ac60938c7e'; font-src cdn.kernvalley.us/fonts/; connect-src 'self' whiskeyflatdays.com/events.json cdn.kernvalley.us/components/wfd/events.html; Cross-Origin-Embedder-Policy: unsafe-none; 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';
33+
Link: <https://unpkg.com/@shgysk8zer0/polyfills@0.0.5/all.min.js> rel=preload; as=script; crossorigin=anonymous; referrerpolicy=no-referrer;
3434
Link: <//cdn.kernvalley.us/js/std-js/harden.js> rel=preload; as=script; crossorigin=anonymous; referrerpolicy=no-referrer;
3535
Link: <//cdn.kernvalley.us/components/wfd/events.html>; rel=preload; as=fetch; type=text/html; crossorigin=anonymous; referrerpolicy=no-referrer;
3636
Link: <//cdn.kernvalley.us/components/wfd/events.html>; rel=preload; as=style; type=text/css; crossorigin=anonymous; referrerpolicy=no-referrer;

_includes/common

Submodule common updated 1 file

_includes/window-controls.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<window-controls>
2-
<button type="button" is="app-list" id="app-menu" class="btn" title="Open KernValley.US Apps Menu" source="{{ site.data.ads.source }}" slot="titlebar" hidden="">
2+
<button type="button" is="app-list" class="btn" title="Open KernValley.US Apps Menu" source="{{ site.data.ads.source }}" slot="titlebar" hidden="">
33
{% include common/icon.html icon="apps" fill="currentColor" height=30 width=30 class="window-icon icon" %}
44
</button>
55
<a href="/" class="window-controls{% if page.url == '/' %} disabled{% endif %}" slot="titlebar" hidden="">

cssnano.config.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)