diff options
| -rw-r--r-- | packages/astro/src/core/app/types.ts | 1 | ||||
| -rw-r--r-- | packages/astro/src/core/build/generate.ts | 5 | ||||
| -rw-r--r-- | packages/astro/src/core/build/internal.ts | 2 | ||||
| -rw-r--r-- | packages/astro/src/core/build/plugins/plugin-pages.ts | 2 | ||||
| -rw-r--r-- | packages/astro/src/core/build/plugins/plugin-ssr.ts | 12 | ||||
| -rw-r--r-- | packages/astro/src/core/build/static-build.ts | 6 |
6 files changed, 13 insertions, 15 deletions
diff --git a/packages/astro/src/core/app/types.ts b/packages/astro/src/core/app/types.ts index 0fa2c034b..0682acb6a 100644 --- a/packages/astro/src/core/app/types.ts +++ b/packages/astro/src/core/app/types.ts @@ -1,7 +1,6 @@ import type { MarkdownRenderingOptions } from '@astrojs/markdown-remark'; import type { AstroMiddlewareInstance, - ComponentInstance, RouteData, SerializedRouteData, SSRComponentMetadata, diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts index 3c24aa4bc..a12313987 100644 --- a/packages/astro/src/core/build/generate.ts +++ b/packages/astro/src/core/build/generate.ts @@ -21,9 +21,9 @@ import { getStaticImageList, } from '../../assets/generate.js'; import { + eachPageDataFromEntryPoint, hasPrerenderedPages, type BuildInternals, - eachPageDataFromEntryPoint, } from '../../core/build/internal.js'; import { prependForwardSlash, @@ -48,7 +48,7 @@ import { createRequest } from '../request.js'; import { matchRoute } from '../routing/match.js'; import { getOutputFilename } from '../util.js'; import { getOutDirWithinCwd, getOutFile, getOutFolder } from './common.js'; -import { cssOrder, eachPageData, getPageDataByComponent, mergeInlineCss } from './internal.js'; +import { cssOrder, getPageDataByComponent, mergeInlineCss } from './internal.js'; import type { PageBuildData, SinglePageBuiltModule, @@ -56,7 +56,6 @@ import type { StylesheetAsset, } from './types'; import { getTimeStat } from './util.js'; -import { ASTRO_PAGE_MODULE_ID } from './plugins/plugin-pages'; function shouldSkipDraft(pageModule: ComponentInstance, settings: AstroSettings): boolean { return ( diff --git a/packages/astro/src/core/build/internal.ts b/packages/astro/src/core/build/internal.ts index f6025238a..18d28ef74 100644 --- a/packages/astro/src/core/build/internal.ts +++ b/packages/astro/src/core/build/internal.ts @@ -1,10 +1,10 @@ import type { Rollup } from 'vite'; -import type { PageBuildData, StylesheetAsset, ViteID } from './types'; import type { SSRResult } from '../../@types/astro'; import type { PageOptions } from '../../vite-plugin-astro/types'; import { prependForwardSlash, removeFileExtension } from '../path.js'; import { viteID } from '../util.js'; import { ASTRO_PAGE_EXTENSION_POST_PATTERN, ASTRO_PAGE_MODULE_ID } from './plugins/plugin-pages.js'; +import type { PageBuildData, StylesheetAsset, ViteID } from './types'; export interface BuildInternals { /** diff --git a/packages/astro/src/core/build/plugins/plugin-pages.ts b/packages/astro/src/core/build/plugins/plugin-pages.ts index 3ea0a61c8..4428d8ac6 100644 --- a/packages/astro/src/core/build/plugins/plugin-pages.ts +++ b/packages/astro/src/core/build/plugins/plugin-pages.ts @@ -1,3 +1,4 @@ +import { extname } from 'node:path'; import type { Plugin as VitePlugin } from 'vite'; import { addRollupInput } from '../add-rollup-input.js'; import { type BuildInternals } from '../internal.js'; @@ -5,7 +6,6 @@ import type { AstroBuildPlugin } from '../plugin'; import type { StaticBuildOptions } from '../types'; import { MIDDLEWARE_MODULE_ID } from './plugin-middleware.js'; import { RENDERERS_MODULE_ID } from './plugin-renderers.js'; -import { extname } from 'node:path'; export const ASTRO_PAGE_MODULE_ID = '@astro-page:'; export const ASTRO_PAGE_RESOLVED_MODULE_ID = '\0@astro-page:'; diff --git a/packages/astro/src/core/build/plugins/plugin-ssr.ts b/packages/astro/src/core/build/plugins/plugin-ssr.ts index b40faf20d..accdd01ad 100644 --- a/packages/astro/src/core/build/plugins/plugin-ssr.ts +++ b/packages/astro/src/core/build/plugins/plugin-ssr.ts @@ -1,21 +1,21 @@ -import type { Plugin as VitePlugin } from 'vite'; -import type { AstroAdapter } from '../../../@types/astro'; -import type { SerializedRouteInfo, SerializedSSRManifest } from '../../app/types'; -import type { StaticBuildOptions } from '../types'; -import type { AstroBuildPlugin } from '../plugin'; import glob from 'fast-glob'; import { fileURLToPath } from 'url'; +import type { Plugin as VitePlugin } from 'vite'; +import type { AstroAdapter } from '../../../@types/astro'; import { runHookBuildSsr } from '../../../integrations/index.js'; import { isHybridOutput } from '../../../prerender/utils.js'; import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from '../../../vite-plugin-scripts/index.js'; +import type { SerializedRouteInfo, SerializedSSRManifest } from '../../app/types'; import { joinPaths, prependForwardSlash } from '../../path.js'; import { serializeRouteData } from '../../routing/index.js'; import { addRollupInput } from '../add-rollup-input.js'; import { getOutFile, getOutFolder } from '../common.js'; import { cssOrder, mergeInlineCss, type BuildInternals } from '../internal.js'; +import type { AstroBuildPlugin } from '../plugin'; +import type { StaticBuildOptions } from '../types'; import { MIDDLEWARE_MODULE_ID } from './plugin-middleware.js'; -import { RENDERERS_MODULE_ID } from './plugin-renderers.js'; import { getVirtualModulePageNameFromPath } from './plugin-pages.js'; +import { RENDERERS_MODULE_ID } from './plugin-renderers.js'; export const SSR_VIRTUAL_MODULE_ID = '@astrojs-ssr-virtual-entry'; const RESOLVED_SSR_VIRTUAL_MODULE_ID = '\0' + SSR_VIRTUAL_MODULE_ID; diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts index 54e99e0f4..cceaa0361 100644 --- a/packages/astro/src/core/build/static-build.ts +++ b/packages/astro/src/core/build/static-build.ts @@ -24,14 +24,14 @@ import { generatePages } from './generate.js'; import { trackPageData } from './internal.js'; import { createPluginContainer, type AstroBuildPluginContainer } from './plugin.js'; import { registerAllPlugins } from './plugins/index.js'; -import { RESOLVED_RENDERERS_MODULE_ID } from './plugins/plugin-renderers.js'; -import type { PageBuildData, StaticBuildOptions } from './types'; -import { getTimeStat } from './util.js'; import { ASTRO_PAGE_EXTENSION_POST_PATTERN, ASTRO_PAGE_RESOLVED_MODULE_ID, } from './plugins/plugin-pages.js'; +import { RESOLVED_RENDERERS_MODULE_ID } from './plugins/plugin-renderers.js'; import { SSR_VIRTUAL_MODULE_ID } from './plugins/plugin-ssr.js'; +import type { PageBuildData, StaticBuildOptions } from './types'; +import { getTimeStat } from './util.js'; export async function viteBuild(opts: StaticBuildOptions) { const { allPages, settings } = opts; |