From 7768ebe31a96bf34a12a33eacd41c535444672fd Mon Sep 17 00:00:00 2001 From: madrilene Date: Sat, 2 Aug 2025 10:55:50 +0200 Subject: [PATCH] organization: adapt new buildAllCss and buildAllJs to the existing system --- eleventy.config.js | 14 +++++--------- src/_config/events.js | 6 +++++- .../{plugins/css-config.js => events/build-css.js} | 0 .../{plugins/js-config.js => events/build-js.js} | 0 4 files changed, 10 insertions(+), 10 deletions(-) rename src/_config/{plugins/css-config.js => events/build-css.js} (100%) rename src/_config/{plugins/js-config.js => events/build-js.js} (100%) diff --git a/eleventy.config.js b/eleventy.config.js index 768cc18..ddf8426 100644 --- a/eleventy.config.js +++ b/eleventy.config.js @@ -20,19 +20,15 @@ import events from './src/_config/events.js'; import filters from './src/_config/filters.js'; import plugins from './src/_config/plugins.js'; import shortcodes from './src/_config/shortcodes.js'; -import {buildAllCss} from './src/_config/plugins/css-config.js'; -import {buildAllJs} from './src/_config/plugins/js-config.js'; - - - export default async function (eleventyConfig) { - + // --------------------- Events: before build eleventyConfig.on('eleventy.before', async () => { - await buildAllCss(); - await buildAllJs(); + await events.buildAllCss(); + await events.buildAllJs(); }); + // --------------------- custom wtach targets eleventyConfig.addWatchTarget('./src/assets/**/*.{css,js,svg,png,jpeg}'); eleventyConfig.addWatchTarget('./src/_includes/**/*.{webc}'); @@ -95,7 +91,7 @@ export default async function (eleventyConfig) { eleventyConfig.addShortcode('image', shortcodes.imageShortcode); eleventyConfig.addShortcode('year', () => `${new Date().getFullYear()}`); - // --------------------- Events --------------------- + // --------------------- Events: after build if (process.env.ELEVENTY_RUN_MODE === 'serve') { eleventyConfig.on('eleventy.after', events.svgToJpeg); } diff --git a/src/_config/events.js b/src/_config/events.js index 80a9896..21b012e 100644 --- a/src/_config/events.js +++ b/src/_config/events.js @@ -1,5 +1,9 @@ import {svgToJpeg} from './events/svg-to-jpeg.js'; +import {buildAllCss} from './events/build-css.js'; +import {buildAllJs} from './events/build-js.js'; export default { - svgToJpeg + svgToJpeg, + buildAllCss, + buildAllJs }; diff --git a/src/_config/plugins/css-config.js b/src/_config/events/build-css.js similarity index 100% rename from src/_config/plugins/css-config.js rename to src/_config/events/build-css.js diff --git a/src/_config/plugins/js-config.js b/src/_config/events/build-js.js similarity index 100% rename from src/_config/plugins/js-config.js rename to src/_config/events/build-js.js