astro 1.0.7 → 1.0.8

package/astro-jsx.d.ts

@@ -548,7 +548,7 @@ declare namespace astroHTML.JSX {
 		| 'strict-origin-when-cross-origin'
 		| 'unsafe-url';
 
-	type HTMLAttributeAnchorTarget = '_self' | '_blank' | '_parent' | '_top';
+	type HTMLAttributeAnchorTarget = '_self' | '_blank' | '_parent' | '_top' | (string & {});
 
 	interface AnchorHTMLAttributes extends HTMLAttributes {
 		download?: string | boolean | undefined | null;
@@ -756,7 +756,7 @@ declare namespace astroHTML.JSX {
 		size?: number | string | undefined | null;
 		src?: string | undefined | null;
 		step?: number | string | undefined | null;
-		type?: HTMLInputTypeAttribute | string | undefined | null;
+		type?: HTMLInputTypeAttribute | undefined | null;
 		value?: string | string[] | number | undefined | null;
 		width?: number | string | undefined | null;
 	}

package/dist/core/add/index.js

@@ -517,7 +517,7 @@ ${message}`
   }
 }
 async function fetchPackageJson(scope, name, tag) {
-  const packageName = `${scope ? `@${scope}/` : ""}${name}`;
+  const packageName = `${scope ? `${scope}/` : ""}${name}`;
   const res = await fetch(`https://registry.npmjs.org/${packageName}/${tag}`);
   if (res.status === 404) {
     return new Error();
@@ -535,10 +535,12 @@ async function validateIntegrations(integrations) {
           throw new Error(`${bold(integration)} does not appear to be a valid package name!`);
         }
         let { scope, name, tag } = parsed;
-        let pkgJson = null;
-        let pkgType = "first-party";
-        if (!scope) {
-          const firstPartyPkgCheck = await fetchPackageJson("astrojs", name, tag);
+        let pkgJson;
+        let pkgType;
+        if (scope && scope !== "@astrojs") {
+          pkgType = "third-party";
+        } else {
+          const firstPartyPkgCheck = await fetchPackageJson("@astrojs", name, tag);
           if (firstPartyPkgCheck instanceof Error) {
             spinner.warn(
               yellow(`${bold(integration)} is not an official Astro package. Use at your own risk!`)
@@ -559,6 +561,7 @@ async function validateIntegrations(integrations) {
             spinner.start("Resolving with third party packages...");
             pkgType = "third-party";
           } else {
+            pkgType = "first-party";
             pkgJson = firstPartyPkgCheck;
           }
         }
@@ -570,8 +573,8 @@ async function validateIntegrations(integrations) {
             pkgJson = thirdPartyPkgCheck;
           }
         }
-        const resolvedScope = pkgType === "first-party" ? "astrojs" : scope;
-        const packageName = `${resolvedScope ? `@${resolvedScope}/` : ""}${name}`;
+        const resolvedScope = pkgType === "first-party" ? "@astrojs" : scope;
+        const packageName = `${resolvedScope ? `${resolvedScope}/` : ""}${name}`;
         let dependencies = [
           [pkgJson["name"], `^${pkgJson["version"]}`]
         ];

package/dist/core/build/generate.js

@@ -19,7 +19,7 @@ import { createRequest } from "../request.js";
 import { matchRoute } from "../routing/match.js";
 import { getOutputFilename } from "../util.js";
 import { getOutFile, getOutFolder } from "./common.js";
-import { eachPageData, getPageDataByComponent } from "./internal.js";
+import { eachPageData, getPageDataByComponent, sortedCSS } from "./internal.js";
 import { getTimeStat } from "./util.js";
 const MAX_CONCURRENT_RENDERS = 1;
 function* throttle(max, inPaths) {
@@ -79,7 +79,7 @@ async function generatePage(opts, internals, pageData, ssrEntry, builtPaths) {
   let timeStart = performance.now();
   const renderers = ssrEntry.renderers;
   const pageInfo = getPageDataByComponent(internals, pageData.route.component);
-  const linkIds = Array.from((pageInfo == null ? void 0 : pageInfo.css) ?? []);
+  const linkIds = sortedCSS(pageData);
   const scripts = (pageInfo == null ? void 0 : pageInfo.hoistedScript) ?? null;
   const pageModule = ssrEntry.pageMap.get(pageData.component);
   if (!pageModule) {
@@ -141,9 +141,6 @@ async function getPathsForRoute(pageData, mod, opts, builtPaths) {
     });
     opts.routeCache.set(route, result);
     paths = result.staticPaths.map((staticPath) => staticPath.params && route.generate(staticPath.params)).filter((staticPath) => {
-      if (!staticPath) {
-        return false;
-      }
       if (!builtPaths.has(removeTrailingForwardSlash(staticPath))) {
         return true;
       }
@@ -168,7 +165,7 @@ async function generatePath(pathname, opts, gopts) {
   }
   debug("build", `Generating: ${pathname}`);
   const site = astroConfig.base !== "/" ? joinPaths(((_a = astroConfig.site) == null ? void 0 : _a.toString()) || "http://localhost/", astroConfig.base) : astroConfig.site;
-  const links = createLinkStylesheetElementSet(linkIds.reverse(), site);
+  const links = createLinkStylesheetElementSet(linkIds, site);
   const scripts = createModuleScriptsSet(hoistedScripts ? [hoistedScripts] : [], site);
   if (astroConfig._ctx.scripts.some((script) => script.stage === "page")) {
     const hashedFilePath = internals.entrySpecifierToBundleMap.get(PAGE_SCRIPT_ID);

package/dist/core/build/graph.js

@@ -1,22 +1,23 @@
 import { resolvedPagesVirtualModuleId } from "../app/index.js";
-function* walkParentInfos(id, ctx, seen = /* @__PURE__ */ new Set()) {
+function* walkParentInfos(id, ctx, depth = 0, seen = /* @__PURE__ */ new Set()) {
   seen.add(id);
   const info = ctx.getModuleInfo(id);
   if (info) {
-    yield info;
+    yield [info, depth];
   }
   const importers = ((info == null ? void 0 : info.importers) || []).concat((info == null ? void 0 : info.dynamicImporters) || []);
   for (const imp of importers) {
     if (seen.has(imp)) {
       continue;
     }
-    yield* walkParentInfos(imp, ctx, seen);
+    yield* walkParentInfos(imp, ctx, ++depth, seen);
   }
 }
 function* getTopLevelPages(id, ctx) {
-  for (const info of walkParentInfos(id, ctx)) {
-    if ((info == null ? void 0 : info.importers[0]) === resolvedPagesVirtualModuleId) {
-      yield info;
+  var _a;
+  for (const res of walkParentInfos(id, ctx)) {
+    if (((_a = res[0]) == null ? void 0 : _a.importers[0]) === resolvedPagesVirtualModuleId) {
+      yield res;
     }
   }
 }

package/dist/core/build/index.js

@@ -38,7 +38,7 @@ class AstroBuilder {
     debug("build", "Initial setup...");
     const { logging } = this;
     this.timer.init = performance.now();
-    this.config = await runHookConfigSetup({ config: this.config, command: "build" });
+    this.config = await runHookConfigSetup({ config: this.config, command: "build", logging });
     this.manifest = createRouteManifest({ config: this.config }, this.logging);
     const viteConfig = await createVite(
       {
@@ -51,7 +51,7 @@ class AstroBuilder {
       },
       { astroConfig: this.config, logging, mode: "build" }
     );
-    await runHookConfigDone({ config: this.config });
+    await runHookConfigDone({ config: this.config, logging });
     return { viteConfig };
   }
   async build({ viteConfig }) {
@@ -60,7 +60,7 @@ class AstroBuilder {
       server: new URL("./server/", this.config.outDir),
       serverEntry: "entry.mjs"
     };
-    await runHookBuildStart({ config: this.config, buildConfig });
+    await runHookBuildStart({ config: this.config, buildConfig, logging: this.logging });
     info(this.logging, "build", `output target: ${colors.green(this.config.output)}`);
     if (this.config._ctx.adapter) {
       info(this.logging, "build", `deploy adapter: ${colors.green(this.config._ctx.adapter.name)}`);
@@ -106,7 +106,8 @@ class AstroBuilder {
       config: this.config,
       buildConfig,
       pages: pageNames,
-      routes: Object.values(allPages).map((pd) => pd.route)
+      routes: Object.values(allPages).map((pd) => pd.route),
+      logging: this.logging
     });
     if (this.logging.level && levels[this.logging.level] <= levels["info"]) {
       await this.printStats({

package/dist/core/build/internal.js

@@ -76,6 +76,18 @@ function hasPageDataByViteID(internals, viteid) {
 function* eachPageData(internals) {
   yield* internals.pagesByComponent.values();
 }
+function sortedCSS(pageData) {
+  return Array.from(pageData.css).sort((a, b) => {
+    let depthA = a[1].depth, depthB = b[1].depth;
+    if (depthA === -1) {
+      return -1;
+    } else if (depthB === -1) {
+      return 1;
+    } else {
+      return depthA > depthB ? -1 : 1;
+    }
+  }).map(([id]) => id);
+}
 export {
   createBuildInternals,
   eachPageData,
@@ -84,6 +96,7 @@ export {
   getPageDatasByChunk,
   getPageDatasByClientOnlyID,
   hasPageDataByViteID,
+  sortedCSS,
   trackClientOnlyPageDatas,
   trackPageData
 };

package/dist/core/build/page-data.js

@@ -27,7 +27,7 @@ async function collectPagesData(opts) {
         component: route.component,
         route,
         moduleSpecifier: "",
-        css: /* @__PURE__ */ new Set(),
+        css: /* @__PURE__ */ new Map(),
         hoistedScript: void 0
       };
       clearInterval(routeCollectionLogTimeout);
@@ -46,7 +46,7 @@ async function collectPagesData(opts) {
       component: route.component,
       route,
       moduleSpecifier: "",
-      css: /* @__PURE__ */ new Set(),
+      css: /* @__PURE__ */ new Map(),
       hoistedScript: void 0
     };
   }

package/dist/core/build/static-build.js

@@ -128,7 +128,8 @@ async function ssrBuild(opts, internals, input) {
     config: astroConfig,
     pages: internals.pagesByComponent,
     vite: viteBuildConfig,
-    target: "server"
+    target: "server",
+    logging: opts.logging
   });
   return await vite.build(viteBuildConfig);
 }
@@ -186,7 +187,8 @@ ${bgGreen(black(" building client "))}`);
     config: astroConfig,
     pages: internals.pagesByComponent,
     vite: viteBuildConfig,
-    target: "client"
+    target: "client",
+    logging: opts.logging
   });
   const buildResult = await vite.build(viteBuildConfig);
   info(opts.logging, null, dim(`Completed in ${getTimeStat(timer, performance.now())}.

package/dist/core/build/vite-plugin-analyzer.js

@@ -15,7 +15,7 @@ function vitePluginAnalyzer(internals) {
           hoistedScripts.add(hid);
         }
         if (hoistedScripts.size) {
-          for (const pageInfo of getTopLevelPages(from, this)) {
+          for (const [pageInfo] of getTopLevelPages(from, this)) {
             const pageId = pageInfo.id;
             for (const hid of hoistedScripts) {
               if (pageScripts.has(pageId)) {
@@ -77,7 +77,7 @@ function vitePluginAnalyzer(internals) {
             internals.discoveredClientOnlyComponents.add(cid);
             clientOnlys.push(cid);
           }
-          for (const pageInfo of getTopLevelPages(id, this)) {
+          for (const [pageInfo] of getTopLevelPages(id, this)) {
             const pageData = getPageDataByViteID(internals, pageInfo.id);
             if (!pageData)
               continue;

package/dist/core/build/vite-plugin-css.js

@@ -20,19 +20,19 @@ function rollupPluginAstroBuildCSS(options) {
     return named;
   }
   function createNameForParentPages(id, ctx) {
-    const parents = Array.from(getTopLevelPages(id, ctx)).sort();
-    const proposedName = parents.map((page) => nameifyPage(page.id)).join("-");
+    const parents = Array.from(getTopLevelPages(id, ctx));
+    const proposedName = parents.map(([page]) => nameifyPage(page.id)).sort().join("-");
     if (proposedName.length <= MAX_NAME_LENGTH) {
       return proposedName;
     }
     const hash = crypto.createHash("sha256");
-    for (const page of parents) {
+    for (const [page] of parents) {
       hash.update(page.id, "utf-8");
     }
     return hash.digest("hex").slice(0, 8);
   }
   function* getParentClientOnlys(id, ctx) {
-    for (const info of walkParentInfos(id, ctx)) {
+    for (const [info] of walkParentInfos(id, ctx)) {
       yield* getPageDatasByClientOnlyID(internals, info.id);
     }
   }
@@ -64,21 +64,30 @@ function rollupPluginAstroBuildCSS(options) {
             if ("viteMetadata" in chunk) {
               const meta = chunk["viteMetadata"];
               if (meta.importedCss.size) {
+                debugger;
                 if (options.target === "client") {
                   for (const [id] of Object.entries(c.modules)) {
                     for (const pageData of getParentClientOnlys(id, this)) {
                       for (const importedCssImport of meta.importedCss) {
-                        pageData.css.add(importedCssImport);
+                        pageData.css.set(importedCssImport, { depth: -1 });
                       }
                     }
                   }
                 }
                 for (const [id] of Object.entries(c.modules)) {
-                  for (const pageInfo of getTopLevelPages(id, this)) {
+                  debugger;
+                  for (const [pageInfo, depth] of getTopLevelPages(id, this)) {
                     const pageViteID = pageInfo.id;
                     const pageData = getPageDataByViteID(internals, pageViteID);
                     for (const importedCssImport of meta.importedCss) {
-                      pageData == null ? void 0 : pageData.css.add(importedCssImport);
+                      if (pageData == null ? void 0 : pageData.css.has(importedCssImport)) {
+                        const cssInfo = pageData == null ? void 0 : pageData.css.get(importedCssImport);
+                        if (depth < cssInfo.depth) {
+                          cssInfo.depth = depth;
+                        }
+                      } else {
+                        pageData == null ? void 0 : pageData.css.set(importedCssImport, { depth });
+                      }
                     }
                   }
                 }

package/dist/core/build/vite-plugin-ssr.js

@@ -6,7 +6,7 @@ import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../vite-plugin-sc
 import { pagesVirtualModuleId } from "../app/index.js";
 import { serializeRouteData } from "../routing/index.js";
 import { addRollupInput } from "./add-rollup-input.js";
-import { eachPageData } from "./internal.js";
+import { eachPageData, sortedCSS } from "./internal.js";
 const virtualModuleId = "@astrojs-ssr-virtual-entry";
 const resolvedVirtualModuleId = "\0" + virtualModuleId;
 const manifestReplace = "@@ASTRO_MANIFEST_REPLACE@@";
@@ -83,7 +83,7 @@ async function injectManifest(buildOpts, internals) {
   }
   const staticFiles = internals.staticFiles;
   const manifest = buildManifest(buildOpts, internals, Array.from(staticFiles));
-  await runHookBuildSsr({ config: buildOpts.astroConfig, manifest });
+  await runHookBuildSsr({ config: buildOpts.astroConfig, manifest, logging: buildOpts.logging });
   const chunk = internals.ssrEntryChunk;
   const code = chunk.code;
   chunk.code = code.replace(replaceExp, () => {
@@ -110,7 +110,7 @@ function buildManifest(opts, internals, staticFiles) {
     }
     routes.push({
       file: "",
-      links: Array.from(pageData.css).reverse(),
+      links: sortedCSS(pageData),
       scripts: [
         ...scripts,
         ...astroConfig._ctx.scripts.filter((script) => script.stage === "head-inline").map(({ stage, content }) => ({ stage, children: content }))

package/dist/core/create-vite.js

@@ -52,7 +52,7 @@ async function createVite(commandConfig, { astroConfig, logging, mode }) {
       htmlVitePlugin(),
       jsxVitePlugin({ config: astroConfig, logging }),
       astroPostprocessVitePlugin({ config: astroConfig }),
-      astroIntegrationsContainerPlugin({ config: astroConfig }),
+      astroIntegrationsContainerPlugin({ config: astroConfig, logging }),
       astroScriptsPageSSRPlugin({ config: astroConfig })
     ],
     publicDir: fileURLToPath(astroConfig.publicDir),

package/dist/core/dev/index.js

@@ -16,7 +16,7 @@ async function dev(config, options) {
   const devStart = performance.now();
   applyPolyfill();
   await options.telemetry.record([]);
-  config = await runHookConfigSetup({ config, command: "dev" });
+  config = await runHookConfigSetup({ config, command: "dev", logging: options.logging });
   const { host, port } = config.server;
   const rendererClientEntries = config._ctx.renderers.map((r) => r.clientEntrypoint).filter(Boolean);
   const viteConfig = await createVite(
@@ -29,9 +29,9 @@ async function dev(config, options) {
     },
     { astroConfig: config, logging: options.logging, mode: "dev" }
   );
-  await runHookConfigDone({ config });
+  await runHookConfigDone({ config, logging: options.logging });
   const viteServer = await vite.createServer(viteConfig);
-  runHookServerSetup({ config, server: viteServer });
+  runHookServerSetup({ config, server: viteServer, logging: options.logging });
   await viteServer.listen(port);
   const devServerAddressInfo = viteServer.httpServer.address();
   const site = config.site ? new URL(config.base, config.site) : void 0;
@@ -46,14 +46,14 @@ async function dev(config, options) {
       https: !!((_a = viteConfig.server) == null ? void 0 : _a.https)
     })
   );
-  const currentVersion = "1.0.7";
+  const currentVersion = "1.0.8";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }
   if (((_c = (_b = viteConfig.server) == null ? void 0 : _b.fs) == null ? void 0 : _c.strict) === false) {
     warn(options.logging, null, msg.fsStrictWarning());
   }
-  await runHookServerStart({ config, address: devServerAddressInfo });
+  await runHookServerStart({ config, address: devServerAddressInfo, logging: options.logging });
   return {
     address: devServerAddressInfo,
     get watcher() {
@@ -61,7 +61,7 @@ async function dev(config, options) {
     },
     stop: async () => {
       await viteServer.close();
-      await runHookServerDone({ config });
+      await runHookServerDone({ config, logging: options.logging });
     }
   };
 }

package/dist/core/messages.js

@@ -46,7 +46,7 @@ function devStart({
   https,
   site
 }) {
-  const version = "1.0.7";
+  const version = "1.0.8";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -225,7 +225,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"1.0.7"}`
+        `v${"1.0.8"}`
       )} ${headline}`
     );
   }

package/dist/core/util.js

@@ -5,7 +5,7 @@ import resolve from "resolve";
 import slash from "slash";
 import { fileURLToPath, pathToFileURL } from "url";
 import { prependForwardSlash, removeTrailingForwardSlash } from "./path.js";
-const ASTRO_VERSION = "1.0.7";
+const ASTRO_VERSION = "1.0.8";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }

package/dist/integrations/index.js

@@ -1,7 +1,23 @@
+import { bold } from "kleur/colors";
 import { mergeConfig } from "../core/config.js";
+import { info } from "../core/logger/core.js";
+async function withTakingALongTimeMsg({
+  name,
+  hookResult,
+  timeoutMs = 3e3,
+  logging
+}) {
+  const timeout = setTimeout(() => {
+    info(logging, "build", `Waiting for the ${bold(name)} integration...`);
+  }, timeoutMs);
+  const result = await hookResult;
+  clearTimeout(timeout);
+  return result;
+}
 async function runHookConfigSetup({
   config: _config,
-  command
+  command,
+  logging
 }) {
   var _a;
   if (_config.adapter) {
@@ -36,67 +52,100 @@ async function runHookConfigSetup({
         writable: false,
         enumerable: false
       });
-      await integration.hooks["astro:config:setup"](hooks);
+      await withTakingALongTimeMsg({
+        name: integration.name,
+        hookResult: integration.hooks["astro:config:setup"](hooks),
+        logging
+      });
     }
   }
   return updatedConfig;
 }
-async function runHookConfigDone({ config }) {
+async function runHookConfigDone({
+  config,
+  logging
+}) {
   var _a;
   for (const integration of config.integrations) {
     if ((_a = integration == null ? void 0 : integration.hooks) == null ? void 0 : _a["astro:config:done"]) {
-      await integration.hooks["astro:config:done"]({
-        config,
-        setAdapter(adapter) {
-          if (config._ctx.adapter && config._ctx.adapter.name !== adapter.name) {
-            throw new Error(
-              `Integration "${integration.name}" conflicts with "${config._ctx.adapter.name}". You can only configure one deployment integration.`
-            );
+      await withTakingALongTimeMsg({
+        name: integration.name,
+        hookResult: integration.hooks["astro:config:done"]({
+          config,
+          setAdapter(adapter) {
+            if (config._ctx.adapter && config._ctx.adapter.name !== adapter.name) {
+              throw new Error(
+                `Integration "${integration.name}" conflicts with "${config._ctx.adapter.name}". You can only configure one deployment integration.`
+              );
+            }
+            config._ctx.adapter = adapter;
           }
-          config._ctx.adapter = adapter;
-        }
+        }),
+        logging
       });
     }
   }
 }
 async function runHookServerSetup({
   config,
-  server
+  server,
+  logging
 }) {
   var _a;
   for (const integration of config.integrations) {
     if ((_a = integration == null ? void 0 : integration.hooks) == null ? void 0 : _a["astro:server:setup"]) {
-      await integration.hooks["astro:server:setup"]({ server });
+      await withTakingALongTimeMsg({
+        name: integration.name,
+        hookResult: integration.hooks["astro:server:setup"]({ server }),
+        logging
+      });
     }
   }
 }
 async function runHookServerStart({
   config,
-  address
+  address,
+  logging
 }) {
   var _a;
   for (const integration of config.integrations) {
     if ((_a = integration == null ? void 0 : integration.hooks) == null ? void 0 : _a["astro:server:start"]) {
-      await integration.hooks["astro:server:start"]({ address });
+      await withTakingALongTimeMsg({
+        name: integration.name,
+        hookResult: integration.hooks["astro:server:start"]({ address }),
+        logging
+      });
     }
   }
 }
-async function runHookServerDone({ config }) {
+async function runHookServerDone({
+  config,
+  logging
+}) {
   var _a;
   for (const integration of config.integrations) {
     if ((_a = integration == null ? void 0 : integration.hooks) == null ? void 0 : _a["astro:server:done"]) {
-      await integration.hooks["astro:server:done"]();
+      await withTakingALongTimeMsg({
+        name: integration.name,
+        hookResult: integration.hooks["astro:server:done"](),
+        logging
+      });
     }
   }
 }
 async function runHookBuildStart({
   config,
-  buildConfig
+  buildConfig,
+  logging
 }) {
   var _a;
   for (const integration of config.integrations) {
     if ((_a = integration == null ? void 0 : integration.hooks) == null ? void 0 : _a["astro:build:start"]) {
-      await integration.hooks["astro:build:start"]({ buildConfig });
+      await withTakingALongTimeMsg({
+        name: integration.name,
+        hookResult: integration.hooks["astro:build:start"]({ buildConfig }),
+        logging
+      });
     }
   }
 }
@@ -104,30 +153,40 @@ async function runHookBuildSetup({
   config,
   vite,
   pages,
-  target
+  target,
+  logging
 }) {
   var _a;
   for (const integration of config.integrations) {
     if ((_a = integration == null ? void 0 : integration.hooks) == null ? void 0 : _a["astro:build:setup"]) {
-      await integration.hooks["astro:build:setup"]({
-        vite,
-        pages,
-        target,
-        updateConfig: (newConfig) => {
-          mergeConfig(vite, newConfig);
-        }
+      await withTakingALongTimeMsg({
+        name: integration.name,
+        hookResult: integration.hooks["astro:build:setup"]({
+          vite,
+          pages,
+          target,
+          updateConfig: (newConfig) => {
+            mergeConfig(vite, newConfig);
+          }
+        }),
+        logging
       });
     }
   }
 }
 async function runHookBuildSsr({
   config,
-  manifest
+  manifest,
+  logging
 }) {
   var _a;
   for (const integration of config.integrations) {
     if ((_a = integration == null ? void 0 : integration.hooks) == null ? void 0 : _a["astro:build:ssr"]) {
-      await integration.hooks["astro:build:ssr"]({ manifest });
+      await withTakingALongTimeMsg({
+        name: integration.name,
+        hookResult: integration.hooks["astro:build:ssr"]({ manifest }),
+        logging
+      });
     }
   }
 }
@@ -135,16 +194,21 @@ async function runHookBuildDone({
   config,
   buildConfig,
   pages,
-  routes
+  routes,
+  logging
 }) {
   var _a;
   const dir = config.output === "server" ? buildConfig.client : config.outDir;
   for (const integration of config.integrations) {
     if ((_a = integration == null ? void 0 : integration.hooks) == null ? void 0 : _a["astro:build:done"]) {
-      await integration.hooks["astro:build:done"]({
-        pages: pages.map((p) => ({ pathname: p })),
-        dir,
-        routes
+      await withTakingALongTimeMsg({
+        name: integration.name,
+        hookResult: integration.hooks["astro:build:done"]({
+          pages: pages.map((p) => ({ pathname: p })),
+          dir,
+          routes
+        }),
+        logging
       });
     }
   }

package/dist/jsx/babel.js

@@ -1,5 +1,6 @@
 import * as t from "@babel/types";
 import { pathToFileURL } from "node:url";
+import { HydrationDirectiveProps } from "../runtime/server/hydration.js";
 const ClientOnlyPlaceholder = "astro-client-only";
 function isComponent(tagName) {
   return tagName[0] && tagName[0].toLowerCase() !== tagName[0] || tagName.includes(".") || /[^a-zA-Z]/.test(tagName[0]);
@@ -256,6 +257,19 @@ function astroJSX() {
         }
         const meta = path.getData("import");
         if (meta) {
+          if (meta.path.endsWith(".astro")) {
+            const displayName = getTagName(parentNode);
+            for (const attr of parentNode.openingElement.attributes) {
+              if (t.isJSXAttribute(attr)) {
+                const name = jsxAttributeToString(attr);
+                if (HydrationDirectiveProps.has(name)) {
+                  console.warn(
+                    `You are attempting to render <${displayName} ${name} />, but ${displayName} is an Astro component. Astro components do not render in the client and should not have a hydration directive. Please use a framework component for client rendering.`
+                  );
+                }
+              }
+            }
+          }
           let resolvedPath;
           if (meta.path.startsWith(".")) {
             const fileURL = pathToFileURL(state.filename);

package/dist/runtime/server/astro-global.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "1.0.7";
+const ASTRO_VERSION = "1.0.8";
 function createDeprecatedFetchContentFn() {
   return () => {
     throw new Error("Deprecated: Astro.fetchContent() has been replaced with Astro.glob().");

package/dist/types/@types/astro.d.ts

@@ -633,7 +633,7 @@ export interface AstroUserConfig {
      * }
      * ```
      */
-    integrations?: Array<AstroIntegration | AstroIntegration[]>;
+    integrations?: Array<AstroIntegration | (AstroIntegration | false | undefined | null)[] | false | undefined | null>;
     /**
      * @docs
      * @kind heading

package/dist/types/core/build/graph.d.ts

@@ -1,7 +1,7 @@
 import type { GetModuleInfo, ModuleInfo } from 'rollup';
 export declare function walkParentInfos(id: string, ctx: {
     getModuleInfo: GetModuleInfo;
-}, seen?: Set<string>): Generator<ModuleInfo, void, unknown>;
+}, depth?: number, seen?: Set<string>): Generator<[ModuleInfo, number], void, unknown>;
 export declare function getTopLevelPages(id: string, ctx: {
     getModuleInfo: GetModuleInfo;
-}): Generator<ModuleInfo, void, unknown>;
+}): Generator<[ModuleInfo, number], void, unknown>;

package/dist/types/core/build/internal.d.ts

@@ -51,3 +51,10 @@ export declare function getPageDataByComponent(internals: BuildInternals, compon
 export declare function getPageDataByViteID(internals: BuildInternals, viteid: ViteID): PageBuildData | undefined;
 export declare function hasPageDataByViteID(internals: BuildInternals, viteid: ViteID): boolean;
 export declare function eachPageData(internals: BuildInternals): Generator<PageBuildData, void, undefined>;
+/**
+ * Sort a page's CSS by depth. A higher depth means that the CSS comes from shared subcomponents.
+ * A lower depth means it comes directly from the top-level page.
+ * The return of this function is an array of CSS paths, with shared CSS on top
+ * and page-level CSS on bottom.
+ */
+export declare function sortedCSS(pageData: PageBuildData): string[];

package/dist/types/core/build/types.d.ts

@@ -8,7 +8,9 @@ export interface PageBuildData {
     component: ComponentPath;
     route: RouteData;
     moduleSpecifier: string;
-    css: Set<string>;
+    css: Map<string, {
+        depth: number;
+    }>;
     hoistedScript: {
         type: 'inline' | 'external';
         value: string;

package/dist/types/integrations/index.d.ts

@@ -5,41 +5,51 @@ import { AstroConfig, BuildConfig, RouteData } from '../@types/astro.js';
 import type { SerializedSSRManifest } from '../core/app/types';
 import type { PageBuildData } from '../core/build/types';
 import type { ViteConfigWithSSR } from '../core/create-vite.js';
-export declare function runHookConfigSetup({ config: _config, command, }: {
+import { LogOptions } from '../core/logger/core.js';
+export declare function runHookConfigSetup({ config: _config, command, logging, }: {
     config: AstroConfig;
     command: 'dev' | 'build';
+    logging: LogOptions;
 }): Promise<AstroConfig>;
-export declare function runHookConfigDone({ config }: {
+export declare function runHookConfigDone({ config, logging, }: {
     config: AstroConfig;
+    logging: LogOptions;
 }): Promise<void>;
-export declare function runHookServerSetup({ config, server, }: {
+export declare function runHookServerSetup({ config, server, logging, }: {
     config: AstroConfig;
     server: ViteDevServer;
+    logging: LogOptions;
 }): Promise<void>;
-export declare function runHookServerStart({ config, address, }: {
+export declare function runHookServerStart({ config, address, logging, }: {
     config: AstroConfig;
     address: AddressInfo;
+    logging: LogOptions;
 }): Promise<void>;
-export declare function runHookServerDone({ config }: {
+export declare function runHookServerDone({ config, logging, }: {
     config: AstroConfig;
+    logging: LogOptions;
 }): Promise<void>;
-export declare function runHookBuildStart({ config, buildConfig, }: {
+export declare function runHookBuildStart({ config, buildConfig, logging, }: {
     config: AstroConfig;
     buildConfig: BuildConfig;
+    logging: LogOptions;
 }): Promise<void>;
-export declare function runHookBuildSetup({ config, vite, pages, target, }: {
+export declare function runHookBuildSetup({ config, vite, pages, target, logging, }: {
     config: AstroConfig;
     vite: ViteConfigWithSSR;
     pages: Map<string, PageBuildData>;
     target: 'server' | 'client';
+    logging: LogOptions;
 }): Promise<void>;
-export declare function runHookBuildSsr({ config, manifest, }: {
+export declare function runHookBuildSsr({ config, manifest, logging, }: {
     config: AstroConfig;
     manifest: SerializedSSRManifest;
+    logging: LogOptions;
 }): Promise<void>;
-export declare function runHookBuildDone({ config, buildConfig, pages, routes, }: {
+export declare function runHookBuildDone({ config, buildConfig, pages, routes, logging, }: {
     config: AstroConfig;
     buildConfig: BuildConfig;
     pages: string[];
     routes: RouteData[];
+    logging: LogOptions;
 }): Promise<void>;

package/dist/types/vite-plugin-integrations-container/index.d.ts

@@ -1,6 +1,8 @@
 import { Plugin as VitePlugin } from 'vite';
 import { AstroConfig } from '../@types/astro.js';
+import { LogOptions } from '../core/logger/core.js';
 /** Connect Astro integrations into Vite, as needed. */
-export default function astroIntegrationsContainerPlugin({ config, }: {
+export default function astroIntegrationsContainerPlugin({ config, logging, }: {
     config: AstroConfig;
+    logging: LogOptions;
 }): VitePlugin;

package/dist/vite-plugin-integrations-container/index.js

@@ -1,11 +1,12 @@
 import { runHookServerSetup } from "../integrations/index.js";
 function astroIntegrationsContainerPlugin({
-  config
+  config,
+  logging
 }) {
   return {
     name: "astro:integration-container",
     configureServer(server) {
-      runHookServerSetup({ config, server });
+      runHookServerSetup({ config, server, logging });
     }
   };
 }

package/dist/vite-plugin-jsx/tag.js

@@ -37,27 +37,39 @@ function tagExportsWithRenderer({
         }
       },
       ExportDeclaration(path, state) {
-        var _a, _b;
+        var _a, _b, _c;
         const node = path.node;
         if (node.exportKind === "type")
           return;
         if (node.type === "ExportAllDeclaration")
           return;
-        if (node.type === "ExportNamedDeclaration") {
-          if (t.isFunctionDeclaration(node.declaration)) {
-            if ((_a = node.declaration.id) == null ? void 0 : _a.name) {
-              const id = node.declaration.id.name;
-              const tags = state.get("astro:tags") ?? [];
-              state.set("astro:tags", [...tags, id]);
-            }
-          }
-        } else if (node.type === "ExportDefaultDeclaration") {
-          if (t.isFunctionDeclaration(node.declaration)) {
-            if ((_b = node.declaration.id) == null ? void 0 : _b.name) {
-              const id = node.declaration.id.name;
-              const tags = state.get("astro:tags") ?? [];
-              state.set("astro:tags", [...tags, id]);
-            }
+        const addTag = (id) => {
+          const tags = state.get("astro:tags") ?? [];
+          state.set("astro:tags", [...tags, id]);
+        };
+        if (node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration") {
+          if (t.isIdentifier(node.declaration)) {
+            addTag(node.declaration.name);
+          } else if (t.isFunctionDeclaration(node.declaration) && ((_a = node.declaration.id) == null ? void 0 : _a.name)) {
+            addTag(node.declaration.id.name);
+          } else if (t.isVariableDeclaration(node.declaration)) {
+            (_b = node.declaration.declarations) == null ? void 0 : _b.forEach((declaration) => {
+              if (t.isArrowFunctionExpression(declaration.init) && t.isIdentifier(declaration.id)) {
+                addTag(declaration.id.name);
+              }
+            });
+          } else if (t.isObjectExpression(node.declaration)) {
+            (_c = node.declaration.properties) == null ? void 0 : _c.forEach((property) => {
+              if (t.isProperty(property) && t.isIdentifier(property.key)) {
+                addTag(property.key.name);
+              }
+            });
+          } else if (t.isExportNamedDeclaration(node)) {
+            node.specifiers.forEach((specifier) => {
+              if (t.isExportSpecifier(specifier) && t.isIdentifier(specifier.exported)) {
+                addTag(specifier.local.name);
+              }
+            });
           }
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",