From dbd764bdeb2b514a426690cedb390edb9c2a75de Mon Sep 17 00:00:00 2001 From: matthewp Date: Tue, 30 Mar 2021 13:24:54 +0000 Subject: [PATCH] [ci] npm run format --- src/build.ts | 28 ++++++++++++++------------- src/build/bundle.ts | 46 ++++++++++++++++++++++----------------------- src/build/static.ts | 8 ++++---- src/runtime.ts | 2 +- 4 files changed, 43 insertions(+), 41 deletions(-) diff --git a/src/build.ts b/src/build.ts index dccc432d83..0287daf6b3 100644 --- a/src/build.ts +++ b/src/build.ts @@ -4,7 +4,7 @@ import type { LoadResult } from './runtime'; import { existsSync, promises as fsPromises } from 'fs'; import { relative as pathRelative } from 'path'; -import {fdir} from 'fdir'; +import { fdir } from 'fdir'; import { defaultLogDestination, error } from './logger.js'; import { createRuntime } from './runtime.js'; import { bundle, collectDynamicImports } from './build/bundle.js'; @@ -31,14 +31,16 @@ async function* recurseFiles(root: URL): AsyncGenerator { } async function allPages(root: URL) { - const api = new fdir().filter(p => /\.(astro|md)$/.test(p)) - .withFullPaths().crawl(root.pathname); + const api = new fdir() + .filter((p) => /\.(astro|md)$/.test(p)) + .withFullPaths() + .crawl(root.pathname); const files = await api.withPromise(); return files as string[]; } function mergeSet(a: Set, b: Set) { - for(let str of b) { + for (let str of b) { a.add(str); } return a; @@ -51,7 +53,7 @@ async function writeFilep(outPath: URL, bytes: string | Buffer, encoding: 'utf-8 } async function writeResult(result: LoadResult, outPath: URL, encoding: null | 'utf-8') { - if(result.statusCode !== 200) { + if (result.statusCode !== 200) { error(logging, 'build', result.error || result.statusCode); //return 1; } else { @@ -73,7 +75,7 @@ export async function build(astroConfig: AstroConfig): Promise<0 | 1> { const runtime = await createRuntime(astroConfig, { logging: runtimeLogging }); const { runtimeConfig } = runtime; const { snowpack } = runtimeConfig; - const resolve = (pkgName: string) => snowpack.getUrlForPackage(pkgName) + const resolve = (pkgName: string) => snowpack.getUrlForPackage(pkgName); const imports = new Set(); const statics = new Set(); @@ -85,7 +87,7 @@ export async function build(astroConfig: AstroConfig): Promise<0 | 1> { try { let relPath = './' + rel.replace(/\.(astro|md)$/, '.html'); - if(!relPath.endsWith('index.html')) { + if (!relPath.endsWith('index.html')) { relPath = relPath.replace(/\.html$/, '/index.html'); } @@ -93,7 +95,7 @@ export async function build(astroConfig: AstroConfig): Promise<0 | 1> { const result = await runtime.load(pagePath); await writeResult(result, outPath, 'utf-8'); - if(result.statusCode === 200) { + if (result.statusCode === 200) { mergeSet(statics, collectStatics(result.contents.toString('utf-8'))); } } catch (err) { @@ -104,20 +106,20 @@ export async function build(astroConfig: AstroConfig): Promise<0 | 1> { mergeSet(imports, await collectDynamicImports(filepath, astroConfig, resolve)); } - await bundle(imports, {dist, runtime, astroConfig}); + await bundle(imports, { dist, runtime, astroConfig }); - for(let url of statics) { + for (let url of statics) { const outPath = new URL('.' + url, dist); const result = await runtime.load(url); await writeResult(result, outPath, null); } - if(existsSync(astroConfig.public)) { + if (existsSync(astroConfig.public)) { const pub = astroConfig.public; const publicFiles = (await new fdir().withFullPaths().crawl(pub.pathname).withPromise()) as string[]; - for(const filepath of publicFiles) { - const fileUrl = new URL(`file://${filepath}`) + for (const filepath of publicFiles) { + const fileUrl = new URL(`file://${filepath}`); const rel = pathRelative(pub.pathname, fileUrl.pathname); const outUrl = new URL('./' + rel, dist); diff --git a/src/build/bundle.ts b/src/build/bundle.ts index c448a4c092..322586a35f 100644 --- a/src/build/bundle.ts +++ b/src/build/bundle.ts @@ -9,7 +9,7 @@ import { parse } from '../parser/index.js'; import { walk } from 'estree-walker'; import babelParser from '@babel/parser'; import path from 'path'; -import {rollup} from 'rollup'; +import { rollup } from 'rollup'; const { transformSync } = esbuild; const { readFile } = fsPromises; @@ -51,29 +51,29 @@ function compileExpressionSafe(raw: string): string { const defaultExtensions: Readonly> = { '.jsx': 'react', '.svelte': 'svelte', - '.vue': 'vue' + '.vue': 'vue', }; export async function collectDynamicImports(filename: URL, astroConfig: AstroConfig, resolve: (s: string) => Promise) { const imports = new Set(); // No markdown for now - if(filename.pathname.endsWith('md')) { + if (filename.pathname.endsWith('md')) { return imports; } const extensions = astroConfig.extensions || defaultExtensions; const source = await readFile(filename, 'utf-8'); const ast = parse(source, { - filename + filename, }); - if(!ast.module) { + if (!ast.module) { return imports; } const componentImports: ImportDeclaration[] = []; - const components: Record = {}; + const components: Record = {}; const plugins = new Set(); const program = babelParser.parse(ast.module.content, { @@ -107,7 +107,7 @@ export async function collectDynamicImports(filename: URL, astroConfig: AstroCon function appendImports(rawName: string, filename: URL, astroConfig: AstroConfig) { const [componentName, componentType] = rawName.split(':'); - if(!componentType) { + if (!componentType) { return; } @@ -118,8 +118,8 @@ export async function collectDynamicImports(filename: URL, astroConfig: AstroCon const defn = components[componentName]; const fileUrl = new URL(defn.specifier, filename); let rel = path.posix.relative(astroConfig.astroRoot.pathname, fileUrl.pathname); - - switch(defn.plugin) { + + switch (defn.plugin) { case 'preact': { imports.add(dynamic.get('preact')!); rel = rel.replace(/\.[^.]+$/, '.js'); @@ -166,7 +166,7 @@ export async function collectDynamicImports(filename: URL, astroConfig: AstroCon break; } case 'InlineComponent': { - if(/^[A-Z]/.test(node.name)) { + if (/^[A-Z]/.test(node.name)) { appendImports(node.name, filename, astroConfig); return; } @@ -174,7 +174,7 @@ export async function collectDynamicImports(filename: URL, astroConfig: AstroCon break; } } - } + }, }); return imports; @@ -189,7 +189,7 @@ interface BundleOptions { export async function bundle(imports: Set, { runtime, dist }: BundleOptions) { const ROOT = 'astro:root'; const root = ` - ${[...imports].map(url => `import '${url}';`).join('\n')} + ${[...imports].map((url) => `import '${url}';`).join('\n')} `; const inputOptions: InputOptions = { @@ -198,14 +198,14 @@ export async function bundle(imports: Set, { runtime, dist }: BundleOpti { name: 'astro:build', resolveId(source: string, imported?: string) { - if(source === ROOT) { + if (source === ROOT) { return source; } - if(source.startsWith('/')) { + if (source.startsWith('/')) { return source; } - if(imported) { + if (imported) { const outUrl = new URL(source, 'http://example.com' + imported); return outUrl.pathname; } @@ -213,21 +213,21 @@ export async function bundle(imports: Set, { runtime, dist }: BundleOpti return null; }, async load(id: string) { - if(id === ROOT) { + if (id === ROOT) { return root; } const result = await runtime.load(id); - if(result.statusCode !== 200) { + if (result.statusCode !== 200) { return null; } return result.contents.toString('utf-8'); - } - } - ] - } + }, + }, + ], + }; const build = await rollup(inputOptions); @@ -237,8 +237,8 @@ export async function bundle(imports: Set, { runtime, dist }: BundleOpti exports: 'named', entryFileNames(chunk) { return chunk.facadeModuleId!.substr(1); - } + }, }; await build.write(outputOptions); -} \ No newline at end of file +} diff --git a/src/build/static.ts b/src/build/static.ts index f7518c7beb..a10f4c33f8 100644 --- a/src/build/static.ts +++ b/src/build/static.ts @@ -1,4 +1,4 @@ -import type {Element} from 'domhandler'; +import type { Element } from 'domhandler'; import cheerio from 'cheerio'; export function collectStatics(html: string) { @@ -8,11 +8,11 @@ export function collectStatics(html: string) { const append = (el: Element, attr: string) => { const value: string = $(el).attr(attr)!; - if(value.startsWith('http')) { + if (value.startsWith('http')) { return; } statics.add(value); - } + }; $('link[href]').each((i, el) => { append(el, 'href'); @@ -23,4 +23,4 @@ export function collectStatics(html: string) { }); return statics; -} \ No newline at end of file +} diff --git a/src/runtime.ts b/src/runtime.ts index 8e4c8635dc..ac6d4664a8 100644 --- a/src/runtime.ts +++ b/src/runtime.ts @@ -127,7 +127,7 @@ export async function createRuntime(astroConfig: AstroConfig, { logging }: Runti extensions?: Record; } = { extensions, - resolve: async (pkgName: string) => snowpack.getUrlForPackage(pkgName) + resolve: async (pkgName: string) => snowpack.getUrlForPackage(pkgName), }; const snowpackConfig = await loadConfiguration({