diff options
| -rw-r--r-- | packages/astro/src/core/build/scan-based-build.ts | 2 | ||||
| -rw-r--r-- | packages/astro/src/core/build/static-build.ts | 4 | ||||
| -rw-r--r-- | packages/astro/src/vite-plugin-build-css/index.ts | 24 | ||||
| -rw-r--r-- | packages/astro/test/page-level-styles.test.js | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/packages/astro/src/core/build/scan-based-build.ts b/packages/astro/src/core/build/scan-based-build.ts index ec473ca79..afb2a5393 100644 --- a/packages/astro/src/core/build/scan-based-build.ts +++ b/packages/astro/src/core/build/scan-based-build.ts @@ -76,7 +76,7 @@ export async function build(opts: ScanBasedBuildOptions): Promise<RollupOutput | }), rollupPluginAstroBuildCSS({ internals, - legacy: true + legacy: true, }), ...(viteConfig.plugins || []), ], diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts index 086d0b82e..f5e54b7bf 100644 --- a/packages/astro/src/core/build/static-build.ts +++ b/packages/astro/src/core/build/static-build.ts @@ -146,7 +146,7 @@ async function ssrBuild(opts: StaticBuildOptions, internals: BuildInternals, inp vitePluginPages(opts, internals), rollupPluginAstroBuildCSS({ internals, - legacy: false + legacy: false, }), ...(viteConfig.plugins || []), // SSR needs to be last @@ -200,7 +200,7 @@ async function clientBuild(opts: StaticBuildOptions, internals: BuildInternals, vitePluginHoistedScripts(astroConfig, internals), rollupPluginAstroBuildCSS({ internals, - legacy: false + legacy: false, }), ...(viteConfig.plugins || []), ], diff --git a/packages/astro/src/vite-plugin-build-css/index.ts b/packages/astro/src/vite-plugin-build-css/index.ts index 94be52405..24101516e 100644 --- a/packages/astro/src/vite-plugin-build-css/index.ts +++ b/packages/astro/src/vite-plugin-build-css/index.ts @@ -53,17 +53,17 @@ export function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin { const { internals, legacy } = options; const styleSourceMap = new Map<string, string>(); - function * walkStyles(ctx: PluginContext, id: string, seen = new Set<string>()): Generator<[string, string], void, unknown> { + function* walkStyles(ctx: PluginContext, id: string, seen = new Set<string>()): Generator<[string, string], void, unknown> { seen.add(id); - if(styleSourceMap.has(id)) { + if (styleSourceMap.has(id)) { yield [id, styleSourceMap.get(id)!]; } const info = ctx.getModuleInfo(id); - if(info) { - for(const importedId of info.importedIds) { - if(!seen.has(importedId)) { - yield * walkStyles(ctx, importedId, seen); + if (info) { + for (const importedId of info.importedIds) { + if (!seen.has(importedId)) { + yield* walkStyles(ctx, importedId, seen); } } } @@ -76,15 +76,15 @@ export function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin { * to prevent adding all styles to all pages. */ async function addStyles(this: PluginContext) { - for(const id of this.getModuleIds()) { - if(hasPageDataByViteID(internals, id)) { + for (const id of this.getModuleIds()) { + if (hasPageDataByViteID(internals, id)) { let pageStyles = ''; - for(const [_styleId, styles] of walkStyles(this, id)) { + for (const [_styleId, styles] of walkStyles(this, id)) { pageStyles += styles; } // Pages with no styles, nothing more to do - if(!pageStyles) continue; + if (!pageStyles) continue; const { code: minifiedCSS } = await esbuild.transform(pageStyles, { loader: 'css', @@ -161,7 +161,7 @@ export function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin { }, async renderChunk(_code, chunk) { - if(!legacy) return null; + if (!legacy) return null; let chunkCSS = ''; let isPureCSS = true; @@ -212,7 +212,7 @@ export function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin { const emptyChunkRE = new RegExp(opts.format === 'es' ? `\\bimport\\s*"[^"]*(?:${emptyChunkFiles})";\n?` : `\\brequire\\(\\s*"[^"]*(?:${emptyChunkFiles})"\\);\n?`, 'g'); // Crawl the module graph to find CSS chunks to create - if(!legacy) { + if (!legacy) { await addStyles.call(this); } diff --git a/packages/astro/test/page-level-styles.test.js b/packages/astro/test/page-level-styles.test.js index ae06c6697..6b3fb5dac 100644 --- a/packages/astro/test/page-level-styles.test.js +++ b/packages/astro/test/page-level-styles.test.js @@ -13,7 +13,7 @@ describe('Page-level styles', () => { await fixture.build(); }); - it('Doesn\'t add page styles for a page without style imports', async () => { + it("Doesn't add page styles for a page without style imports", async () => { let html = await fixture.readFile('/index.html'); let $ = await cheerioLoad(html); expect($('link').length).to.equal(0); |