Skip to content

Commit d715f1f

Browse files
florian-lefebvresarah11918
florian-lefebvre
and
sarah11918
authored
fix(fonts): remove getFontBuffer() (#15334)
Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>
1 parent 08d38c6 commit d715f1f

14 files changed

Lines changed: 17 additions & 248 deletions

File tree

‎.changeset/many-horses-kiss.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
'astro': patch
3+
---
4+
5+
**BREAKING CHANGE to the experimental Fonts API only**
6+
7+
Removes the `getFontBuffer()` helper function exported from `astro:assets` when using the experimental Fonts API
8+
9+
This experimental feature introduced in v15.6.13 ended up causing significant memory usage during build. This feature has been removed and will be reintroduced after further exploration and testing.
10+
11+
If you were relying on this function, you can replicate the previous behavior manually:
12+
13+
- On prerendered routes, read the file using `node:fs`
14+
- On server rendered routes, fetch files using URLs from `fontData` and `context.url`

‎packages/astro/client.d.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ declare module 'astro:assets' {
5555
Picture: typeof import('./components/Picture.astro').default;
5656
Font: typeof import('./components/Font.astro').default;
5757
fontData: Record<import('astro:assets').CssVariable, Array<import('astro:assets').FontData>>;
58-
getFontBuffer: (url: string) => Promise<Buffer>;
5958
};
6059

6160
type ImgAttributes = import('./dist/type-utils.js').WithRequired<
@@ -78,7 +77,6 @@ declare module 'astro:assets' {
7877
Font,
7978
inferRemoteSize,
8079
fontData,
81-
getFontBuffer,
8280
}: AstroAssets;
8381
}
8482

‎packages/astro/dev-only.d.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ declare module 'virtual:astro:env/internal' {
99
declare module 'virtual:astro:assets/fonts/internal' {
1010
export const componentDataByCssVariable: import('./src/assets/fonts/types.js').ComponentDataByCssVariable;
1111
export const fontDataByCssVariable: import('./src/assets/fonts/types.js').FontDataByCssVariable;
12-
export const bufferImports: import('./src/assets/fonts/types.js').BufferImports;
1312
}
1413

1514
declare module 'virtual:astro:adapter-config/client' {

‎packages/astro/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@
6363
"./assets/endpoint/*": "./dist/assets/endpoint/*.js",
6464
"./assets/services/sharp": "./dist/assets/services/sharp.js",
6565
"./assets/services/noop": "./dist/assets/services/noop.js",
66-
"./assets/fonts/runtime/server.js": "./dist/assets/fonts/runtime/server.js",
67-
"./assets/fonts/runtime/client.js": "./dist/assets/fonts/runtime/client.js",
66+
"./assets/fonts/runtime.js": "./dist/assets/fonts/runtime.js",
6867
"./loaders": "./dist/content/loaders/index.js",
6968
"./content/config": "./dist/content/config.js",
7069
"./content/runtime": "./dist/content/runtime.js",

‎packages/astro/src/assets/fonts/constants.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ export const RESOLVED_VIRTUAL_MODULE_ID = '\0' + VIRTUAL_MODULE_ID;
1616
export const RUNTIME_VIRTUAL_MODULE_ID = 'virtual:astro:assets/fonts/runtime';
1717
export const RESOLVED_RUNTIME_VIRTUAL_MODULE_ID = '\0' + RUNTIME_VIRTUAL_MODULE_ID;
1818

19-
export const BUFFER_VIRTUAL_MODULE_ID_PREFIX = 'virtual:astro:assets/fonts/file/';
20-
export const RESOLVED_BUFFER_VIRTUAL_MODULE_ID_PREFIX = '\0' + BUFFER_VIRTUAL_MODULE_ID_PREFIX;
21-
2219
export const ASSETS_DIR = 'fonts';
2320
export const CACHE_DIR = './fonts/';
2421

‎packages/astro/src/assets/fonts/core/create-get-font-buffer.ts‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

packages/astro/src/assets/fonts/runtime/client.ts renamed to packages/astro/src/assets/fonts/runtime.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,3 @@ import * as fontsMod from 'virtual:astro:assets/fonts/internal';
22

33
// TODO: remove default when stabilizing
44
export const fontData = fontsMod.fontDataByCssVariable ?? {};
5-
6-
export async function getFontBuffer() {
7-
throw new Error('[astro:assets] `getFontBuffer()` is not available on the client.');
8-
}

‎packages/astro/src/assets/fonts/runtime/server.ts‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎packages/astro/src/assets/fonts/types.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,5 +272,3 @@ export type FontFamilyAssetsByUniqueKey = Map<string, FontFamilyAssets>;
272272
export type Collaborator<T extends (input: any) => any, U extends keyof Parameters<T>[0]> = (
273273
params: Pick<Parameters<T>[0], U>,
274274
) => ReturnType<T>;
275-
276-
export type BufferImports = Record<string, () => Promise<{ default: Buffer | null }>>;

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

Lines changed: 2 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ import { getClientOutputDirectory } from '../../prerender/utils.js';
1414
import type { AstroSettings } from '../../types/astro.js';
1515
import {
1616
ASSETS_DIR,
17-
BUFFER_VIRTUAL_MODULE_ID_PREFIX,
1817
CACHE_DIR,
1918
DEFAULTS,
20-
RESOLVED_BUFFER_VIRTUAL_MODULE_ID_PREFIX,
2119
RESOLVED_RUNTIME_VIRTUAL_MODULE_ID,
2220
RESOLVED_VIRTUAL_MODULE_ID,
2321
RUNTIME_VIRTUAL_MODULE_ID,
@@ -73,16 +71,9 @@ export function fontsPlugin({ settings, sync, logger }: Options): Plugin {
7371
if (id === RUNTIME_VIRTUAL_MODULE_ID) {
7472
return RESOLVED_RUNTIME_VIRTUAL_MODULE_ID;
7573
}
76-
if (id.startsWith(BUFFER_VIRTUAL_MODULE_ID_PREFIX)) {
77-
return `\0` + id;
78-
}
7974
},
8075
load(id) {
81-
if (
82-
id === RESOLVED_VIRTUAL_MODULE_ID ||
83-
id === RESOLVED_RUNTIME_VIRTUAL_MODULE_ID ||
84-
id.startsWith(RESOLVED_BUFFER_VIRTUAL_MODULE_ID_PREFIX)
85-
) {
76+
if (id === RESOLVED_VIRTUAL_MODULE_ID || id === RESOLVED_RUNTIME_VIRTUAL_MODULE_ID) {
8677
return {
8778
code: '',
8879
};
@@ -307,66 +298,22 @@ export function fontsPlugin({ settings, sync, logger }: Options): Plugin {
307298
if (id === RUNTIME_VIRTUAL_MODULE_ID) {
308299
return RESOLVED_RUNTIME_VIRTUAL_MODULE_ID;
309300
}
310-
if (id.startsWith(BUFFER_VIRTUAL_MODULE_ID_PREFIX)) {
311-
return `\0` + id;
312-
}
313301
},
314302
async load(id) {
315303
if (id === RESOLVED_VIRTUAL_MODULE_ID) {
316304
return {
317305
code: `
318306
export const componentDataByCssVariable = new Map(${JSON.stringify(Array.from(componentDataByCssVariable?.entries() ?? []))});
319307
export const fontDataByCssVariable = ${JSON.stringify(fontDataByCssVariable ?? {})}
320-
export const bufferImports = {${[...(fontFileById?.keys() ?? [])].map((key) => `"${key}": () => import("${BUFFER_VIRTUAL_MODULE_ID_PREFIX}${key}")`).join(',')}};
321308
`,
322309
};
323310
}
324311

325312
if (id === RESOLVED_RUNTIME_VIRTUAL_MODULE_ID) {
326-
// TODO: use ASTRO_VITE_ENVIRONMENT_NAMES.client
327-
if (this.environment.name === 'client') {
328-
return {
329-
code: `export * from 'astro/assets/fonts/runtime/client.js';`,
330-
};
331-
}
332313
return {
333-
code: `export * from 'astro/assets/fonts/runtime/server.js';`,
314+
code: `export * from 'astro/assets/fonts/runtime.js';`,
334315
};
335316
}
336-
337-
if (id.startsWith(RESOLVED_BUFFER_VIRTUAL_MODULE_ID_PREFIX)) {
338-
if (!fontFetcher) {
339-
logger.debug(
340-
'assets',
341-
'Fonts dependencies should be initialized by now, skipping dev middleware.',
342-
);
343-
return { code: `export default null;` };
344-
}
345-
346-
const fontId = id.slice(RESOLVED_BUFFER_VIRTUAL_MODULE_ID_PREFIX.length);
347-
const fontData = fontFileById?.get(fontId);
348-
if (!fontData) {
349-
return { code: `export default null;` };
350-
}
351-
352-
try {
353-
const buffer = await fontFetcher.fetch({ id: fontId, ...fontData });
354-
355-
const bytes = Array.from(buffer);
356-
return {
357-
code: `export default Uint8Array.from(${JSON.stringify(bytes)});`,
358-
};
359-
} catch (err) {
360-
logger.error('assets', 'Cannot download font file');
361-
if (isAstroError(err)) {
362-
logger.error(
363-
'SKIP_FORMAT',
364-
formatErrorMessage(collectErrorMetadata(err), logger.level() === 'debug'),
365-
);
366-
}
367-
return { code: `export default null;` };
368-
}
369-
}
370317
},
371318
async buildEnd() {
372319
if (sync || settings.config.experimental.fonts!.length === 0 || !isBuild) {

0 commit comments

Comments
 (0)