fix: remove inline style and script for CSP; upgrade dependencies (#2)

jquery · Sep 18, 2024 · 516099a · 516099a
1 parent d72cfc2
commit 516099a
Show file tree

Hide file tree

Showing 10 changed files with 1,603 additions and 1,224 deletions.
diff --git a/_data/metadata.js b/_data/metadata.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   title: 'jQuery - Bug Tracker',
   url: 'https://bugs.jquery.com/',
   language: 'en',

diff --git a/_includes/layouts/base.njk b/_includes/layouts/base.njk
@@ -34,11 +34,11 @@
     {# 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>
+    {# <style>
       {% getBundle "css" %}
-    </style>
+    </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">
@@ -151,17 +151,5 @@
       </footer>
     </div>
     <script src="/pagefind/pagefind-ui.js" type="text/javascript"></script>
-    <script>
-      window.addEventListener('DOMContentLoaded', (event) => {
-        new PagefindUI({
-          element: "#search",
-          showImages: false,
-          translations: {
-            placeholder: '',
-            zero_results: 'No matches found.'
-          }
-        })
-      })
-    </script>
   </body>
 </html>
diff --git a/eleventy.config.images.js b/eleventy.config.images.js
@@ -1,7 +1,7 @@
-const path = require('path')
-const eleventyImage = require('@11ty/eleventy-img')
+import path from 'node:path'
+import eleventyImage from '@11ty/eleventy-img'
 
-module.exports = (eleventyConfig) => {
+export default function imagesConfig(eleventyConfig) {
   function relativeToInputPath(inputPath, relativeFilePath) {
     let split = inputPath.split('/')
     split.pop()

diff --git a/eleventy.config.js b/eleventy.config.js
@@ -1,19 +1,17 @@
-const { DateTime } = require('luxon')
-
-const pluginSyntaxHighlight = require('@11ty/eleventy-plugin-syntaxhighlight')
-const pluginBundle = require('@11ty/eleventy-plugin-bundle')
-const pluginNavigation = require('@11ty/eleventy-navigation')
-const { EleventyHtmlBasePlugin } = require('@11ty/eleventy')
-const pluginFavicon = require('eleventy-favicon')
-const CleanCSS = require('clean-css')
-const fs = require('node:fs')
-const path = require('node:path')
-const { exec } = require('node:child_process')
-
-const pluginImages = require('./eleventy.config.images.js')
-const tracToHTML = require('./eleventy.config.tracToHTML.js')
-
-module.exports = function (eleventyConfig) {
+import { EleventyHtmlBasePlugin } from '@11ty/eleventy'
+import pluginNavigation from '@11ty/eleventy-navigation'
+import pluginBundle from '@11ty/eleventy-plugin-bundle'
+import pluginSyntaxHighlight from '@11ty/eleventy-plugin-syntaxhighlight'
+import CleanCSS from 'clean-css'
+import pluginFavicon from 'eleventy-favicon'
+import { DateTime } from 'luxon'
+import { exec } from 'node:child_process'
+import fs from 'node:fs'
+import path from 'node:path'
+import pluginImages from './eleventy.config.images.js'
+import tracToHTML from './eleventy.config.tracToHTML.js'
+
+export default function config(eleventyConfig) {
   // Copy the contents of the `public` folder to the output folder
   // For example, `./public/css/` ends up in `_site/css/`
   eleventyConfig.addPassthroughCopy({

diff --git a/eleventy.config.tracToHTML.js b/eleventy.config.tracToHTML.js
@@ -25,7 +25,7 @@ function escapeHTML(string) {
   return string.replace(/</g, '&lt;').replace(/>/g, '&gt;')
 }
 
-module.exports = function tracToHTML(text) {
+export default function tracToHTML(text) {
   const codes = []
   const pres = []
   let html = escapeHTML(text)