astro 1.0.8 → 1.0.9

package/dist/core/build/graph.js

@@ -13,15 +13,18 @@ function* walkParentInfos(id, ctx, depth = 0, seen = /* @__PURE__ */ new Set())
     yield* walkParentInfos(imp, ctx, ++depth, seen);
   }
 }
+function moduleIsTopLevelPage(info) {
+  return info.importers[0] === resolvedPagesVirtualModuleId;
+}
 function* getTopLevelPages(id, ctx) {
-  var _a;
   for (const res of walkParentInfos(id, ctx)) {
-    if (((_a = res[0]) == null ? void 0 : _a.importers[0]) === resolvedPagesVirtualModuleId) {
+    if (moduleIsTopLevelPage(res[0])) {
       yield res;
     }
   }
 }
 export {
   getTopLevelPages,
+  moduleIsTopLevelPage,
   walkParentInfos
 };

package/dist/core/build/internal.js

@@ -2,9 +2,6 @@ import { prependForwardSlash } from "../path.js";
 import { viteID } from "../util.js";
 function createBuildInternals() {
   const pureCSSChunks = /* @__PURE__ */ new Set();
-  const chunkToReferenceIdMap = /* @__PURE__ */ new Map();
-  const astroStyleMap = /* @__PURE__ */ new Map();
-  const astroPageStyleMap = /* @__PURE__ */ new Map();
   const hoistedScriptIdToHoistedMap = /* @__PURE__ */ new Map();
   const hoistedScriptIdToPagesMap = /* @__PURE__ */ new Map();
   return {
@@ -88,6 +85,20 @@ function sortedCSS(pageData) {
     }
   }).map(([id]) => id);
 }
+function isHoistedScript(internals, id) {
+  return internals.hoistedScriptIdToPagesMap.has(id);
+}
+function* getPageDatasByHoistedScriptId(internals, id) {
+  const set = internals.hoistedScriptIdToPagesMap.get(id);
+  if (set) {
+    for (const pageId of set) {
+      const pageData = getPageDataByComponent(internals, pageId.slice(1));
+      if (pageData) {
+        yield pageData;
+      }
+    }
+  }
+}
 export {
   createBuildInternals,
   eachPageData,
@@ -95,7 +106,9 @@ export {
   getPageDataByViteID,
   getPageDatasByChunk,
   getPageDatasByClientOnlyID,
+  getPageDatasByHoistedScriptId,
   hasPageDataByViteID,
+  isHoistedScript,
   sortedCSS,
   trackClientOnlyPageDatas,
   trackPageData

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

@@ -122,7 +122,8 @@ async function ssrBuild(opts, internals, input) {
       vitePluginAnalyzer(internals)
     ],
     publicDir: ssr ? false : viteConfig.publicDir,
-    envPrefix: "PUBLIC_"
+    envPrefix: "PUBLIC_",
+    base: astroConfig.base
   };
   await runHookBuildSetup({
     config: astroConfig,
@@ -181,7 +182,8 @@ ${bgGreen(black(" building client "))}`);
       }),
       ...viteConfig.plugins || []
     ],
-    envPrefix: "PUBLIC_"
+    envPrefix: "PUBLIC_",
+    base: astroConfig.base
   };
   await runHookBuildSetup({
     config: astroConfig,

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

@@ -3,12 +3,19 @@ import esbuild from "esbuild";
 import npath from "path";
 import { isCSSRequest } from "../render/util.js";
 import { relativeToSrcDir } from "../util.js";
-import { getTopLevelPages, walkParentInfos } from "./graph.js";
-import { getPageDataByViteID, getPageDatasByClientOnlyID } from "./internal.js";
+import { getTopLevelPages, moduleIsTopLevelPage, walkParentInfos } from "./graph.js";
+import {
+  eachPageData,
+  getPageDataByViteID,
+  getPageDatasByClientOnlyID,
+  getPageDatasByHoistedScriptId,
+  isHoistedScript
+} from "./internal.js";
 const MAX_NAME_LENGTH = 70;
 function rollupPluginAstroBuildCSS(options) {
   const { internals, buildOptions } = options;
   const { astroConfig } = buildOptions;
+  let resolvedConfig;
   function nameifyPage(id) {
     let rel = relativeToSrcDir(astroConfig, id);
     if (rel.startsWith("pages/")) {
@@ -58,13 +65,24 @@ function rollupPluginAstroBuildCSS(options) {
         };
       },
       async generateBundle(_outputOptions, bundle) {
+        const appendCSSToPage = (pageData, meta, depth) => {
+          for (const importedCssImport of meta.importedCss) {
+            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 });
+            }
+          }
+        };
         for (const [_, chunk] of Object.entries(bundle)) {
           if (chunk.type === "chunk") {
             const c = chunk;
             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)) {
@@ -75,18 +93,19 @@ function rollupPluginAstroBuildCSS(options) {
                   }
                 }
                 for (const [id] of Object.entries(c.modules)) {
-                  debugger;
-                  for (const [pageInfo, depth] of getTopLevelPages(id, this)) {
-                    const pageViteID = pageInfo.id;
-                    const pageData = getPageDataByViteID(internals, pageViteID);
-                    for (const importedCssImport of meta.importedCss) {
-                      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 });
+                  for (const [pageInfo, depth] of walkParentInfos(id, this)) {
+                    if (moduleIsTopLevelPage(pageInfo)) {
+                      const pageViteID = pageInfo.id;
+                      const pageData = getPageDataByViteID(internals, pageViteID);
+                      if (pageData) {
+                        appendCSSToPage(pageData, meta, depth);
+                      }
+                    } else if (options.target === "client" && isHoistedScript(internals, pageInfo.id)) {
+                      for (const pageData of getPageDatasByHoistedScriptId(
+                        internals,
+                        pageInfo.id
+                      )) {
+                        appendCSSToPage(pageData, meta, -1);
                       }
                     }
                   }
@@ -97,6 +116,25 @@ function rollupPluginAstroBuildCSS(options) {
         }
       }
     },
+    {
+      name: "astro:rollup-plugin-single-css",
+      enforce: "post",
+      configResolved(config) {
+        resolvedConfig = config;
+      },
+      generateBundle(_, bundle) {
+        if (!resolvedConfig.build.cssCodeSplit) {
+          const cssChunk = Object.values(bundle).find(
+            (chunk) => chunk.type === "asset" && chunk.name === "style.css"
+          );
+          if (cssChunk) {
+            for (const pageData of eachPageData(internals)) {
+              pageData.css.set(cssChunk.fileName, { depth: -1 });
+            }
+          }
+        }
+      }
+    },
     {
       name: "astro:rollup-plugin-build-css-minify",
       enforce: "post",

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.8";
+  const currentVersion = "1.0.9";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -46,7 +46,7 @@ function devStart({
   https,
   site
 }) {
-  const version = "1.0.8";
+  const version = "1.0.9";
   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.8"}`
+        `v${"1.0.9"}`
       )} ${headline}`
     );
   }

package/dist/core/render/result.js

@@ -16,7 +16,7 @@ var __privateSet = (obj, member, value, setter) => {
   setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
 };
-var _cache, _result, _slots;
+var _cache, _result, _slots, _loggingOpts;
 import { bold } from "kleur/colors";
 import { renderSlot } from "../../runtime/server/index.js";
 import { warn } from "../logger/core.js";
@@ -37,12 +37,14 @@ function getFunctionExpression(slot) {
   return slot.expressions[0];
 }
 class Slots {
-  constructor(result, slots) {
+  constructor(result, slots, logging) {
     __privateAdd(this, _cache, /* @__PURE__ */ new Map());
     __privateAdd(this, _result, void 0);
     __privateAdd(this, _slots, void 0);
+    __privateAdd(this, _loggingOpts, void 0);
     __privateSet(this, _result, result);
     __privateSet(this, _slots, slots);
+    __privateSet(this, _loggingOpts, logging);
     if (slots) {
       for (const key of Object.keys(slots)) {
         if (this[key] !== void 0) {
@@ -78,11 +80,19 @@ Please update the name of this slot.`
     if (!cacheable) {
       const component = await __privateGet(this, _slots)[name]();
       const expression = getFunctionExpression(component);
-      if (expression) {
-        const slot = expression(...args);
-        return await renderSlot(__privateGet(this, _result), slot).then(
-          (res) => res != null ? String(res) : res
+      if (!Array.isArray(args)) {
+        warn(
+          __privateGet(this, _loggingOpts),
+          "Astro.slots.render",
+          `Expected second parameter to be an array, received a ${typeof args}. If you're trying to pass an array as a single argument and getting unexpected results, make sure you're passing your array as a item of an array. Ex: Astro.slots.render('default', [["Hello", "World"]])`
         );
+      } else {
+        if (expression) {
+          const slot = expression(...args);
+          return await renderSlot(__privateGet(this, _result), slot).then(
+            (res) => res != null ? String(res) : res
+          );
+        }
       }
     }
     const content = await renderSlot(__privateGet(this, _result), __privateGet(this, _slots)[name]).then(
@@ -96,6 +106,7 @@ Please update the name of this slot.`
 _cache = new WeakMap();
 _result = new WeakMap();
 _slots = new WeakMap();
+_loggingOpts = new WeakMap();
 let renderMarkdown = null;
 function createResult(args) {
   const { markdown, params, pathname, props: pageProps, renderers, request, resolve } = args;
@@ -122,7 +133,7 @@ function createResult(args) {
     scripts: args.scripts ?? /* @__PURE__ */ new Set(),
     links: args.links ?? /* @__PURE__ */ new Set(),
     createAstro(astroGlobal, props, slots) {
-      const astroSlots = new Slots(result, slots);
+      const astroSlots = new Slots(result, slots, args.logging);
       const Astro = {
         __proto__: astroGlobal,
         get clientAddress() {

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.8";
+const ASTRO_VERSION = "1.0.9";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }

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

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

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

@@ -23,21 +23,22 @@ var _a;
         constructor() {
           super(...arguments);
           this.hydrate = () => {
-            var _a2, _b, _c;
-            if (!this.hydrator || ((_a2 = this.parentElement) == null ? void 0 : _a2.closest("astro-island[ssr]"))) {
+            if (!this.hydrator || this.parentElement && 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 (!((_b = template.closest(this.tagName)) == null ? void 0 : _b.isSameNode(this)))
+              const closest = template.closest(this.tagName);
+              if (!closest || !closest.isSameNode(this))
                 continue;
               slots[template.getAttribute("data-astro-template") || "default"] = template.innerHTML;
               template.remove();
             }
             for (const slot of slotted) {
-              if (!((_c = slot.closest(this.tagName)) == null ? void 0 : _c.isSameNode(this)))
+              const closest = slot.closest(this.tagName);
+              if (!closest || !closest.isSameNode(this))
                 continue;
               slots[slot.getAttribute("name") || "default"] = slot.innerHTML;
             }

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

@@ -1,4 +1,4 @@
-var astro_island_prebuilt_default = `var d;{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",(d=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")),this.start()}start(){const r=JSON.parse(this.getAttribute("opts")),e=this.getAttribute("client");if(Astro[e]===void 0){window.addEventListener(\`astro:\${e}\`,()=>this.start(),{once:!0});return}Astro[e](async()=>{const i=this.getAttribute("renderer-url"),[o,{default:s}]=await Promise.all([import(this.getAttribute("component-url")),i?import(i):()=>()=>{}]),a=this.getAttribute("component-export")||"default";if(!a.includes("."))this.Component=o[a];else{this.Component=o;for(const c of a.split("."))this.Component=this.Component[c]}return this.hydrator=s,this.hydrate},r,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},d.observedAttributes=["props"],d))}`;
+var astro_island_prebuilt_default = `var l;{const c={0:t=>t,1:t=>JSON.parse(t,o),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,o)),5:t=>new Set(JSON.parse(t,o)),6:t=>BigInt(t),7:t=>new URL(t)},o=(t,i)=>{if(t===""||!Array.isArray(i))return i;const[e,n]=i;return e in c?c[e](n):void 0};customElements.get("astro-island")||customElements.define("astro-island",(l=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement&&this.parentElement.closest("astro-island[ssr]"))return;const i=this.querySelectorAll("astro-slot"),e={},n=this.querySelectorAll("template[data-astro-template]");for(const s of n){const r=s.closest(this.tagName);!r||!r.isSameNode(this)||(e[s.getAttribute("data-astro-template")||"default"]=s.innerHTML,s.remove())}for(const s of i){const r=s.closest(this.tagName);!r||!r.isSameNode(this)||(e[s.getAttribute("name")||"default"]=s.innerHTML)}const a=this.hasAttribute("props")?JSON.parse(this.getAttribute("props"),o):{};this.hydrator(this)(this.Component,a,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((i,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener("astro:hydrate",this.hydrate),await import(this.getAttribute("before-hydration-url")),this.start()}start(){const i=JSON.parse(this.getAttribute("opts")),e=this.getAttribute("client");if(Astro[e]===void 0){window.addEventListener(\`astro:\${e}\`,()=>this.start(),{once:!0});return}Astro[e](async()=>{const n=this.getAttribute("renderer-url"),[a,{default:s}]=await Promise.all([import(this.getAttribute("component-url")),n?import(n):()=>()=>{}]),r=this.getAttribute("component-export")||"default";if(!r.includes("."))this.Component=a[r];else{this.Component=a;for(const d of r.split("."))this.Component=this.Component[d]}return this.hydrator=s,this.hydrate},i,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},l.observedAttributes=["props"],l))}`;
 export {
   astro_island_prebuilt_default as default
 };

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

@@ -179,7 +179,7 @@ export interface AstroGlobal extends AstroGlobalPartial {
          */
         has(slotName: string): boolean;
         /**
-         * Asychronously renders this slot and returns HTML
+         * Asynchronously renders this slot and returns a string
          *
          * Example usage:
          * ```astro
@@ -192,6 +192,21 @@ export interface AstroGlobal extends AstroGlobalPartial {
          * <Fragment set:html={html} />
          * ```
          *
+         * A second parameters can be used to pass arguments to a slotted callback
+         *
+         * Example usage:
+         * ```astro
+         * ---
+         * html = await Astro.slots.render('default', ["Hello", "World"])
+         * ---
+         * ```
+         * Each item in the array will be passed as an argument that you can use like so:
+         * ```astro
+         * <Component>
+         *		{(hello, world) => <div>{hello}, {world}!</div>}
+         * </Component>
+         * ```
+         *
          * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astroslots)
          */
         render(slotName: string, args?: any[]): Promise<string>;

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

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

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

@@ -58,3 +58,5 @@ export declare function eachPageData(internals: BuildInternals): Generator<PageB
  * and page-level CSS on bottom.
  */
 export declare function sortedCSS(pageData: PageBuildData): string[];
+export declare function isHoistedScript(internals: BuildInternals, id: string): boolean;
+export declare function getPageDatasByHoistedScriptId(internals: BuildInternals, id: string): Generator<PageBuildData, void, unknown>;

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 d;{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\",(d=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\")),this.start()}start(){const r=JSON.parse(this.getAttribute(\"opts\")),e=this.getAttribute(\"client\");if(Astro[e]===void 0){window.addEventListener(`astro:${e}`,()=>this.start(),{once:!0});return}Astro[e](async()=>{const i=this.getAttribute(\"renderer-url\"),[o,{default:s}]=await Promise.all([import(this.getAttribute(\"component-url\")),i?import(i):()=>()=>{}]),a=this.getAttribute(\"component-export\")||\"default\";if(!a.includes(\".\"))this.Component=o[a];else{this.Component=o;for(const c of a.split(\".\"))this.Component=this.Component[c]}return this.hydrator=s,this.hydrate},r,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},d.observedAttributes=[\"props\"],d))}";
+declare const _default: "var l;{const c={0:t=>t,1:t=>JSON.parse(t,o),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,o)),5:t=>new Set(JSON.parse(t,o)),6:t=>BigInt(t),7:t=>new URL(t)},o=(t,i)=>{if(t===\"\"||!Array.isArray(i))return i;const[e,n]=i;return e in c?c[e](n):void 0};customElements.get(\"astro-island\")||customElements.define(\"astro-island\",(l=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement&&this.parentElement.closest(\"astro-island[ssr]\"))return;const i=this.querySelectorAll(\"astro-slot\"),e={},n=this.querySelectorAll(\"template[data-astro-template]\");for(const s of n){const r=s.closest(this.tagName);!r||!r.isSameNode(this)||(e[s.getAttribute(\"data-astro-template\")||\"default\"]=s.innerHTML,s.remove())}for(const s of i){const r=s.closest(this.tagName);!r||!r.isSameNode(this)||(e[s.getAttribute(\"name\")||\"default\"]=s.innerHTML)}const a=this.hasAttribute(\"props\")?JSON.parse(this.getAttribute(\"props\"),o):{};this.hydrator(this)(this.Component,a,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((i,e)=>{e.disconnect(),this.childrenConnectedCallback()}).observe(this,{childList:!0})}async childrenConnectedCallback(){window.addEventListener(\"astro:hydrate\",this.hydrate),await import(this.getAttribute(\"before-hydration-url\")),this.start()}start(){const i=JSON.parse(this.getAttribute(\"opts\")),e=this.getAttribute(\"client\");if(Astro[e]===void 0){window.addEventListener(`astro:${e}`,()=>this.start(),{once:!0});return}Astro[e](async()=>{const n=this.getAttribute(\"renderer-url\"),[a,{default:s}]=await Promise.all([import(this.getAttribute(\"component-url\")),n?import(n):()=>()=>{}]),r=this.getAttribute(\"component-export\")||\"default\";if(!r.includes(\".\"))this.Component=a[r];else{this.Component=a;for(const d of r.split(\".\"))this.Component=this.Component[d]}return this.hydrator=s,this.hydrate},i,this)}attributeChangedCallback(){this.hydrator&&this.hydrate()}},l.observedAttributes=[\"props\"],l))}";
 export default _default;

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

@@ -1,9 +1,10 @@
 import type { TransformResult } from '@astrojs/compiler';
 import type { PluginContext } from 'rollup';
+import type { ViteDevServer } from 'vite';
 import type { AstroConfig } from '../@types/astro';
-import type { TransformHook } from './styles';
+import type { TransformStyleWithVite } from './styles';
 declare type CompileResult = TransformResult & {
-    rawCSSDeps: Set<string>;
+    cssDeps: Set<string>;
     source: string;
 };
 export interface CompileProps {
@@ -12,7 +13,8 @@ export interface CompileProps {
     moduleId: string;
     source: string;
     ssr: boolean;
-    viteTransform: TransformHook;
+    transformStyleWithVite: TransformStyleWithVite;
+    viteDevServer?: ViteDevServer;
     pluginContext: PluginContext;
 }
 export declare function isCached(config: AstroConfig, filename: string): boolean;

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

@@ -1,19 +1,10 @@
-import type { PluginContext as RollupPluginContext } from 'rollup';
-import type { HmrContext, ModuleNode, ViteDevServer } from 'vite';
+import type { HmrContext, ModuleNode } from 'vite';
 import type { AstroConfig } from '../@types/astro';
 import type { LogOptions } from '../core/logger/core.js';
 import { cachedCompilation } from './compile.js';
-interface TrackCSSDependenciesOptions {
-    viteDevServer: ViteDevServer | null;
-    filename: string;
-    id: string;
-    deps: Set<string>;
-}
-export declare function trackCSSDependencies(this: RollupPluginContext, opts: TrackCSSDependenciesOptions): Promise<void>;
 export interface HandleHotUpdateOptions {
     config: AstroConfig;
     logging: LogOptions;
     compile: () => ReturnType<typeof cachedCompilation>;
 }
 export declare function handleHotUpdate(ctx: HmrContext, { config, logging, compile }: HandleHotUpdateOptions): Promise<ModuleNode[] | undefined>;
-export {};

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

@@ -1,16 +1,18 @@
-import type { PluginContext } from 'rollup';
 import type * as vite from 'vite';
 export declare type TransformHook = (code: string, id: string, ssr?: boolean) => Promise<vite.TransformResult>;
-/** Load vite:css’ transform() hook */
-export declare function getViteTransform(viteConfig: vite.ResolvedConfig): TransformHook;
-interface TransformWithViteOptions {
-    value: string;
-    lang: string;
+interface TransformStyleWithViteOptions {
     id: string;
-    transformHook: TransformHook;
-    pluginContext: PluginContext;
+    source: string;
+    lang: string;
     ssr?: boolean;
+    viteDevServer?: vite.ViteDevServer;
+}
+export interface TransformStyleWithVite {
+    (options: TransformStyleWithViteOptions): Promise<{
+        code: string;
+        map: vite.TransformResult['map'];
+        deps: Set<string>;
+    } | null>;
 }
-/** Transform style using Vite hook */
-export declare function transformWithVite({ value, lang, transformHook, id, ssr, pluginContext, }: TransformWithViteOptions): Promise<vite.TransformResult | null>;
+export declare function createTransformStyleWithViteFn(viteConfig: vite.ResolvedConfig): TransformStyleWithVite;
 export {};

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

@@ -3,13 +3,6 @@ import { fileURLToPath } from "url";
 import { AstroErrorCodes } from "../core/errors.js";
 import { prependForwardSlash } from "../core/path.js";
 import { viteID } from "../core/util.js";
-import { transformWithVite } from "./styles.js";
-function createImportPlaceholder(spec) {
-  return `/*IMPORT:${spec}*/`;
-}
-function safelyReplaceImportPlaceholder(code) {
-  return code.replace(/\/\*IMPORT\:(.*?)\*\//g, `@import '$1';`);
-}
 const configCache = /* @__PURE__ */ new WeakMap();
 function getNormalizedID(filename) {
   try {
@@ -25,13 +18,18 @@ async function compile({
   moduleId,
   source,
   ssr,
-  viteTransform,
+  transformStyleWithVite,
+  viteDevServer,
   pluginContext
 }) {
   var _a;
   const normalizedID = getNormalizedID(filename);
-  let rawCSSDeps = /* @__PURE__ */ new Set();
+  let cssDeps = /* @__PURE__ */ new Set();
   let cssTransformError;
+  if (!pluginContext.addWatchFile) {
+    pluginContext.addWatchFile = () => {
+    };
+  }
   const transformResult = await transform(source, {
     pathname: `/@fs${prependForwardSlash(moduleId)}`,
     projectRoot: config.root.toString(),
@@ -45,28 +43,19 @@ async function compile({
     preprocessStyle: async (value, attrs) => {
       const lang = `.${(attrs == null ? void 0 : attrs.lang) || "css"}`.toLowerCase();
       try {
-        value.replace(
-          /(?:@import)\s(?:url\()?\s?["\'](.*?)["\']\s?\)?(?:[^;]*);?/gi,
-          (match, spec) => {
-            rawCSSDeps.add(spec);
-            if (lang === ".css") {
-              return createImportPlaceholder(spec);
-            } else {
-              return match;
-            }
-          }
-        );
-        const result = await transformWithVite({
-          value,
-          lang,
+        const result = await transformStyleWithVite.call(pluginContext, {
           id: normalizedID,
-          transformHook: viteTransform,
+          source: value,
+          lang,
           ssr,
-          pluginContext
+          viteDevServer
         });
-        let map;
         if (!result)
           return null;
+        for (const dep of result.deps) {
+          cssDeps.add(dep);
+        }
+        let map;
         if (result.map) {
           if (typeof result.map === "string") {
             map = result.map;
@@ -74,8 +63,7 @@ async function compile({
             map = result.map.toString();
           }
         }
-        const code = safelyReplaceImportPlaceholder(result.code);
-        return { code, map };
+        return { code: result.code, map };
       } catch (err) {
         cssTransformError = err;
         return null;
@@ -92,8 +80,8 @@ async function compile({
     return result;
   });
   const compileResult = Object.create(transformResult, {
-    rawCSSDeps: {
-      value: rawCSSDeps
+    cssDeps: {
+      value: cssDeps
     },
     source: {
       value: source

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

@@ -3,28 +3,6 @@ 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) {
-    const mod = viteDevServer.moduleGraph.getModuleById(id);
-    if (mod) {
-      const cssDeps = (await Promise.all(
-        Array.from(deps).map((spec) => {
-          return this.resolve(spec, id);
-        })
-      )).filter(Boolean).map((dep) => dep.id);
-      const { moduleGraph } = viteDevServer;
-      const depModules = new Set(mod.importedModules);
-      for (const dep of cssDeps) {
-        depModules.add(moduleGraph.createFileOnlyEntry(dep));
-      }
-      moduleGraph.updateModuleInfo(mod, depModules, /* @__PURE__ */ new Map(), /* @__PURE__ */ new Set(), /* @__PURE__ */ new Set(), true);
-      for (const dep of cssDeps) {
-        this.addWatchFile(dep);
-      }
-    }
-  }
-}
 const PKG_PREFIX = new URL("../../", import.meta.url);
 const isPkgFile = (id) => {
   return (id == null ? void 0 : id.startsWith(fileURLToPath(PKG_PREFIX))) || (id == null ? void 0 : id.startsWith(PKG_PREFIX.pathname));
@@ -75,6 +53,9 @@ async function handleHotUpdate(ctx, { config, logging, compile }) {
     if (isStyleOnlyChange && file2 === ctx.file)
       continue;
     invalidateCompilation(config, file2);
+    if (file2.endsWith(".astro")) {
+      ctx.server.moduleGraph.onFileChange(file2);
+    }
   }
   const mods = ctx.modules.filter((m) => !m.url.endsWith("="));
   const file = ctx.file.replace(config.root.pathname, "/");
@@ -109,6 +90,5 @@ async function handleHotUpdate(ctx, { config, logging, compile }) {
   return mods;
 }
 export {
-  handleHotUpdate,
-  trackCSSDependencies
+  handleHotUpdate
 };

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

@@ -5,9 +5,9 @@ import { fileURLToPath } from "url";
 import { isRelativePath, startsWithForwardSlash } from "../core/path.js";
 import { getFileInfo } from "../vite-plugin-utils/index.js";
 import { cachedCompilation, getCachedSource } from "./compile.js";
-import { handleHotUpdate, trackCSSDependencies } from "./hmr.js";
+import { handleHotUpdate } from "./hmr.js";
 import { parseAstroRequest } from "./query.js";
-import { getViteTransform } from "./styles.js";
+import { createTransformStyleWithViteFn } from "./styles.js";
 const FRONTMATTER_PARSE_REGEXP = /^\-\-\-(.*)^\-\-\-/ms;
 function astro({ config, logging }) {
   function normalizeFilename(filename) {
@@ -24,8 +24,8 @@ function astro({ config, logging }) {
     return slash(fileURLToPath(url)) + url.search;
   }
   let resolvedConfig;
-  let viteTransform;
-  let viteDevServer = null;
+  let transformStyleWithVite;
+  let viteDevServer;
   const srcRootWeb = config.srcDir.pathname.slice(config.root.pathname.length - 1);
   const isBrowserPath = (path) => path.startsWith(srcRootWeb);
   function resolveRelativeFromAstroParent(id, parsedFrom) {
@@ -42,7 +42,7 @@ function astro({ config, logging }) {
     enforce: "pre",
     configResolved(_resolvedConfig) {
       resolvedConfig = _resolvedConfig;
-      viteTransform = getViteTransform(resolvedConfig);
+      transformStyleWithVite = createTransformStyleWithViteFn(_resolvedConfig);
     },
     configureServer(server) {
       viteDevServer = server;
@@ -87,7 +87,8 @@ function astro({ config, logging }) {
         moduleId: id,
         source,
         ssr: Boolean(opts == null ? void 0 : opts.ssr),
-        viteTransform,
+        transformStyleWithVite,
+        viteDevServer,
         pluginContext: this
       };
       switch (query.type) {
@@ -96,12 +97,6 @@ function astro({ config, logging }) {
             throw new Error(`Requests for Astro CSS must include an index.`);
           }
           const transformResult = await cachedCompilation(compileProps);
-          await trackCSSDependencies.call(this, {
-            viteDevServer,
-            id,
-            filename,
-            deps: transformResult.rawCSSDeps
-          });
           const csses = transformResult.css;
           const code = csses[query.index];
           return {
@@ -184,12 +179,16 @@ File: ${filename}`
         moduleId: id,
         source,
         ssr: Boolean(opts == null ? void 0 : opts.ssr),
-        viteTransform,
+        transformStyleWithVite,
+        viteDevServer,
         pluginContext: this
       };
       try {
         const transformResult = await cachedCompilation(compileProps);
         const { fileId: file, fileUrl: url } = getFileInfo(id, config);
+        for (const dep of transformResult.cssDeps) {
+          this.addWatchFile(dep);
+        }
         const { code, map } = await esbuild.transform(transformResult.code, {
           loader: "ts",
           sourcemap: "external",
@@ -290,7 +289,8 @@ ${source}
         moduleId: context.file,
         source: await context.read(),
         ssr: true,
-        viteTransform,
+        transformStyleWithVite,
+        viteDevServer,
         pluginContext: this
       };
       const compile = () => cachedCompilation(compileProps);

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

@@ -1,26 +1,31 @@
 import { STYLE_EXTENSIONS } from "../core/render/util.js";
-function getViteTransform(viteConfig) {
+function createTransformStyleWithViteFn(viteConfig) {
   const viteCSSPlugin = viteConfig.plugins.find(({ name }) => name === "vite:css");
   if (!viteCSSPlugin)
-    throw new Error(`vite:css plugin couldn\u2019t be found`);
+    throw new Error(`vite:css plugin couldn't be found`);
   if (!viteCSSPlugin.transform)
     throw new Error(`vite:css has no transform() hook`);
-  return viteCSSPlugin.transform;
-}
-async function transformWithVite({
-  value,
-  lang,
-  transformHook,
-  id,
-  ssr,
-  pluginContext
-}) {
-  if (!STYLE_EXTENSIONS.has(lang)) {
-    return null;
-  }
-  return transformHook.call(pluginContext, value, id + `?astro&type=style&lang${lang}`, ssr);
+  const transformCss = viteCSSPlugin.transform;
+  return async function({ id, source, lang, ssr, viteDevServer }) {
+    if (!STYLE_EXTENSIONS.has(lang)) {
+      return null;
+    }
+    const styleId = `${id}?astro&type=style&lang${lang}`;
+    viteDevServer == null ? void 0 : viteDevServer.moduleGraph.ensureEntryFromUrl(styleId, ssr, false);
+    const transformResult = await transformCss.call(this, source, styleId, ssr);
+    const { code, map } = transformResult;
+    const deps = /* @__PURE__ */ new Set();
+    const mod = viteDevServer == null ? void 0 : viteDevServer.moduleGraph.getModuleById(styleId);
+    if (mod) {
+      for (const imported of mod.importedModules) {
+        if (imported.file) {
+          deps.add(imported.file);
+        }
+      }
+    }
+    return { code, map, deps };
+  };
 }
 export {
-  getViteTransform,
-  transformWithVite
+  createTransformStyleWithViteFn
 };

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

@@ -37,39 +37,27 @@ function tagExportsWithRenderer({
         }
       },
       ExportDeclaration(path, state) {
-        var _a, _b, _c;
+        var _a, _b;
         const node = path.node;
         if (node.exportKind === "type")
           return;
         if (node.type === "ExportAllDeclaration")
           return;
-        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);
-              }
-            });
+        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]);
+            }
           }
         }
       }

package/dist/vite-plugin-markdown-legacy/index.js

@@ -7,7 +7,9 @@ import { fileURLToPath } from "url";
 import { pagesVirtualModuleId } from "../core/app/index.js";
 import { collectErrorMetadata } from "../core/errors.js";
 import { cachedCompilation } from "../vite-plugin-astro/compile.js";
-import { getViteTransform } from "../vite-plugin-astro/styles.js";
+import {
+  createTransformStyleWithViteFn
+} from "../vite-plugin-astro/styles.js";
 import { getFileInfo } from "../vite-plugin-utils/index.js";
 const MARKDOWN_IMPORT_FLAG = "?mdImport";
 const MARKDOWN_CONTENT_FLAG = "?content";
@@ -41,12 +43,13 @@ function markdown({ config, logging }) {
     }
     return false;
   }
-  let viteTransform;
+  let transformStyleWithVite;
+  let viteDevServer;
   return {
     name: "astro:markdown",
     enforce: "pre",
     configResolved(_resolvedConfig) {
-      viteTransform = getViteTransform(_resolvedConfig);
+      transformStyleWithVite = createTransformStyleWithViteFn(_resolvedConfig);
     },
     async resolveId(id, importer, options) {
       if (id.endsWith(`.md${MARKDOWN_CONTENT_FLAG}`)) {
@@ -159,7 +162,8 @@ ${astroResult}
           moduleId: id,
           source: astroResult,
           ssr: Boolean(opts == null ? void 0 : opts.ssr),
-          viteTransform,
+          transformStyleWithVite,
+          viteDevServer,
           pluginContext: this
         };
         let transformResult = await cachedCompilation(compileProps);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -74,7 +74,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^0.23.3",
+    "@astrojs/compiler": "^0.23.4",
     "@astrojs/language-server": "^0.20.0",
     "@astrojs/markdown-remark": "^1.0.0",
     "@astrojs/telemetry": "^1.0.0",
@@ -115,7 +115,7 @@
     "recast": "^0.20.5",
     "rehype": "^12.0.1",
     "resolve": "^1.22.0",
-    "rollup": "^2.75.6",
+    "rollup": "~2.77.0",
     "semver": "^7.3.7",
     "shiki": "^0.10.1",
     "sirv": "^2.0.2",