Skip to content

Commit 2548abf

Browse files
fix: invalid internal declarations (#17869)
Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>
1 parent 19dae21 commit 2548abf

4 files changed

Lines changed: 24 additions & 21 deletions

File tree

.changeset/clear-pets-help.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'astro': patch
3+
---
4+
5+
Fixes a case where the logger was improperly initialized at runtime in dev.

packages/astro/dev-only.d.ts

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,29 @@ declare module 'virtual:astro:actions/options' {
2424
}
2525

2626
declare module 'virtual:astro:actions/entrypoint' {
27-
import type { SSRActions } from './src/index.js';
28-
export const server: SSRActions;
27+
export const server: import('./src/index.js').SSRActions;
2928
}
3029

3130
declare module 'virtual:astro:manifest' {
32-
import type { SSRManifest } from './src/index.js';
33-
export const manifest: SSRManifest;
31+
export const manifest: import('./src/index.js').SSRManifest;
3432
}
3533

3634
declare module 'virtual:astro:routes' {
37-
import type { RoutesList } from './src/types/astro.js';
38-
export const routes: RoutesList[];
35+
export const routes: import('./src/core/app/types.js').RouteInfo[];
3936
}
4037

4138
declare module 'virtual:astro:renderers' {
42-
import type { AstroRenderer } from './src/index.js';
43-
export const renderers: AstroRenderer[];
39+
export const renderers: import('./src/index.js').AstroRenderer[];
4440
}
4541

4642
declare module 'virtual:astro:middleware' {
47-
import type { AstroMiddlewareInstance } from './src/index.js';
48-
const middleware: AstroMiddlewareInstance;
43+
const middleware: import('./src/index.js').AstroMiddlewareInstance;
4944
export default middleware;
45+
export = middleware;
5046
}
5147

5248
declare module 'virtual:astro:session-driver' {
53-
import type { Driver } from 'unstorage';
54-
export const driver: Driver;
49+
export const driver: import('unstorage').Driver;
5550
}
5651

5752
declare module 'virtual:astro:pages' {
@@ -73,18 +68,21 @@ declare module 'virtual:astro:adapter-config' {
7368
}
7469

7570
declare module 'virtual:astro:dev-css' {
76-
import type { ImportedDevStyles } from './src/types/astro.js';
77-
export const css: Set<ImportedDevStyles>;
71+
export const css: Set<import('./src/types/astro.js').ImportedDevStyles>;
7872
}
7973

8074
declare module 'virtual:astro:dev-css-all' {
81-
import type { ImportedDevStyles } from './src/types/astro.js';
82-
export const devCSSMap: Map<string, () => Promise<{ css: Set<ImportedDevStyles> }>>;
75+
export const devCSSMap: Map<
76+
string,
77+
() => Promise<{ css: Set<import('./src/types/astro.js').ImportedDevStyles> }>
78+
>;
8379
}
8480

8581
declare module 'virtual:astro:component-metadata' {
86-
import type { SSRComponentMetadata } from './src/types/public/internal.js';
87-
export const componentMetadataEntries: [string, SSRComponentMetadata][];
82+
export const componentMetadataEntries: [
83+
string,
84+
import('./src/types/public/internal.js').SSRComponentMetadata,
85+
][];
8886
}
8987

9088
declare module 'virtual:astro:app' {

packages/astro/src/core/app/entrypoints/virtual/dev.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ let hmrWired = false;
2121
export const createApp: CreateApp = ({ streaming } = {}) => {
2222
// Composition order: logger → environment → facade ctor
2323
// (which warms the route table) → fetch handler → HMR wiring.
24-
setLogger(manifest, createConsoleLogger(manifest.logLevel));
24+
setLogger(manifest, createConsoleLogger({ level: manifest.logLevel }));
2525
setEnvironment(manifest, createNonRunnableEnvironment());
2626
const app = new DevFacadeApp(manifest, streaming);
2727
app.setFetchHandler(fetchable);
@@ -38,7 +38,7 @@ export const createApp: CreateApp = ({ streaming } = {}) => {
3838
const { routes: newRoutes } = await import('virtual:astro:routes');
3939
updateRouteTable(
4040
manifest,
41-
newRoutes.map((r: RouteInfo) => r.routeData),
41+
newRoutes.map((route: RouteInfo) => route.routeData),
4242
);
4343
} catch (e: any) {
4444
// Log error but don't crash - route updates are non-critical

packages/astro/src/vite-plugin-app/createAstroServerApp.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export default async function createAstroServerApp(
7373
const { routes: newRoutes } = await import('virtual:astro:routes');
7474
updateRouteTable(
7575
manifest,
76-
newRoutes.map((r: RouteInfo) => r.routeData),
76+
newRoutes.map((route: RouteInfo) => route.routeData),
7777
);
7878
actualLogger.debug('router', 'Routes updated via HMR');
7979
} catch (e: any) {

0 commit comments

Comments
 (0)