diff --git a/.eleventy.js b/.eleventy.js index 7d06972..b342c22 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -1,40 +1,39 @@ const faviconPlugin = require("eleventy-plugin-gen-favicons"); -const format = require('date-fns/format') +const format = require("date-fns/format"); const pluginSEO = require("eleventy-plugin-seo"); -const tinysvg = require('@sardine/eleventy-plugin-tinysvg'); -const slinkity = require('slinkity') +const tinysvg = require("@sardine/eleventy-plugin-tinysvg"); +const slinkity = require("slinkity"); // for 404 callback const fs = require("fs"); const NOT_FOUND_PATH = "_site/404.html"; module.exports = function (eleventyConfig) { - eleventyConfig.addPassthroughCopy('./src/assets/images/'); - eleventyConfig.addPassthroughCopy('./src/assets/videos/'); - eleventyConfig.addPassthroughCopy('./src/assets/proxy.pac'); - eleventyConfig.addPassthroughCopy('public') + eleventyConfig.addPassthroughCopy("./src/assets/proxy.pac"); + eleventyConfig.addPassthroughCopy("public"); // plugins - eleventyConfig.addPlugin(faviconPlugin, { outputDir: './public' }); - eleventyConfig.addPlugin(slinkity.plugin, slinkity.defineConfig({})) + eleventyConfig.addPlugin(faviconPlugin, { outputDir: "./public" }); + eleventyConfig.addPlugin(slinkity.plugin, slinkity.defineConfig({})); eleventyConfig.addPlugin(pluginSEO, require("./src/_data/seo.json")); eleventyConfig.addPlugin(tinysvg, { - baseUrl: 'src/_includes/svgs/', + baseUrl: "src/_includes/svgs/", }); // filters - eleventyConfig.addFilter('date', function (date, dateFormat) { - return format(date, dateFormat) - }) + eleventyConfig.addFilter("date", function (date, dateFormat) { + return format(date, dateFormat); + }); // 404 callback eleventyConfig.setBrowserSyncConfig({ callbacks: { - ready: function(err, bs) { - + ready: function (err, bs) { bs.addMiddleware("*", (req, res) => { if (!fs.existsSync(NOT_FOUND_PATH)) { - throw new Error(`Expected a \`${NOT_FOUND_PATH}\` file but could not find one. Did you create a 404.html template?`); + throw new Error( + `Expected a \`${NOT_FOUND_PATH}\` file but could not find one. Did you create a 404.html template?`, + ); } const content_404 = fs.readFileSync(NOT_FOUND_PATH); @@ -44,11 +43,11 @@ module.exports = function (eleventyConfig) { res.write(content_404); res.end(); }); - } - } + }, + }, }); return { dir: { input: "src", output: "_site", data: "_data" }, }; -}; \ No newline at end of file +}; diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index afbef9f..a27bcf7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -31,6 +31,11 @@ jobs: npm run build || true test -f _site/index.html + - name: Copy passthrough files missed by broken Slinkity build + run: | + mkdir -p _site/assets + cp src/assets/proxy.pac _site/assets/proxy.pac + - name: Configure SSH run: | mkdir -p ~/.ssh