[ci] yarn format

.changeset/shaggy-countries-battle.md

@@ -9,10 +9,11 @@ Updated the rendering pipeline for `astro` to truly support any framework.
 For the vast majority of use cases, `astro` should _just work_ out of the box. Astro now depends on `@astro-renderer/preact`, `@astro-renderer/react`, `@astro-renderer/svelte`, and `@astro-renderer/vue`, rather than these being built into the core library. This opens the door for anyone to contribute additional renderers for Astro to support their favorite framework, as well as the ability for users to control which renderers should be used.
 
 **Features**
+
 - Expose a pluggable interface for controlling server-side rendering and client-side hydration
 - Allows components from different frameworks to be nested within each other.
   > Note: `svelte` currently does support non-destructive hydration, so components from other frameworks cannot currently be nested inside of a Svelte component. See https://github.com/sveltejs/svelte/issues/4308.
 
 **Breaking Changes**
-- To improve compiler performance, improve framework support, and minimize JS payloads, any children passed to hydrated components are automatically wrapped with an `<astro-fragment>` element.
 
+- To improve compiler performance, improve framework support, and minimize JS payloads, any children passed to hydrated components are automatically wrapped with an `<astro-fragment>` element.

packages/astro-parser/src/parse/utils/html.ts

@@ -3,38 +3,7 @@
 import entities from './entities.js';
 
 const windows_1252 = [
-  8364,
-  129,
-  8218,
-  402,
-  8222,
-  8230,
-  8224,
-  8225,
-  710,
-  8240,
-  352,
-  8249,
-  338,
-  141,
-  381,
-  143,
-  144,
-  8216,
-  8217,
-  8220,
-  8221,
-  8226,
-  8211,
-  8212,
-  732,
-  8482,
-  353,
-  8250,
-  339,
-  157,
-  382,
-  376,
+  8364, 129, 8218, 402, 8222, 8230, 8224, 8225, 710, 8240, 352, 8249, 338, 141, 381, 143, 144, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 732, 8482, 353, 8250, 339, 157, 382, 376,
 ];
 
 const entity_pattern = new RegExp(`&(#?(?:x[\\w\\d]+|\\d+|${Object.keys(entities).join('|')}))(?:;|\\b)`, 'g');

packages/astro/src/@types/astro.ts

@@ -125,9 +125,7 @@ export interface CollectionRSS<T = any> {
   /** Specify custom data in opening of file */
   customData?: string;
   /** Return data about each item */
-  item: (
-    item: T
-  ) => {
+  item: (item: T) => {
     /** (required) Title of item */
     title: string;
     /** (required) Link to item */

packages/astro/src/build/page.ts

@@ -103,6 +103,6 @@ export async function buildStaticPage({ astroConfig, buildState, filepath, runti
         contentType: 'text/html',
         encoding: 'utf8',
       };
-    })
+    }),
   ]);
 }

packages/astro/src/compiler/codegen/index.ts

@@ -146,7 +146,8 @@ function getComponentWrapper(_name: string, { url, importSpecifier }: ComponentI
   };
   const getComponentExport = () => {
     switch (importSpecifier.type) {
-      case 'ImportDefaultSpecifier': return { value: 'default' };
+      case 'ImportDefaultSpecifier':
+        return { value: 'default' };
       case 'ImportSpecifier': {
         if (importSpecifier.imported.type === 'Identifier') {
           return { value: importSpecifier.imported.name };
@@ -158,13 +159,13 @@ function getComponentWrapper(_name: string, { url, importSpecifier }: ComponentI
         return { value };
       }
     }
-  }
+  };
 
   const importInfo = kind ? { componentUrl: getComponentUrl(), componentExport: getComponentExport() } : {};
   return {
     wrapper: `__astro_component(${name}, ${JSON.stringify({ hydrate: kind, displayName: name, ...importInfo })})`,
     wrapperImport: `import {__astro_component} from '${internalImport('__astro_component.js')}';`,
-  }
+  };
 }
 
 /** Evaluate expression (safely) */

packages/astro/src/compiler/transform/hydration.ts

@@ -16,7 +16,7 @@ export default function (): Transformer {
             if (kind && !hasComponents) {
               hasComponents = true;
             }
-          }
+          },
         },
         Element: {
           enter(node) {
@@ -30,21 +30,20 @@ export default function (): Transformer {
                 body = node;
                 return;
               }
-              default: return;
-            }
-          }
+              default:
+                return;
             }
           },
         },
+      },
+    },
     async finalize() {
       if (!(head && hasComponents)) return;
 
       const style: TemplateNode = {
         type: 'Element',
         name: 'style',
-        attributes: [
-          { name: 'type', type: 'Attribute', value: [{ type: 'Text', raw: 'text/css', data: 'text/css' }] },
-        ],  
+        attributes: [{ name: 'type', type: 'Attribute', value: [{ type: 'Text', raw: 'text/css', data: 'text/css' }] }],
         start: 0,
         end: 0,
         children: [
@@ -53,9 +52,9 @@ export default function (): Transformer {
             end: 0,
             type: 'Text',
             data: 'astro-root, astro-fragment { display: contents; }',
-            raw: 'astro-root, astro-fragment { display: contents; }'
-          }
-        ]
+            raw: 'astro-root, astro-fragment { display: contents; }',
+          },
+        ],
       };
       head.children = [...(head.children ?? []), style];
     },

packages/astro/src/frontend/__astro_component.ts

@@ -33,7 +33,7 @@ function resolveRenderer(Component: any, props: any = {}) {
   }
 
   for (const __renderer of __renderers) {
-    const shouldUse = __renderer.check(Component, props)
+    const shouldUse = __renderer.check(Component, props);
     if (shouldUse) {
       rendererCache.set(Component, __renderer);
       return __renderer;
@@ -45,13 +45,12 @@ interface AstroComponentProps {
   displayName: string;
   hydrate?: 'load' | 'idle' | 'visible';
   componentUrl?: string;
-  componentExport?: { value: string, namespace?: boolean };
+  componentExport?: { value: string; namespace?: boolean };
 }
 
-
 /** For hydrated components, generate a <script type="module"> to load the component */
 async function generateHydrateScript({ renderer, astroId, props }: any, { hydrate, componentUrl, componentExport }: Required<AstroComponentProps>) {
-  const rendererSource = __rendererSources[__renderers.findIndex(r => r === renderer)];
+  const rendererSource = __rendererSources[__renderers.findIndex((r) => r === renderer)];
 
   const script = `<script type="module">
 import setup from '/_astro_internal/hydrate/${hydrate}.js';
@@ -64,7 +63,6 @@ setup("${astroId}", async () => {
   return script;
 }
 
-
 export const __astro_component = (Component: any, componentProps: AstroComponentProps = {} as any) => {
   if (Component == null) {
     throw new Error(`Unable to render <${componentProps.displayName}> because it is ${Component}!\nDid you forget to import the component or is it possible there is a typo?`);
@@ -79,7 +77,7 @@ export const __astro_component = (Component: any, componentProps: AstroComponent
 
       // Okay now we definitely can't resolve a renderer, so let's throw
       if (!renderer) {
-          const name = typeof Component === 'function' ? (Component.displayName ?? Component.name) : `{ ${Object.keys(Component).join(', ')} }`;
+        const name = typeof Component === 'function' ? Component.displayName ?? Component.name : `{ ${Object.keys(Component).join(', ')} }`;
         throw new Error(`No renderer found for ${name}! Did you forget to add a renderer to your Astro config?`);
       }
     }
@@ -89,12 +87,12 @@ export const __astro_component = (Component: any, componentProps: AstroComponent
     if (!componentProps.hydrate) {
       // It's safe to remove <astro-fragment>, static content doesn't need the wrapper
       return html.replace(/\<\/?astro-fragment\>/g, '');
-      };
+    }
 
     // If we ARE hydrating this component, let's generate the hydration script
     const astroId = hash.unique(html);
-      const script = await generateHydrateScript({ renderer, astroId, props }, componentProps as Required<AstroComponentProps>)
+    const script = await generateHydrateScript({ renderer, astroId, props }, componentProps as Required<AstroComponentProps>);
     const astroRoot = `<astro-root uid="${astroId}">${html}</astro-root>`;
     return [astroRoot, script].join('\n');
-  }
-}
+  };
+};

packages/astro/src/frontend/renderer-astro.ts

@@ -4,5 +4,5 @@ export function check(Component: any) {
 
 export async function renderToStaticMarkup(Component: any, props: any, children: string) {
   const html = await Component.__render(props, children);
-  return { html }
-};
+  return { html };
+}

packages/astro/src/runtime.ts

@@ -266,12 +266,7 @@ interface CreateSnowpackOptions {
   resolvePackageUrl?: (pkgName: string) => Promise<string>;
 }
 
-const defaultRenderers = [
-  '@astro-renderer/vue',
-  '@astro-renderer/svelte',
-  '@astro-renderer/react',
-  '@astro-renderer/preact'
-];
+const defaultRenderers = ['@astro-renderer/vue', '@astro-renderer/svelte', '@astro-renderer/react', '@astro-renderer/preact'];
 
 /** Create a new Snowpack instance to power Astro */
 async function createSnowpack(astroConfig: AstroConfig, options: CreateSnowpackOptions) {
@@ -284,7 +279,7 @@ async function createSnowpack(astroConfig: AstroConfig, options: CreateSnowpackO
   let snowpack: SnowpackDevServer;
   let astroPluginOptions: {
     resolvePackageUrl?: (s: string) => Promise<string>;
-    renderers?: { name: string, client: string, server: string }[];
+    renderers?: { name: string; client: string; server: string }[];
     astroConfig: AstroConfig;
   } = {
     astroConfig,
@@ -305,8 +300,7 @@ async function createSnowpack(astroConfig: AstroConfig, options: CreateSnowpackO
     (process.env as any).TAILWIND_DISABLE_TOUCH = true;
   }
 
-  const rendererInstances = (await Promise.all(renderers.map(renderer => import(pathToFileURL(resolveDependency(renderer)).toString()))))
-    .map(({ default: raw }, i) => {
+  const rendererInstances = (await Promise.all(renderers.map((renderer) => import(pathToFileURL(resolveDependency(renderer)).toString())))).map(({ default: raw }, i) => {
     const { name = renderers[i], client, server, snowpackPlugin: snowpackPluginName, snowpackPluginOptions } = raw;
 
     if (typeof client !== 'string') {
@@ -320,7 +314,7 @@ async function createSnowpack(astroConfig: AstroConfig, options: CreateSnowpackO
     let snowpackPlugin: string | [string, any] | undefined;
     if (typeof snowpackPluginName === 'string') {
       if (snowpackPluginOptions) {
-          snowpackPlugin = [resolveDependency(snowpackPluginName), snowpackPluginOptions]
+        snowpackPlugin = [resolveDependency(snowpackPluginName), snowpackPluginOptions];
       } else {
         snowpackPlugin = resolveDependency(snowpackPluginName);
       }
@@ -333,14 +327,14 @@ async function createSnowpack(astroConfig: AstroConfig, options: CreateSnowpackO
       snowpackPlugin,
       client: path.join(name, raw.client),
       server: path.join(name, raw.server),
-      }
-    })
+    };
+  });
 
   astroPluginOptions.renderers = rendererInstances;
 
   // Make sure that Snowpack builds our renderer plugins
-  const knownEntrypoints = [].concat(...rendererInstances.map(renderer => [renderer.server, renderer.client]) as any) as string[];
-  const rendererSnowpackPlugins = rendererInstances.filter(renderer => renderer.snowpackPlugin).map(renderer => renderer.snowpackPlugin) as string|[string, any];
+  const knownEntrypoints = [].concat(...(rendererInstances.map((renderer) => [renderer.server, renderer.client]) as any)) as string[];
+  const rendererSnowpackPlugins = rendererInstances.filter((renderer) => renderer.snowpackPlugin).map((renderer) => renderer.snowpackPlugin) as string | [string, any];
 
   const snowpackConfig = await loadConfiguration({
     root: fileURLToPath(projectRoot),
@@ -395,7 +389,11 @@ export async function createRuntime(astroConfig: AstroConfig, { mode, logging }:
   const resolvePackageUrl = async (pkgName: string) => frontendSnowpack.getUrlForPackage(pkgName);
 
   timer.backend = performance.now();
-  const { snowpack: backendSnowpack, snowpackRuntime: backendSnowpackRuntime, snowpackConfig: backendSnowpackConfig } = await createSnowpack(astroConfig, {
+  const {
+    snowpack: backendSnowpack,
+    snowpackRuntime: backendSnowpackRuntime,
+    snowpackConfig: backendSnowpackConfig,
+  } = await createSnowpack(astroConfig, {
     env: {
       astro: true,
     },
@@ -405,7 +403,11 @@ export async function createRuntime(astroConfig: AstroConfig, { mode, logging }:
   debug(logging, 'core', `backend snowpack created [${stopTimer(timer.backend)}]`);
 
   timer.frontend = performance.now();
-  const { snowpack: frontendSnowpack, snowpackRuntime: frontendSnowpackRuntime, snowpackConfig: frontendSnowpackConfig } = await createSnowpack(astroConfig, {
+  const {
+    snowpack: frontendSnowpack,
+    snowpackRuntime: frontendSnowpackRuntime,
+    snowpackConfig: frontendSnowpackConfig,
+  } = await createSnowpack(astroConfig, {
     env: {
       astro: false,
     },

packages/renderers/preact/index.js

@@ -2,4 +2,4 @@ export default {
   name: '@astro-renderer/preact',
   client: './client',
   server: './server',
-}
+};

packages/renderers/preact/server.js

@@ -7,14 +7,14 @@ function check(Component, props) {
     return Boolean(renderToString(h(Component, props)));
   } catch (e) {}
   return false;
-};
+}
 
 function renderToStaticMarkup(Component, props, children) {
-  const html = renderToString(h(Component, props, h(StaticHtml, { value: children })))
+  const html = renderToString(h(Component, props, h(StaticHtml, { value: children })));
   return { html };
 }
 
 export default {
   check,
-  renderToStaticMarkup
-}
+  renderToStaticMarkup,
+};

packages/renderers/preact/static-html.js

@@ -10,7 +10,7 @@ import { h } from 'preact';
 const StaticHtml = ({ value }) => {
   if (!value) return null;
   return h('astro-fragment', { dangerouslySetInnerHTML: { __html: value } });
-}
+};
 
 /**
  * This tells Preact to opt-out of re-rendering this subtree,

packages/renderers/react/client.js

@@ -2,4 +2,5 @@ import { createElement } from 'react';
 import { hydrate } from 'react-dom';
 import StaticHtml from './static-html.js';
 
-export default (element) => (Component, props, children) => hydrate(createElement(Component, { ...props, suppressHydrationWarning: true }, createElement(StaticHtml, { value: children, suppressHydrationWarning: true })), element);
+export default (element) => (Component, props, children) =>
+  hydrate(createElement(Component, { ...props, suppressHydrationWarning: true }, createElement(StaticHtml, { value: children, suppressHydrationWarning: true })), element);

packages/renderers/react/index.js

@@ -2,4 +2,4 @@ export default {
   name: '@astro-renderer/react',
   client: './client',
   server: './server',
-}
+};

packages/renderers/react/server.js

@@ -7,14 +7,14 @@ function check(Component, props) {
     return Boolean(renderToString(h(Component, props)));
   } catch (e) {}
   return false;
-};
+}
 
 function renderToStaticMarkup(Component, props, children) {
-  const html = renderToString(h(Component, props, h(StaticHtml, { value: children })))
+  const html = renderToString(h(Component, props, h(StaticHtml, { value: children })));
   return { html };
 }
 
 export default {
   check,
-  renderToStaticMarkup
+  renderToStaticMarkup,
 };

packages/renderers/react/static-html.js

@@ -10,7 +10,7 @@ import { createElement as h } from 'react';
 const StaticHtml = ({ value }) => {
   if (!value) return null;
   return h('astro-fragment', { suppressHydrationWarning: true, dangerouslySetInnerHTML: { __html: value } });
-}
+};
 
 /**
  * This tells React to opt-out of re-rendering this subtree,

packages/renderers/svelte/client.js

@@ -9,5 +9,5 @@ export default (target) => {
         hydrate: true,
       });
     } catch (e) {}
-  }
-}
+  };
+};

packages/renderers/svelte/index.js

@@ -3,5 +3,5 @@ export default {
   snowpackPlugin: '@snowpack/plugin-svelte',
   snowpackPluginOptions: { compilerOptions: { hydratable: true } },
   client: './client',
-  server: './server'
+  server: './server',
 };

packages/renderers/svelte/server.js

@@ -11,5 +11,5 @@ async function renderToStaticMarkup (Component, props, children) {
 
 export default {
   check,
-  renderToStaticMarkup
+  renderToStaticMarkup,
 };

packages/renderers/vue/index.js

@@ -2,5 +2,5 @@ export default {
   name: '@astro-renderer/vue',
   snowpackPlugin: '@snowpack/plugin-vue',
   client: './client',
-  server: './server'
+  server: './server',
 };

packages/renderers/vue/server.js

@@ -14,5 +14,5 @@ async function renderToStaticMarkup(Component, props, children) {
 
 export default {
   check,
-  renderToStaticMarkup
-}
+  renderToStaticMarkup,
+};

packages/renderers/vue/static-html.js

@@ -8,13 +8,13 @@ import { h, defineComponent } from 'vue';
  */
 const StaticHtml = defineComponent({
   props: {
-    value: String
+    value: String,
   },
   setup({ value }) {
     if (!value) return () => null;
-    return () => h('astro-fragment', { innerHTML: value })
-  }
-})
+    return () => h('astro-fragment', { innerHTML: value });
+  },
+});
 
 /**
  * Other frameworks have `shouldComponentUpdate` in order to signal

tools/astro-languageserver/src/plugins/typescript/DocumentSnapshot.ts

@@ -211,7 +211,7 @@ export class TypeScriptDocumentSnapshot implements DocumentSnapshot {
   }
 
   async getFragment(): Promise<DocumentFragmentSnapshot> {
-    return (this as unknown) as any;
+    return this as unknown as any;
   }
 
   destroyFragment() {

tools/astro-languageserver/src/plugins/typescript/LanguageServiceManager.ts

@@ -61,9 +61,7 @@ export class LanguageServiceManager {
     return tsService.updateDocument(pathOrDoc);
   }
 
-  async getTypeScriptDoc(
-    document: Document
-  ): Promise<{
+  async getTypeScriptDoc(document: Document): Promise<{
     tsDoc: DocumentSnapshot;
     lang: ts.LanguageService;
   }> {