ci(deploy): switch to css bundle

timmywil · timmywil · commit 6c5042a41258 · 2023-06-13T10:42:26.000-04:00
diff --git a/README.md b/README.md
@@ -101,9 +101,6 @@ Deploy this Eleventy site in just a few clicks on these services:
 - Use the `eleventyNavigation` key (via the [Eleventy Navigation plugin](https://www.11ty.dev/docs/plugins/navigation/)) in your front matter to add a template to the top level site navigation. This is in use on `content/index.njk` and `content/about/index.md`.
 - Content can be in _any template format_ (blog posts needn’t exclusively be markdown, for example). Configure your project’s supported templates in `eleventy.config.js` -> `templateFormats`.
 - The `public` folder in your input directory will be copied to the output folder (via `addPassthroughCopy` in the `eleventy.config.js` file). This means `./public/css/*` will live at `./_site/css/*` after your build completes.
-- Provides two content feeds:
-  - `content/feed/feed.njk`
-  - `content/feed/json.njk`
 - This project uses three [Eleventy Layouts](https://www.11ty.dev/docs/layouts/):
   - `_includes/layouts/base.njk`: the top level HTML structure
   - `_includes/layouts/home.njk`: the home page template (wrapped into `base.njk`)
@@ -121,7 +118,7 @@ If your site enforces a Content Security Policy (as public-facing sites should),
 and enable
 
 ```html
-<link rel="stylesheet" href="{% getBundleFileUrl "css" %}">
+<link rel="stylesheet" href="{% getBundleFileUrl 'css' %}" />
 ```
 
 or configure the server with the CSP directive `style-src: 'unsafe-inline'` (which is less secure).
diff --git a/_includes/layouts/base.njk b/_includes/layouts/base.njk
@@ -6,9 +6,6 @@
     <title data-pagefind-meta="title">{{ title or metadata.title }}</title>
     <meta name="description" content="{{ description or metadata.description }}">
     {% favicon './public/favicon.svg' %}
-    {# Atom and JSON feeds included by default #}
-    <link rel="alternate" href="/feed/feed.xml" type="application/atom+xml" title="{{ metadata.title }}" />
-    <link rel="alternate" href="/feed/feed.json" type="application/json" title="{{ metadata.title }}" />
     {#
       CSS bundles are provided via the `eleventy-plugin-bundle` plugin:
       1. You can add to them using `{% css %}`
@@ -20,16 +17,16 @@
       Hot reload isn't working with the bundle plugin on windows
       See https://github.com/11ty/eleventy/issues/2807
     #}
-    <link rel="stylesheet" href="/css/index.css" />
-    <link rel="stylesheet" href="/css/search.css" />
+    {%- css %}{% include "public/css/index.css" %}{% endcss %}
+    {%- css %}{% include "public/css/search.css" %}{% endcss %}
     {# Add an arbitrary string to the bundle #}
     {# {%- css %}* { box-sizing: border-box; }{% endcss %} #}
     {# Render the CSS bundle using Inlined CSS (for the fastest site performance in production) #}
     <style>
       {% getBundle "css" %}
     </style>
     {#- Renders the CSS bundle using a separate file, if you can't set CSP directive style-src: 'unsafe-inline' #}
-    {# <link rel="stylesheet" href="{% getBundleFileUrl "css" %}"> #}
+    {# <link rel="stylesheet" href="{% getBundleFileUrl 'css' %}"> #}
   </head>
   <body>
     <div class="banner flex-center">
diff --git a/_includes/layouts/ticket.njk b/_includes/layouts/ticket.njk
@@ -2,8 +2,8 @@
 layout: layouts/base.njk
 ---
 
-<link rel="stylesheet" href="/css/ticket.css" />
+{%- css %}{% include "public/css/ticket.css" %}{% endcss %}
 
 <div class="flex-column" data-pagefind-body>
   {{ content | safe }}
-</div>
+</div>
diff --git a/_includes/layouts/wiki.njk b/_includes/layouts/wiki.njk
@@ -2,7 +2,7 @@
 layout: layouts/base.njk
 ---
 
-<link rel="stylesheet" href="/css/wiki.css" />
+{%- css %}{% include "public/css/wiki.css" %}{% endcss %}
 
 <div class="wiki flex-column">
   <div class="breadcrumbs-nav flex-row">
@@ -24,4 +24,4 @@ layout: layouts/base.njk
   <div class="wiki-content">
     {{ content | safe }}
   </div>
-</div>
+</div>
diff --git a/content/attachment.njk b/content/attachment.njk
@@ -24,7 +24,7 @@
 {# Include syntax highligher CSS #}
 {%- css %}{% include "node_modules/prismjs/themes/prism.min.css" %}{% endcss %}
 {%- css %}{% include "public/css/prism-diff.css" %}{%- endcss %}
-<link rel="stylesheet" href="/css/attachment.css" />
+{%- css %}{% include "public/css/attachment.css" %}{% endcss %}
 
 <div class="flex-column attachment">
   <nav class="content-nav">
diff --git a/content/index.md b/content/index.md
@@ -7,6 +7,6 @@ breadcrumb: WikiStart
 
 jQuery UI is in **maintenance-only mode**. Users should not expect any new releases. Patches may be issued to resolve critical security, interoperability, or regression bugs. See the [blog post](https://blog.jqueryui.com/2021/10/jquery-maintainers-update-and-transition-jquery-ui-as-part-of-overall-modernization-efforts/) for more information.
 
-jQuery UI issues were moved to <a href="https://github.com/jquery/jquery-ui/issues">GitHub</a>. This site is now a static, read-only archive of the old <a href="https://trac.edgewall.org/">Trac</a> site. Any critical issues should be filed on the project's <a href="https://github.com/jquery/jquery-ui/issues">GitHub repository</a>.
+jQuery UI issues were moved to <a href="https://github.com/jquery/jquery-ui/issues" class="ext-link"><span class="icon"></span>GitHub</a>. This site is now a static, read-only archive of the old <a href="https://trac.edgewall.org/" class="ext-link"><span class="icon"></span>Trac</a> site. Any critical issues should be filed on the project's <a href="https://github.com/jquery/jquery-ui/issues" class="ext-link"><span class="icon"></span>GitHub repository</a>.
 
 **Search** is still supported for tickets and milestones, but some functions and pages no longer work.
diff --git a/content/search.njk b/content/search.njk
@@ -2,7 +2,7 @@
 layout: layouts/base.njk
 ---
 
-<link rel="stylesheet" href="/css/fullpagesearch.css" />
+{%- css %}{% include "public/css/fullpagesearch.css" %}{% endcss %}
 
 <h1>Search</h1>
 <hr>
@@ -20,4 +20,4 @@ layout: layouts/base.njk
       }
     })
   })
-</script>
+</script>
diff --git a/public/css/index.css b/public/css/index.css
@@ -268,12 +268,6 @@ pre[class*='language-'] code {
   background: none;
   word-break: normal;
 }
-pre[class*='language-'] code .token.deleted {
-  background-color: #ffd8d8;
-}
-pre[class*='language-'] code .token.inserted {
-  background-color: #caffcf;
-}
 
 .strikethrough {
   text-decoration: line-through;
diff --git a/public/css/prism-diff.css b/public/css/prism-diff.css
@@ -8,11 +8,11 @@ pre[class*='language-diff'] {
   padding-right: var(--eleventy-code-padding);
 }
 .token.deleted {
-  background-color: hsl(0, 51%, 37%);
+  background-color: #ffd8d8;
   color: inherit;
 }
 .token.inserted {
-  background-color: hsl(126, 31%, 39%);
+  background-color: #caffcf;
   color: inherit;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@ pre[class*='language-diff'] {`
`8`	`8`	`padding-right: var(--eleventy-code-padding);`
`9`	`9`	`}`
`10`	`10`	`.token.deleted {`
`11`		`- background-color: hsl(0, 51%, 37%);`
	`11`	`+ background-color: #ffd8d8;`
`12`	`12`	`color: inherit;`
`13`	`13`	`}`
`14`	`14`	`.token.inserted {`
`15`		`- background-color: hsl(126, 31%, 39%);`
	`15`	`+ background-color: #caffcf;`
`16`	`16`	`color: inherit;`
`17`	`17`	`}`
`18`	`18`