From 1d4db68e64b7c3faf8863bf67f8332aa28e2f34b Mon Sep 17 00:00:00 2001
From: Erika <3019731+Princesseuh@users.noreply.github.com>
Date: Fri, 5 May 2023 16:20:37 +0200
Subject: [PATCH] fix: declare namespace so client-base.d.ts stays an ambient
 definition (#7009)

---
 .changeset/giant-planes-try.md        |  5 +++++
 packages/astro/client-base.d.ts       |  2 +-
 packages/astro/src/assets/internal.ts | 15 +++++++++------
 3 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/giant-planes-try.md

diff --git a/.changeset/giant-planes-try.md b/.changeset/giant-planes-try.md
new file mode 100644
index 0000000000..6d3e172dd7
--- /dev/null
+++ b/.changeset/giant-planes-try.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix types from `astro/client` not working properly due to `client-base.d.ts` being an non-ambient declaration file
diff --git a/packages/astro/client-base.d.ts b/packages/astro/client-base.d.ts
index 6e37b60c77..5186468c85 100644
--- a/packages/astro/client-base.d.ts
+++ b/packages/astro/client-base.d.ts
@@ -389,7 +389,7 @@ declare module '*?inline' {
 }
 
 // eslint-disable-next-line  @typescript-eslint/no-namespace
-export namespace App {
+declare namespace App {
 	// eslint-disable-next-line  @typescript-eslint/no-empty-interface
 	export interface Locals {}
 }
diff --git a/packages/astro/src/assets/internal.ts b/packages/astro/src/assets/internal.ts
index 365bbcf62d..2a7d08ff71 100644
--- a/packages/astro/src/assets/internal.ts
+++ b/packages/astro/src/assets/internal.ts
@@ -2,6 +2,7 @@ import fs from 'node:fs';
 import { basename, join } from 'node:path/posix';
 import type { StaticBuildOptions } from '../core/build/types.js';
 import { AstroError, AstroErrorData } from '../core/errors/index.js';
+import { warn } from '../core/logger/core.js';
 import { prependForwardSlash } from '../core/path.js';
 import { isLocalService, type ImageService, type LocalImageService } from './services/service.js';
 import type { GetImageResult, ImageMetadata, ImageTransform } from './types.js';
@@ -103,9 +104,10 @@ export async function generateImage(
 	try {
 		await fs.promises.mkdir(assetsCacheDir, { recursive: true });
 	} catch (err) {
-		console.error(
-			'An error was encountered while creating the cache directory. Proceeding without caching. Error: ',
-			err
+		warn(
+			buildOpts.logging,
+			'astro:assets',
+			`An error was encountered while creating the cache directory. Proceeding without caching. Error: ${err}`
 		);
 		useCache = false;
 	}
@@ -160,9 +162,10 @@ export async function generateImage(
 			await fs.promises.writeFile(cachedFileURL, resultData.data);
 			await fs.promises.copyFile(cachedFileURL, finalFileURL);
 		} catch (e) {
-			console.error(
-				`There was an error creating the cache entry for ${filepath}. Attempting to write directly to output directory. Error: `,
-				e
+			warn(
+				buildOpts.logging,
+				'astro:assets',
+				`An error was encountered while creating the cache directory. Proceeding without caching. Error: ${e}`
 			);
 			await fs.promises.writeFile(finalFileURL, resultData.data);
 		}