From 6c7c81fcdb5574c47fc59809005d1066123abb28 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Mon, 1 Jan 2024 13:31:15 -0400 Subject: infra, write: use showAggregate when loading content functions --- src/content/dependencies/index.js | 9 +++++++-- src/write/build-modes/live-dev-server.js | 5 ++++- src/write/build-modes/static-build.js | 4 +++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/content/dependencies/index.js b/src/content/dependencies/index.js index 58bac0d2..95247e9c 100644 --- a/src/content/dependencies/index.js +++ b/src/content/dependencies/index.js @@ -8,7 +8,11 @@ import {ESLint} from 'eslint'; import {colors, logWarn} from '#cli'; import contentFunction, {ContentFunctionSpecError} from '#content-function'; -import {annotateFunction} from '#sugar'; + +import { + annotateFunction, + showAggregate as _showAggregate +} from '#sugar'; function cachebust(filePath) { if (filePath in cachebust.cache) { @@ -25,6 +29,7 @@ cachebust.cache = Object.create(null); export function watchContentDependencies({ mock = null, logging = true, + showAggregate = _showAggregate, } = {}) { const events = new EventEmitter(); const contentDependencies = {}; @@ -229,7 +234,7 @@ export function watchContentDependencies({ } else if (error instanceof ContentFunctionSpecError) { console.error(colors.yellow(error.message)); } else { - console.error(error); + showAggregate(error); } } diff --git a/src/write/build-modes/live-dev-server.js b/src/write/build-modes/live-dev-server.js index 6e7df0ef..8160c8f9 100644 --- a/src/write/build-modes/live-dev-server.js +++ b/src/write/build-modes/live-dev-server.js @@ -106,7 +106,10 @@ export async function go({ const skipServing = cliOptions['skip-serving'] ?? false; const serveSFX = cliOptions['serve-sfx'] ?? null; - const contentDependenciesWatcher = await watchContentDependencies(); + const contentDependenciesWatcher = await watchContentDependencies({ + showAggregate: niceShowAggregate, + }); + const {contentDependencies} = contentDependenciesWatcher; contentDependenciesWatcher.on('error', () => {}); diff --git a/src/write/build-modes/static-build.js b/src/write/build-modes/static-build.js index d2802f4e..f292fde0 100644 --- a/src/write/build-modes/static-build.js +++ b/src/write/build-modes/static-build.js @@ -256,7 +256,9 @@ export async function go({ let errored = false; - const contentDependencies = await quickLoadContentDependencies(); + const contentDependencies = await quickLoadContentDependencies({ + showAggregate: niceShowAggregate, + }); const perLanguageFn = async (language, i, entries) => { const baseDirectory = -- cgit 1.3.0-6-gf8a5