Handle cleanup

packages/astro/src/content/sync.ts

@@ -23,6 +23,7 @@ export class ContentLayer {
 	#settings: AstroSettings;
 	#watcher?: FSWatcher;
 	#lastConfigDigest?: string;
+	#unsubscribe?: () => void;
 
 	#generateDigest?: (data: Record<string, unknown> | string) => string;
 
@@ -48,7 +49,8 @@ export class ContentLayer {
 	 * Watch for changes to the content config and trigger a sync when it changes.
 	 */
 	watchContentConfig() {
-		globalContentConfigObserver.subscribe(async (ctx) => {
+		this.#unsubscribe?.();
+		this.#unsubscribe = globalContentConfigObserver.subscribe(async (ctx) => {
 			if (
 				!this.#loading &&
 				ctx.status === 'loaded' &&
@@ -60,6 +62,10 @@ export class ContentLayer {
 		});
 	}
 
+	unwatchContentConfig() {
+		this.#unsubscribe?.();
+	}
+
 	/**
 	 * Run the `load()` method of each collection's loader, which will load the data and save it in the data store.
 	 * The loader itself is responsible for deciding whether this will clear and reload the full collection, or
@@ -223,9 +229,7 @@ function contentLayerSingleton() {
 	return {
 		initialized: () => Boolean(instance),
 		init: (options: ContentLayerOptions) => {
-			if (instance) {
-				throw new Error('Content layer already initialized');
-			}
+			instance?.unwatchContentConfig();
 			instance = new ContentLayer(options);
 			return instance;
 		},
@@ -235,8 +239,8 @@ function contentLayerSingleton() {
 			}
 			return instance;
 		},
-		/** @internal */
 		dispose: () => {
+			instance?.unwatchContentConfig();
 			instance = null;
 		},
 	};

packages/astro/test/test-utils.js

@@ -171,6 +171,7 @@ export async function loadFixture(inlineConfig) {
 			return await check(opts);
 		},
 		startDevServer: async (extraInlineConfig = {}) => {
+			globalContentLayer.dispose();
 			process.env.NODE_ENV = 'development';
 			devServer = await dev(mergeConfig(inlineConfig, extraInlineConfig));
 			config.server.host = parseAddressToHost(devServer.address.address); // update host