diff --git a/packages/astro/src/cli/check/print.ts b/packages/astro/src/cli/check/print.ts index 21536e7de..bd8de2ddb 100644 --- a/packages/astro/src/cli/check/print.ts +++ b/packages/astro/src/cli/check/print.ts @@ -11,8 +11,8 @@ import { white, yellow, } from 'kleur/colors'; -import stringWidth from 'string-width'; import { fileURLToPath } from 'node:url'; +import stringWidth from 'string-width'; export function printDiagnostic(filePath: string, text: string, diag: Diagnostic): string { let result = []; diff --git a/packages/astro/src/content/vite-plugin-content-imports.ts b/packages/astro/src/content/vite-plugin-content-imports.ts index 934ef37c6..c76d72a12 100644 --- a/packages/astro/src/content/vite-plugin-content-imports.ts +++ b/packages/astro/src/content/vite-plugin-content-imports.ts @@ -1,8 +1,8 @@ import * as devalue from 'devalue'; import type fsMod from 'node:fs'; import { extname } from 'node:path'; -import type { PluginContext } from 'rollup'; import { pathToFileURL } from 'node:url'; +import type { PluginContext } from 'rollup'; import type { Plugin } from 'vite'; import type { AstroConfig, diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts index 8fde2e0c1..3ae36ac57 100644 --- a/packages/astro/src/core/build/generate.ts +++ b/packages/astro/src/core/build/generate.ts @@ -41,8 +41,8 @@ import { callEndpoint, throwIfRedirectNotAllowed } from '../endpoint/index.js'; import { AstroError, AstroErrorData } from '../errors/index.js'; import { debug, info } from '../logger/core.js'; import { - RedirectSinglePageBuiltModule, getRedirectLocationOrThrow, + RedirectSinglePageBuiltModule, routeIsRedirect, } from '../redirects/index.js'; import { createEnvironment, createRenderContext, tryRenderPage } from '../render/index.js'; diff --git a/packages/integrations/sitemap/src/index.ts b/packages/integrations/sitemap/src/index.ts index 35fb7c6b5..f9ef360fb 100644 --- a/packages/integrations/sitemap/src/index.ts +++ b/packages/integrations/sitemap/src/index.ts @@ -1,11 +1,11 @@ import type { AstroConfig, AstroIntegration } from 'astro'; +import { fileURLToPath } from 'node:url'; import { EnumChangefreq, simpleSitemapAndIndex, type LinkItem as LinkItemBase, type SitemapItemLoose, } from 'sitemap'; -import { fileURLToPath } from 'node:url'; import { ZodError } from 'zod'; import { generateSitemap } from './generate-sitemap.js'; diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts index 7f45852ed..456af106f 100644 --- a/packages/integrations/vercel/src/serverless/adapter.ts +++ b/packages/integrations/vercel/src/serverless/adapter.ts @@ -2,8 +2,7 @@ import type { AstroAdapter, AstroConfig, AstroIntegration, RouteData } from 'ast import glob from 'fast-glob'; import { basename } from 'node:path'; -import { fileURLToPath } from 'node:url'; -import { pathToFileURL } from 'node:url'; +import { fileURLToPath, pathToFileURL } from 'node:url'; import { defaultImageConfig, getImageConfig, diff --git a/packages/markdown/remark/src/load-plugins.ts b/packages/markdown/remark/src/load-plugins.ts index b1343401f..de6601e7d 100644 --- a/packages/markdown/remark/src/load-plugins.ts +++ b/packages/markdown/remark/src/load-plugins.ts @@ -1,7 +1,7 @@ import { resolve as importMetaResolve } from 'import-meta-resolve'; import path from 'node:path'; -import type * as unified from 'unified'; import { pathToFileURL } from 'node:url'; +import type * as unified from 'unified'; const cwdUrlStr = pathToFileURL(path.join(process.cwd(), 'package.json')).toString();