Skip to content

Commit

Permalink
Merge pull request #11 from BristolFurs/dependabot/npm_and_yarn/eleve…
Browse files Browse the repository at this point in the history
…nty-a1a3a38078

⬆️ Bump the eleventy group with 2 updates
  • Loading branch information
querkmachine authored Nov 14, 2024
2 parents cc41da6 + 095605c commit 3bba43c
Show file tree
Hide file tree
Showing 15 changed files with 1,596 additions and 1,471 deletions.
4 changes: 2 additions & 2 deletions app/filters/cachebust.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const format = require("date-fns/format")
import { format } from "date-fns"

module.exports = function (url) {
export default function (url) {
const [urlPart, paramPart] = url.split("?")
const params = new URLSearchParams(paramPart || "")
params.set("v", format(new Date(), "t"))
Expand Down
11 changes: 5 additions & 6 deletions app/filters/formatDate.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
const dateFormat = require("date-fns/format")
const dateFormatISO = require("date-fns/formatISO")
import { format, formatISO } from "date-fns"

module.exports = function (value, format) {
export default function (value, outputFormat) {
value = new Date(value)

if (format) {
return dateFormat(value, format)
if (outputFormat) {
return format(value, outputFormat)
}
return dateFormatISO(value)
return formatISO(value)
}
4 changes: 2 additions & 2 deletions app/shortcodes/faq.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const markdownIt = require("markdown-it")
import markdownIt from "markdown-it"

module.exports = function (content, question) {
export default function (content, question) {
const md = new markdownIt({
html: true,
linkify: true,
Expand Down
6 changes: 3 additions & 3 deletions app/shortcodes/icon.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const fs = require("fs")
import { readFileSync } from "node:fs"

module.exports = function (name) {
export default function (name) {
const filePath = `./src/assets/images/icons/${name}.svg`
const data = fs.readFileSync(filePath, function (err, contents) {
const data = readFileSync(filePath, function (err, contents) {
if (err) return err
return contents
})
Expand Down
6 changes: 3 additions & 3 deletions app/shortcodes/image.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const eleventyImg = require("@11ty/eleventy-img")
const paths = require("../../tasks/paths")
import eleventyImg from "@11ty/eleventy-img"
import paths from "../../tasks/paths.js"

module.exports = function (src, alt, credit = "", options = {}) {
export default function (src, alt, credit = "", options = {}) {
// Throw errors is either required option is missing
if (!src) {
console.log(src)
Expand Down
4 changes: 2 additions & 2 deletions app/shortcodes/markdown.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const markdownIt = require("markdown-it")
import markdownIt from "markdown-it"

module.exports = function (content) {
export default function (content) {
const md = new markdownIt({
html: true,
linkify: true,
Expand Down
30 changes: 15 additions & 15 deletions eleventy.config.js
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
const paths = require("./tasks/paths")
import paths from "./tasks/paths.js"

// Build tasks
const { compileSass } = require("./tasks/compile-sass")
import { compileSass } from "./tasks/compile-sass.js"

// Eleventy plugins
const pluginDirectoryLogging = require("@11ty/eleventy-plugin-directory-output")
const pluginSvgContents = require("eleventy-plugin-svg-contents")
const pluginTableOfContents = require("eleventy-plugin-toc")
import pluginDirectoryLogging from "@11ty/eleventy-plugin-directory-output"
import pluginSvgContents from "eleventy-plugin-svg-contents"
import pluginTableOfContents from "eleventy-plugin-toc"

// Markdown parser and plugins
const markdownIt = require("markdown-it")
const markdownItAnchorPlugin = require("markdown-it-anchor")
const markdownItAttributesPlugin = require("markdown-it-attrs")
import markdownIt from "markdown-it"
import markdownItAnchorPlugin from "markdown-it-anchor"
import markdownItAttributesPlugin from "markdown-it-attrs"

// Custom shortcodes
const shortcodeFAQ = require("./app/shortcodes/faq")
const shortcodeIcon = require("./app/shortcodes/icon")
const shortcodeImage = require("./app/shortcodes/image")
const shortcodeMarkdown = require("./app/shortcodes/markdown")
import shortcodeFAQ from "./app/shortcodes/faq.js"
import shortcodeIcon from "./app/shortcodes/icon.js"
import shortcodeImage from "./app/shortcodes/image.js"
import shortcodeMarkdown from "./app/shortcodes/markdown.js"

// Custom filters
const filterCachebust = require("./app/filters/cachebust")
const filterFormatDate = require("./app/filters/formatDate")
import filterCachebust from "./app/filters/cachebust.js"
import filterFormatDate from "./app/filters/formatDate.js"

module.exports = function (config) {
export default function (config) {
// Turn off default log output
// config.setQuietMode(true)

Expand Down
Loading

0 comments on commit 3bba43c

Please sign in to comment.