astro 1.0.1 → 1.0.2

package/dist/core/add/index.js

@@ -610,7 +610,7 @@ function parseIntegrationName(spec) {
   return { scope, name, tag };
 }
 async function askToContinue({ flags }) {
-  if (flags.yes)
+  if (flags.yes || flags.y)
     return true;
   const response = await prompts({
     type: "confirm",

package/dist/core/app/index.js

@@ -87,6 +87,9 @@ class App {
         });
       }
     }
+    if (routeData.route === "/404") {
+      defaultStatus = 404;
+    }
     let mod = __privateGet(this, _manifest).pageMap.get(routeData.component);
     if (routeData.type === "page") {
       let response = await __privateMethod(this, _renderPage, renderPage_fn).call(this, request, routeData, mod, defaultStatus);

package/dist/core/app/node.js

@@ -19,10 +19,10 @@ function createRequestFromNodeRequest(req, body) {
   return request;
 }
 class NodeApp extends App {
-  match(req) {
-    return super.match(req instanceof Request ? req : createRequestFromNodeRequest(req));
+  match(req, opts = {}) {
+    return super.match(req instanceof Request ? req : createRequestFromNodeRequest(req), opts);
   }
-  render(req) {
+  render(req, routeData) {
     if ("on" in req) {
       let body = Buffer.from([]);
       let reqBodyComplete = new Promise((resolve, reject) => {
@@ -37,10 +37,16 @@ class NodeApp extends App {
         });
       });
       return reqBodyComplete.then(() => {
-        return super.render(req instanceof Request ? req : createRequestFromNodeRequest(req, body));
+        return super.render(
+          req instanceof Request ? req : createRequestFromNodeRequest(req, body),
+          routeData
+        );
       });
     }
-    return super.render(req instanceof Request ? req : createRequestFromNodeRequest(req));
+    return super.render(
+      req instanceof Request ? req : createRequestFromNodeRequest(req),
+      routeData
+    );
   }
 }
 async function loadManifest(rootFolder) {

package/dist/core/build/index.js

@@ -1,7 +1,6 @@
 import fs from "fs";
 import * as colors from "kleur/colors";
 import { performance } from "perf_hooks";
-import * as vite from "vite";
 import {
   runHookBuildDone,
   runHookBuildStart,
@@ -14,7 +13,6 @@ import { debug, info, levels, timerMessage } from "../logger/core.js";
 import { apply as applyPolyfill } from "../polyfill.js";
 import { RouteCache } from "../render/route-cache.js";
 import { createRouteManifest } from "../routing/index.js";
-import { createSafeError } from "../util.js";
 import { collectPagesData } from "./page-data.js";
 import { staticBuild } from "./static-build.js";
 import { getTimeStat } from "./util.js";
@@ -40,7 +38,6 @@ class AstroBuilder {
     debug("build", "Initial setup...");
     const { logging } = this;
     this.timer.init = performance.now();
-    this.timer.viteStart = performance.now();
     this.config = await runHookConfigSetup({ config: this.config, command: "build" });
     this.manifest = createRouteManifest({ config: this.config }, this.logging);
     const viteConfig = await createVite(
@@ -55,15 +52,9 @@ class AstroBuilder {
       { astroConfig: this.config, logging, mode: "build" }
     );
     await runHookConfigDone({ config: this.config });
-    const viteServer = await vite.createServer(viteConfig);
-    debug("build", timerMessage("Vite started", this.timer.viteStart));
-    return { viteConfig, viteServer };
+    return { viteConfig };
   }
-  async build({
-    viteConfig,
-    viteServer
-  }) {
-    const { origin } = this;
+  async build({ viteConfig }) {
     const buildConfig = {
       client: new URL("./client/", this.config.outDir),
       server: new URL("./server/", this.config.outDir),
@@ -79,11 +70,7 @@ class AstroBuilder {
     const { assets, allPages } = await collectPagesData({
       astroConfig: this.config,
       logging: this.logging,
-      manifest: this.manifest,
-      origin,
-      routeCache: this.routeCache,
-      viteServer,
-      ssr: this.config.output === "server"
+      manifest: this.manifest
     });
     debug("build", timerMessage("All pages loaded", this.timer.loadStart));
     const pageNames = [];
@@ -93,23 +80,18 @@ class AstroBuilder {
       "build",
       colors.dim(`Completed in ${getTimeStat(this.timer.init, performance.now())}.`)
     );
-    try {
-      await staticBuild({
-        allPages,
-        astroConfig: this.config,
-        logging: this.logging,
-        manifest: this.manifest,
-        mode: this.mode,
-        origin: this.origin,
-        pageNames,
-        routeCache: this.routeCache,
-        viteConfig,
-        buildConfig
-      });
-    } catch (err) {
-      await viteServer.close();
-      throw err;
-    }
+    await staticBuild({
+      allPages,
+      astroConfig: this.config,
+      logging: this.logging,
+      manifest: this.manifest,
+      mode: this.mode,
+      origin: this.origin,
+      pageNames,
+      routeCache: this.routeCache,
+      viteConfig,
+      buildConfig
+    });
     this.timer.assetsStart = performance.now();
     Object.keys(assets).map((k) => {
       if (!assets[k])
@@ -120,7 +102,6 @@ class AstroBuilder {
       delete assets[k];
     });
     debug("build", timerMessage("Additional assets copied", this.timer.assetsStart));
-    await viteServer.close();
     await runHookBuildDone({
       config: this.config,
       buildConfig,
@@ -141,7 +122,7 @@ class AstroBuilder {
     try {
       await this.build(setupData);
     } catch (_err) {
-      throw fixViteErrorMessage(createSafeError(_err), setupData.viteServer);
+      throw fixViteErrorMessage(_err);
     }
   }
   async printStats({

package/dist/core/dev/index.js

@@ -46,7 +46,7 @@ async function dev(config, options) {
       https: !!((_a = viteConfig.server) == null ? void 0 : _a.https)
     })
   );
-  const currentVersion = "1.0.1";
+  const currentVersion = "1.0.2";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/errors.js

@@ -17,7 +17,7 @@ function cleanErrorStack(stack) {
 function fixViteErrorMessage(_err, server, filePath) {
   var _a, _b;
   const err = createSafeError(_err);
-  server.ssrFixStacktrace(err);
+  server == null ? void 0 : server.ssrFixStacktrace(err);
   if (err.message === "import.meta.glob() can only accept string literals.") {
     err.message = "Astro.glob() and import.meta.glob() can only accept string literals.";
   }

package/dist/core/messages.js

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

package/dist/core/render/dev/index.js

@@ -1,7 +1,6 @@
 import { fileURLToPath } from "url";
-import { prependForwardSlash } from "../../../core/path.js";
 import { PAGE_SCRIPT_ID } from "../../../vite-plugin-scripts/index.js";
-import { isPage } from "../../util.js";
+import { isPage, resolveIdToUrl } from "../../util.js";
 import { render as coreRender } from "../core.js";
 import { collectMdMetadata } from "../util.js";
 import { getStylesForURL } from "./css.js";
@@ -54,7 +53,7 @@ async function render(renderers, mod, ssrOpts) {
     scripts.add({
       props: {
         type: "module",
-        src: "/@id/astro/runtime/client/hmr.js"
+        src: await resolveIdToUrl(viteServer, "astro/runtime/client/hmr.js")
       },
       children: ""
     });
@@ -115,7 +114,7 @@ async function render(renderers, mod, ssrOpts) {
       if (s.startsWith("/@fs")) {
         return resolveClientDevPath(s);
       }
-      return "/@id" + prependForwardSlash(s);
+      return await resolveIdToUrl(viteServer, s);
     },
     renderers,
     request,

package/dist/core/util.js

@@ -4,8 +4,8 @@ import path from "path";
 import resolve from "resolve";
 import slash from "slash";
 import { fileURLToPath, pathToFileURL } from "url";
-import { removeTrailingForwardSlash } from "./path.js";
-const ASTRO_VERSION = "1.0.1";
+import { prependForwardSlash, removeTrailingForwardSlash } from "./path.js";
+const ASTRO_VERSION = "1.0.2";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }
@@ -157,6 +157,16 @@ function getLocalAddress(serverAddress, host) {
     return serverAddress;
   }
 }
+async function resolveIdToUrl(viteServer, id) {
+  const result = await viteServer.pluginContainer.resolveId(id);
+  if (!result) {
+    return VALID_ID_PREFIX + id;
+  }
+  if (path.isAbsolute(result.id)) {
+    return "/@fs" + prependForwardSlash(result.id);
+  }
+  return VALID_ID_PREFIX + result.id;
+}
 export {
   ASTRO_VERSION,
   VALID_ID_PREFIX,
@@ -175,6 +185,7 @@ export {
   relativeToSrcDir,
   removeDir,
   resolveDependency,
+  resolveIdToUrl,
   resolvePages,
   unwrapId,
   viteID

package/dist/runtime/client/idle.prebuilt.js

@@ -1,4 +1,14 @@
-var idle_prebuilt_default = `(self.Astro=self.Astro||{}).idle=a=>{const e=async()=>{await(await a())()};"requestIdleCallback"in window?window.requestIdleCallback(e):setTimeout(e,200)};`;
+var idle_prebuilt_default = `(self.Astro = self.Astro || {}).idle = (getHydrateCallback) => {
+  const cb = async () => {
+    let hydrate = await getHydrateCallback();
+    await hydrate();
+  };
+  if ("requestIdleCallback" in window) {
+    window.requestIdleCallback(cb);
+  } else {
+    setTimeout(cb, 200);
+  }
+};`;
 export {
   idle_prebuilt_default as default
 };

package/dist/runtime/client/load.prebuilt.js

@@ -1,4 +1,9 @@
-var load_prebuilt_default = `(self.Astro=self.Astro||{}).load=a=>{(async()=>await(await a())())()};`;
+var load_prebuilt_default = `(self.Astro = self.Astro || {}).load = (getHydrateCallback) => {
+  (async () => {
+    let hydrate = await getHydrateCallback();
+    await hydrate();
+  })();
+};`;
 export {
   load_prebuilt_default as default
 };

package/dist/runtime/client/media.prebuilt.js

@@ -1,4 +1,17 @@
-var media_prebuilt_default = `(self.Astro=self.Astro||{}).media=(s,a)=>{const t=async()=>{await(await s())()};if(a.value){const e=matchMedia(a.value);e.matches?t():e.addEventListener("change",t,{once:!0})}};`;
+var media_prebuilt_default = `(self.Astro = self.Astro || {}).media = (getHydrateCallback, options) => {
+  const cb = async () => {
+    let hydrate = await getHydrateCallback();
+    await hydrate();
+  };
+  if (options.value) {
+    const mql = matchMedia(options.value);
+    if (mql.matches) {
+      cb();
+    } else {
+      mql.addEventListener("change", cb, { once: true });
+    }
+  }
+};`;
 export {
   media_prebuilt_default as default
 };

package/dist/runtime/client/only.prebuilt.js

@@ -1,4 +1,9 @@
-var only_prebuilt_default = `(self.Astro=self.Astro||{}).only=a=>{(async()=>await(await a())())()};`;
+var only_prebuilt_default = `(self.Astro = self.Astro || {}).only = (getHydrateCallback) => {
+  (async () => {
+    let hydrate = await getHydrateCallback();
+    await hydrate();
+  })();
+};`;
 export {
   only_prebuilt_default as default
 };

package/dist/runtime/client/visible.prebuilt.js

@@ -1,4 +1,22 @@
-var visible_prebuilt_default = `(self.Astro=self.Astro||{}).visible=(i,c,n)=>{const r=async()=>{await(await i())()};let s=new IntersectionObserver(e=>{for(const t of e)if(!!t.isIntersecting){s.disconnect(),r();break}});for(let e=0;e<n.children.length;e++){const t=n.children[e];s.observe(t)}};`;
+var visible_prebuilt_default = `(self.Astro = self.Astro || {}).visible = (getHydrateCallback, _opts, root) => {
+  const cb = async () => {
+    let hydrate = await getHydrateCallback();
+    await hydrate();
+  };
+  let io = new IntersectionObserver((entries) => {
+    for (const entry of entries) {
+      if (!entry.isIntersecting)
+        continue;
+      io.disconnect();
+      cb();
+      break;
+    }
+  });
+  for (let i = 0; i < root.children.length; i++) {
+    const child = root.children[i];
+    io.observe(child);
+  }
+};`;
 export {
   visible_prebuilt_default as default
 };

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

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

package/dist/runtime/server/astro-island.prebuilt.js

@@ -1,4 +1,92 @@
-var astro_island_prebuilt_default = `var a;{const l={0:t=>t,1:t=>JSON.parse(t,n),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,n)),5:t=>new Set(JSON.parse(t,n)),6:t=>BigInt(t),7:t=>new URL(t)},n=(t,r)=>{if(t===""||!Array.isArray(r))return r;const[e,i]=r;return e in l?l[e](i):void 0};customElements.get("astro-island")||customElements.define("astro-island",(a=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement?.closest("astro-island[ssr]"))return;const r=this.querySelectorAll("astro-slot"),e={},i=this.querySelectorAll("template[data-astro-template]");for(const s of i)!s.closest(this.tagName)?.isSameNode(this)||(e[s.getAttribute("data-astro-template")||"default"]=s.innerHTML,s.remove());for(const s of r)!s.closest(this.tagName)?.isSameNode(this)||(e[s.getAttribute("name")||"default"]=s.innerHTML);const o=this.hasAttribute("props")?JSON.parse(this.getAttribute("props"),n):{};this.hydrator(this)(this.Component,o,e,{client:this.getAttribute("client")}),this.removeAttribute("ssr"),window.removeEventListener("astro:hydrate",this.hydrate),window.dispatchEvent(new CustomEvent("astro:hydrate"))}}connectedCallback(){!this.hasAttribute("await-children")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((r,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener("astro:hydrate",this.hydrate),await import(this.getAttribute("before-hydration-url"));const r=JSON.parse(this.getAttribute("opts"));Astro[this.getAttribute("client")](async()=>{const e=this.getAttribute("renderer-url"),[i,{default:o}]=await Promise.all([import(this.getAttribute("component-url")),e?import(e):()=>()=>{}]);return this.Component=i[this.getAttribute("component-export")||"default"],this.hydrator=o,this.hydrate},r,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},a.observedAttributes=["props"],a))}`;
+var astro_island_prebuilt_default = `var _a;
+{
+  const propTypes = {
+    0: (value) => value,
+    1: (value) => JSON.parse(value, reviver),
+    2: (value) => new RegExp(value),
+    3: (value) => new Date(value),
+    4: (value) => new Map(JSON.parse(value, reviver)),
+    5: (value) => new Set(JSON.parse(value, reviver)),
+    6: (value) => BigInt(value),
+    7: (value) => new URL(value)
+  };
+  const reviver = (propKey, raw) => {
+    if (propKey === "" || !Array.isArray(raw))
+      return raw;
+    const [type, value] = raw;
+    return type in propTypes ? propTypes[type](value) : void 0;
+  };
+  if (!customElements.get("astro-island")) {
+    customElements.define(
+      "astro-island",
+      (_a = class extends HTMLElement {
+        constructor() {
+          super(...arguments);
+          this.hydrate = () => {
+            if (!this.hydrator || this.parentElement?.closest("astro-island[ssr]")) {
+              return;
+            }
+            const slotted = this.querySelectorAll("astro-slot");
+            const slots = {};
+            const templates = this.querySelectorAll("template[data-astro-template]");
+            for (const template of templates) {
+              if (!template.closest(this.tagName)?.isSameNode(this))
+                continue;
+              slots[template.getAttribute("data-astro-template") || "default"] = template.innerHTML;
+              template.remove();
+            }
+            for (const slot of slotted) {
+              if (!slot.closest(this.tagName)?.isSameNode(this))
+                continue;
+              slots[slot.getAttribute("name") || "default"] = slot.innerHTML;
+            }
+            const props = this.hasAttribute("props") ? JSON.parse(this.getAttribute("props"), reviver) : {};
+            this.hydrator(this)(this.Component, props, slots, {
+              client: this.getAttribute("client")
+            });
+            this.removeAttribute("ssr");
+            window.removeEventListener("astro:hydrate", this.hydrate);
+            window.dispatchEvent(new CustomEvent("astro:hydrate"));
+          };
+        }
+        connectedCallback() {
+          if (!this.hasAttribute("await-children") || this.firstChild) {
+            this.childrenConnectedCallback();
+          } else {
+            new MutationObserver((_, mo) => {
+              mo.disconnect();
+              this.childrenConnectedCallback();
+            }).observe(this, { childList: true });
+          }
+        }
+        async childrenConnectedCallback() {
+          window.addEventListener("astro:hydrate", this.hydrate);
+          await import(this.getAttribute("before-hydration-url"));
+          const opts = JSON.parse(this.getAttribute("opts"));
+          Astro[this.getAttribute("client")](
+            async () => {
+              const rendererUrl = this.getAttribute("renderer-url");
+              const [componentModule, { default: hydrator }] = await Promise.all([
+                import(this.getAttribute("component-url")),
+                rendererUrl ? import(rendererUrl) : () => () => {
+                }
+              ]);
+              this.Component = componentModule[this.getAttribute("component-export") || "default"];
+              this.hydrator = hydrator;
+              return this.hydrate;
+            },
+            opts,
+            this
+          );
+        }
+        attributeChangedCallback() {
+          if (this.hydrator)
+            this.hydrate();
+        }
+      }, _a.observedAttributes = ["props"], _a)
+    );
+  }
+}`;
 export {
   astro_island_prebuilt_default as default
 };

package/dist/runtime/server/hydration.js

@@ -67,7 +67,7 @@ function extractDirectives(inputProps) {
   return extracted;
 }
 async function generateHydrateScript(scriptOptions, metadata) {
-  const { renderer, result, astroId, props } = scriptOptions;
+  const { renderer, result, astroId, props, attrs } = scriptOptions;
   const { hydrate, componentUrl, componentExport } = metadata;
   if (!componentExport) {
     throw new Error(
@@ -80,6 +80,11 @@ async function generateHydrateScript(scriptOptions, metadata) {
       uid: astroId
     }
   };
+  if (attrs) {
+    for (const [key, value] of Object.entries(attrs)) {
+      island.props[key] = value;
+    }
+  }
   island.props["component-url"] = await result.resolve(componentUrl);
   if (renderer.clientEntrypoint) {
     island.props["component-export"] = componentExport.value;

package/dist/runtime/server/render/component.js

@@ -77,6 +77,7 @@ Did you forget to import the component or is it possible there is a typo?`
   const metadata = { displayName };
   const { hydration, isPage, props } = extractDirectives(_props);
   let html = "";
+  let attrs = void 0;
   if (hydration) {
     metadata.hydrate = hydration.directive;
     metadata.hydrateArgs = hydration.value;
@@ -164,7 +165,7 @@ but ${plural ? "none were" : "it was not"} able to server-side render ${metadata
 Did you mean to enable ${formatList(probableRendererNames.map((r) => "`" + r + "`"))}?`);
       } else if (matchingRenderers.length === 1) {
         renderer = matchingRenderers[0];
-        ({ html } = await renderer.ssr.renderToStaticMarkup.call(
+        ({ html, attrs } = await renderer.ssr.renderToStaticMarkup.call(
           { result },
           Component,
           props,
@@ -189,7 +190,7 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
     if (metadata.hydrate === "only") {
       html = await renderSlot(result, slots == null ? void 0 : slots.fallback);
     } else {
-      ({ html } = await renderer.ssr.renderToStaticMarkup.call(
+      ({ html, attrs } = await renderer.ssr.renderToStaticMarkup.call(
         { result },
         Component,
         props,
@@ -229,7 +230,7 @@ ${serializeProps(
     )}`
   );
   const island = await generateHydrateScript(
-    { renderer, result, astroId, props },
+    { renderer, result, astroId, props, attrs },
     metadata
   );
   let unrenderedSlots = [];

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

@@ -917,6 +917,7 @@ export interface SSRLoadedRenderer extends AstroRenderer {
         check: AsyncRendererComponentFn<boolean>;
         renderToStaticMarkup: AsyncRendererComponentFn<{
             html: string;
+            attrs?: Record<string, string>;
         }>;
     };
 }

package/dist/types/core/app/node.d.ts

@@ -1,10 +1,11 @@
 /// <reference types="node" />
+import type { RouteData } from '../../@types/astro';
 import type { SSRManifest } from './types';
 import { IncomingMessage } from 'http';
-import { App } from './index.js';
+import { App, MatchOptions } from './index.js';
 export declare class NodeApp extends App {
-    match(req: IncomingMessage | Request): import("../../@types/astro").RouteData | undefined;
-    render(req: IncomingMessage | Request): Promise<Response>;
+    match(req: IncomingMessage | Request, opts?: MatchOptions): RouteData | undefined;
+    render(req: IncomingMessage | Request, routeData?: RouteData): Promise<Response>;
 }
 export declare function loadManifest(rootFolder: URL): Promise<SSRManifest>;
 export declare function loadApp(rootFolder: URL): Promise<NodeApp>;

package/dist/types/core/build/page-data.d.ts

@@ -1,16 +1,10 @@
-import type { ViteDevServer } from 'vite';
 import type { AstroConfig, ManifestData } from '../../@types/astro';
 import type { LogOptions } from '../logger/core';
 import type { AllPagesData } from './types';
-import { RouteCache } from '../render/route-cache.js';
 export interface CollectPagesDataOptions {
     astroConfig: AstroConfig;
     logging: LogOptions;
     manifest: ManifestData;
-    origin: string;
-    routeCache: RouteCache;
-    viteServer: ViteDevServer;
-    ssr: boolean;
 }
 export interface CollectPagesDataResult {
     assets: Record<string, string>;

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

@@ -22,8 +22,11 @@ export interface ErrorWithMetadata {
     };
 }
 export declare function cleanErrorStack(stack: string): string;
-/** Update the error message to correct any vite-isms that we don't want to expose to the user. */
-export declare function fixViteErrorMessage(_err: unknown, server: ViteDevServer, filePath?: URL): Error;
+/**
+ * Update the error message to correct any vite-isms that we don't want to expose to the user.
+ * The `server` is required if the error may come from `server.ssrLoadModule()`.
+ */
+export declare function fixViteErrorMessage(_err: unknown, server?: ViteDevServer, filePath?: URL): Error;
 export declare function createCustomViteLogger(logLevel: LogLevel): Logger;
 /**
  * Takes any error-like object and returns a standardized Error + metadata object.

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

@@ -1,4 +1,4 @@
-import type { ErrorPayload } from 'vite';
+import type { ErrorPayload, ViteDevServer } from 'vite';
 import type { AstroConfig } from '../@types/astro';
 export declare const ASTRO_VERSION: string;
 /** Returns true if argument is an object of any prototype/class (but not null). */
@@ -41,3 +41,8 @@ export declare function isModeServerWithNoAdapter(config: AstroConfig): boolean;
 export declare function relativeToSrcDir(config: AstroConfig, idOrUrl: URL | string): string;
 export declare function emoji(char: string, fallback: string): string;
 export declare function getLocalAddress(serverAddress: string, host: string | boolean): string;
+/**
+ * Simulate Vite's resolve and import analysis so we can import the id as an URL
+ * through a script tag or a dynamic import as-is.
+ */
+export declare function resolveIdToUrl(viteServer: ViteDevServer, id: string): Promise<string>;

package/dist/types/runtime/client/idle.prebuilt.d.ts

@@ -3,5 +3,5 @@
  * Do not edit this directly, but instead edit that file and rerun the prebuild
  * to generate this file.
  */
-declare const _default: "(self.Astro=self.Astro||{}).idle=a=>{const e=async()=>{await(await a())()};\"requestIdleCallback\"in window?window.requestIdleCallback(e):setTimeout(e,200)};";
+declare const _default: "(self.Astro = self.Astro || {}).idle = (getHydrateCallback) => {\n  const cb = async () => {\n    let hydrate = await getHydrateCallback();\n    await hydrate();\n  };\n  if (\"requestIdleCallback\" in window) {\n    window.requestIdleCallback(cb);\n  } else {\n    setTimeout(cb, 200);\n  }\n};";
 export default _default;

package/dist/types/runtime/client/load.prebuilt.d.ts

@@ -3,5 +3,5 @@
  * Do not edit this directly, but instead edit that file and rerun the prebuild
  * to generate this file.
  */
-declare const _default: "(self.Astro=self.Astro||{}).load=a=>{(async()=>await(await a())())()};";
+declare const _default: "(self.Astro = self.Astro || {}).load = (getHydrateCallback) => {\n  (async () => {\n    let hydrate = await getHydrateCallback();\n    await hydrate();\n  })();\n};";
 export default _default;

package/dist/types/runtime/client/media.prebuilt.d.ts

@@ -3,5 +3,5 @@
  * Do not edit this directly, but instead edit that file and rerun the prebuild
  * to generate this file.
  */
-declare const _default: "(self.Astro=self.Astro||{}).media=(s,a)=>{const t=async()=>{await(await s())()};if(a.value){const e=matchMedia(a.value);e.matches?t():e.addEventListener(\"change\",t,{once:!0})}};";
+declare const _default: "(self.Astro = self.Astro || {}).media = (getHydrateCallback, options) => {\n  const cb = async () => {\n    let hydrate = await getHydrateCallback();\n    await hydrate();\n  };\n  if (options.value) {\n    const mql = matchMedia(options.value);\n    if (mql.matches) {\n      cb();\n    } else {\n      mql.addEventListener(\"change\", cb, { once: true });\n    }\n  }\n};";
 export default _default;

package/dist/types/runtime/client/only.prebuilt.d.ts

@@ -3,5 +3,5 @@
  * Do not edit this directly, but instead edit that file and rerun the prebuild
  * to generate this file.
  */
-declare const _default: "(self.Astro=self.Astro||{}).only=a=>{(async()=>await(await a())())()};";
+declare const _default: "(self.Astro = self.Astro || {}).only = (getHydrateCallback) => {\n  (async () => {\n    let hydrate = await getHydrateCallback();\n    await hydrate();\n  })();\n};";
 export default _default;

package/dist/types/runtime/client/visible.prebuilt.d.ts

@@ -3,5 +3,5 @@
  * Do not edit this directly, but instead edit that file and rerun the prebuild
  * to generate this file.
  */
-declare const _default: "(self.Astro=self.Astro||{}).visible=(i,c,n)=>{const r=async()=>{await(await i())()};let s=new IntersectionObserver(e=>{for(const t of e)if(!!t.isIntersecting){s.disconnect(),r();break}});for(let e=0;e<n.children.length;e++){const t=n.children[e];s.observe(t)}};";
+declare const _default: "(self.Astro = self.Astro || {}).visible = (getHydrateCallback, _opts, root) => {\n  const cb = async () => {\n    let hydrate = await getHydrateCallback();\n    await hydrate();\n  };\n  let io = new IntersectionObserver((entries) => {\n    for (const entry of entries) {\n      if (!entry.isIntersecting)\n        continue;\n      io.disconnect();\n      cb();\n      break;\n    }\n  });\n  for (let i = 0; i < root.children.length; i++) {\n    const child = root.children[i];\n    io.observe(child);\n  }\n};";
 export default _default;

package/dist/types/runtime/server/astro-island.prebuilt.d.ts

@@ -3,5 +3,5 @@
  * Do not edit this directly, but instead edit that file and rerun the prebuild
  * to generate this file.
  */
-declare const _default: "var a;{const l={0:t=>t,1:t=>JSON.parse(t,n),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,n)),5:t=>new Set(JSON.parse(t,n)),6:t=>BigInt(t),7:t=>new URL(t)},n=(t,r)=>{if(t===\"\"||!Array.isArray(r))return r;const[e,i]=r;return e in l?l[e](i):void 0};customElements.get(\"astro-island\")||customElements.define(\"astro-island\",(a=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement?.closest(\"astro-island[ssr]\"))return;const r=this.querySelectorAll(\"astro-slot\"),e={},i=this.querySelectorAll(\"template[data-astro-template]\");for(const s of i)!s.closest(this.tagName)?.isSameNode(this)||(e[s.getAttribute(\"data-astro-template\")||\"default\"]=s.innerHTML,s.remove());for(const s of r)!s.closest(this.tagName)?.isSameNode(this)||(e[s.getAttribute(\"name\")||\"default\"]=s.innerHTML);const o=this.hasAttribute(\"props\")?JSON.parse(this.getAttribute(\"props\"),n):{};this.hydrator(this)(this.Component,o,e,{client:this.getAttribute(\"client\")}),this.removeAttribute(\"ssr\"),window.removeEventListener(\"astro:hydrate\",this.hydrate),window.dispatchEvent(new CustomEvent(\"astro:hydrate\"))}}connectedCallback(){!this.hasAttribute(\"await-children\")||this.firstChild?this.childrenConnectedCallback():new MutationObserver((r,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener(\"astro:hydrate\",this.hydrate),await import(this.getAttribute(\"before-hydration-url\"));const r=JSON.parse(this.getAttribute(\"opts\"));Astro[this.getAttribute(\"client\")](async()=>{const e=this.getAttribute(\"renderer-url\"),[i,{default:o}]=await Promise.all([import(this.getAttribute(\"component-url\")),e?import(e):()=>()=>{}]);return this.Component=i[this.getAttribute(\"component-export\")||\"default\"],this.hydrator=o,this.hydrate},r,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},a.observedAttributes=[\"props\"],a))}";
+declare const _default: "var _a;\n{\n  const propTypes = {\n    0: (value) => value,\n    1: (value) => JSON.parse(value, reviver),\n    2: (value) => new RegExp(value),\n    3: (value) => new Date(value),\n    4: (value) => new Map(JSON.parse(value, reviver)),\n    5: (value) => new Set(JSON.parse(value, reviver)),\n    6: (value) => BigInt(value),\n    7: (value) => new URL(value)\n  };\n  const reviver = (propKey, raw) => {\n    if (propKey === \"\" || !Array.isArray(raw))\n      return raw;\n    const [type, value] = raw;\n    return type in propTypes ? propTypes[type](value) : void 0;\n  };\n  if (!customElements.get(\"astro-island\")) {\n    customElements.define(\n      \"astro-island\",\n      (_a = class extends HTMLElement {\n        constructor() {\n          super(...arguments);\n          this.hydrate = () => {\n            if (!this.hydrator || this.parentElement?.closest(\"astro-island[ssr]\")) {\n              return;\n            }\n            const slotted = this.querySelectorAll(\"astro-slot\");\n            const slots = {};\n            const templates = this.querySelectorAll(\"template[data-astro-template]\");\n            for (const template of templates) {\n              if (!template.closest(this.tagName)?.isSameNode(this))\n                continue;\n              slots[template.getAttribute(\"data-astro-template\") || \"default\"] = template.innerHTML;\n              template.remove();\n            }\n            for (const slot of slotted) {\n              if (!slot.closest(this.tagName)?.isSameNode(this))\n                continue;\n              slots[slot.getAttribute(\"name\") || \"default\"] = slot.innerHTML;\n            }\n            const props = this.hasAttribute(\"props\") ? JSON.parse(this.getAttribute(\"props\"), reviver) : {};\n            this.hydrator(this)(this.Component, props, slots, {\n              client: this.getAttribute(\"client\")\n            });\n            this.removeAttribute(\"ssr\");\n            window.removeEventListener(\"astro:hydrate\", this.hydrate);\n            window.dispatchEvent(new CustomEvent(\"astro:hydrate\"));\n          };\n        }\n        connectedCallback() {\n          if (!this.hasAttribute(\"await-children\") || this.firstChild) {\n            this.childrenConnectedCallback();\n          } else {\n            new MutationObserver((_, mo) => {\n              mo.disconnect();\n              this.childrenConnectedCallback();\n            }).observe(this, { childList: true });\n          }\n        }\n        async childrenConnectedCallback() {\n          window.addEventListener(\"astro:hydrate\", this.hydrate);\n          await import(this.getAttribute(\"before-hydration-url\"));\n          const opts = JSON.parse(this.getAttribute(\"opts\"));\n          Astro[this.getAttribute(\"client\")](\n            async () => {\n              const rendererUrl = this.getAttribute(\"renderer-url\");\n              const [componentModule, { default: hydrator }] = await Promise.all([\n                import(this.getAttribute(\"component-url\")),\n                rendererUrl ? import(rendererUrl) : () => () => {\n                }\n              ]);\n              this.Component = componentModule[this.getAttribute(\"component-export\") || \"default\"];\n              this.hydrator = hydrator;\n              return this.hydrate;\n            },\n            opts,\n            this\n          );\n        }\n        attributeChangedCallback() {\n          if (this.hydrator)\n            this.hydrate();\n        }\n      }, _a.observedAttributes = [\"props\"], _a)\n    );\n  }\n}";
 export default _default;

package/dist/types/runtime/server/hydration.d.ts

@@ -19,6 +19,7 @@ interface HydrateScriptOptions {
     result: SSRResult;
     astroId: string;
     props: Record<string | number, any>;
+    attrs: Record<string, string> | undefined;
 }
 /** For hydrated components, generate a <script type="module"> to load the component */
 export declare function generateHydrateScript(scriptOptions: HydrateScriptOptions, metadata: Required<AstroComponentMetadata>): Promise<SSRElement>;

package/dist/types/vite-plugin-astro/query.d.ts

@@ -11,3 +11,4 @@ export interface ParsedRequestResult {
     query: AstroQuery;
 }
 export declare function parseAstroRequest(id: string): ParsedRequestResult;
+export declare function isAstroScript(id: string): boolean;

package/dist/vite-plugin-astro/hmr.js

@@ -2,6 +2,7 @@ import { fileURLToPath } from "node:url";
 import { info } from "../core/logger/core.js";
 import * as msg from "../core/messages.js";
 import { invalidateCompilation, isCached } from "./compile.js";
+import { isAstroScript } from "./query.js";
 async function trackCSSDependencies(opts) {
   const { viteDevServer, filename, deps, id } = opts;
   if (viteDevServer) {
@@ -29,7 +30,6 @@ const isPkgFile = (id) => {
   return (id == null ? void 0 : id.startsWith(fileURLToPath(PKG_PREFIX))) || (id == null ? void 0 : id.startsWith(PKG_PREFIX.pathname));
 };
 async function handleHotUpdate(ctx, { config, logging, compile }) {
-  var _a;
   let isStyleOnlyChange = false;
   if (ctx.file.endsWith(".astro")) {
     const oldResult = await compile();
@@ -81,17 +81,25 @@ async function handleHotUpdate(ctx, { config, logging, compile }) {
   if (isStyleOnlyChange) {
     info(logging, "astro", msg.hmr({ file, style: true }));
     return mods.filter((mod) => {
-      var _a2;
-      return mod.id !== ctx.file && !((_a2 = mod.id) == null ? void 0 : _a2.endsWith(".ts"));
+      var _a;
+      return mod.id !== ctx.file && !((_a = mod.id) == null ? void 0 : _a.endsWith(".ts"));
     });
   }
   for (const mod of mods) {
     for (const imp of mod.importedModules) {
-      if ((_a = imp.id) == null ? void 0 : _a.includes("?astro&type=script")) {
+      if (imp.id && isAstroScript(imp.id)) {
         mods.push(imp);
       }
     }
   }
+  for (const mod of filtered) {
+    if (mod.id && isAstroScript(mod.id) && mod.file) {
+      const astroMod = ctx.server.moduleGraph.getModuleById(mod.file);
+      if (astroMod) {
+        mods.unshift(astroMod);
+      }
+    }
+  }
   const isSelfAccepting = mods.every((m) => m.isSelfAccepting || m.url.endsWith(".svelte"));
   if (isSelfAccepting) {
     info(logging, "astro", msg.hmr({ file }));

package/dist/vite-plugin-astro/index.js

@@ -294,7 +294,11 @@ ${source}
         pluginContext: this
       };
       const compile = () => cachedCompilation(compileProps);
-      return handleHotUpdate.call(this, context, { config, logging, compile });
+      return handleHotUpdate.call(this, context, {
+        config,
+        logging,
+        compile
+      });
     }
   };
 }

package/dist/vite-plugin-astro/query.js

@@ -18,6 +18,11 @@ function parseAstroRequest(id) {
     query
   };
 }
+function isAstroScript(id) {
+  const parsed = parseAstroRequest(id);
+  return parsed.query.type === "script";
+}
 export {
+  isAstroScript,
   parseAstroRequest
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -126,7 +126,7 @@
     "tsconfig-resolver": "^3.0.1",
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2",
-    "vite": "3.0.4",
+    "vite": "3.0.5",
     "yargs-parser": "^21.0.1",
     "zod": "^3.17.3"
   },