[ci] yarn format

2021-08-27 14:13:41 +00:00 · 2021-08-27 14:13:41 +00:00 · 5cc7947a58
commit 5cc7947a58
parent 788c769d78
9 changed files with 65 additions and 69 deletions
--- a/docs/src/pages/core-concepts/astro-components.md
+++ b/docs/src/pages/core-concepts/astro-components.md
@ -281,7 +281,7 @@ By default Astro does not make any assumptions on how you want scripts to be ser

 However if you'd like all of your scripts to be hoisted out of components and moved to the top of the page, and then later bundled together in production, you can achieve this with hoisted scripts.

-A __hoisted script__ looks like this:
+A **hoisted script** looks like this:

 ```astro
 <script hoist>
--- a/packages/astro/src/build.ts
+++ b/packages/astro/src/build.ts
@ -140,7 +140,7 @@ ${stack}
      const pageDeps = findDeps(buildState[id].contents as string, {
        astroConfig,
        srcPath: buildState[id].srcPath,
-        id
+        id,
      });
      depTree[id] = pageDeps;

@ -178,7 +178,7 @@ ${stack}
      bundleCSS({ buildState, astroConfig, logging, depTree }).then(() => {
        debug(logging, 'build', `bundled CSS [${stopTimer(timer.prebundleCSS)}]`);
      }),
-      bundleHoistedJS({ buildState, astroConfig, logging, depTree, runtime: astroRuntime, dist: astroConfig.dist })
+      bundleHoistedJS({ buildState, astroConfig, logging, depTree, runtime: astroRuntime, dist: astroConfig.dist }),
      // TODO: optimize images?
    ]);
    // TODO: minify HTML?
@ -272,7 +272,7 @@ ${stack}
 }

 /** Given an HTML string, collect <link> and <img> tags */
-export function findDeps(html: string, { astroConfig, srcPath }: { astroConfig: AstroConfig; srcPath: URL, id: string }): PageDependencies {
+export function findDeps(html: string, { astroConfig, srcPath }: { astroConfig: AstroConfig; srcPath: URL; id: string }): PageDependencies {
  const pageDeps: PageDependencies = {
    js: new Set<string>(),
    css: new Set<string>(),
@ -288,12 +288,12 @@ export function findDeps(html: string, { astroConfig, srcPath }: { astroConfig:
    if (hoist) {
      if (src) {
        pageDeps.hoistedJS.set(src, {
-          src
+          src,
        });
      } else {
        let content = $(el).html() || '';
        pageDeps.hoistedJS.set(`astro-virtual:${hash.unique(content)}`, {
-          content
+          content,
        });
      }
    } else if (src) {
--- a/packages/astro/src/build/bundle/js.ts
+++ b/packages/astro/src/build/bundle/js.ts
@ -6,7 +6,7 @@ import type { LogOptions } from '../../logger.js';
 import { fileURLToPath } from 'url';
 import { rollup } from 'rollup';
 import { terser } from 'rollup-plugin-terser';
-import { createBundleStats, addBundleStats, BundleStatsMap } from '../stats.js'
+import { createBundleStats, addBundleStats, BundleStatsMap } from '../stats.js';
 import { IS_ASTRO_FILE_URL } from '../util.js';
 import cheerio from 'cheerio';
 import path from 'path';
@ -35,7 +35,7 @@ export async function bundleHoistedJS({
  logging,
  depTree,
  dist,
-  runtime
+  runtime,
 }: {
  astroConfig: AstroConfig;
  buildState: BuildOutput;
@ -62,9 +62,11 @@ export async function bundleHoistedJS({
        virtualScripts.set(url, scriptInfo);
      }
      const entryURL = pageUrlToVirtualJSEntry(pageUrl);
-      const entryJS = Array.from(hoistedJS.keys()).map(url => `import '${url}';`).join('\n');
+      const entryJS = Array.from(hoistedJS.keys())
+        .map((url) => `import '${url}';`)
+        .join('\n');
      virtualScripts.set(entryURL, {
-        content: entryJS
+        content: entryJS,
      });
      entryImports.push(entryURL);
      pageToEntryMap.set(pageUrl, entryURL);
@ -92,7 +94,6 @@ export async function bundleHoistedJS({
            return source;
          }

-
          if (imported) {
            const outUrl = new URL(source, 'http://example.com' + imported);
            return outUrl.pathname;
@ -106,7 +107,6 @@ export async function bundleHoistedJS({
            return info.content;
          }

-
          const result = await runtime.load(id);

          if (result.statusCode !== 200) {
@ -128,8 +128,7 @@ export async function bundleHoistedJS({
    entryFileNames(chunk) {
      const { facadeModuleId } = chunk;
      if (!facadeModuleId) throw new Error(`facadeModuleId missing: ${chunk.name}`);
-      return facadeModuleId.substr('astro-virtual:/'.length, facadeModuleId.length - 'astro-virtual:/'.length - 3 /* .js */)
-        + '-[hash].js';
+      return facadeModuleId.substr('astro-virtual:/'.length, facadeModuleId.length - 'astro-virtual:/'.length - 3 /* .js */) + '-[hash].js';
    },
    plugins: [
      // We are using terser for the demo, but might switch to something else long term
@ -201,7 +200,6 @@ export async function bundleJS(imports: Set<string>, { astroRuntime, dist }: Bun
            return source;
          }

-
          if (imported) {
            const outUrl = new URL(source, 'http://example.com' + imported);
            return outUrl.pathname;
--- a/packages/astro/src/compiler/codegen/index.ts
+++ b/packages/astro/src/compiler/codegen/index.ts
@ -676,11 +676,11 @@ async function compileHtml(enterNode: TemplateNode, state: CodegenState, compile
                if (attributes.hoist) {
                  if (attributes.src) {
                    state.hoistedScripts.push({
-                      src: attributes.src.substr(1, attributes.src.length - 2)
+                      src: attributes.src.substr(1, attributes.src.length - 2),
                    });
                  } else if (node.children && node.children.length === 1 && node.children[0].type === 'Text') {
                    state.hoistedScripts.push({
-                      content: node.children[0].data
+                      content: node.children[0].data,
                    });
                  }
                  this.skip();
--- a/packages/astro/src/compiler/index.ts
+++ b/packages/astro/src/compiler/index.ts
@ -155,7 +155,7 @@ ${result.getStaticPaths || ''}
 import { h, Fragment } from 'astro/dist/internal/h.js';
 import { __astro_hoisted_scripts } from 'astro/dist/internal/__astro_hoisted_scripts.js';

-const __astroScripts = __astro_hoisted_scripts([${result.components.map(n => `typeof ${n} !== 'undefined' && ${n}`)}], ${JSON.stringify(result.hoistedScripts)});
+const __astroScripts = __astro_hoisted_scripts([${result.components.map((n) => `typeof ${n} !== 'undefined' && ${n}`)}], ${JSON.stringify(result.hoistedScripts)});
 const __astroInternal = Symbol('astro.internal');
 const __astroContext = Symbol.for('astro.context');
 async function __render(props, ...children) {
--- a/packages/astro/src/compiler/transform/head.ts
+++ b/packages/astro/src/compiler/transform/head.ts
@ -138,9 +138,9 @@ export default function (opts: TransformOptions): Transformer {
                          {
                            type: 'Text',
                            raw: 'module',
-                            data: 'module'
-                          }
-                        ]
+                            data: 'module',
+                          },
+                        ],
                      },
                      {
                        type: 'Attribute',
@ -157,8 +157,8 @@ export default function (opts: TransformOptions): Transformer {
                              codeChunks: ['script.src'],
                              children: [],
                            },
-                          }
-                        ]
+                          },
+                        ],
                      },
                      {
                        type: 'Attribute',
@ -167,10 +167,10 @@ export default function (opts: TransformOptions): Transformer {
                          {
                            type: 'Text',
                            raw: 'hoist',
-                            data: 'hoist'
-                          }
-                        ]
-                      }
+                            data: 'hoist',
+                          },
+                        ],
+                      },
                    ],
                    start: 0,
                    end: 0,
@ -187,9 +187,9 @@ export default function (opts: TransformOptions): Transformer {
                          {
                            type: 'Text',
                            raw: 'module',
-                            data: 'module'
-                          }
-                        ]
+                            data: 'module',
+                          },
+                        ],
                      },
                      {
                        type: 'Attribute',
@ -198,10 +198,10 @@ export default function (opts: TransformOptions): Transformer {
                          {
                            type: 'Text',
                            raw: 'hoist',
-                            data: 'hoist'
-                          }
-                        ]
-                      }
+                            data: 'hoist',
+                          },
+                        ],
+                      },
                    ],
                    start: 0,
                    end: 0,
@ -217,11 +217,11 @@ export default function (opts: TransformOptions): Transformer {
                          codeChunks: ['script.content'],
                          children: [],
                        },
-                      }
+                      },
+                    ],
+                  },
                ],
              },
-                ]
-              }
            ],
          },
        ],
--- a/packages/astro/src/internal/__astro_hoisted_scripts.ts
+++ b/packages/astro/src/internal/__astro_hoisted_scripts.ts
@ -3,7 +3,7 @@ import type { ScriptInfo } from '../@types/astro';
 const sym = Symbol.for('astro.hoistedScripts');

 interface ComponentThatMaybeHasHoistedScripts {
-  [sym]: ScriptInfo[]
+  [sym]: ScriptInfo[];
 }

 /**
@ -14,10 +14,10 @@ interface ComponentThatMaybeHasHoistedScripts {
 function hoistedScripts(Components: ComponentThatMaybeHasHoistedScripts[], scripts: ScriptInfo[]) {
  const flatScripts = [];

-  const allScripts: ScriptInfo[] = Components.map(c => c && c[sym])
-    .filter(a => a)
+  const allScripts: ScriptInfo[] = Components.map((c) => c && c[sym])
+    .filter((a) => a)
    .concat(scripts)
-    .flatMap(a => a);
+    .flatMap((a) => a);

  const visitedSource = new Set();
  for (let script of allScripts) {
@ -32,6 +32,4 @@ function hoistedScripts(Components: ComponentThatMaybeHasHoistedScripts[], scrip
  return flatScripts;
 }

-export {
-  hoistedScripts as __astro_hoisted_scripts
-};
+export { hoistedScripts as __astro_hoisted_scripts };
--- a/packages/astro/src/runtime.ts
+++ b/packages/astro/src/runtime.ts
@ -163,7 +163,7 @@ async function load(config: AstroRuntimeConfig, rawPathname: string | undefined)
      children: [],
      props: pageProps,
      css: Array.isArray(mod.css) ? mod.css : typeof mod.css === 'string' ? [mod.css] : [],
-      scripts: mod.exports.default[Symbol.for('astro.hoistedScripts')]
+      scripts: mod.exports.default[Symbol.for('astro.hoistedScripts')],
    })) as string;

    return {