diff options
author | 2025-04-28 10:10:01 +0000 | |
---|---|---|
committer | 2025-04-28 10:10:01 +0000 | |
commit | 0cd3f320e8d8532288e3da2c0a39d1cbbf567005 (patch) | |
tree | 1ce65eb8e36366b7e82c682bed7333d7624b6b79 | |
parent | a7b2dc60ca94f42a66575feb190e8b0f36b48e7c (diff) | |
download | astro-0cd3f320e8d8532288e3da2c0a39d1cbbf567005.tar.gz astro-0cd3f320e8d8532288e3da2c0a39d1cbbf567005.tar.zst astro-0cd3f320e8d8532288e3da2c0a39d1cbbf567005.zip |
[ci] format
17 files changed, 48 insertions, 48 deletions
diff --git a/packages/astro/src/assets/fonts/constants.ts b/packages/astro/src/assets/fonts/constants.ts index fbf09d767..bc7382f25 100644 --- a/packages/astro/src/assets/fonts/constants.ts +++ b/packages/astro/src/assets/fonts/constants.ts @@ -1,4 +1,4 @@ -import type { Defaults } from "./types.js"; +import type { Defaults } from './types.js'; export const LOCAL_PROVIDER_NAME = 'local'; diff --git a/packages/astro/src/assets/fonts/definitions.ts b/packages/astro/src/assets/fonts/definitions.ts index 4ce2decb9..2c25f2968 100644 --- a/packages/astro/src/assets/fonts/definitions.ts +++ b/packages/astro/src/assets/fonts/definitions.ts @@ -1,8 +1,8 @@ +import type * as unifont from 'unifont'; +import type { CollectedFontForMetrics } from './logic/optimize-fallbacks.js'; /* eslint-disable @typescript-eslint/no-empty-object-type */ import type { AstroFontProvider, FontType, PreloadData, ResolvedFontProvider } from './types.js'; -import type * as unifont from 'unifont'; import type { FontFaceMetrics, GenericFallbackName } from './types.js'; -import type { CollectedFontForMetrics } from './logic/optimize-fallbacks.js'; export interface Hasher { hashString: (input: string) => string; diff --git a/packages/astro/src/assets/fonts/implementations/font-fetcher.ts b/packages/astro/src/assets/fonts/implementations/font-fetcher.ts index c47c87fb6..af70bd130 100644 --- a/packages/astro/src/assets/fonts/implementations/font-fetcher.ts +++ b/packages/astro/src/assets/fonts/implementations/font-fetcher.ts @@ -1,7 +1,7 @@ +import { isAbsolute } from 'node:path'; import type { Storage } from 'unstorage'; import type { ErrorHandler, FontFetcher } from '../definitions.js'; import { cache } from '../utils.js'; -import { isAbsolute } from 'node:path'; export function createCachedFontFetcher({ storage, diff --git a/packages/astro/src/assets/fonts/implementations/font-metrics-resolver.ts b/packages/astro/src/assets/fonts/implementations/font-metrics-resolver.ts index 4541479d0..093a9d2fc 100644 --- a/packages/astro/src/assets/fonts/implementations/font-metrics-resolver.ts +++ b/packages/astro/src/assets/fonts/implementations/font-metrics-resolver.ts @@ -1,4 +1,4 @@ -import { fromBuffer, type Font } from '@capsizecss/unpack'; +import { type Font, fromBuffer } from '@capsizecss/unpack'; import type { CssRenderer, FontFetcher, FontMetricsResolver } from '../definitions.js'; import type { FontFaceMetrics } from '../types.js'; import { renderFontSrc } from '../utils.js'; diff --git a/packages/astro/src/assets/fonts/implementations/local-provider-url-resolver.ts b/packages/astro/src/assets/fonts/implementations/local-provider-url-resolver.ts index 18738e2bb..13f8c65ac 100644 --- a/packages/astro/src/assets/fonts/implementations/local-provider-url-resolver.ts +++ b/packages/astro/src/assets/fonts/implementations/local-provider-url-resolver.ts @@ -1,6 +1,6 @@ +import { fileURLToPath } from 'node:url'; import type { LocalProviderUrlResolver } from '../definitions.js'; import { resolveEntrypoint } from '../utils.js'; -import { fileURLToPath } from 'node:url'; export function createRequireLocalProviderUrlResolver({ root, diff --git a/packages/astro/src/assets/fonts/implementations/storage.ts b/packages/astro/src/assets/fonts/implementations/storage.ts index b9e26ebb0..ad0f6ae8c 100644 --- a/packages/astro/src/assets/fonts/implementations/storage.ts +++ b/packages/astro/src/assets/fonts/implementations/storage.ts @@ -1,5 +1,5 @@ import { fileURLToPath } from 'node:url'; -import { createStorage, type Storage } from 'unstorage'; +import { type Storage, createStorage } from 'unstorage'; import fsLiteDriver from 'unstorage/drivers/fs-lite'; export function createFsStorage({ base }: { base: URL }): Storage { diff --git a/packages/astro/src/assets/fonts/logic/extract-unifont-providers.ts b/packages/astro/src/assets/fonts/logic/extract-unifont-providers.ts index 07759920d..c6bdbac6d 100644 --- a/packages/astro/src/assets/fonts/logic/extract-unifont-providers.ts +++ b/packages/astro/src/assets/fonts/logic/extract-unifont-providers.ts @@ -1,7 +1,7 @@ +import type * as unifont from 'unifont'; import { LOCAL_PROVIDER_NAME } from '../constants.js'; import type { Hasher } from '../definitions.js'; import type { ResolvedFontFamily } from '../types.js'; -import type * as unifont from 'unifont'; export function extractUnifontProviders({ families, diff --git a/packages/astro/src/assets/fonts/logic/optimize-fallbacks.ts b/packages/astro/src/assets/fonts/logic/optimize-fallbacks.ts index 181ea9c27..ed49e4e68 100644 --- a/packages/astro/src/assets/fonts/logic/optimize-fallbacks.ts +++ b/packages/astro/src/assets/fonts/logic/optimize-fallbacks.ts @@ -1,7 +1,7 @@ +import type * as unifont from 'unifont'; import type { FontMetricsResolver, SystemFallbacksProvider } from '../definitions.js'; import type { ResolvedFontFamily } from '../types.js'; import { isGenericFontFamily, unifontFontFaceDataToProperties } from '../utils.js'; -import type * as unifont from 'unifont'; export interface CollectedFontForMetrics { hash: string; diff --git a/packages/astro/src/assets/fonts/logic/resolve-families.ts b/packages/astro/src/assets/fonts/logic/resolve-families.ts index 1ee7bdb9a..c1ba14297 100644 --- a/packages/astro/src/assets/fonts/logic/resolve-families.ts +++ b/packages/astro/src/assets/fonts/logic/resolve-families.ts @@ -1,8 +1,8 @@ import { LOCAL_PROVIDER_NAME } from '../constants.js'; import type { - RemoteFontProviderResolver, Hasher, LocalProviderUrlResolver, + RemoteFontProviderResolver, } from '../definitions.js'; import type { FontFamily, diff --git a/packages/astro/src/assets/fonts/orchestrate.ts b/packages/astro/src/assets/fonts/orchestrate.ts index 8b47802d5..1876cbc5d 100644 --- a/packages/astro/src/assets/fonts/orchestrate.ts +++ b/packages/astro/src/assets/fonts/orchestrate.ts @@ -1,12 +1,6 @@ -import { LOCAL_PROVIDER_NAME } from './constants.js'; -import { resolveFamilies } from './logic/resolve-families.js'; -import { resolveLocalFont } from './providers/local.js'; -import type { CreateUrlProxyParams, Defaults, FontFamily, PreloadData } from './types.js'; import * as unifont from 'unifont'; -import { pickFontFaceProperty, unifontFontFaceDataToProperties } from './utils.js'; -import { extractUnifontProviders } from './logic/extract-unifont-providers.js'; -import { normalizeRemoteFontFaces } from './logic/normalize-remote-font-faces.js'; -import { optimizeFallbacks, type CollectedFontForMetrics } from './logic/optimize-fallbacks.js'; +import type { Storage } from 'unstorage'; +import { LOCAL_PROVIDER_NAME } from './constants.js'; import type { CssRenderer, FontMetricsResolver, @@ -17,7 +11,13 @@ import type { SystemFallbacksProvider, UrlProxy, } from './definitions.js'; -import type { Storage } from 'unstorage'; +import { extractUnifontProviders } from './logic/extract-unifont-providers.js'; +import { normalizeRemoteFontFaces } from './logic/normalize-remote-font-faces.js'; +import { type CollectedFontForMetrics, optimizeFallbacks } from './logic/optimize-fallbacks.js'; +import { resolveFamilies } from './logic/resolve-families.js'; +import { resolveLocalFont } from './providers/local.js'; +import type { CreateUrlProxyParams, Defaults, FontFamily, PreloadData } from './types.js'; +import { pickFontFaceProperty, unifontFontFaceDataToProperties } from './utils.js'; /** * Manages how fonts are resolved: diff --git a/packages/astro/src/assets/fonts/providers/local.ts b/packages/astro/src/assets/fonts/providers/local.ts index c67a21d52..d4b95d500 100644 --- a/packages/astro/src/assets/fonts/providers/local.ts +++ b/packages/astro/src/assets/fonts/providers/local.ts @@ -1,7 +1,7 @@ import type * as unifont from 'unifont'; import { FONT_FORMAT_MAP } from '../constants.js'; -import type { ResolvedLocalFontFamily } from '../types.js'; import type { FontTypeExtractor, UrlProxy } from '../definitions.js'; +import type { ResolvedLocalFontFamily } from '../types.js'; interface Options { family: ResolvedLocalFontFamily; diff --git a/packages/astro/src/assets/fonts/types.ts b/packages/astro/src/assets/fonts/types.ts index 3e3fb89b8..04678ad83 100644 --- a/packages/astro/src/assets/fonts/types.ts +++ b/packages/astro/src/assets/fonts/types.ts @@ -1,3 +1,4 @@ +import type { Font } from '@capsizecss/unpack'; import type * as unifont from 'unifont'; import type { z } from 'zod'; import type { @@ -6,7 +7,6 @@ import type { remoteFontFamilySchema, } from './config.js'; import type { FONT_TYPES, GENERIC_FALLBACK_NAMES } from './constants.js'; -import type { Font } from '@capsizecss/unpack'; import type { CollectedFontForMetrics } from './logic/optimize-fallbacks.js'; export type AstroFontProvider = z.infer<typeof fontProviderSchema>; diff --git a/packages/astro/src/assets/fonts/utils.ts b/packages/astro/src/assets/fonts/utils.ts index 71601c11c..963f24b7b 100644 --- a/packages/astro/src/assets/fonts/utils.ts +++ b/packages/astro/src/assets/fonts/utils.ts @@ -3,8 +3,8 @@ import { pathToFileURL } from 'node:url'; import type * as unifont from 'unifont'; import type { Storage } from 'unstorage'; import { FONT_TYPES, GENERIC_FALLBACK_NAMES, LOCAL_PROVIDER_NAME } from './constants.js'; -import type { FontType, GenericFallbackName, ResolvedFontFamily } from './types.js'; import type { CssProperties } from './definitions.js'; +import type { FontType, GenericFallbackName, ResolvedFontFamily } from './types.js'; /** * Turns unifont font face data into generic CSS properties, to be consumed by the CSS renderer. diff --git a/packages/astro/src/assets/fonts/vite-plugin-fonts.ts b/packages/astro/src/assets/fonts/vite-plugin-fonts.ts index 4412fbe90..d0a4c3496 100644 --- a/packages/astro/src/assets/fonts/vite-plugin-fonts.ts +++ b/packages/astro/src/assets/fonts/vite-plugin-fonts.ts @@ -1,5 +1,7 @@ import { mkdirSync, writeFileSync } from 'node:fs'; +import { readFile } from 'node:fs/promises'; import { isAbsolute } from 'node:path'; +import { fileURLToPath } from 'node:url'; import { removeTrailingForwardSlash } from '@astrojs/internal-helpers/path'; import type { Plugin } from 'vite'; import { collectErrorMetadata } from '../../core/errors/dev/utils.js'; @@ -15,36 +17,34 @@ import { URL_PREFIX, VIRTUAL_MODULE_ID, } from './constants.js'; -import type { PreloadData } from './types.js'; -import { orchestrate } from './orchestrate.js'; -import { createXxHasher } from './implementations/hasher.js'; -import { createAstroErrorHandler } from './implementations/error-handler.js'; import type { CssRenderer, FontFetcher, FontTypeExtractor, RemoteFontProviderModResolver, } from './definitions.js'; +import { createMinifiableCssRenderer } from './implementations/css-renderer.js'; +import { createDataCollector } from './implementations/data-collector.js'; +import { createAstroErrorHandler } from './implementations/error-handler.js'; +import { createCachedFontFetcher } from './implementations/font-fetcher.js'; +import { createCapsizeFontMetricsResolver } from './implementations/font-metrics-resolver.js'; +import { createFontTypeExtractor } from './implementations/font-type-extractor.js'; +import { createXxHasher } from './implementations/hasher.js'; +import { createRequireLocalProviderUrlResolver } from './implementations/local-provider-url-resolver.js'; import { createBuildRemoteFontProviderModResolver, createDevServerRemoteFontProviderModResolver, } from './implementations/remote-font-provider-mod-resolver.js'; import { createRemoteFontProviderResolver } from './implementations/remote-font-provider-resolver.js'; -import { createRequireLocalProviderUrlResolver } from './implementations/local-provider-url-resolver.js'; import { createFsStorage } from './implementations/storage.js'; import { createSystemFallbacksProvider } from './implementations/system-fallbacks-provider.js'; -import { createCachedFontFetcher } from './implementations/font-fetcher.js'; -import { createCapsizeFontMetricsResolver } from './implementations/font-metrics-resolver.js'; -import { createUrlProxy } from './implementations/url-proxy.js'; import { createLocalUrlProxyContentResolver, createRemoteUrlProxyContentResolver, } from './implementations/url-proxy-content-resolver.js'; -import { createDataCollector } from './implementations/data-collector.js'; -import { createMinifiableCssRenderer } from './implementations/css-renderer.js'; -import { createFontTypeExtractor } from './implementations/font-type-extractor.js'; -import { readFile } from 'node:fs/promises'; -import { fileURLToPath } from 'node:url'; +import { createUrlProxy } from './implementations/url-proxy.js'; +import { orchestrate } from './orchestrate.js'; +import type { PreloadData } from './types.js'; interface Options { settings: AstroSettings; diff --git a/packages/astro/test/units/assets/fonts/logic.test.js b/packages/astro/test/units/assets/fonts/logic.test.js index 192acaa35..00d43df98 100644 --- a/packages/astro/test/units/assets/fonts/logic.test.js +++ b/packages/astro/test/units/assets/fonts/logic.test.js @@ -1,11 +1,11 @@ // @ts-check import assert from 'node:assert/strict'; import { describe, it } from 'node:test'; -import { resolveFamily } from '../../../../dist/assets/fonts/logic/resolve-families.js'; +import { createSystemFallbacksProvider } from '../../../../dist/assets/fonts/implementations/system-fallbacks-provider.js'; import { extractUnifontProviders } from '../../../../dist/assets/fonts/logic/extract-unifont-providers.js'; import { normalizeRemoteFontFaces } from '../../../../dist/assets/fonts/logic/normalize-remote-font-faces.js'; import { optimizeFallbacks } from '../../../../dist/assets/fonts/logic/optimize-fallbacks.js'; -import { createSystemFallbacksProvider } from '../../../../dist/assets/fonts/implementations/system-fallbacks-provider.js'; +import { resolveFamily } from '../../../../dist/assets/fonts/logic/resolve-families.js'; import { createSpyUrlProxy, fakeFontMetricsResolver, fakeHasher } from './utils.js'; describe('fonts logic', () => { diff --git a/packages/astro/test/units/assets/fonts/orchestrate.test.js b/packages/astro/test/units/assets/fonts/orchestrate.test.js index 50725e291..d745f903c 100644 --- a/packages/astro/test/units/assets/fonts/orchestrate.test.js +++ b/packages/astro/test/units/assets/fonts/orchestrate.test.js @@ -1,16 +1,19 @@ // @ts-check import assert from 'node:assert/strict'; import { describe, it } from 'node:test'; -import { orchestrate } from '../../../../dist/assets/fonts/orchestrate.js'; -import { createRemoteFontProviderResolver } from '../../../../dist/assets/fonts/implementations/remote-font-provider-resolver.js'; -import { createBuildRemoteFontProviderModResolver } from '../../../../dist/assets/fonts/implementations/remote-font-provider-mod-resolver.js'; -import { createRequireLocalProviderUrlResolver } from '../../../../dist/assets/fonts/implementations/local-provider-url-resolver.js'; +import { fileURLToPath } from 'node:url'; +import { defineFontProvider } from 'unifont'; +import { DEFAULTS } from '../../../../dist/assets/fonts/constants.js'; import { createMinifiableCssRenderer } from '../../../../dist/assets/fonts/implementations/css-renderer.js'; -import { createSystemFallbacksProvider } from '../../../../dist/assets/fonts/implementations/system-fallbacks-provider.js'; -import { createFontTypeExtractor } from '../../../../dist/assets/fonts/implementations/font-type-extractor.js'; import { createDataCollector } from '../../../../dist/assets/fonts/implementations/data-collector.js'; -import { createUrlProxy } from '../../../../dist/assets/fonts/implementations/url-proxy.js'; +import { createFontTypeExtractor } from '../../../../dist/assets/fonts/implementations/font-type-extractor.js'; +import { createRequireLocalProviderUrlResolver } from '../../../../dist/assets/fonts/implementations/local-provider-url-resolver.js'; +import { createBuildRemoteFontProviderModResolver } from '../../../../dist/assets/fonts/implementations/remote-font-provider-mod-resolver.js'; +import { createRemoteFontProviderResolver } from '../../../../dist/assets/fonts/implementations/remote-font-provider-resolver.js'; +import { createSystemFallbacksProvider } from '../../../../dist/assets/fonts/implementations/system-fallbacks-provider.js'; import { createRemoteUrlProxyContentResolver } from '../../../../dist/assets/fonts/implementations/url-proxy-content-resolver.js'; +import { createUrlProxy } from '../../../../dist/assets/fonts/implementations/url-proxy.js'; +import { orchestrate } from '../../../../dist/assets/fonts/orchestrate.js'; import { defineAstroFontProvider } from '../../../../dist/assets/fonts/providers/index.js'; import { createSpyStorage, @@ -18,9 +21,6 @@ import { fakeHasher, simpleErrorHandler, } from './utils.js'; -import { DEFAULTS } from '../../../../dist/assets/fonts/constants.js'; -import { defineFontProvider } from 'unifont'; -import { fileURLToPath } from 'node:url'; describe('fonts orchestrate()', () => { it('works with local fonts', async () => { diff --git a/packages/astro/test/units/assets/fonts/providers.test.js b/packages/astro/test/units/assets/fonts/providers.test.js index c95078bd2..dec49fbb1 100644 --- a/packages/astro/test/units/assets/fonts/providers.test.js +++ b/packages/astro/test/units/assets/fonts/providers.test.js @@ -1,13 +1,13 @@ // @ts-check import assert from 'node:assert/strict'; import { describe, it } from 'node:test'; +import { createFontTypeExtractor } from '../../../../dist/assets/fonts/implementations/font-type-extractor.js'; import * as adobeEntrypoint from '../../../../dist/assets/fonts/providers/entrypoints/adobe.js'; import * as bunnyEntrypoint from '../../../../dist/assets/fonts/providers/entrypoints/bunny.js'; import * as fontshareEntrypoint from '../../../../dist/assets/fonts/providers/entrypoints/fontshare.js'; import * as fontsourceEntrypoint from '../../../../dist/assets/fonts/providers/entrypoints/fontsource.js'; import * as googleEntrypoint from '../../../../dist/assets/fonts/providers/entrypoints/google.js'; import { resolveLocalFont } from '../../../../dist/assets/fonts/providers/local.js'; -import { createFontTypeExtractor } from '../../../../dist/assets/fonts/implementations/font-type-extractor.js'; import { fontProviders } from '../../../../dist/config/entrypoint.js'; import { createSpyUrlProxy, simpleErrorHandler } from './utils.js'; |