Switch back to safe-stringify

packages/astro/src/content/content-layer.ts

@@ -1,12 +1,10 @@
 import { promises as fs, existsSync } from 'node:fs';
-import { deterministicString } from 'deterministic-object-hash';
 import PQueue from 'p-queue';
 import type { FSWatcher } from 'vite';
 import xxhash from 'xxhash-wasm';
 import { AstroError, AstroErrorData } from '../core/errors/index.js';
 import type { Logger } from '../core/logger/core.js';
 import type { AstroSettings } from '../types/astro.js';
-
 import type { ContentEntryType, RefreshContentOptions } from '../types/public/content.js';
 import {
 	ASSET_IMPORTS_FILE,
@@ -21,6 +19,7 @@ import {
 	getEntryConfigByExtMap,
 	getEntryDataAndImages,
 	globalContentConfigObserver,
+	safeStringify,
 } from './utils.js';
 
 export interface ContentLayerOptions {
@@ -152,7 +151,7 @@ export class ContentLayer {
 			...hashableConfig
 		} = this.#settings.config;
 
-		const astroConfigDigest = deterministicString(hashableConfig);
+		const astroConfigDigest = safeStringify(hashableConfig);
 
 		const { digest: currentConfigDigest } = contentConfig.config;
 		this.#lastConfigDigest = currentConfigDigest;

packages/astro/src/content/utils.ts

@@ -832,3 +832,26 @@ export function contentModuleToId(fileName: string) {
 	params.set(CONTENT_MODULE_FLAG, 'true');
 	return `${DEFERRED_MODULE}?${params.toString()}`;
 }
+
+// Based on https://github.com/sindresorhus/safe-stringify
+function safeStringifyReplacer(seen: WeakSet<object>) {
+	return function (_key: string, value: unknown) {
+		if (!(value !== null && typeof value === 'object')) {
+			return value;
+		}
+		if (seen.has(value)) {
+			return '[Circular]';
+		}
+		seen.add(value);
+		const newValue = Array.isArray(value) ? [] : {};
+		for (const [key2, value2] of Object.entries(value)) {
+			(newValue as Record<string, unknown>)[key2] = safeStringifyReplacer(seen)(key2, value2);
+		}
+		seen.delete(value);
+		return newValue;
+	};
+}
+export function safeStringify(value: unknown) {
+	const seen = new WeakSet();
+	return JSON.stringify(value, safeStringifyReplacer(seen));
+}