michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ci] format

Browse source
This commit is contained in:
matthewp 2022-08-25 15:16:13 +00:00 committed by fredkbot
parent 9490f0e223
commit ba1ca7e61f
3 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/astro/src/core/build/graph.ts
View file

@ -33,7 +33,7 @@ export function moduleIsTopLevelPage(info: ModuleInfo): boolean {
// This could be a .astro page or a .md page.
export function* getTopLevelPages(
id: string,
ctx: { getModuleInfo: GetModuleInfo },
ctx: { getModuleInfo: GetModuleInfo }
): Generator<[ModuleInfo, number], void, unknown> {
for (const res of walkParentInfos(id, ctx)) {
if (moduleIsTopLevelPage(res[0])) {

8
packages/astro/src/core/build/internal.ts
View file

@ -1,4 +1,4 @@
import type { OutputChunk, RenderedChunk, ModuleInfo, GetModuleInfo } from 'rollup';
import type { OutputChunk, RenderedChunk } from 'rollup';
import type { PageBuildData, ViteID } from './types';
import { prependForwardSlash } from '../path.js';
@ -207,10 +207,10 @@ export function* getPageDatasByHoistedScriptId(
id: string
): Generator<PageBuildData, void, unknown> {
const set = internals.hoistedScriptIdToPagesMap.get(id);
if(set) {
for(const pageId of set) {
if (set) {
for (const pageId of set) {
const pageData = getPageDataByComponent(internals, pageId.slice(1));
if(pageData) {
if (pageData) {
yield pageData;
}
}

26
packages/astro/src/core/build/vite-plugin-css.ts
View file

@ -9,8 +9,14 @@ import npath from 'path';
import { Plugin as VitePlugin, ResolvedConfig } from 'vite';
import { isCSSRequest } from '../render/util.js';
import { relativeToSrcDir } from '../util.js';
import { getTopLevelPages, walkParentInfos, moduleIsTopLevelPage } from './graph.js';
import { eachPageData, getPageDataByViteID, getPageDatasByClientOnlyID, getPageDatasByHoistedScriptId, isHoistedScript } from './internal.js';
import { getTopLevelPages, moduleIsTopLevelPage, walkParentInfos } from './graph.js';
import {
eachPageData,
getPageDataByViteID,
getPageDatasByClientOnlyID,
getPageDatasByHoistedScriptId,
isHoistedScript,
} from './internal.js';
interface PluginOptions {
internals: BuildInternals;
@ -118,7 +124,7 @@ export function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[]
pageData?.css.set(importedCssImport, { depth });
}
}
}
};
for (const [_, chunk] of Object.entries(bundle)) {
if (chunk.type === 'chunk') {
@ -144,14 +150,20 @@ export function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[]
// For this CSS chunk, walk parents until you find a page. Add the CSS to that page.
for (const [id] of Object.entries(c.modules)) {
for (const [pageInfo, depth] of walkParentInfos(id, this)) {
if(moduleIsTopLevelPage(pageInfo)) {
if (moduleIsTopLevelPage(pageInfo)) {
const pageViteID = pageInfo.id;
const pageData = getPageDataByViteID(internals, pageViteID);
if(pageData) {
if (pageData) {
appendCSSToPage(pageData, meta, depth);
}
} else if(options.target === 'client' && isHoistedScript(internals, pageInfo.id)) {
for(const pageData of getPageDatasByHoistedScriptId(internals, pageInfo.id)) {
} else if (
options.target === 'client' &&
isHoistedScript(internals, pageInfo.id)
) {
for (const pageData of getPageDatasByHoistedScriptId(
internals,
pageInfo.id
)) {
appendCSSToPage(pageData, meta, -1);
}
}