Skip to content

Commit 30cd6db

Browse files
ematipicorururux
ematipico
and
rururux
authored
fix(core): logging overhaul (#15565)
* fix(core): logging overhaul * remove consola * a bunch of fixes eheh * revert changes * fix linting warnings * remove another package * changeset * Use better soluition for workerd engine Co-authored-by: rururux <rururux@users.noreply.github.com> * fix linting --------- Co-authored-by: rururux <rururux@users.noreply.github.com>
1 parent 425ea16 commit 30cd6db

54 files changed

Lines changed: 384 additions & 150 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.changeset/big-jobs-make.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 an issue where the use of the Astro internal logger couldn't work with Cloudflare Vite plugin.

‎.changeset/floppy-cases-hug.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@astrojs/cloudflare': patch
3+
'astro': patch
4+
---
5+
6+
Fixes an issue where the use of the `Code` component would result in an unexpected error.

‎.changeset/green-zebras-lick.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 an issue where the new Astro v6 development server didn't log anything when navigating the pages.

‎benchmark/packages/adapter/src/server.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as fs from 'node:fs';
22
import type { SSRManifest } from 'astro';
3-
import { AppPipeline, BaseApp } from 'astro/app';
3+
import { AppPipeline, BaseApp, type LogRequestPayload } from 'astro/app';
44

55
class MyApp extends BaseApp {
66
#manifest: SSRManifest | undefined;
@@ -30,6 +30,8 @@ class MyApp extends BaseApp {
3030
streaming,
3131
});
3232
}
33+
34+
logRequest(_options: LogRequestPayload) {}
3335
}
3436

3537
export function createExports(manifest: SSRManifest) {

‎biome.jsonc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
// We don't want to have node modules in code that should be runtime agnostic
138138
"includes": [
139139
"**/packages/astro/src/**/runtime/**/*.ts",
140-
"**/packages/astro/src/**/runtime.ts"
140+
"**/packages/astro/src/**/*runtime*.ts"
141141
],
142142
"linter": {
143143
"rules": {

‎knip.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export default {
8585
'packages/markdown/remark': {
8686
entry: [testEntry],
8787
// package.json#imports are not resolved at the moment
88-
ignore: ['src/import-plugin-browser.ts'],
88+
ignore: ['src/import-plugin-browser.ts', 'src/shiki-engine-workerd.ts'],
8989
},
9090
'packages/upgrade': {
9191
entry: ['src/index.ts', testEntry],

‎packages/astro/components/Code.astro‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
---
2-
import {
3-
type ThemePresets,
4-
createShikiHighlighter,
5-
globalShikiStyleCollector,
6-
transformerStyleToClass,
7-
} from '@astrojs/markdown-remark';
2+
import { createShikiHighlighter, type ThemePresets } from '@astrojs/markdown-remark/shiki';
3+
import { globalShikiStyleCollector } from '@astrojs/markdown-remark/shiki-style-collector';
4+
import { transformerStyleToClass } from '@astrojs/markdown-remark/transformers/style-to-class';
85
import type { ShikiTransformer, ThemeRegistration, ThemeRegistrationRaw } from 'shiki';
96
import { bundledLanguages } from 'shiki/langs';
107
import type { CodeLanguage } from '../dist/types/public/common.js';
@@ -13,6 +10,7 @@ import type { HTMLAttributes } from '../types.js';
1310
// Code.astro always uses Shiki, so import the virtual CSS module
1411
import 'virtual:astro:shiki-styles.css';
1512
13+
1614
interface Props extends Omit<HTMLAttributes<'pre'>, 'lang'> {
1715
/** The code to highlight. Required. */
1816
code: string;

‎packages/astro/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@
131131
"common-ancestor-path": "^2.0.0",
132132
"cookie": "^1.1.1",
133133
"cssesc": "^3.0.0",
134-
"debug": "^4.4.3",
135134
"deterministic-object-hash": "^2.0.2",
136135
"devalue": "^5.6.2",
137136
"diff": "^8.0.3",
@@ -149,6 +148,7 @@
149148
"magicast": "^0.5.2",
150149
"mrmime": "^2.0.1",
151150
"neotraverse": "^0.6.18",
151+
"obug": "^2.1.1",
152152
"p-limit": "^7.3.0",
153153
"p-queue": "^9.1.0",
154154
"package-manager-detector": "^1.6.0",
@@ -181,7 +181,6 @@
181181
"@playwright/test": "1.58.2",
182182
"@types/aria-query": "^5.0.4",
183183
"@types/cssesc": "^3.0.2",
184-
"@types/debug": "^4.1.12",
185184
"@types/dlv": "^1.1.5",
186185
"@types/hast": "^3.0.4",
187186
"@types/html-escaper": "3.0.4",

‎packages/astro/src/assets/fonts/vite-plugin-fonts.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { generateCspDigest } from '../../core/encryption.js';
88
import { collectErrorMetadata } from '../../core/errors/dev/utils.js';
99
import { AstroError, AstroErrorData, isAstroError } from '../../core/errors/index.js';
1010
import type { Logger } from '../../core/logger/core.js';
11-
import { formatErrorMessage } from '../../core/messages.js';
11+
import { formatErrorMessage } from '../../core/messages/runtime.js';
1212
import { appendForwardSlash, joinPaths, prependForwardSlash } from '../../core/path.js';
1313
import { getClientOutputDirectory } from '../../prerender/utils.js';
1414
import type { AstroSettings } from '../../types/astro.js';

‎packages/astro/src/cli/add/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import {
2424
updateTSConfigForFramework,
2525
} from '../../core/config/tsconfig.js';
2626
import type { Logger } from '../../core/logger/core.js';
27-
import * as msg from '../../core/messages.js';
28-
import { printHelp } from '../../core/messages.js';
27+
import * as msg from '../../core/messages/runtime.js';
28+
import { printHelp } from '../../core/messages/runtime.js';
2929
import { appendForwardSlash } from '../../core/path.js';
3030
import { ensureProcessNodeEnv, parseNpmName } from '../../core/util.js';
3131
import { eventCliSession, telemetry } from '../../events/index.js';

0 commit comments

Comments
 (0)