diff options
105 files changed, 361 insertions, 379 deletions
diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts index 97f94e389..45963dbcf 100644 --- a/packages/astro/src/@types/astro.ts +++ b/packages/astro/src/@types/astro.ts @@ -1,20 +1,20 @@ -import type { AddressInfo } from 'net'; -import type * as babel from '@babel/core'; -import type * as vite from 'vite'; -import { z } from 'zod'; import type { - ShikiConfig, - RemarkPlugins, - RehypePlugins, MarkdownHeader, MarkdownMetadata, MarkdownRenderingResult, + RehypePlugins, + RemarkPlugins, + ShikiConfig, } from '@astrojs/markdown-remark'; -import type { AstroConfigSchema } from '../core/config'; -import type { AstroComponentFactory, Metadata } from '../runtime/server'; -import type { ViteConfigWithSSR } from '../core/create-vite'; +import type * as babel from '@babel/core'; +import type { AddressInfo } from 'net'; +import type * as vite from 'vite'; +import { z } from 'zod'; import type { SerializedSSRManifest } from '../core/app/types'; import type { PageBuildData } from '../core/build/types'; +import type { AstroConfigSchema } from '../core/config'; +import type { ViteConfigWithSSR } from '../core/create-vite'; +import type { AstroComponentFactory, Metadata } from '../runtime/server'; export type { SSRManifest } from '../core/app/types'; export interface AstroBuiltinProps { diff --git a/packages/astro/src/cli/check.ts b/packages/astro/src/cli/check.ts index bda394014..65995d0e5 100644 --- a/packages/astro/src/cli/check.ts +++ b/packages/astro/src/cli/check.ts @@ -2,11 +2,11 @@ import { AstroCheck, DiagnosticSeverity } from '@astrojs/language-server'; import type { AstroConfig } from '../@types/astro'; -import { bold, black, bgWhite, red, cyan, yellow } from 'kleur/colors'; import glob from 'fast-glob'; +import * as fs from 'fs'; +import { bgWhite, black, bold, cyan, red, yellow } from 'kleur/colors'; import * as path from 'path'; import { pathToFileURL } from 'url'; -import * as fs from 'fs'; async function openAllDocuments( workspaceUri: URL, diff --git a/packages/astro/src/cli/index.ts b/packages/astro/src/cli/index.ts index 7494f2551..7fd3b2572 100644 --- a/packages/astro/src/cli/index.ts +++ b/packages/astro/src/cli/index.ts @@ -1,25 +1,24 @@ /* eslint-disable no-console */ -import type { AstroConfig } from '../@types/astro'; import { LogOptions } from '../core/logger/core.js'; +import { AstroTelemetry } from '@astrojs/telemetry'; +import * as event from '@astrojs/telemetry/events'; import * as colors from 'kleur/colors'; import yargs from 'yargs-parser'; import { z } from 'zod'; -import { AstroTelemetry } from '@astrojs/telemetry'; -import * as event from '@astrojs/telemetry/events'; -import { nodeLogDestination, enableVerboseLogging } from '../core/logger/node.js'; -import build from '../core/build/index.js'; import add from '../core/add/index.js'; +import build from '../core/build/index.js'; +import { openConfig } from '../core/config.js'; import devServer from '../core/dev/index.js'; +import { enableVerboseLogging, nodeLogDestination } from '../core/logger/node.js'; +import { formatConfigErrorMessage, formatErrorMessage, printHelp } from '../core/messages.js'; import preview from '../core/preview/index.js'; +import { createSafeError } from '../core/util.js'; import { check } from './check.js'; import { openInBrowser } from './open.js'; import * as telemetryHandler from './telemetry.js'; -import { openConfig } from '../core/config.js'; -import { printHelp, formatErrorMessage, formatConfigErrorMessage } from '../core/messages.js'; -import { createSafeError } from '../core/util.js'; type Arguments = yargs.Arguments; type CLICommand = diff --git a/packages/astro/src/cli/telemetry.ts b/packages/astro/src/cli/telemetry.ts index ff30b35d8..8247b459d 100644 --- a/packages/astro/src/cli/telemetry.ts +++ b/packages/astro/src/cli/telemetry.ts @@ -1,8 +1,7 @@ /* eslint-disable no-console */ -import type yargs from 'yargs-parser'; import type { AstroTelemetry } from '@astrojs/telemetry'; +import type yargs from 'yargs-parser'; -import prompts from 'prompts'; import * as msg from '../core/messages.js'; export interface TelemetryOptions { diff --git a/packages/astro/src/core/add/babel.ts b/packages/astro/src/core/add/babel.ts index 0c302803d..b7b0dd161 100644 --- a/packages/astro/src/core/add/babel.ts +++ b/packages/astro/src/core/add/babel.ts @@ -1,7 +1,7 @@ -import traverse from '@babel/traverse'; import generator from '@babel/generator'; -import * as t from '@babel/types'; import parser from '@babel/parser'; +import traverse from '@babel/traverse'; +import * as t from '@babel/types'; // @ts-ignore @babel/traverse isn't ESM and needs this trick export const visit = traverse.default as typeof traverse; diff --git a/packages/astro/src/core/add/index.ts b/packages/astro/src/core/add/index.ts index 072de0bfb..09664f8f1 100644 --- a/packages/astro/src/core/add/index.ts +++ b/packages/astro/src/core/add/index.ts @@ -1,26 +1,26 @@ -import type yargs from 'yargs-parser'; import type { AstroTelemetry } from '@astrojs/telemetry'; -import path from 'path'; -import { existsSync, promises as fs } from 'fs'; -import { execa } from 'execa'; -import { fileURLToPath, pathToFileURL } from 'url'; -import { diffWords } from 'diff'; import boxen from 'boxen'; -import prompts from 'prompts'; -import preferredPM from 'preferred-pm'; +import { diffWords } from 'diff'; +import { execa } from 'execa'; +import { existsSync, promises as fs } from 'fs'; +import { bold, cyan, dim, green, magenta } from 'kleur/colors'; import ora from 'ora'; +import path from 'path'; +import preferredPM from 'preferred-pm'; +import prompts from 'prompts'; +import { fileURLToPath, pathToFileURL } from 'url'; +import type yargs from 'yargs-parser'; import { resolveConfigURL } from '../config.js'; -import { apply as applyPolyfill } from '../polyfill.js'; -import { error, info, debug, LogOptions } from '../logger/core.js'; -import { printHelp } from '../messages.js'; +import { debug, error, info, LogOptions } from '../logger/core.js'; import * as msg from '../messages.js'; -import * as CONSTS from './consts.js'; -import { dim, red, cyan, green, magenta, bold } from 'kleur/colors'; +import { printHelp } from '../messages.js'; +import { appendForwardSlash } from '../path.js'; +import { apply as applyPolyfill } from '../polyfill.js'; import { parseNpmName } from '../util.js'; -import { wrapDefaultExport } from './wrapper.js'; +import { generate, parse, t, visit } from './babel.js'; +import * as CONSTS from './consts.js'; import { ensureImport } from './imports.js'; -import { t, parse, visit, generate } from './babel.js'; -import { appendForwardSlash } from '../path.js'; +import { wrapDefaultExport } from './wrapper.js'; export interface AddOptions { logging: LogOptions; diff --git a/packages/astro/src/core/app/common.ts b/packages/astro/src/core/app/common.ts index c8b27c35a..2da98f1c6 100644 --- a/packages/astro/src/core/app/common.ts +++ b/packages/astro/src/core/app/common.ts @@ -1,5 +1,5 @@ -import type { SSRManifest, SerializedSSRManifest, RouteInfo } from './types'; import { deserializeRouteData } from '../routing/manifest/serialization.js'; +import type { RouteInfo, SerializedSSRManifest, SSRManifest } from './types'; export function deserializeManifest(serializedManifest: SerializedSSRManifest): SSRManifest { const routes: RouteInfo[] = []; diff --git a/packages/astro/src/core/app/index.ts b/packages/astro/src/core/app/index.ts index ca2877a9d..dbda3cd44 100644 --- a/packages/astro/src/core/app/index.ts +++ b/packages/astro/src/core/app/index.ts @@ -4,21 +4,21 @@ import type { ManifestData, RouteData, } from '../../@types/astro'; -import type { SSRManifest as Manifest, RouteInfo } from './types'; import type { LogOptions } from '../logger/core.js'; +import type { RouteInfo, SSRManifest as Manifest } from './types'; import mime from 'mime'; +import { call as callEndpoint } from '../endpoint/index.js'; import { consoleLogDestination } from '../logger/console.js'; -export { deserializeManifest } from './common.js'; -import { matchRoute } from '../routing/match.js'; +import { joinPaths, prependForwardSlash } from '../path.js'; import { render } from '../render/core.js'; -import { call as callEndpoint } from '../endpoint/index.js'; import { RouteCache } from '../render/route-cache.js'; import { createLinkStylesheetElementSet, createModuleScriptElementWithSrcSet, } from '../render/ssr-element.js'; -import { joinPaths, prependForwardSlash } from '../path.js'; +import { matchRoute } from '../routing/match.js'; +export { deserializeManifest } from './common.js'; export const pagesVirtualModuleId = '@astrojs-pages-virtual-entry'; export const resolvedPagesVirtualModuleId = '\0' + pagesVirtualModuleId; diff --git a/packages/astro/src/core/app/node.ts b/packages/astro/src/core/app/node.ts index 8eee93d0f..075c55c65 100644 --- a/packages/astro/src/core/app/node.ts +++ b/packages/astro/src/core/app/node.ts @@ -1,9 +1,9 @@ -import type { SSRManifest, SerializedSSRManifest } from './types'; +import type { SerializedSSRManifest, SSRManifest } from './types'; import * as fs from 'fs'; -import { App } from './index.js'; -import { deserializeManifest } from './common.js'; import { IncomingMessage } from 'http'; +import { deserializeManifest } from './common.js'; +import { App } from './index.js'; function createRequestFromNodeRequest(req: IncomingMessage): Request { let url = `http://${req.headers.host}${req.url}`; diff --git a/packages/astro/src/core/app/types.ts b/packages/astro/src/core/app/types.ts index 6c6e879d5..7410ad42a 100644 --- a/packages/astro/src/core/app/types.ts +++ b/packages/astro/src/core/app/types.ts @@ -1,10 +1,10 @@ +import type { MarkdownRenderingOptions } from '@astrojs/markdown-remark'; import type { + ComponentInstance, RouteData, SerializedRouteData, - ComponentInstance, SSRLoadedRenderer, } from '../../@types/astro'; -import type { MarkdownRenderingOptions } from '@astrojs/markdown-remark'; export type ComponentPath = string; diff --git a/packages/astro/src/core/build/common.ts b/packages/astro/src/core/build/common.ts index 6b5423857..8b57334d8 100644 --- a/packages/astro/src/core/build/common.ts +++ b/packages/astro/src/core/build/common.ts @@ -1,5 +1,5 @@ -import type { AstroConfig, RouteType } from '../../@types/astro'; import npath from 'path'; +import type { AstroConfig, RouteType } from '../../@types/astro'; import { appendForwardSlash } from '../../core/path.js'; const STATUS_CODE_PAGES = new Set(['/404', '/500']); diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts index 5a9965eee..65f3930dd 100644 --- a/packages/astro/src/core/build/generate.ts +++ b/packages/astro/src/core/build/generate.ts @@ -10,22 +10,22 @@ import type { SSRLoadedRenderer, } from '../../@types/astro'; import type { BuildInternals } from '../../core/build/internal.js'; -import { debug, info } from '../logger/core.js'; import { joinPaths, prependForwardSlash, removeLeadingForwardSlash } from '../../core/path.js'; import type { RenderOptions } from '../../core/render/core'; import { BEFORE_HYDRATION_SCRIPT_ID } from '../../vite-plugin-scripts/index.js'; import { call as callEndpoint } from '../endpoint/index.js'; +import { debug, info } from '../logger/core.js'; import { render } from '../render/core.js'; import { createLinkStylesheetElementSet, createModuleScriptElementWithSrcSet, } from '../render/ssr-element.js'; +import { createRequest } from '../request.js'; import { getOutputFilename, isBuildingToSSR } from '../util.js'; import { getOutFile, getOutFolder } from './common.js'; import { eachPageData, getPageDataByComponent } from './internal.js'; import type { PageBuildData, SingleFileBuiltModule, StaticBuildOptions } from './types'; import { getTimeStat } from './util.js'; -import { createRequest } from '../request.js'; // Render is usually compute, which Node.js can't parallelize well. // In real world testing, dropping from 10->1 showed a notiable perf diff --git a/packages/astro/src/core/build/index.ts b/packages/astro/src/core/build/index.ts index 7639a9f18..357255f0c 100644 --- a/packages/astro/src/core/build/index.ts +++ b/packages/astro/src/core/build/index.ts @@ -1,35 +1,27 @@ +import type { AstroTelemetry } from '@astrojs/telemetry'; import type { AstroConfig, BuildConfig, ManifestData } from '../../@types/astro'; import type { LogOptions } from '../logger/core'; -import type { AstroTelemetry } from '@astrojs/telemetry'; import fs from 'fs'; import * as colors from 'kleur/colors'; -import { apply as applyPolyfill } from '../polyfill.js'; import { performance } from 'perf_hooks'; import * as vite from 'vite'; -import { createVite, ViteConfigWithSSR } from '../create-vite.js'; -import { - debug, - info, - levels, - timerMessage, - warn, - warnIfUsingExperimentalSSR, -} from '../logger/core.js'; -import { nodeLogOptions } from '../logger/node.js'; -import { createRouteManifest } from '../routing/index.js'; -import { collectPagesData } from './page-data.js'; -import { staticBuild } from './static-build.js'; -import { RouteCache } from '../render/route-cache.js'; import { runHookBuildDone, runHookBuildStart, runHookConfigDone, runHookConfigSetup, } from '../../integrations/index.js'; -import { getTimeStat } from './util.js'; -import { createSafeError, isBuildingToSSR } from '../util.js'; +import { createVite, ViteConfigWithSSR } from '../create-vite.js'; import { fixViteErrorMessage } from '../errors.js'; +import { debug, info, levels, timerMessage, warnIfUsingExperimentalSSR } from '../logger/core.js'; +import { apply as applyPolyfill } from '../polyfill.js'; +import { RouteCache } from '../render/route-cache.js'; +import { createRouteManifest } from '../routing/index.js'; +import { createSafeError, isBuildingToSSR } from '../util.js'; +import { collectPagesData } from './page-data.js'; +import { staticBuild } from './static-build.js'; +import { getTimeStat } from './util.js'; export interface BuildOptions { mode?: string; diff --git a/packages/astro/src/core/build/page-data.ts b/packages/astro/src/core/build/page-data.ts index b634ddcff..ebbe50a51 100644 --- a/packages/astro/src/core/build/page-data.ts +++ b/packages/astro/src/core/build/page-data.ts @@ -1,17 +1,17 @@ +import type { ViteDevServer } from 'vite'; import type { AstroConfig, ComponentInstance, ManifestData, RouteData } from '../../@types/astro'; -import type { AllPagesData } from './types'; import type { LogOptions } from '../logger/core'; import { info } from '../logger/core.js'; -import type { ViteDevServer } from 'vite'; +import type { AllPagesData } from './types'; -import { fileURLToPath } from 'url'; import * as colors from 'kleur/colors'; +import { fileURLToPath } from 'url'; import { debug } from '../logger/core.js'; +import { removeTrailingForwardSlash } from '../path.js'; import { preload as ssrPreload } from '../render/dev/index.js'; import { callGetStaticPaths, RouteCache, RouteCacheEntry } from '../render/route-cache.js'; -import { removeTrailingForwardSlash } from '../path.js'; -import { isBuildingToSSR } from '../util.js'; import { matchRoute } from '../routing/match.js'; +import { isBuildingToSSR } from '../util.js'; export interface CollectPagesDataOptions { astroConfig: AstroConfig; diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts index c99cb18d7..a88b3593e 100644 --- a/packages/astro/src/core/build/static-build.ts +++ b/packages/astro/src/core/build/static-build.ts @@ -1,27 +1,29 @@ -import type { RollupOutput } from 'rollup'; -import { BuildInternals, trackClientOnlyPageDatas } from '../../core/build/internal.js'; -import type { ViteConfigWithSSR } from '../create-vite'; -import type { PageBuildData, StaticBuildOptions } from './types'; import glob from 'fast-glob'; import fs from 'fs'; import { bgGreen, bgMagenta, black, dim } from 'kleur/colors'; -import npath from 'path'; +import type { RollupOutput } from 'rollup'; import { fileURLToPath } from 'url'; import * as vite from 'vite'; -import { createBuildInternals } from '../../core/build/internal.js'; -import { info } from '../logger/core.js'; +import { + BuildInternals, + createBuildInternals, + trackClientOnlyPageDatas, +} from '../../core/build/internal.js'; import { prependForwardSlash } from '../../core/path.js'; import { emptyDir, removeDir } from '../../core/util.js'; +import { runHookBuildSetup } from '../../integrations/index.js'; import { rollupPluginAstroBuildCSS } from '../../vite-plugin-build-css/index.js'; -import { vitePluginHoistedScripts } from './vite-plugin-hoisted-scripts.js'; -import { vitePluginInternals } from './vite-plugin-internals.js'; -import { vitePluginSSR } from './vite-plugin-ssr.js'; -import { vitePluginPages } from './vite-plugin-pages.js'; +import type { ViteConfigWithSSR } from '../create-vite'; +import { info } from '../logger/core.js'; +import { isBuildingToSSR } from '../util.js'; import { generatePages } from './generate.js'; import { trackPageData } from './internal.js'; -import { isBuildingToSSR } from '../util.js'; -import { runHookBuildSetup } from '../../integrations/index.js'; +import type { PageBuildData, StaticBuildOptions } from './types'; import { getTimeStat } from './util.js'; +import { vitePluginHoistedScripts } from './vite-plugin-hoisted-scripts.js'; +import { vitePluginInternals } from './vite-plugin-internals.js'; +import { vitePluginPages } from './vite-plugin-pages.js'; +import { vitePluginSSR } from './vite-plugin-ssr.js'; export async function staticBuild(opts: StaticBuildOptions) { const { allPages, astroConfig } = opts; diff --git a/packages/astro/src/core/build/types.ts b/packages/astro/src/core/build/types.ts index 0d89c6c30..980d3a170 100644 --- a/packages/astro/src/core/build/types.ts +++ b/packages/astro/src/core/build/types.ts @@ -1,15 +1,15 @@ -import type { ComponentPreload } from '../render/dev/index'; import type { AstroConfig, BuildConfig, + ComponentInstance, ManifestData, RouteData, - ComponentInstance, SSRLoadedRenderer, } from '../../@types/astro'; +import type { ViteConfigWithSSR } from '../create-vite'; import type { LogOptions } from '../logger/core'; +import type { ComponentPreload } from '../render/dev/index'; import type { RouteCache } from '../render/route-cache'; -import type { ViteConfigWithSSR } from '../create-vite'; export type ComponentPath = string; export type ViteID = string; diff --git a/packages/astro/src/core/build/vite-plugin-hoisted-scripts.ts b/packages/astro/src/core/build/vite-plugin-hoisted-scripts.ts index 4641b5f13..0ac874fba 100644 --- a/packages/astro/src/core/build/vite-plugin-hoisted-scripts.ts +++ b/packages/astro/src/core/build/vite-plugin-hoisted-scripts.ts @@ -1,5 +1,5 @@ -import type { AstroConfig } from '../../@types/astro'; import type { Plugin as VitePlugin } from 'vite'; +import type { AstroConfig } from '../../@types/astro'; import type { BuildInternals } from '../../core/build/internal.js'; import { viteID } from '../util.js'; import { getPageDataByViteID } from './internal.js'; diff --git a/packages/astro/src/core/build/vite-plugin-pages.ts b/packages/astro/src/core/build/vite-plugin-pages.ts index 25adbcae8..1158d69be 100644 --- a/packages/astro/src/core/build/vite-plugin-pages.ts +++ b/packages/astro/src/core/build/vite-plugin-pages.ts @@ -1,10 +1,10 @@ import type { Plugin as VitePlugin } from 'vite'; -import type { BuildInternals } from './internal.js'; -import type { StaticBuildOptions } from './types'; +import { pagesVirtualModuleId, resolvedPagesVirtualModuleId } from '../app/index.js'; +import { isBuildingToSSR } from '../util.js'; import { addRollupInput } from './add-rollup-input.js'; +import type { BuildInternals } from './internal.js'; import { eachPageData } from './internal.js'; -import { isBuildingToSSR } from '../util.js'; -import { resolvedPagesVirtualModuleId, pagesVirtualModuleId } from '../app/index.js'; +import type { StaticBuildOptions } from './types'; export function vitePluginPages(opts: StaticBuildOptions, internals: BuildInternals): VitePlugin { return { diff --git a/packages/astro/src/core/build/vite-plugin-ssr.ts b/packages/astro/src/core/build/vite-plugin-ssr.ts index 2b2915ff0..a7cd3ef4c 100644 --- a/packages/astro/src/core/build/vite-plugin-ssr.ts +++ b/packages/astro/src/core/build/vite-plugin-ssr.ts @@ -1,17 +1,17 @@ import type { Plugin as VitePlugin } from 'vite'; -import type { BuildInternals } from './internal.js'; import type { AstroAdapter } from '../../@types/astro'; -import type { StaticBuildOptions } from './types'; import type { SerializedRouteInfo, SerializedSSRManifest } from '../app/types'; +import type { BuildInternals } from './internal.js'; +import type { StaticBuildOptions } from './types'; -import { serializeRouteData } from '../routing/index.js'; -import { eachPageData } from './internal.js'; -import { addRollupInput } from './add-rollup-input.js'; -import { fileURLToPath } from 'url'; import glob from 'fast-glob'; -import { pagesVirtualModuleId } from '../app/index.js'; -import { BEFORE_HYDRATION_SCRIPT_ID } from '../../vite-plugin-scripts/index.js'; +import { fileURLToPath } from 'url'; import { runHookBuildSsr } from '../../integrations/index.js'; +import { BEFORE_HYDRATION_SCRIPT_ID } from '../../vite-plugin-scripts/index.js'; +import { pagesVirtualModuleId } from '../app/index.js'; +import { serializeRouteData } from '../routing/index.js'; +import { addRollupInput } from './add-rollup-input.js'; +import { eachPageData } from './internal.js'; export const virtualModuleId = '@astrojs-ssr-virtual-entry'; const resolvedVirtualModuleId = '\0' + virtualModuleId; diff --git a/packages/astro/src/core/config.ts b/packages/astro/src/core/config.ts index 2b814435c..669e0bcd2 100644 --- a/packages/astro/src/core/config.ts +++ b/packages/astro/src/core/config.ts @@ -1,20 +1,20 @@ -import type { AstroConfig, AstroUserConfig, CLIFlags, ViteUserConfig } from '../@types/astro'; -import type { Arguments as Flags } from 'yargs-parser'; +import type { RehypePlugin, RemarkPlugin } from '@astrojs/markdown-remark'; import type * as Postcss from 'postcss'; import type { ILanguageRegistration, IThemeRegistration, Theme } from 'shiki'; -import type { RemarkPlugin, RehypePlugin } from '@astrojs/markdown-remark'; +import type { Arguments as Flags } from 'yargs-parser'; +import type { AstroConfig, AstroUserConfig, CLIFlags, ViteUserConfig } from '../@types/astro'; +import load, { ProloadError, resolve } from '@proload/core'; +import loadTypeScript from '@proload/plugin-tsm'; import * as colors from 'kleur/colors'; import path from 'path'; -import { pathToFileURL, fileURLToPath } from 'url'; -import { mergeConfig as mergeViteConfig } from 'vite'; +import postcssrc from 'postcss-load-config'; import { BUNDLED_THEMES } from 'shiki'; +import { fileURLToPath, pathToFileURL } from 'url'; +import { mergeConfig as mergeViteConfig } from 'vite'; import { z } from 'zod'; -import load, { resolve, ProloadError } from '@proload/core'; -import loadTypeScript from '@proload/plugin-tsm'; -import postcssrc from 'postcss-load-config'; -import { arraify, isObject } from './util.js'; import { appendForwardSlash, prependForwardSlash, trimSlashes } from './path.js'; +import { arraify, isObject } from './util.js'; load.use([loadTypeScript]); diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts index f4c18a881..0bdda9826 100644 --- a/packages/astro/src/core/create-vite.ts +++ b/packages/astro/src/core/create-vite.ts @@ -1,19 +1,19 @@ import type { AstroConfig } from '../@types/astro'; import type { LogOptions } from './logger/core'; +import fs from 'fs'; import { builtinModules } from 'module'; import { fileURLToPath } from 'url'; -import fs from 'fs'; import * as vite from 'vite'; -import astroVitePlugin from '../vite-plugin-astro/index.js'; -import astroViteServerPlugin from '../vite-plugin-astro-server/index.js'; import astroPostprocessVitePlugin from '../vite-plugin-astro-postprocess/index.js'; +import astroViteServerPlugin from '../vite-plugin-astro-server/index.js'; +import astroVitePlugin from '../vite-plugin-astro/index.js'; import configAliasVitePlugin from '../vite-plugin-config-alias/index.js'; -import markdownVitePlugin from '../vite-plugin-markdown/index.js'; -import jsxVitePlugin from '../vite-plugin-jsx/index.js'; import envVitePlugin from '../vite-plugin-env/index.js'; -import astroScriptsPlugin from '../vite-plugin-scripts/index.js'; import astroIntegrationsContainerPlugin from '../vite-plugin-integrations-container/index.js'; +import jsxVitePlugin from '../vite-plugin-jsx/index.js'; +import markdownVitePlugin from '../vite-plugin-markdown/index.js'; +import astroScriptsPlugin from '../vite-plugin-scripts/index.js'; // Some packages are just external, and that’s the way it goes. const ALWAYS_EXTERNAL = new Set([ diff --git a/packages/astro/src/core/dev/index.ts b/packages/astro/src/core/dev/index.ts index 08971856e..37a0e63ee 100644 --- a/packages/astro/src/core/dev/index.ts +++ b/packages/astro/src/core/dev/index.ts @@ -1,7 +1,7 @@ +import type { AstroTelemetry } from '@astrojs/telemetry'; import glob from 'fast-glob'; -import path from 'path'; import type { AddressInfo } from 'net'; -import type { AstroTelemetry } from '@astrojs/telemetry'; +import path from 'path'; import { performance } from 'perf_hooks'; import * as vite from 'vite'; import type { AstroConfig } from '../../@types/astro'; diff --git a/packages/astro/src/core/endpoint/index.ts b/packages/astro/src/core/endpoint/index.ts index de51be2c4..2e0318d58 100644 --- a/packages/astro/src/core/endpoint/index.ts +++ b/packages/astro/src/core/endpoint/index.ts @@ -1,6 +1,6 @@ import type { EndpointHandler } from '../../@types/astro'; -import type { RenderOptions } from '../render/core'; import { renderEndpoint } from '../../runtime/server/index.js'; +import type { RenderOptions } from '../render/core'; import { getParamsAndProps, GetParamsAndPropsError } from '../render/core.js'; export type EndpointOptions = Pick< diff --git a/packages/astro/src/core/errors.ts b/packages/astro/src/core/errors.ts index 436e0004b..e295d9191 100644 --- a/packages/astro/src/core/errors.ts +++ b/packages/astro/src/core/errors.ts @@ -1,8 +1,8 @@ +import eol from 'eol'; import type { BuildResult } from 'esbuild'; +import fs from 'fs'; import type { ViteDevServer } from 'vite'; import type { SSRError } from '../@types/astro'; -import eol from 'eol'; -import fs from 'fs'; import { codeFrame, createSafeError } from './util.js'; export interface ErrorWithMetadata { diff --git a/packages/astro/src/core/logger/console.ts b/packages/astro/src/core/logger/console.ts index eb62cf9a4..4769381f3 100644 --- a/packages/astro/src/core/logger/console.ts +++ b/packages/astro/src/core/logger/console.ts @@ -1,9 +1,7 @@ -import type { AstroConfig } from '../../@types/astro'; -import type { LogMessage } from './core.js'; -import { bold, cyan, dim, red, yellow, reset } from 'kleur/colors'; -import stringWidth from 'string-width'; +import { bold, cyan, dim, red, reset, yellow } from 'kleur/colors'; import { format as utilFormat } from 'util'; -import { levels, dateTimeFormat } from './core.js'; +import type { LogMessage } from './core.js'; +import { dateTimeFormat, levels } from './core.js'; let lastMessage: string; let lastMessageCount = 1; diff --git a/packages/astro/src/core/logger/core.ts b/packages/astro/src/core/logger/core.ts index 5df39816a..9e4da4b8e 100644 --- a/packages/astro/src/core/logger/core.ts +++ b/packages/astro/src/core/logger/core.ts @@ -1,6 +1,6 @@ -import type { AstroConfig } from '../../@types/astro'; import { bold, dim } from 'kleur/colors'; import stringWidth from 'string-width'; +import type { AstroConfig } from '../../@types/astro'; interface LogWritable<T> { write: (chunk: T) => boolean; diff --git a/packages/astro/src/core/logger/node.ts b/packages/astro/src/core/logger/node.ts index bd6fecf28..b655b2631 100644 --- a/packages/astro/src/core/logger/node.ts +++ b/packages/astro/src/core/logger/node.ts @@ -1,10 +1,10 @@ -import { bold, cyan, dim, red, yellow, reset } from 'kleur/colors'; -import stringWidth from 'string-width'; import debugPackage from 'debug'; -import { format as utilFormat } from 'util'; +import { bold, cyan, dim, red, reset, yellow } from 'kleur/colors'; import * as readline from 'readline'; import { Writable } from 'stream'; -import { info, warn, error, dateTimeFormat } from './core.js'; +import stringWidth from 'string-width'; +import { format as utilFormat } from 'util'; +import { dateTimeFormat, error, info, warn } from './core.js'; type ConsoleStream = Writable & { fd: 1 | 2; diff --git a/packages/astro/src/core/messages.ts b/packages/astro/src/core/messages.ts index 2ea134ff3..d6a263ec4 100644 --- a/packages/astro/src/core/messages.ts +++ b/packages/astro/src/core/messages.ts @@ -1,24 +1,24 @@ -import type { AddressInfo } from 'net'; -import type { AstroConfig } from '../@types/astro'; -import os from 'os'; +import boxen from 'boxen'; import { + bgCyan, + bgGreen, + bgRed, + bgWhite, + bgYellow, + black, bold, + cyan, dim, - red, green, + red, underline, yellow, - bgYellow, - cyan, - bgGreen, - black, - bgRed, - bgWhite, - bgCyan, } from 'kleur/colors'; -import boxen from 'boxen'; -import { collectErrorMetadata, cleanErrorStack } from './errors.js'; +import type { AddressInfo } from 'net'; +import os from 'os'; import { ZodError } from 'zod'; +import type { AstroConfig } from '../@types/astro'; +import { cleanErrorStack, collectErrorMetadata } from './errors.js'; import { emoji, getLocalAddress, padMultilineString } from './util.js'; const PREFIX_PADDING = 6; diff --git a/packages/astro/src/core/preview/index.ts b/packages/astro/src/core/preview/index.ts index 4a952e380..9f141d875 100644 --- a/packages/astro/src/core/preview/index.ts +++ b/packages/astro/src/core/preview/index.ts @@ -1,15 +1,15 @@ +import type { AstroTelemetry } from '@astrojs/telemetry'; +import type { AddressInfo } from 'net'; import type { AstroConfig } from '../../@types/astro'; import type { LogOptions } from '../logger/core'; -import type { AddressInfo } from 'net'; -import type { AstroTelemetry } from '@astrojs/telemetry'; import http from 'http'; -import sirv from 'sirv'; import { performance } from 'perf_hooks'; +import sirv from 'sirv'; import { fileURLToPath } from 'url'; -import * as msg from '../messages.js'; +import { notFoundTemplate, subpathNotUsedTemplate } from '../../template/4xx.js'; import { error, info } from '../logger/core.js'; -import { subpathNotUsedTemplate, notFoundTemplate } from '../../template/4xx.js'; +import * as msg from '../messages.js'; import { getResolvedHostForHttpServer } from './util.js'; interface PreviewOptions { diff --git a/packages/astro/src/core/preview/util.ts b/packages/astro/src/core/preview/util.ts index 87c1bfdf8..556946d2b 100644 --- a/packages/astro/src/core/preview/util.ts +++ b/packages/astro/src/core/preview/util.ts @@ -1,5 +1,3 @@ -import type { AstroConfig } from '../../@types/astro'; - export function getResolvedHostForHttpServer(host: string | boolean) { if (host === false) { // Use a secure default diff --git a/packages/astro/src/core/render/core.ts b/packages/astro/src/core/render/core.ts index b1a0fc81c..ad30fe00e 100644 --- a/packages/astro/src/core/render/core.ts +++ b/packages/astro/src/core/render/core.ts @@ -1,18 +1,18 @@ +import type { MarkdownRenderingOptions } from '@astrojs/markdown-remark'; import type { ComponentInstance, Params, Props, - SSRLoadedRenderer, RouteData, SSRElement, + SSRLoadedRenderer, } from '../../@types/astro'; -import type { MarkdownRenderingOptions } from '@astrojs/markdown-remark'; import type { LogOptions } from '../logger/core.js'; import { renderHead, renderPage } from '../../runtime/server/index.js'; import { getParams } from '../routing/params.js'; import { createResult } from './result.js'; -import { findPathItemByKey, RouteCache, callGetStaticPaths } from './route-cache.js'; +import { callGetStaticPaths, findPathItemByKey, RouteCache } from './route-cache.js'; interface GetParamsAndPropsOptions { mod: ComponentInstance; diff --git a/packages/astro/src/core/render/dev/index.ts b/packages/astro/src/core/render/dev/index.ts index ddde50291..3a85b2385 100644 --- a/packages/astro/src/core/render/dev/index.ts +++ b/packages/astro/src/core/render/dev/index.ts @@ -9,15 +9,15 @@ import type { SSRElement, SSRLoadedRenderer, } from '../../../@types/astro'; +import { prependForwardSlash } from '../../../core/path.js'; import { LogOptions } from '../../logger/core.js'; +import { isBuildingToSSR } from '../../util.js'; import { render as coreRender } from '../core.js'; -import { prependForwardSlash } from '../../../core/path.js'; import { RouteCache } from '../route-cache.js'; import { createModuleScriptElementWithSrcSet } from '../ssr-element.js'; +import { collectMdMetadata } from '../util.js'; import { getStylesForURL } from './css.js'; import { injectTags } from './html.js'; -import { isBuildingToSSR } from '../../util.js'; -import { collectMdMetadata } from '../util.js'; export interface SSROptions { /** an instance of the AstroConfig */ diff --git a/packages/astro/src/core/render/result.ts b/packages/astro/src/core/render/result.ts index 1c3b66268..739802208 100644 --- a/packages/astro/src/core/render/result.ts +++ b/packages/astro/src/core/render/result.ts @@ -1,3 +1,4 @@ +import type { MarkdownRenderingOptions } from '@astrojs/markdown-remark'; import { bold } from 'kleur/colors'; import type { AstroGlobal, @@ -9,11 +10,10 @@ import type { SSRLoadedRenderer, SSRResult, } from '../../@types/astro'; -import type { MarkdownRenderingOptions } from '@astrojs/markdown-remark'; import { renderSlot } from '../../runtime/server/index.js'; import { LogOptions, warn } from '../logger/core.js'; -import { createCanonicalURL, isCSSRequest } from './util.js'; import { isScriptRequest } from './script.js'; +import { createCanonicalURL, isCSSRequest } from './util.js'; function onlyAvailableInSSR(name: string) { return function _onlyAvailableInSSR() { diff --git a/packages/astro/src/core/render/route-cache.ts b/packages/astro/src/core/render/route-cache.ts index a5b97499e..422d25da9 100644 --- a/packages/astro/src/core/render/route-cache.ts +++ b/packages/astro/src/core/render/route-cache.ts @@ -6,14 +6,14 @@ import type { Params, RouteData, } from '../../@types/astro'; -import { LogOptions, warn, debug } from '../logger/core.js'; +import { debug, LogOptions, warn } from '../logger/core.js'; -import { generatePaginateFunction } from './paginate.js'; import { stringifyParams } from '../routing/params.js'; import { validateGetStaticPathsModule, validateGetStaticPathsResult, } from '../routing/validation.js'; +import { generatePaginateFunction } from './paginate.js'; interface CallGetStaticPathsOptions { mod: ComponentInstance; diff --git a/packages/astro/src/core/routing/index.ts b/packages/astro/src/core/routing/index.ts index 35944d079..84ec1f66e 100644 --- a/packages/astro/src/core/routing/index.ts +++ b/packages/astro/src/core/routing/index.ts @@ -1,5 +1,5 @@ export { createRouteManifest } from './manifest/create.js'; -export { serializeRouteData, deserializeRouteData } from './manifest/serialization.js'; +export { deserializeRouteData, serializeRouteData } from './manifest/serialization.js'; export { matchRoute } from './match.js'; export { getParams } from './params.js'; export { validateGetStaticPathsModule, validateGetStaticPathsResult } from './validation.js'; diff --git a/packages/astro/src/core/routing/manifest/serialization.ts b/packages/astro/src/core/routing/manifest/serialization.ts index f5cce5697..5db04b49d 100644 --- a/packages/astro/src/core/routing/manifest/serialization.ts +++ b/packages/astro/src/core/routing/manifest/serialization.ts @@ -1,4 +1,4 @@ -import type { RouteData, SerializedRouteData, AstroConfig } from '../../../@types/astro'; +import type { AstroConfig, RouteData, SerializedRouteData } from '../../../@types/astro'; import { getRouteGenerator } from './generator.js'; diff --git a/packages/astro/src/core/routing/params.ts b/packages/astro/src/core/routing/params.ts index e70c4aec9..3ccbd1475 100644 --- a/packages/astro/src/core/routing/params.ts +++ b/packages/astro/src/core/routing/params.ts @@ -1,5 +1,5 @@ -import { validateGetStaticPathsParameter } from './validation.js'; import type { Params } from '../../@types/astro'; +import { validateGetStaticPathsParameter } from './validation.js'; /** * given an array of params like `['x', 'y', 'z']` for diff --git a/packages/astro/src/integrations/index.ts b/packages/astro/src/integrations/index.ts index 47dcfdcc5..4e53dc4e6 100644 --- a/packages/astro/src/integrations/index.ts +++ b/packages/astro/src/integrations/index.ts @@ -1,10 +1,10 @@ import type { AddressInfo } from 'net'; import type { ViteDevServer } from 'vite'; +import { AstroConfig, AstroRenderer, BuildConfig, RouteData } from '../@types/astro.js'; +import ssgAdapter from '../adapter-ssg/index.js'; import type { SerializedSSRManifest } from '../core/app/types'; import type { PageBuildData } from '../core/build/types'; -import { AstroConfig, AstroRenderer, BuildConfig, RouteData } from '../@types/astro.js'; import { mergeConfig } from '../core/config.js'; -import ssgAdapter from '../adapter-ssg/index.js'; import type { ViteConfigWithSSR } from '../core/create-vite.js'; import { isBuildingToSSR } from '../core/util.js'; diff --git a/packages/astro/src/runtime/client/idle.ts b/packages/astro/src/runtime/client/idle.ts index a9b7b39a0..be8c1cb9a 100644 --- a/packages/astro/src/runtime/client/idle.ts +++ b/packages/astro/src/runtime/client/idle.ts @@ -1,5 +1,5 @@ import type { GetHydrateCallback, HydrateOptions } from '../../@types/astro'; -import { notify, listen } from './events'; +import { listen, notify } from './events'; /** * Hydrate this component as soon as the main thread is free diff --git a/packages/astro/src/runtime/client/load.ts b/packages/astro/src/runtime/client/load.ts index 80a1f4d51..abdf2bfde 100644 --- a/packages/astro/src/runtime/client/load.ts +++ b/packages/astro/src/runtime/client/load.ts @@ -1,5 +1,5 @@ import type { GetHydrateCallback, HydrateOptions } from '../../@types/astro'; -import { notify, listen } from './events'; +import { listen, notify } from './events'; /** * Hydrate this component immediately diff --git a/packages/astro/src/runtime/client/media.ts b/packages/astro/src/runtime/client/media.ts index ab1fb8dc8..146b09831 100644 --- a/packages/astro/src/runtime/client/media.ts +++ b/packages/astro/src/runtime/client/media.ts @@ -1,5 +1,5 @@ import type { GetHydrateCallback, HydrateOptions } from '../../@types/astro'; -import { notify, listen } from './events'; +import { listen, notify } from './events'; /** * Hydrate this component when a matching media query is found diff --git a/packages/astro/src/runtime/client/visible.ts b/packages/astro/src/runtime/client/visible.ts index dacb756eb..ed4b64c71 100644 --- a/packages/astro/src/runtime/client/visible.ts +++ b/packages/astro/src/runtime/client/visible.ts @@ -1,5 +1,5 @@ import type { GetHydrateCallback, HydrateOptions } from '../../@types/astro'; -import { notify, listen } from './events'; +import { listen, notify } from './events'; /** * Hydrate this component when one of it's children becomes visible diff --git a/packages/astro/src/runtime/server/hydration.ts b/packages/astro/src/runtime/server/hydration.ts index 4d8ab48f0..ec077adbe 100644 --- a/packages/astro/src/runtime/server/hydration.ts +++ b/packages/astro/src/runtime/server/hydration.ts @@ -1,7 +1,11 @@ -import type { AstroComponentMetadata, SSRLoadedRenderer } from '../../@types/astro'; -import type { SSRElement, SSRResult } from '../../@types/astro'; -import { hydrationSpecifier, serializeListValue } from './util.js'; import serializeJavaScript from 'serialize-javascript'; +import type { + AstroComponentMetadata, + SSRElement, + SSRLoadedRenderer, + SSRResult, +} from '../../@types/astro'; +import { hydrationSpecifier, serializeListValue } from './util.js'; // Serializes props passed into a component so that they can be reused during hydration. // The value is any diff --git a/packages/astro/src/runtime/server/index.ts b/packages/astro/src/runtime/server/index.ts index 0892f2227..0f1e8de71 100644 --- a/packages/astro/src/runtime/server/index.ts +++ b/packages/astro/src/runtime/server/index.ts @@ -10,8 +10,8 @@ import type { } from '../../@types/astro'; import { escapeHTML, HTMLString, markHTMLString } from './escape.js'; import { extractDirectives, generateHydrateScript, serializeProps } from './hydration.js'; -import { serializeListValue } from './util.js'; import { shorthash } from './shorthash.js'; +import { serializeListValue } from './util.js'; export { markHTMLString, markHTMLString as unescapeHTML } from './escape.js'; export type { Metadata } from './metadata'; diff --git a/packages/astro/src/vite-plugin-astro-postprocess/index.ts b/packages/astro/src/vite-plugin-astro-postprocess/index.ts index 3e53e5044..9d1fb460b 100644 --- a/packages/astro/src/vite-plugin-astro-postprocess/index.ts +++ b/packages/astro/src/vite-plugin-astro-postprocess/index.ts @@ -1,9 +1,5 @@ import { parse as babelParser } from '@babel/parser'; -import type { - ArrowFunctionExpressionKind, - CallExpressionKind, - StringLiteralKind, -} from 'ast-types/gen/kinds'; +import type { ArrowFunctionExpressionKind, CallExpressionKind } from 'ast-types/gen/kinds'; import type { NodePath } from 'ast-types/lib/node-path'; import { parse, print, types, visit } from 'recast'; import type { Plugin } from 'vite'; diff --git a/packages/astro/src/vite-plugin-astro-server/index.ts b/packages/astro/src/vite-plugin-astro-server/index.ts index f6da58546..d3ad53eff 100644 --- a/packages/astro/src/vite-plugin-astro-server/index.ts +++ b/packages/astro/src/vite-plugin-astro-server/index.ts @@ -1,22 +1,22 @@ -import type * as vite from 'vite'; import type http from 'http'; +import { Readable } from 'stream'; +import stripAnsi from 'strip-ansi'; +import type * as vite from 'vite'; import type { AstroConfig, ManifestData } from '../@types/astro'; -import type { RenderResponse, SSROptions } from '../core/render/dev/index'; -import { debug, info, warn, error, LogOptions } from '../core/logger/core.js'; +import { call as callEndpoint } from '../core/endpoint/dev/index.js'; +import { fixViteErrorMessage } from '../core/errors.js'; +import { error, info, LogOptions, warn } from '../core/logger/core.js'; +import * as msg from '../core/messages.js'; import { appendForwardSlash } from '../core/path.js'; import { getParamsAndProps, GetParamsAndPropsError } from '../core/render/core.js'; +import type { RenderResponse, SSROptions } from '../core/render/dev/index'; +import { preload, ssr } from '../core/render/dev/index.js'; +import { RouteCache } from '../core/render/route-cache.js'; +import { createRequest } from '../core/request.js'; import { createRouteManifest, matchRoute } from '../core/routing/index.js'; -import stripAnsi from 'strip-ansi'; -import { createSafeError, resolvePages, isBuildingToSSR } from '../core/util.js'; -import { ssr, preload } from '../core/render/dev/index.js'; -import { call as callEndpoint } from '../core/endpoint/dev/index.js'; -import * as msg from '../core/messages.js'; +import { createSafeError, isBuildingToSSR, resolvePages } from '../core/util.js'; import notFoundTemplate, { subpathNotUsedTemplate } from '../template/4xx.js'; import serverErrorTemplate from '../template/5xx.js'; -import { RouteCache } from '../core/render/route-cache.js'; -import { fixViteErrorMessage } from '../core/errors.js'; -import { createRequest } from '../core/request.js'; -import { Readable } from 'stream'; interface AstroPluginOptions { config: AstroConfig; diff --git a/packages/astro/src/vite-plugin-astro/compile.ts b/packages/astro/src/vite-plugin-astro/compile.ts index 7301d4734..09dcbbe57 100644 --- a/packages/astro/src/vite-plugin-astro/compile.ts +++ b/packages/astro/src/vite-plugin-astro/compile.ts @@ -1,14 +1,13 @@ -import type { AstroConfig } from '../@types/astro'; import type { TransformResult } from '@astrojs/compiler'; import type { SourceMapInput } from 'rollup'; +import type { AstroConfig } from '../@types/astro'; import type { TransformHook } from './styles'; -import fs from 'fs'; -import { fileURLToPath } from 'url'; import { transform } from '@astrojs/compiler'; -import { transformWithVite } from './styles.js'; -import { viteID } from '../core/util.js'; +import { fileURLToPath } from 'url'; import { prependForwardSlash } from '../core/path.js'; +import { viteID } from '../core/util.js'; +import { transformWithVite } from './styles.js'; type CompilationCache = Map<string, CompileResult>; type CompileResult = TransformResult & { rawCSSDeps: Set<string> }; diff --git a/packages/astro/src/vite-plugin-astro/hmr.ts b/packages/astro/src/vite-plugin-astro/hmr.ts index 9bb1ff371..cc9b26770 100644 --- a/packages/astro/src/vite-plugin-astro/hmr.ts +++ b/packages/astro/src/vite-plugin-astro/hmr.ts @@ -1,10 +1,10 @@ +import type { PluginContext as RollupPluginContext, ResolvedId } from 'rollup'; +import type { HmrContext, ModuleNode, ViteDevServer } from 'vite'; import type { AstroConfig } from '../@types/astro'; import type { LogOptions } from '../core/logger/core.js'; -import type { ViteDevServer, ModuleNode, HmrContext } from 'vite'; -import type { PluginContext as RollupPluginContext, ResolvedId } from 'rollup'; -import { invalidateCompilation, isCached } from './compile.js'; import { info } from '../core/logger/core.js'; import * as msg from '../core/messages.js'; +import { invalidateCompilation, isCached } from './compile.js'; interface TrackCSSDependenciesOptions { viteDevServer: ViteDevServer | null; diff --git a/packages/astro/src/vite-plugin-astro/index.ts b/packages/astro/src/vite-plugin-astro/index.ts index 449333c13..dd69d4156 100644 --- a/packages/astro/src/vite-plugin-astro/index.ts +++ b/packages/astro/src/vite-plugin-astro/index.ts @@ -1,21 +1,21 @@ -import type * as vite from 'vite'; import type { PluginContext } from 'rollup'; +import type * as vite from 'vite'; import type { AstroConfig } from '../@types/astro'; import type { LogOptions } from '../core/logger/core.js'; +import ancestor from 'common-ancestor-path'; import esbuild from 'esbuild'; -import { fileURLToPath } from 'url'; -import slash from 'slash'; import fs from 'fs'; -import { getViteTransform, TransformHook } from './styles.js'; -import { parseAstroRequest } from './query.js'; -import { cachedCompilation } from './compile.js'; -import ancestor from 'common-ancestor-path'; -import { trackCSSDependencies, handleHotUpdate } from './hmr.js'; +import slash from 'slash'; +import { fileURLToPath } from 'url'; import { isRelativePath, startsWithForwardSlash } from '../core/path.js'; +import { resolvePages } from '../core/util.js'; import { PAGE_SCRIPT_ID, PAGE_SSR_SCRIPT_ID } from '../vite-plugin-scripts/index.js'; import { getFileInfo } from '../vite-plugin-utils/index.js'; -import { resolvePages } from '../core/util.js'; +import { cachedCompilation } from './compile.js'; +import { handleHotUpdate, trackCSSDependencies } from './hmr.js'; +import { parseAstroRequest } from './query.js'; +import { getViteTransform, TransformHook } from './styles.js'; const FRONTMATTER_PARSE_REGEXP = /^\-\-\-(.*)^\-\-\-/ms; interface AstroPluginOptions { diff --git a/packages/astro/src/vite-plugin-build-css/index.ts b/packages/astro/src/vite-plugin-build-css/index.ts index 0ff5f58eb..6faec04cd 100644 --- a/packages/astro/src/vite-plugin-build-css/index.ts +++ b/packages/astro/src/vite-plugin-build-css/index.ts @@ -1,12 +1,12 @@ -import { BuildInternals } from '../core/build/internal'; import type { GetModuleInfo, ModuleInfo } from 'rollup'; +import { BuildInternals } from '../core/build/internal'; import type { PageBuildData } from '../core/build/types'; +import crypto from 'crypto'; import { Plugin as VitePlugin } from 'vite'; -import { isCSSRequest } from '../core/render/util.js'; -import { getPageDataByViteID, getPageDatasByClientOnlyID } from '../core/build/internal.js'; import { resolvedPagesVirtualModuleId } from '../core/app/index.js'; -import crypto from 'crypto'; +import { getPageDataByViteID, getPageDatasByClientOnlyID } from '../core/build/internal.js'; +import { isCSSRequest } from '../core/render/util.js'; interface PluginOptions { internals: BuildInternals; diff --git a/packages/astro/src/vite-plugin-build-css/resolve.ts b/packages/astro/src/vite-plugin-build-css/resolve.ts index eb00a6c8f..4bb09d174 100644 --- a/packages/astro/src/vite-plugin-build-css/resolve.ts +++ b/packages/astro/src/vite-plugin-build-css/resolve.ts @@ -1,5 +1,5 @@ -import type { ResolveIdHook, LoadHook } from 'rollup'; -import type { ResolvedConfig, Plugin as VitePlugin } from 'vite'; +import type { LoadHook, ResolveIdHook } from 'rollup'; +import type { Plugin as VitePlugin, ResolvedConfig } from 'vite'; export function getVitePluginByName(viteConfig: ResolvedConfig, pluginName: string): VitePlugin { const plugin = viteConfig.plugins.find(({ name }) => name === pluginName); diff --git a/packages/astro/src/vite-plugin-config-alias/index.ts b/packages/astro/src/vite-plugin-config-alias/index.ts index d07dcb631..b35ca5afe 100644 --- a/packages/astro/src/vite-plugin-config-alias/index.ts +++ b/packages/astro/src/vite-plugin-config-alias/index.ts @@ -1,5 +1,5 @@ -import * as tsr from 'tsconfig-resolver'; import * as path from 'path'; +import * as tsr from 'tsconfig-resolver'; import * as url from 'url'; import type * as vite from 'vite'; diff --git a/packages/astro/src/vite-plugin-env/index.ts b/packages/astro/src/vite-plugin-env/index.ts index 71c086865..d3a5f2635 100644 --- a/packages/astro/src/vite-plugin-env/index.ts +++ b/packages/astro/src/vite-plugin-env/index.ts @@ -1,9 +1,8 @@ -import type * as vite from 'vite'; -import type { AstroConfig } from '../@types/astro'; -import type { TransformPluginContext } from 'rollup'; import MagicString from 'magic-string'; import { fileURLToPath } from 'url'; +import type * as vite from 'vite'; import { loadEnv } from 'vite'; +import type { AstroConfig } from '../@types/astro'; interface EnvPluginOptions { config: AstroConfig; diff --git a/packages/astro/src/vite-plugin-integrations-container/index.ts b/packages/astro/src/vite-plugin-integrations-container/index.ts index da14e43f9..5be13be1b 100644 --- a/packages/astro/src/vite-plugin-integrations-container/index.ts +++ b/packages/astro/src/vite-plugin-integrations-container/index.ts @@ -1,4 +1,4 @@ -import { Plugin as VitePlugin, ResolvedConfig } from 'vite'; +import { Plugin as VitePlugin } from 'vite'; import { AstroConfig } from '../@types/astro.js'; import { runHookServerSetup } from '../integrations/index.js'; diff --git a/packages/astro/src/vite-plugin-jsx/index.ts b/packages/astro/src/vite-plugin-jsx/index.ts index 635db2d27..22df96cb4 100644 --- a/packages/astro/src/vite-plugin-jsx/index.ts +++ b/packages/astro/src/vite-plugin-jsx/index.ts @@ -4,9 +4,9 @@ import type { AstroConfig, AstroRenderer } from '../@types/astro'; import type { LogOptions } from '../core/logger/core.js'; import babel from '@babel/core'; +import * as eslexer from 'es-module-lexer'; import esbuild from 'esbuild'; import * as colors from 'kleur/colors'; -import * as eslexer from 'es-module-lexer'; import path from 'path'; import { error } from '../core/logger/core.js'; import { parseNpmName } from '../core/util.js'; diff --git a/packages/astro/src/vite-plugin-markdown/index.ts b/packages/astro/src/vite-plugin-markdown/index.ts index 7827ed1d4..6712e0cbb 100644 --- a/packages/astro/src/vite-plugin-markdown/index.ts +++ b/packages/astro/src/vite-plugin-markdown/index.ts @@ -1,5 +1,5 @@ -import { renderMarkdown } from '@astrojs/markdown-remark'; import { transform } from '@astrojs/compiler'; +import { renderMarkdown } from '@astrojs/markdown-remark'; import ancestor from 'common-ancestor-path'; import esbuild from 'esbuild'; import fs from 'fs'; @@ -7,10 +7,10 @@ import matter from 'gray-matter'; import { fileURLToPath } from 'url'; import type { Plugin } from 'vite'; import type { AstroConfig } from '../@types/astro'; -import { PAGE_SSR_SCRIPT_ID } from '../vite-plugin-scripts/index.js'; import { pagesVirtualModuleId } from '../core/app/index.js'; import { prependForwardSlash } from '../core/path.js'; import { resolvePages, viteID } from '../core/util.js'; +import { PAGE_SSR_SCRIPT_ID } from '../vite-plugin-scripts/index.js'; import { getFileInfo } from '../vite-plugin-utils/index.js'; interface AstroPluginOptions { diff --git a/packages/create-astro/src/gradient.ts b/packages/create-astro/src/gradient.ts index 2d4c48d81..539f3f17d 100644 --- a/packages/create-astro/src/gradient.ts +++ b/packages/create-astro/src/gradient.ts @@ -1,6 +1,6 @@ import chalk from 'chalk'; -import ora from 'ora'; import type { Ora } from 'ora'; +import ora from 'ora'; const gradientColors = [ `#ff5e00`, diff --git a/packages/create-astro/src/index.ts b/packages/create-astro/src/index.ts index 0546bd751..4fb6cec28 100644 --- a/packages/create-astro/src/index.ts +++ b/packages/create-astro/src/index.ts @@ -1,14 +1,14 @@ +import degit from 'degit'; +import { execa, execaCommand } from 'execa'; import fs from 'fs'; -import path from 'path'; import { bgCyan, black, bold, cyan, gray, green, red, yellow } from 'kleur/colors'; +import ora from 'ora'; +import path from 'path'; import prompts from 'prompts'; -import degit from 'degit'; import yargs from 'yargs-parser'; -import ora from 'ora'; -import { TEMPLATES } from './templates.js'; -import { logger, defaultLogLevel } from './logger.js'; -import { execa, execaCommand } from 'execa'; import { loadWithRocketGradient, rocketAscii } from './gradient.js'; +import { defaultLogLevel, logger } from './logger.js'; +import { TEMPLATES } from './templates.js'; // NOTE: In the v7.x version of npm, the default behavior of `npm init` was changed // to no longer require `--` to pass args and instead pass `--` directly to us. This diff --git a/packages/create-astro/src/logger.ts b/packages/create-astro/src/logger.ts index 80e5bf916..46f916c42 100644 --- a/packages/create-astro/src/logger.ts +++ b/packages/create-astro/src/logger.ts @@ -1,4 +1,4 @@ -import { bold, blue, dim, red, yellow } from 'kleur/colors'; +import { blue, bold, dim, red, yellow } from 'kleur/colors'; import { Writable } from 'stream'; import { format as utilFormat } from 'util'; diff --git a/packages/integrations/deno/src/index.ts b/packages/integrations/deno/src/index.ts index aa4496e1f..0dad8e8ef 100644 --- a/packages/integrations/deno/src/index.ts +++ b/packages/integrations/deno/src/index.ts @@ -1,8 +1,8 @@ import type { AstroAdapter, AstroIntegration } from 'astro'; -import { fileURLToPath } from 'url'; import esbuild from 'esbuild'; -import * as npath from 'path'; import * as fs from 'fs'; +import * as npath from 'path'; +import { fileURLToPath } from 'url'; interface Options { port?: number; diff --git a/packages/integrations/lit/src/index.ts b/packages/integrations/lit/src/index.ts index 087aa4167..8eca44492 100644 --- a/packages/integrations/lit/src/index.ts +++ b/packages/integrations/lit/src/index.ts @@ -1,5 +1,5 @@ +import type { AstroIntegration } from 'astro'; import { readFileSync } from 'node:fs'; -import type { AstroConfig, AstroIntegration } from 'astro'; function getViteConfiguration() { return { diff --git a/packages/integrations/netlify/src/index.ts b/packages/integrations/netlify/src/index.ts index beb3d0e0c..fd7fd5fed 100644 --- a/packages/integrations/netlify/src/index.ts +++ b/packages/integrations/netlify/src/index.ts @@ -1,3 +1,2 @@ -export { netlifyFunctions, netlifyFunctions as default } from './integration-functions.js'; - export { netlifyEdgeFunctions } from './integration-edge-functions.js'; +export { netlifyFunctions as default, netlifyFunctions } from './integration-functions.js'; diff --git a/packages/integrations/netlify/src/integration-edge-functions.ts b/packages/integrations/netlify/src/integration-edge-functions.ts index 9b4503e2b..e43a7f482 100644 --- a/packages/integrations/netlify/src/integration-edge-functions.ts +++ b/packages/integrations/netlify/src/integration-edge-functions.ts @@ -1,6 +1,6 @@ -import type { AstroAdapter, AstroIntegration, AstroConfig, RouteData } from 'astro'; -import { createRedirects } from './shared.js'; +import type { AstroAdapter, AstroConfig, AstroIntegration, RouteData } from 'astro'; import * as fs from 'fs'; +import { createRedirects } from './shared.js'; export function getAdapter(): AstroAdapter { return { diff --git a/packages/integrations/netlify/src/integration-functions.ts b/packages/integrations/netlify/src/integration-functions.ts index fd8ec0b9a..8f9b291fa 100644 --- a/packages/integrations/netlify/src/integration-functions.ts +++ b/packages/integrations/netlify/src/integration-functions.ts @@ -1,4 +1,4 @@ -import type { AstroAdapter, AstroIntegration, AstroConfig } from 'astro'; +import type { AstroAdapter, AstroConfig, AstroIntegration } from 'astro'; import { createRedirects } from './shared.js'; export function getAdapter(): AstroAdapter { diff --git a/packages/integrations/netlify/src/netlify-edge-functions.ts b/packages/integrations/netlify/src/netlify-edge-functions.ts index 35f9714a4..5c26da0bf 100644 --- a/packages/integrations/netlify/src/netlify-edge-functions.ts +++ b/packages/integrations/netlify/src/netlify-edge-functions.ts @@ -1,6 +1,6 @@ -import './edge-shim.js'; import { SSRManifest } from 'astro'; import { App } from 'astro/app'; +import './edge-shim.js'; export function createExports(manifest: SSRManifest) { const app = new App(manifest); diff --git a/packages/integrations/netlify/src/netlify-functions.ts b/packages/integrations/netlify/src/netlify-functions.ts index c0881bb05..66e5271f5 100644 --- a/packages/integrations/netlify/src/netlify-functions.ts +++ b/packages/integrations/netlify/src/netlify-functions.ts @@ -1,7 +1,7 @@ -import { SSRManifest } from 'astro'; +import { polyfill } from '@astrojs/webapi'; import type { Handler } from '@netlify/functions'; +import { SSRManifest } from 'astro'; import { App } from 'astro/app'; -import { polyfill } from '@astrojs/webapi'; polyfill(globalThis, { exclude: 'window document', diff --git a/packages/integrations/node/src/server.ts b/packages/integrations/node/src/server.ts index 44a43431c..c07b5a91b 100644 --- a/packages/integrations/node/src/server.ts +++ b/packages/integrations/node/src/server.ts @@ -1,8 +1,8 @@ +import { polyfill } from '@astrojs/webapi'; import type { SSRManifest } from 'astro'; +import { NodeApp } from 'astro/app/node'; import type { IncomingMessage, ServerResponse } from 'http'; import type { Readable } from 'stream'; -import { NodeApp } from 'astro/app/node'; -import { polyfill } from '@astrojs/webapi'; polyfill(globalThis, { exclude: 'window document', diff --git a/packages/integrations/partytown/src/index.ts b/packages/integrations/partytown/src/index.ts index 789f974eb..3d1101f96 100644 --- a/packages/integrations/partytown/src/index.ts +++ b/packages/integrations/partytown/src/index.ts @@ -1,10 +1,10 @@ -import type { AstroConfig, AstroIntegration } from 'astro'; -import sirv from './sirv.js'; import { partytownSnippet } from '@builder.io/partytown/integration'; import { copyLibFiles } from '@builder.io/partytown/utils'; -import { fileURLToPath } from 'url'; +import type { AstroConfig, AstroIntegration } from 'astro'; import { createRequire } from 'module'; import path from 'path'; +import { fileURLToPath } from 'url'; +import sirv from './sirv.js'; const resolve = createRequire(import.meta.url).resolve; type PartytownOptions = diff --git a/packages/integrations/sitemap/src/index.ts b/packages/integrations/sitemap/src/index.ts index 01759eaef..1c1cf29ab 100644 --- a/packages/integrations/sitemap/src/index.ts +++ b/packages/integrations/sitemap/src/index.ts @@ -1,5 +1,5 @@ -import fs from 'node:fs'; import type { AstroConfig, AstroIntegration } from 'astro'; +import fs from 'node:fs'; const STATUS_CODE_PAGE_REGEXP = /\/[0-9]{3}\/?$/; type SitemapOptions = diff --git a/packages/integrations/svelte/src/index.ts b/packages/integrations/svelte/src/index.ts index 4d9fddf70..340e2def0 100644 --- a/packages/integrations/svelte/src/index.ts +++ b/packages/integrations/svelte/src/index.ts @@ -1,7 +1,7 @@ -import type { AstroIntegration, AstroRenderer } from 'astro'; +import type { Options } from '@sveltejs/vite-plugin-svelte'; import { svelte } from '@sveltejs/vite-plugin-svelte'; +import type { AstroIntegration, AstroRenderer } from 'astro'; import preprocess from 'svelte-preprocess'; -import type { Options } from '@sveltejs/vite-plugin-svelte'; function getRenderer(): AstroRenderer { return { diff --git a/packages/integrations/tailwind/src/index.ts b/packages/integrations/tailwind/src/index.ts index 29c23c733..4051b93ee 100644 --- a/packages/integrations/tailwind/src/index.ts +++ b/packages/integrations/tailwind/src/index.ts @@ -1,11 +1,11 @@ +import load from '@proload/core'; import type { AstroIntegration } from 'astro'; -import { fileURLToPath } from 'url'; +import autoprefixerPlugin from 'autoprefixer'; import path from 'path'; import tailwindPlugin from 'tailwindcss'; -import type { TailwindConfig } from 'tailwindcss/tailwind-config'; import resolveConfig from 'tailwindcss/resolveConfig.js'; -import autoprefixerPlugin from 'autoprefixer'; -import load from '@proload/core'; +import type { TailwindConfig } from 'tailwindcss/tailwind-config'; +import { fileURLToPath } from 'url'; function getDefaultTailwindConfig(srcUrl: URL): TailwindConfig { return resolveConfig({ diff --git a/packages/integrations/vercel/src/edge/adapter.ts b/packages/integrations/vercel/src/edge/adapter.ts index 664eb2c43..6cd3405f6 100644 --- a/packages/integrations/vercel/src/edge/adapter.ts +++ b/packages/integrations/vercel/src/edge/adapter.ts @@ -1,6 +1,6 @@ import type { AstroAdapter, AstroConfig, AstroIntegration } from 'astro'; -import { writeJson, getVercelOutput } from '../lib/fs.js'; +import { getVercelOutput, writeJson } from '../lib/fs.js'; import { getRedirects } from '../lib/redirects.js'; const PACKAGE_NAME = '@astrojs/vercel/edge'; diff --git a/packages/integrations/vercel/src/lib/nft.ts b/packages/integrations/vercel/src/lib/nft.ts index d88429714..b18cb73ef 100644 --- a/packages/integrations/vercel/src/lib/nft.ts +++ b/packages/integrations/vercel/src/lib/nft.ts @@ -1,6 +1,6 @@ +import { nodeFileTrace } from '@vercel/nft'; import * as fs from 'node:fs/promises'; import { fileURLToPath } from 'node:url'; -import { nodeFileTrace } from '@vercel/nft'; export async function copyDependenciesToFunction( root: URL, diff --git a/packages/integrations/vercel/src/lib/redirects.ts b/packages/integrations/vercel/src/lib/redirects.ts index b52ce8725..c11d74802 100644 --- a/packages/integrations/vercel/src/lib/redirects.ts +++ b/packages/integrations/vercel/src/lib/redirects.ts @@ -1,4 +1,4 @@ -import type { AstroConfig, RoutePart, RouteData } from 'astro'; +import type { AstroConfig, RouteData, RoutePart } from 'astro'; // https://vercel.com/docs/project-configuration#legacy/routes interface VercelRoute { diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts index a554fe175..9633cdeca 100644 --- a/packages/integrations/vercel/src/serverless/adapter.ts +++ b/packages/integrations/vercel/src/serverless/adapter.ts @@ -1,6 +1,6 @@ import type { AstroAdapter, AstroConfig, AstroIntegration } from 'astro'; -import { writeJson, getVercelOutput } from '../lib/fs.js'; +import { getVercelOutput, writeJson } from '../lib/fs.js'; import { copyDependenciesToFunction } from '../lib/nft.js'; import { getRedirects } from '../lib/redirects.js'; diff --git a/packages/integrations/vercel/src/serverless/entrypoint.ts b/packages/integrations/vercel/src/serverless/entrypoint.ts index 6ef7ccef9..852aebefd 100644 --- a/packages/integrations/vercel/src/serverless/entrypoint.ts +++ b/packages/integrations/vercel/src/serverless/entrypoint.ts @@ -1,6 +1,6 @@ +import { polyfill } from '@astrojs/webapi'; import type { SSRManifest } from 'astro'; import { App } from 'astro/app'; -import { polyfill } from '@astrojs/webapi'; import type { IncomingMessage, ServerResponse } from 'node:http'; import { getRequest, setResponse } from './request-transform.js'; diff --git a/packages/integrations/vercel/src/serverless/request-transform.ts b/packages/integrations/vercel/src/serverless/request-transform.ts index 7cdb2550a..e675045f9 100644 --- a/packages/integrations/vercel/src/serverless/request-transform.ts +++ b/packages/integrations/vercel/src/serverless/request-transform.ts @@ -1,5 +1,5 @@ -import { Readable } from 'node:stream'; import type { IncomingMessage, ServerResponse } from 'node:http'; +import { Readable } from 'node:stream'; /* Credits to the SvelteKit team diff --git a/packages/integrations/vercel/src/static/adapter.ts b/packages/integrations/vercel/src/static/adapter.ts index 489ab356b..f5e2f63a5 100644 --- a/packages/integrations/vercel/src/static/adapter.ts +++ b/packages/integrations/vercel/src/static/adapter.ts @@ -1,6 +1,6 @@ import type { AstroAdapter, AstroConfig, AstroIntegration } from 'astro'; -import { getVercelOutput, writeJson, emptyDir } from '../lib/fs.js'; +import { emptyDir, getVercelOutput, writeJson } from '../lib/fs.js'; import { getRedirects } from '../lib/redirects.js'; const PACKAGE_NAME = '@astrojs/vercel/static'; diff --git a/packages/integrations/vue/src/index.ts b/packages/integrations/vue/src/index.ts index b56763504..af7f1d175 100644 --- a/packages/integrations/vue/src/index.ts +++ b/packages/integrations/vue/src/index.ts @@ -1,6 +1,6 @@ -import type { AstroIntegration, AstroRenderer } from 'astro'; -import vue from '@vitejs/plugin-vue'; import type { Options } from '@vitejs/plugin-vue'; +import vue from '@vitejs/plugin-vue'; +import type { AstroIntegration, AstroRenderer } from 'astro'; function getRenderer(): AstroRenderer { return { diff --git a/packages/markdown/remark/src/index.ts b/packages/markdown/remark/src/index.ts index 2e9aa54fd..917976d5e 100644 --- a/packages/markdown/remark/src/index.ts +++ b/packages/markdown/remark/src/index.ts @@ -1,24 +1,24 @@ import type { MarkdownRenderingOptions, MarkdownRenderingResult } from './types'; +import { loadPlugins } from './load-plugins.js'; import createCollectHeaders from './rehype-collect-headers.js'; -import scopedStyles from './remark-scoped-styles.js'; +import rehypeEscape from './rehype-escape.js'; import rehypeExpressions from './rehype-expressions.js'; import rehypeIslands from './rehype-islands.js'; -import remarkMdxish from './remark-mdxish.js'; -import remarkMarkAndUnravel from './remark-mark-and-unravel.js'; import rehypeJsx from './rehype-jsx.js'; -import rehypeEscape from './rehype-escape.js'; +import remarkMarkAndUnravel from './remark-mark-and-unravel.js'; +import remarkMdxish from './remark-mdxish.js'; import remarkPrism from './remark-prism.js'; +import scopedStyles from './remark-scoped-styles.js'; import remarkShiki from './remark-shiki.js'; import remarkUnwrap from './remark-unwrap.js'; -import { loadPlugins } from './load-plugins.js'; -import { unified } from 'unified'; +import Slugger from 'github-slugger'; +import rehypeRaw from 'rehype-raw'; +import rehypeStringify from 'rehype-stringify'; import markdown from 'remark-parse'; import markdownToHtml from 'remark-rehype'; -import rehypeStringify from 'rehype-stringify'; -import rehypeRaw from 'rehype-raw'; -import Slugger from 'github-slugger'; +import { unified } from 'unified'; import { VFile } from 'vfile'; export * from './types.js'; diff --git a/packages/markdown/remark/src/rehype-collect-headers.ts b/packages/markdown/remark/src/rehype-collect-headers.ts index 44881864b..9a64d59c8 100644 --- a/packages/markdown/remark/src/rehype-collect-headers.ts +++ b/packages/markdown/remark/src/rehype-collect-headers.ts @@ -1,6 +1,6 @@ -import { visit } from 'unist-util-visit'; -import { toHtml } from 'hast-util-to-html'; import Slugger from 'github-slugger'; +import { toHtml } from 'hast-util-to-html'; +import { visit } from 'unist-util-visit'; import type { MarkdownHeader, RehypePlugin } from './types.js'; diff --git a/packages/markdown/remark/src/rehype-escape.ts b/packages/markdown/remark/src/rehype-escape.ts index 5cf463608..a32027b89 100644 --- a/packages/markdown/remark/src/rehype-escape.ts +++ b/packages/markdown/remark/src/rehype-escape.ts @@ -1,4 +1,4 @@ -import { SKIP, visit } from 'unist-util-visit'; +import { visit } from 'unist-util-visit'; export default function rehypeEscape(): any { return function (node: any): any { diff --git a/packages/markdown/remark/src/remark-mdxish.ts b/packages/markdown/remark/src/remark-mdxish.ts index 3293f6f45..71f36042a 100644 --- a/packages/markdown/remark/src/remark-mdxish.ts +++ b/packages/markdown/remark/src/remark-mdxish.ts @@ -1,7 +1,7 @@ -import { mdxjs } from 'micromark-extension-mdxjs'; -import { mdxFromMarkdown, mdxToMarkdown } from './mdast-util-mdxish.js'; import type * as fromMarkdown from 'mdast-util-from-markdown'; import type { Tag } from 'mdast-util-mdx-jsx'; +import { mdxjs } from 'micromark-extension-mdxjs'; +import { mdxFromMarkdown, mdxToMarkdown } from './mdast-util-mdxish.js'; export default function remarkMdxish(this: any, options = {}) { const data = this.data(); diff --git a/packages/markdown/remark/src/remark-prism.ts b/packages/markdown/remark/src/remark-prism.ts index 544de1540..caa50f738 100644 --- a/packages/markdown/remark/src/remark-prism.ts +++ b/packages/markdown/remark/src/remark-prism.ts @@ -1,7 +1,7 @@ -import { visit } from 'unist-util-visit'; -import Prism from 'prismjs'; import { addAstro } from '@astrojs/prism/internal'; +import Prism from 'prismjs'; import loadLanguages from 'prismjs/components/index.js'; +import { visit } from 'unist-util-visit'; const noVisit = new Set(['root', 'html', 'text']); const languageMap = new Map([['ts', 'typescript']]); diff --git a/packages/markdown/remark/src/remark-unwrap.ts b/packages/markdown/remark/src/remark-unwrap.ts index 3ce7a72c0..e54f01397 100644 --- a/packages/markdown/remark/src/remark-unwrap.ts +++ b/packages/markdown/remark/src/remark-unwrap.ts @@ -1,4 +1,4 @@ -import { visit as _visit, SKIP } from 'unist-util-visit'; +import { SKIP, visit as _visit } from 'unist-util-visit'; // This is a workaround. // It fixes a compatibility issue between different, incompatible ASTs given by plugins to Unist diff --git a/packages/markdown/remark/src/types.ts b/packages/markdown/remark/src/types.ts index af9778c9a..ddd96b3d1 100644 --- a/packages/markdown/remark/src/types.ts +++ b/packages/markdown/remark/src/types.ts @@ -1,7 +1,7 @@ -import type * as unified from 'unified'; -import type * as mdast from 'mdast'; import type * as hast from 'hast'; +import type * as mdast from 'mdast'; import type { ILanguageRegistration, IThemeRegistration, Theme } from 'shiki'; +import type * as unified from 'unified'; export type { Node } from 'unist'; diff --git a/packages/telemetry/src/anonymous-meta.ts b/packages/telemetry/src/anonymous-meta.ts index 3c9e728b7..8f42d91bf 100644 --- a/packages/telemetry/src/anonymous-meta.ts +++ b/packages/telemetry/src/anonymous-meta.ts @@ -1,7 +1,7 @@ -import os from 'node:os'; +import { isCI, name as ciName } from 'ci-info'; import isDocker from 'is-docker'; import isWSL from 'is-wsl'; -import { isCI, name as ciName } from 'ci-info'; +import os from 'node:os'; type AnonymousMeta = { systemPlatform: NodeJS.Platform; diff --git a/packages/telemetry/src/config.ts b/packages/telemetry/src/config.ts index 9d9bf21f9..9317ab80d 100644 --- a/packages/telemetry/src/config.ts +++ b/packages/telemetry/src/config.ts @@ -1,9 +1,9 @@ +import dget from 'dlv'; +import { dset } from 'dset'; import fs from 'node:fs'; -import path from 'node:path'; import os from 'node:os'; +import path from 'node:path'; import process from 'node:process'; -import { dset } from 'dset'; -import dget from 'dlv'; export interface ConfigOptions { name: string; diff --git a/packages/telemetry/src/events/index.ts b/packages/telemetry/src/events/index.ts index 20fc79a75..6c671ff6c 100644 --- a/packages/telemetry/src/events/index.ts +++ b/packages/telemetry/src/events/index.ts @@ -1,2 +1,2 @@ -export * from './session.js'; export * from './build.js'; +export * from './session.js'; diff --git a/packages/telemetry/src/events/session.ts b/packages/telemetry/src/events/session.ts index d63b87f05..995cf5075 100644 --- a/packages/telemetry/src/events/session.ts +++ b/packages/telemetry/src/events/session.ts @@ -1,6 +1,4 @@ -import escalade from 'escalade/sync'; import { createRequire } from 'node:module'; -import { fileURLToPath } from 'node:url'; const require = createRequire(import.meta.url); diff --git a/packages/telemetry/src/index.ts b/packages/telemetry/src/index.ts index a11f4ae0e..a0c3f5c43 100644 --- a/packages/telemetry/src/index.ts +++ b/packages/telemetry/src/index.ts @@ -4,11 +4,11 @@ import { createHash, randomBytes } from 'node:crypto'; import { isCI } from 'ci-info'; import debug from 'debug'; +import { getAnonymousMeta } from './anonymous-meta.js'; +import { Config } from './config.js'; import * as KEY from './keys.js'; import { post } from './post.js'; -import { getAnonymousMeta } from './anonymous-meta.js'; import { getRawProjectId } from './project-id.js'; -import { Config } from './config.js'; export interface AstroTelemetryOptions { version: string; diff --git a/packages/webapi/mod.d.ts b/packages/webapi/mod.d.ts index a9b9d832e..882a42919 100644 --- a/packages/webapi/mod.d.ts +++ b/packages/webapi/mod.d.ts @@ -1,5 +1,5 @@ -export { AbortController, AbortSignal, Blob, ByteLengthQueuingStrategy, CanvasRenderingContext2D, CharacterData, Comment, CountQueuingStrategy, CSSStyleSheet, CustomElementRegistry, CustomEvent, DOMException, Document, DocumentFragment, Element, Event, EventTarget, File, FormData, HTMLDocument, HTMLElement, HTMLBodyElement, HTMLCanvasElement, HTMLDivElement, HTMLHeadElement, HTMLHtmlElement, HTMLImageElement, HTMLSpanElement, HTMLStyleElement, HTMLTemplateElement, HTMLUnknownElement, Headers, IntersectionObserver, Image, ImageData, MediaQueryList, MutationObserver, Node, NodeFilter, NodeIterator, OffscreenCanvas, ReadableByteStreamController, ReadableStream, ReadableStreamBYOBReader, ReadableStreamBYOBRequest, ReadableStreamDefaultController, ReadableStreamDefaultReader, Request, ResizeObserver, Response, ShadowRoot, StyleSheet, Text, TransformStream, TreeWalker, URLPattern, WritableStream, WritableStreamDefaultController, WritableStreamDefaultWriter, Window, alert, atob, btoa, cancelAnimationFrame, cancelIdleCallback, clearTimeout, fetch, requestAnimationFrame, requestIdleCallback, setTimeout, structuredClone, } from './mod.js'; export { pathToPosix } from './lib/utils'; +export { AbortController, AbortSignal, alert, atob, Blob, btoa, ByteLengthQueuingStrategy, cancelAnimationFrame, cancelIdleCallback, CanvasRenderingContext2D, CharacterData, clearTimeout, Comment, CountQueuingStrategy, CSSStyleSheet, CustomElementRegistry, CustomEvent, Document, DocumentFragment, DOMException, Element, Event, EventTarget, fetch, File, FormData, Headers, HTMLBodyElement, HTMLCanvasElement, HTMLDivElement, HTMLDocument, HTMLElement, HTMLHeadElement, HTMLHtmlElement, HTMLImageElement, HTMLSpanElement, HTMLStyleElement, HTMLTemplateElement, HTMLUnknownElement, Image, ImageData, IntersectionObserver, MediaQueryList, MutationObserver, Node, NodeFilter, NodeIterator, OffscreenCanvas, ReadableByteStreamController, ReadableStream, ReadableStreamBYOBReader, ReadableStreamBYOBRequest, ReadableStreamDefaultController, ReadableStreamDefaultReader, Request, requestAnimationFrame, requestIdleCallback, ResizeObserver, Response, setTimeout, ShadowRoot, structuredClone, StyleSheet, Text, TransformStream, TreeWalker, URLPattern, Window, WritableStream, WritableStreamDefaultController, WritableStreamDefaultWriter } from './mod.js'; export declare const polyfill: { (target: any, options?: PolyfillOptions | undefined): any; internals(target: any, name: string): any; diff --git a/packages/webapi/src/lib/AnimationFrame.ts b/packages/webapi/src/lib/AnimationFrame.ts index ef89b631e..e29d3cabf 100644 --- a/packages/webapi/src/lib/AnimationFrame.ts +++ b/packages/webapi/src/lib/AnimationFrame.ts @@ -1,6 +1,6 @@ import { - setTimeout as nodeSetTimeout, clearTimeout as nodeClearTimeout, + setTimeout as nodeSetTimeout, } from 'node:timers' import * as _ from './utils.js' diff --git a/packages/webapi/src/lib/CanvasRenderingContext2D.ts b/packages/webapi/src/lib/CanvasRenderingContext2D.ts index 082125828..147a80ca9 100644 --- a/packages/webapi/src/lib/CanvasRenderingContext2D.ts +++ b/packages/webapi/src/lib/CanvasRenderingContext2D.ts @@ -1,8 +1,8 @@ import type { HTMLCanvasElement } from './HTMLCanvasElement' import type { OffscreenCanvas } from './OffscreenCanvas' -import * as _ from './utils' import { ImageData } from './ImageData' +import * as _ from './utils' export class CanvasRenderingContext2D { get canvas(): HTMLCanvasElement | OffscreenCanvas | null { diff --git a/packages/webapi/src/lib/CustomEvent.ts b/packages/webapi/src/lib/CustomEvent.ts index 5fca7b598..1269b7216 100644 --- a/packages/webapi/src/lib/CustomEvent.ts +++ b/packages/webapi/src/lib/CustomEvent.ts @@ -1,5 +1,5 @@ -import * as _ from './utils' import { Event } from 'event-target-shim' +import * as _ from './utils' class CustomEvent< TEventType extends string = string diff --git a/packages/webapi/src/lib/Document.ts b/packages/webapi/src/lib/Document.ts index 79f9b36fd..b9c30b3a3 100644 --- a/packages/webapi/src/lib/Document.ts +++ b/packages/webapi/src/lib/Document.ts @@ -1,6 +1,6 @@ -import * as _ from './utils' import { Text } from './CharacterData' import { TreeWalker } from './TreeWalker' +import * as _ from './utils' export class Document extends Node { createElement(name: string) { diff --git a/packages/webapi/src/lib/HTMLCanvasElement.ts b/packages/webapi/src/lib/HTMLCanvasElement.ts index b5deda6aa..a38471498 100644 --- a/packages/webapi/src/lib/HTMLCanvasElement.ts +++ b/packages/webapi/src/lib/HTMLCanvasElement.ts @@ -1,7 +1,7 @@ import type { CanvasRenderingContext2D } from './CanvasRenderingContext2D' -import * as _ from './utils' import { __createCanvasRenderingContext2D } from './CanvasRenderingContext2D' +import * as _ from './utils' export class HTMLCanvasElement extends HTMLElement { get height(): number { diff --git a/packages/webapi/src/lib/HTMLImageElement.ts b/packages/webapi/src/lib/HTMLImageElement.ts index 9ddcb0ef5..fd9e5f605 100644 --- a/packages/webapi/src/lib/HTMLImageElement.ts +++ b/packages/webapi/src/lib/HTMLImageElement.ts @@ -1,5 +1,5 @@ -import * as _ from './utils' import { HTMLElement } from './Element' +import * as _ from './utils' export class HTMLImageElement extends HTMLElement { get src(): string { diff --git a/packages/webapi/src/lib/IdleCallback.ts b/packages/webapi/src/lib/IdleCallback.ts index 2f5700e18..bc73f22f1 100644 --- a/packages/webapi/src/lib/IdleCallback.ts +++ b/packages/webapi/src/lib/IdleCallback.ts @@ -1,6 +1,6 @@ import { - setTimeout as nodeSetTimeout, clearTimeout as nodeClearTimeout, + setTimeout as nodeSetTimeout, } from 'node:timers' import * as _ from './utils.js' diff --git a/packages/webapi/src/lib/Image.ts b/packages/webapi/src/lib/Image.ts index d72c33159..4f403e945 100644 --- a/packages/webapi/src/lib/Image.ts +++ b/packages/webapi/src/lib/Image.ts @@ -1,5 +1,5 @@ -import * as _ from './utils' import { HTMLImageElement } from './HTMLImageElement' +import * as _ from './utils' export function Image() { // @ts-ignore diff --git a/packages/webapi/src/lib/OffscreenCanvas.ts b/packages/webapi/src/lib/OffscreenCanvas.ts index 0f1f3e2fa..e799f7210 100644 --- a/packages/webapi/src/lib/OffscreenCanvas.ts +++ b/packages/webapi/src/lib/OffscreenCanvas.ts @@ -1,7 +1,7 @@ import type { CanvasRenderingContext2D } from './CanvasRenderingContext2D' -import * as _ from './utils' import { __createCanvasRenderingContext2D } from './CanvasRenderingContext2D' +import * as _ from './utils' export class OffscreenCanvas extends EventTarget { constructor(width: number, height: number) { diff --git a/packages/webapi/src/lib/Timeout.ts b/packages/webapi/src/lib/Timeout.ts index f2e81c35e..2ad4f153e 100644 --- a/packages/webapi/src/lib/Timeout.ts +++ b/packages/webapi/src/lib/Timeout.ts @@ -1,6 +1,6 @@ import { - setTimeout as nodeSetTimeout, clearTimeout as nodeClearTimeout, + setTimeout as nodeSetTimeout, } from 'node:timers' import * as _ from './utils.js' diff --git a/packages/webapi/src/lib/fetch.ts b/packages/webapi/src/lib/fetch.ts index 667984a0f..b099e44af 100644 --- a/packages/webapi/src/lib/fetch.ts +++ b/packages/webapi/src/lib/fetch.ts @@ -1,5 +1,5 @@ -import { default as nodeFetch, Headers, Request, Response } from 'node-fetch' import type { RequestInit } from 'node-fetch' +import { default as nodeFetch, Headers, Request, Response } from 'node-fetch' import Stream from 'node:stream' import * as _ from './utils' diff --git a/packages/webapi/src/polyfill.ts b/packages/webapi/src/polyfill.ts index cf162b649..0eb4794d4 100644 --- a/packages/webapi/src/polyfill.ts +++ b/packages/webapi/src/polyfill.ts @@ -1,28 +1,36 @@ import { AbortController, AbortSignal, + alert, + atob, Blob, + btoa, ByteLengthQueuingStrategy, + cancelAnimationFrame, + cancelIdleCallback, CanvasRenderingContext2D, CharacterData, + clearTimeout, Comment, CountQueuingStrategy, CSSStyleSheet, CustomElementRegistry, CustomEvent, - DOMException, Document, DocumentFragment, + DOMException, Element, Event, EventTarget, + fetch, File, FormData, - HTMLDocument, - HTMLElement, + Headers, HTMLBodyElement, HTMLCanvasElement, HTMLDivElement, + HTMLDocument, + HTMLElement, HTMLHeadElement, HTMLHtmlElement, HTMLImageElement, @@ -30,10 +38,18 @@ import { HTMLStyleElement, HTMLTemplateElement, HTMLUnknownElement, - Headers, - IntersectionObserver, Image, ImageData, + initCustomElementRegistry, + initDocument, + initMediaQueryList, + initObject, + initPromise, + initRelativeIndexingMethod, + initStorage, + initString, + initWindow, + IntersectionObserver, MediaQueryList, MutationObserver, Node, @@ -47,69 +63,62 @@ import { ReadableStreamDefaultController, ReadableStreamDefaultReader, Request, + requestAnimationFrame, + requestIdleCallback, ResizeObserver, Response, + setTimeout, ShadowRoot, Storage, + structuredClone, StyleSheet, Text, TransformStream, TreeWalker, URLPattern, + Window, WritableStream, WritableStreamDefaultController, WritableStreamDefaultWriter, - Window, - alert, - atob, - btoa, - cancelAnimationFrame, - cancelIdleCallback, - clearTimeout, - fetch, - requestAnimationFrame, - requestIdleCallback, - setTimeout, - structuredClone, - initCustomElementRegistry, - initDocument, - initMediaQueryList, - initObject, - initPromise, - initRelativeIndexingMethod, - initStorage, - initString, - initWindow, } from './ponyfill' import { exclusions } from './exclusions' import { inheritence } from './inheritence' +export { pathToPosix } from './lib/utils' export { AbortController, AbortSignal, + alert, + atob, Blob, + btoa, ByteLengthQueuingStrategy, + cancelAnimationFrame, + cancelIdleCallback, CanvasRenderingContext2D, CharacterData, + clearTimeout, Comment, CountQueuingStrategy, CSSStyleSheet, CustomElementRegistry, CustomEvent, - DOMException, Document, DocumentFragment, + DOMException, Element, Event, EventTarget, + fetch, File, FormData, - HTMLDocument, - HTMLElement, + Headers, HTMLBodyElement, HTMLCanvasElement, HTMLDivElement, + HTMLDocument, + HTMLElement, HTMLHeadElement, HTMLHtmlElement, HTMLImageElement, @@ -117,10 +126,9 @@ export { HTMLStyleElement, HTMLTemplateElement, HTMLUnknownElement, - Headers, - IntersectionObserver, Image, ImageData, + IntersectionObserver, MediaQueryList, MutationObserver, Node, @@ -134,33 +142,24 @@ export { ReadableStreamDefaultController, ReadableStreamDefaultReader, Request, + requestAnimationFrame, + requestIdleCallback, ResizeObserver, Response, + setTimeout, ShadowRoot, + structuredClone, StyleSheet, Text, TransformStream, TreeWalker, URLPattern, + Window, WritableStream, WritableStreamDefaultController, WritableStreamDefaultWriter, - Window, - alert, - atob, - btoa, - cancelAnimationFrame, - cancelIdleCallback, - clearTimeout, - fetch, - requestAnimationFrame, - requestIdleCallback, - setTimeout, - structuredClone, } from './ponyfill.js' -export { pathToPosix } from './lib/utils' - export const polyfill = (target: any, options?: PolyfillOptions) => { const webAPIs = { AbortController, diff --git a/packages/webapi/src/ponyfill.ts b/packages/webapi/src/ponyfill.ts index 06bf8a677..fc92975b5 100644 --- a/packages/webapi/src/ponyfill.ts +++ b/packages/webapi/src/ponyfill.ts @@ -4,20 +4,10 @@ import { AbortController, AbortSignal, } from 'abort-controller/dist/abort-controller.mjs' -import { - requestAnimationFrame, - cancelAnimationFrame, -} from './lib/AnimationFrame' -import { atob, btoa } from './lib/Base64' -import { CharacterData, Comment, Text } from './lib/CharacterData' -import { File, Blob } from 'fetch-blob/from.js' -import { CustomEvent } from './lib/CustomEvent' -import { DOMException } from './lib/DOMException' -import { TreeWalker } from './lib/TreeWalker' -import { cancelIdleCallback, requestIdleCallback } from './lib/IdleCallback' import { Event, EventTarget } from 'event-target-shim' -import { fetch, Headers, Request, Response } from './lib/fetch' +import { Blob, File } from 'fetch-blob/from.js' import { FormData } from 'formdata-polyfill/esm.min.js' +import { URLPattern } from 'urlpattern-polyfill' import { ByteLengthQueuingStrategy, CountQueuingStrategy, @@ -32,29 +22,31 @@ import { WritableStreamDefaultController, WritableStreamDefaultWriter, } from 'web-streams-polyfill/dist/ponyfill.es6.mjs' -import { URLPattern } from 'urlpattern-polyfill' -import { setTimeout, clearTimeout } from './lib/Timeout' +import { + cancelAnimationFrame, + requestAnimationFrame, +} from './lib/AnimationFrame' +import { atob, btoa } from './lib/Base64' +import { CharacterData, Comment, Text } from './lib/CharacterData' +import { CustomEvent } from './lib/CustomEvent' +import { DOMException } from './lib/DOMException' +import { fetch, Headers, Request, Response } from './lib/fetch' +import { cancelIdleCallback, requestIdleCallback } from './lib/IdleCallback' import structuredClone from './lib/structuredClone' +import { clearTimeout, setTimeout } from './lib/Timeout' +import { TreeWalker } from './lib/TreeWalker' import { CanvasRenderingContext2D } from './lib/CanvasRenderingContext2D' -import { CSSStyleSheet, StyleSheet } from './lib/StyleSheet' import { CustomElementRegistry, initCustomElementRegistry, } from './lib/CustomElementRegistry' import { Document, HTMLDocument, initDocument } from './lib/Document' import { - DocumentFragment, - Node, - NodeFilter, - NodeIterator, - ShadowRoot, -} from './lib/Node' -import { Element, - HTMLElement, HTMLBodyElement, HTMLDivElement, + HTMLElement, HTMLHeadElement, HTMLHtmlElement, HTMLSpanElement, @@ -66,15 +58,23 @@ import { HTMLCanvasElement } from './lib/HTMLCanvasElement' import { HTMLImageElement } from './lib/HTMLImageElement' import { Image } from './lib/Image' import { ImageData } from './lib/ImageData' +import { initMediaQueryList, MediaQueryList } from './lib/MediaQueryList' +import { + DocumentFragment, + Node, + NodeFilter, + NodeIterator, + ShadowRoot, +} from './lib/Node' import { IntersectionObserver, MutationObserver, ResizeObserver, } from './lib/Observer' -import { MediaQueryList, initMediaQueryList } from './lib/MediaQueryList' import { OffscreenCanvas } from './lib/OffscreenCanvas' -import { Storage, initStorage } from './lib/Storage' -import { Window, initWindow } from './lib/Window' +import { initStorage, Storage } from './lib/Storage' +import { CSSStyleSheet, StyleSheet } from './lib/StyleSheet' +import { initWindow, Window } from './lib/Window' import { alert } from './lib/Alert' |