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-05 13:53:50 +00:00 committed by fredkbot
parent 82a1063cc2
commit 9315ce65dd
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/astro/src/core/build/static-build.ts
View file

@ -7,7 +7,6 @@ import { BuildInternals, createBuildInternals } from '../../core/build/internal.
import { prependForwardSlash } from '../../core/path.js'; import { prependForwardSlash } from '../../core/path.js';
import { emptyDir, isModeServerWithNoAdapter, removeDir } from '../../core/util.js'; import { emptyDir, isModeServerWithNoAdapter, removeDir } from '../../core/util.js';
import { runHookBuildSetup } from '../../integrations/index.js'; import { runHookBuildSetup } from '../../integrations/index.js';
import { rollupPluginAstroBuildCSS } from './vite-plugin-css.js';
import { PAGE_SCRIPT_ID } from '../../vite-plugin-scripts/index.js'; import { PAGE_SCRIPT_ID } from '../../vite-plugin-scripts/index.js';
import type { ViteConfigWithSSR } from '../create-vite'; import type { ViteConfigWithSSR } from '../create-vite';
import { info } from '../logger/core.js'; import { info } from '../logger/core.js';
@ -16,6 +15,7 @@ import { trackPageData } from './internal.js';
import type { PageBuildData, StaticBuildOptions } from './types'; import type { PageBuildData, StaticBuildOptions } from './types';
import { getTimeStat } from './util.js'; import { getTimeStat } from './util.js';
import { vitePluginAnalyzer } from './vite-plugin-analyzer.js'; import { vitePluginAnalyzer } from './vite-plugin-analyzer.js';
import { rollupPluginAstroBuildCSS } from './vite-plugin-css.js';
import { vitePluginHoistedScripts } from './vite-plugin-hoisted-scripts.js'; import { vitePluginHoistedScripts } from './vite-plugin-hoisted-scripts.js';
import { vitePluginInternals } from './vite-plugin-internals.js'; import { vitePluginInternals } from './vite-plugin-internals.js';
import { vitePluginPages } from './vite-plugin-pages.js'; import { vitePluginPages } from './vite-plugin-pages.js';

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

@ -1,16 +1,16 @@
import type { GetModuleInfo, OutputChunk } from 'rollup'; import type { GetModuleInfo, OutputChunk } from 'rollup';
import type { AstroConfig } from '../../@types/astro';
import type { BuildInternals } from './internal'; import type { BuildInternals } from './internal';
import type { PageBuildData, StaticBuildOptions } from './types'; import type { PageBuildData, StaticBuildOptions } from './types';
import type { AstroConfig } from '../../@types/astro';
import crypto from 'crypto'; import crypto from 'crypto';
import esbuild from 'esbuild'; import esbuild from 'esbuild';
import npath from 'path'; import npath from 'path';
import { Plugin as VitePlugin } from 'vite'; import { Plugin as VitePlugin } from 'vite';
import { isCSSRequest } from '../render/util.js';
import { relativeToSrcDir } from '../util.js';
import { getTopLevelPages, walkParentInfos } from './graph.js'; import { getTopLevelPages, walkParentInfos } from './graph.js';
import { getPageDataByViteID, getPageDatasByClientOnlyID } from './internal.js'; import { getPageDataByViteID, getPageDatasByClientOnlyID } from './internal.js';
import { relativeToSrcDir } from '../util.js';
import { isCSSRequest } from '../render/util.js';
interface PluginOptions { interface PluginOptions {
internals: BuildInternals; internals: BuildInternals;
@ -30,7 +30,7 @@ export function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[]
function nameifyPage(id: string) { function nameifyPage(id: string) {
let rel = relativeToSrcDir(astroConfig, id); let rel = relativeToSrcDir(astroConfig, id);
// Remove pages, ex. blog/posts/something.astro // Remove pages, ex. blog/posts/something.astro
if(rel.startsWith('pages/')) { if (rel.startsWith('pages/')) {
rel = rel.slice(6); rel = rel.slice(6);
} }
// Remove extension, ex. blog/posts/something // Remove extension, ex. blog/posts/something
@ -43,14 +43,14 @@ export function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[]
function createNameForParentPages(id: string, ctx: { getModuleInfo: GetModuleInfo }): string { function createNameForParentPages(id: string, ctx: { getModuleInfo: GetModuleInfo }): string {
const parents = Array.from(getTopLevelPages(id, ctx)).sort(); const parents = Array.from(getTopLevelPages(id, ctx)).sort();
const proposedName = parents.map(page => nameifyPage(page.id)).join('-'); const proposedName = parents.map((page) => nameifyPage(page.id)).join('-');
// We don't want absurdedly long chunk names, so if this is too long create a hashed version instead. // We don't want absurdedly long chunk names, so if this is too long create a hashed version instead.
if(proposedName.length <= MAX_NAME_LENGTH) { if (proposedName.length <= MAX_NAME_LENGTH) {
return proposedName; return proposedName;
} }
const hash = crypto.createHash('sha256'); const hash = crypto.createHash('sha256');
for (const page of parents) { for (const page of parents) {
hash.update(page.id, 'utf-8'); hash.update(page.id, 'utf-8');
} }

2
packages/astro/src/core/util.ts
View file

@ -188,7 +188,7 @@ export function isModeServerWithNoAdapter(config: AstroConfig): boolean {
export function relativeToSrcDir(config: AstroConfig, idOrUrl: URL | string) { export function relativeToSrcDir(config: AstroConfig, idOrUrl: URL | string) {
let id: string; let id: string;
if(typeof idOrUrl !== 'string') { if (typeof idOrUrl !== 'string') {
id = unwrapId(viteID(idOrUrl)); id = unwrapId(viteID(idOrUrl));
} else { } else {
id = idOrUrl; id = idOrUrl;

1
packages/astro/test/glob-pages-css.test.js
View file

@ -17,6 +17,5 @@ describe('Astro.glob on pages/ directory', () => {
let $ = cheerio.load(html); let $ = cheerio.load(html);
expect($('link[rel=stylesheet]')).to.have.a.lengthOf(1); expect($('link[rel=stylesheet]')).to.have.a.lengthOf(1);
}); });
}); });