From c2d6c1f727c27f0d541eb2de25480f51442e2106 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Fri, 2 Aug 2024 10:15:42 +0800 Subject: [PATCH] Remove unused code (#11592) --- packages/astro/src/core/build/index.ts | 2 +- packages/astro/src/core/build/internal.ts | 15 ------------- packages/astro/src/core/build/page-data.ts | 21 +------------------ .../src/core/build/plugins/plugin-analyzer.ts | 5 ----- .../core/build/plugins/plugin-internals.ts | 7 ------- .../src/core/build/plugins/plugin-ssr.ts | 1 - 6 files changed, 2 insertions(+), 49 deletions(-) diff --git a/packages/astro/src/core/build/index.ts b/packages/astro/src/core/build/index.ts index 0d5fa91a04..de8e48b9d2 100644 --- a/packages/astro/src/core/build/index.ts +++ b/packages/astro/src/core/build/index.ts @@ -166,7 +166,7 @@ class AstroBuilder { } this.logger.info('build', 'Collecting build info...'); this.timer.loadStart = performance.now(); - const { assets, allPages } = await collectPagesData({ + const { assets, allPages } = collectPagesData({ settings: this.settings, logger: this.logger, manifest: this.manifest, diff --git a/packages/astro/src/core/build/internal.ts b/packages/astro/src/core/build/internal.ts index 07ecf261d7..7386f806f1 100644 --- a/packages/astro/src/core/build/internal.ts +++ b/packages/astro/src/core/build/internal.ts @@ -1,6 +1,5 @@ import type { Rollup } from 'vite'; import type { RouteData, SSRResult } from '../../@types/astro.js'; -import type { PageOptions } from '../../vite-plugin-astro/types.js'; import { prependForwardSlash, removeFileExtension } from '../path.js'; import { viteID } from '../util.js'; import { makePageDataKey } from './plugins/util.js'; @@ -32,21 +31,11 @@ export interface BuildInternals { // Used to render pages with the correct specifiers. entrySpecifierToBundleMap: Map; - /** - * A map to get a specific page's bundled output file. - */ - pageToBundleMap: Map; - /** * A map for page-specific information. */ pagesByKeys: Map; - /** - * A map for page-specific output. - */ - pageOptionsByPage: Map; - /** * A map for page-specific information by Vite ID (a path-like string) */ @@ -110,7 +99,6 @@ export interface BuildInternals { manifestEntryChunk?: Rollup.OutputChunk; manifestFileName?: string; entryPoints: Map; - ssrSplitEntryChunks: Map; componentMetadata: SSRResult['componentMetadata']; middlewareEntryPoint?: URL; @@ -138,9 +126,7 @@ export function createBuildInternals(): BuildInternals { hoistedScriptIdToPagesMap, inlinedScripts: new Map(), entrySpecifierToBundleMap: new Map(), - pageToBundleMap: new Map(), pagesByKeys: new Map(), - pageOptionsByPage: new Map(), pagesByViteID: new Map(), pagesByClientOnly: new Map(), pagesByScriptId: new Map(), @@ -153,7 +139,6 @@ export function createBuildInternals(): BuildInternals { discoveredScripts: new Set(), staticFiles: new Set(), componentMetadata: new Map(), - ssrSplitEntryChunks: new Map(), entryPoints: new Map(), cacheManifestUsed: false, prerenderOnlyChunks: [], diff --git a/packages/astro/src/core/build/page-data.ts b/packages/astro/src/core/build/page-data.ts index c4c1e180cd..b6cc03002c 100644 --- a/packages/astro/src/core/build/page-data.ts +++ b/packages/astro/src/core/build/page-data.ts @@ -18,18 +18,11 @@ export interface CollectPagesDataResult { } // Examines the routes and returns a collection of information about each page. -export async function collectPagesData( - opts: CollectPagesDataOptions -): Promise { +export function collectPagesData(opts: CollectPagesDataOptions): CollectPagesDataResult { const { settings, manifest } = opts; const assets: Record = {}; const allPages: AllPagesData = {}; - const builtPaths = new Set(); - const dataCollectionLogTimeout = setInterval(() => { - opts.logger.info('build', 'The data collection step may take longer for larger projects...'); - clearInterval(dataCollectionLogTimeout); - }, 30000); // Collect all routes ahead-of-time, before we start the build. // NOTE: This enforces that `getStaticPaths()` is only called once per route, @@ -40,16 +33,6 @@ export async function collectPagesData( const key = makePageDataKey(route.route, route.component); // static route: if (route.pathname) { - const routeCollectionLogTimeout = setInterval(() => { - opts.logger.info( - 'build', - `${colors.bold( - route.component - )} is taking a bit longer to import. This is common for larger "Astro.glob(...)" or "import.meta.glob(...)" calls, for instance. Hang tight!` - ); - clearInterval(routeCollectionLogTimeout); - }, 10000); - builtPaths.add(route.pathname); allPages[key] = { key: key, component: route.component, @@ -59,7 +42,6 @@ export async function collectPagesData( hoistedScript: undefined, }; - clearInterval(routeCollectionLogTimeout); if (settings.config.output === 'static') { const html = `${route.pathname}`.replace(/\/?$/, '/index.html'); debug( @@ -82,6 +64,5 @@ export async function collectPagesData( }; } - clearInterval(dataCollectionLogTimeout); return { assets, allPages }; } diff --git a/packages/astro/src/core/build/plugins/plugin-analyzer.ts b/packages/astro/src/core/build/plugins/plugin-analyzer.ts index a4e1ae9894..b0ba0e74d5 100644 --- a/packages/astro/src/core/build/plugins/plugin-analyzer.ts +++ b/packages/astro/src/core/build/plugins/plugin-analyzer.ts @@ -133,11 +133,6 @@ export function vitePluginAnalyzer( const astro = info.meta.astro as AstroPluginMetadata['astro']; - const pageData = getPageDataByViteID(internals, id); - if (pageData) { - internals.pageOptionsByPage.set(id, astro.pageOptions); - } - for (const c of astro.hydratedComponents) { const rid = c.resolvedPath ? decodeURI(c.resolvedPath) : c.specifier; if (internals.discoveredHydratedComponents.has(rid)) { diff --git a/packages/astro/src/core/build/plugins/plugin-internals.ts b/packages/astro/src/core/build/plugins/plugin-internals.ts index 4f18e02458..3f5467aae8 100644 --- a/packages/astro/src/core/build/plugins/plugin-internals.ts +++ b/packages/astro/src/core/build/plugins/plugin-internals.ts @@ -46,13 +46,6 @@ export function vitePluginInternals(input: Set, internals: BuildInternal for (const specifier of specifiers) { internals.entrySpecifierToBundleMap.set(normalizeEntryId(specifier), chunk.fileName); } - } else if (chunk.type === 'chunk') { - for (const id of Object.keys(chunk.modules)) { - const pageData = internals.pagesByViteID.get(id); - if (pageData) { - internals.pageToBundleMap.set(pageData.moduleSpecifier, chunk.fileName); - } - } } } }, diff --git a/packages/astro/src/core/build/plugins/plugin-ssr.ts b/packages/astro/src/core/build/plugins/plugin-ssr.ts index 2aff997ee6..f4857402a1 100644 --- a/packages/astro/src/core/build/plugins/plugin-ssr.ts +++ b/packages/astro/src/core/build/plugins/plugin-ssr.ts @@ -207,7 +207,6 @@ function vitePluginSSRSplit( } for (const moduleKey of Object.keys(chunk.modules)) { if (moduleKey.startsWith(RESOLVED_SPLIT_MODULE_ID)) { - internals.ssrSplitEntryChunks.set(moduleKey, chunk); storeEntryPoint(moduleKey, options, internals, chunk.fileName); } }