fix rebase issues

withastro · Nov 15, 2023 · 0a35e8d · 0a35e8d
1 parent de16df0
commit 0a35e8d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/packages/astro/src/assets/build/generate.ts b/packages/astro/src/assets/build/generate.ts
@@ -231,7 +231,7 @@ export async function generateImagesForPath(
 			}
 		} catch (e) {
 			env.logger.warn(
-				'astro:assets',
+				null,
 				`An error was encountered while creating the cache directory. Proceeding without caching. Error: ${e}`
 			);
 		} finally {

diff --git a/packages/astro/src/content/server-listeners.ts b/packages/astro/src/content/server-listeners.ts
@@ -39,7 +39,7 @@ export async function attachContentServerListeners({
 		viteServer.watcher.on('addDir', contentDirListener);
 		async function contentDirListener(dir: string) {
 			if (appendForwardSlash(pathToFileURL(dir).href) === contentPaths.contentDir.href) {
-				logger.debug('content', `Content dir found. Watching for changes`);
+				logger.debug('content', `Content directory found. Watching for changes`);
 				await attachListeners();
 				viteServer.watcher.removeListener('addDir', contentDirListener);
 			}

diff --git a/packages/astro/src/core/build/index.ts b/packages/astro/src/core/build/index.ts
@@ -69,8 +69,9 @@ export default async function build(
 	if (astroConfig.experimental.contentCollectionCache && options.force) {
 		const contentCacheDir = new URL('./content/', astroConfig.cacheDir);
 		if (fs.existsSync(contentCacheDir)) {
-			logger.warn('content', 'clearing cache');
+			logger.debug('content', 'clearing content cache');
 			await fs.promises.rm(contentCacheDir, { force: true, recursive: true });
+			logger.warn('content', 'content cache cleared (force)');
 		}
 	}
 

diff --git a/packages/astro/src/core/logger/core.ts b/packages/astro/src/core/logger/core.ts
@@ -24,6 +24,7 @@ export type LoggerLabel =
 	| 'types'
 	| 'vite'
 	| 'watch'
+	| 'middleware'
 	// SKIP_FORMAT: A special label that tells the logger not to apply any formatting.
 	// Useful for messages that are already formatted, like the server start message.
 	| 'SKIP_FORMAT';