astro 1.0.0-beta.34 → 1.0.0-beta.35

package/dist/cli/index.js

@@ -40,7 +40,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.34";
+  const version = "1.0.0-beta.35";
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
 }
@@ -83,7 +83,7 @@ async function cli(args) {
   } else if (flags.silent) {
     logging.level = "silent";
   }
-  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.34" });
+  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.35" });
   if (cmd === "telemetry") {
     try {
       const subcommand = (_a = flags._[3]) == null ? void 0 : _a.toString();
@@ -97,7 +97,7 @@ async function cli(args) {
       try {
         const packages = flags._.slice(3);
         telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.34",
+          astroVersion: "1.0.0-beta.35",
           cliCommand: "add"
         }));
         return await add(packages, { cwd: root, flags, logging, telemetry });
@@ -108,7 +108,7 @@ async function cli(args) {
     case "dev": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.34", cliCommand: "dev" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.35", cliCommand: "dev" }, userConfig, flags));
         await devServer(astroConfig, { logging, telemetry });
         return await new Promise(() => {
         });
@@ -119,7 +119,7 @@ async function cli(args) {
     case "build": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.34", cliCommand: "build" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.35", cliCommand: "build" }, userConfig, flags));
         return await build(astroConfig, { logging, telemetry });
       } catch (err) {
         return throwAndExit(err);
@@ -127,14 +127,14 @@ async function cli(args) {
     }
     case "check": {
       const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.34", cliCommand: "check" }, userConfig, flags));
+      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.35", cliCommand: "check" }, userConfig, flags));
       const ret = await check(astroConfig);
       return process.exit(ret);
     }
     case "preview": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.34", cliCommand: "preview" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.35", cliCommand: "preview" }, userConfig, flags));
         const server = await preview(astroConfig, { logging, telemetry });
         return await server.closed();
       } catch (err) {
@@ -144,7 +144,7 @@ async function cli(args) {
     case "docs": {
       try {
         await telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.34",
+          astroVersion: "1.0.0-beta.35",
           cliCommand: "docs"
         }));
         return await openInBrowser("https://docs.astro.build/");

package/dist/core/build/generate.js

@@ -159,6 +159,7 @@ async function generatePath(pathname, opts, gopts) {
   }
   const outFolder = getOutFolder(astroConfig, pathname, pageData.route.type);
   const outFile = getOutFile(astroConfig, outFolder, pathname, pageData.route.type);
+  pageData.route.distURL = outFile;
   await fs.promises.mkdir(outFolder, { recursive: true });
   await fs.promises.writeFile(outFile, body, "utf-8");
 }

package/dist/core/build/internal.js

@@ -42,15 +42,14 @@ function* getPageDatasByChunk(internals, chunk) {
     }
   }
 }
-function* getPageDatasByClientOnlyChunk(internals, chunk) {
+function* getPageDatasByClientOnlyID(internals, viteid) {
   const pagesByClientOnly = internals.pagesByClientOnly;
   if (pagesByClientOnly.size) {
-    for (const [modulePath] of Object.entries(chunk.modules)) {
-      const pathname = `/@fs${prependForwardSlash(modulePath)}`;
-      if (pagesByClientOnly.has(pathname)) {
-        for (const pageData of pagesByClientOnly.get(pathname)) {
-          yield pageData;
-        }
+    const pathname = `/@fs${prependForwardSlash(viteid)}`;
+    const pageBuildDatas = pagesByClientOnly.get(pathname);
+    if (pageBuildDatas) {
+      for (const pageData of pageBuildDatas) {
+        yield pageData;
       }
     }
   }
@@ -79,7 +78,7 @@ export {
   getPageDataByComponent,
   getPageDataByViteID,
   getPageDatasByChunk,
-  getPageDatasByClientOnlyChunk,
+  getPageDatasByClientOnlyID,
   hasPageDataByViteID,
   trackClientOnlyPageDatas,
   trackPageData

package/dist/core/dev/index.js

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

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function devStart({
   https,
   site
 }) {
-  const version = "1.0.0-beta.34";
+  const version = "1.0.0-beta.35";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -203,7 +203,7 @@ function printHelp({
   };
   let message = [];
   if (headline) {
-    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.34"}`)} ${headline}`);
+    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.35"}`)} ${headline}`);
   }
   if (usage) {
     message.push(linebreak(), `  ${green(commandName)} ${bold(usage)}`);

package/dist/runtime/client/only.js

@@ -1,4 +1,4 @@
-async function onLoad(astroId, options, getHydrateCallback) {
+async function onOnly(astroId, options, getHydrateCallback) {
   const roots = document.querySelectorAll(`astro-root[uid="${astroId}"]`);
   if (roots.length === 0) {
     throw new Error(`Unable to find the root for the component ${options.name}`);
@@ -20,5 +20,5 @@ async function onLoad(astroId, options, getHydrateCallback) {
   }
 }
 export {
-  onLoad as default
+  onOnly as default
 };

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

@@ -876,6 +876,7 @@ export interface RouteData {
     generate: (data?: any) => string;
     params: string[];
     pathname?: string;
+    distURL?: URL;
     pattern: RegExp;
     segments: RoutePart[][];
     type: RouteType;

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

@@ -29,7 +29,7 @@ export declare function trackPageData(internals: BuildInternals, component: stri
  */
 export declare function trackClientOnlyPageDatas(internals: BuildInternals, pageData: PageBuildData, clientOnlys: string[]): void;
 export declare function getPageDatasByChunk(internals: BuildInternals, chunk: RenderedChunk): Generator<PageBuildData, void, unknown>;
-export declare function getPageDatasByClientOnlyChunk(internals: BuildInternals, chunk: RenderedChunk): Generator<PageBuildData, void, unknown>;
+export declare function getPageDatasByClientOnlyID(internals: BuildInternals, viteid: ViteID): Generator<PageBuildData, void, unknown>;
 export declare function getPageDataByComponent(internals: BuildInternals, component: string): PageBuildData | undefined;
 export declare function getPageDataByViteID(internals: BuildInternals, viteid: ViteID): PageBuildData | undefined;
 export declare function hasPageDataByViteID(internals: BuildInternals, viteid: ViteID): boolean;

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

@@ -1,6 +1,6 @@
 import type { GetHydrateCallback, HydrateOptions } from '../../@types/astro';
 /**
- * Hydrate this component as soon as the main thread is free
+ * Hydrate this component as soon as the main thread is free!
  * (or after a short delay, if `requestIdleCallback`) isn't supported
  */
 export default function onIdle(astroId: string, options: HydrateOptions, getHydrateCallback: GetHydrateCallback): Promise<void>;

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

@@ -1,5 +1,5 @@
 import type { GetHydrateCallback, HydrateOptions } from '../../@types/astro';
 /**
- * Hydrate this component immediately
+ * Hydrate this component immediately!
  */
 export default function onLoad(astroId: string, options: HydrateOptions, getHydrateCallback: GetHydrateCallback): Promise<void>;

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

@@ -1,5 +1,5 @@
 import type { GetHydrateCallback, HydrateOptions } from '../../@types/astro';
 /**
- * Hydrate this component when a matching media query is found
+ * Hydrate this component when a matching media query is found!
  */
 export default function onMedia(astroId: string, options: HydrateOptions, getHydrateCallback: GetHydrateCallback): Promise<void>;

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

@@ -1,5 +1,5 @@
 import type { GetHydrateCallback, HydrateOptions } from '../../@types/astro';
 /**
- * Hydrate this component immediately
+ * Hydrate this component only on the client
  */
-export default function onLoad(astroId: string, options: HydrateOptions, getHydrateCallback: GetHydrateCallback): Promise<void>;
+export default function onOnly(astroId: string, options: HydrateOptions, getHydrateCallback: GetHydrateCallback): Promise<void>;

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

@@ -1,6 +1,6 @@
 import type { GetHydrateCallback, HydrateOptions } from '../../@types/astro';
 /**
- * Hydrate this component when one of it's children becomes visible.
+ * Hydrate this component when one of it's children becomes visible!
  * We target the children because `astro-root` is set to `display: contents`
  * which doesn't work with IntersectionObserver
  */

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

@@ -1,154 +1,126 @@
-import * as path from "path";
-import esbuild from "esbuild";
 import { isCSSRequest } from "../core/render/util.js";
-import {
-  getPageDatasByChunk,
-  getPageDataByViteID,
-  hasPageDataByViteID,
-  getPageDatasByClientOnlyChunk
-} from "../core/build/internal.js";
-const PLUGIN_NAME = "@astrojs/rollup-plugin-build-css";
-const ASTRO_STYLE_PREFIX = "@astro-inline-style";
-const ASTRO_PAGE_STYLE_PREFIX = "@astro-page-all-styles";
-function isStyleVirtualModule(id) {
-  return id.startsWith(ASTRO_STYLE_PREFIX);
-}
-function isPageStyleVirtualModule(id) {
-  return id.startsWith(ASTRO_PAGE_STYLE_PREFIX);
-}
-function isRawOrUrlModule(id) {
-  return id.match(/(\?|\&)([^=]+)(raw|url)/gm);
-}
+import { getPageDataByViteID, getPageDatasByClientOnlyID } from "../core/build/internal.js";
+import { resolvedPagesVirtualModuleId } from "../core/app/index.js";
+import crypto from "crypto";
 function rollupPluginAstroBuildCSS(options) {
   const { internals } = options;
-  const styleSourceMap = /* @__PURE__ */ new Map();
-  function* walkStyles(ctx, id, seen = /* @__PURE__ */ new Set()) {
+  function* walkParentInfos(id, ctx, seen = /* @__PURE__ */ new Set()) {
     seen.add(id);
-    if (styleSourceMap.has(id)) {
-      yield [id, styleSourceMap.get(id)];
-    }
     const info = ctx.getModuleInfo(id);
     if (info) {
-      for (const importedId of [...info.importedIds, ...info.dynamicallyImportedIds]) {
-        if (!seen.has(importedId) && !isRawOrUrlModule(importedId)) {
-          yield* walkStyles(ctx, importedId, seen);
-        }
+      yield info;
+    }
+    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);
     }
   }
-  async function addStyles() {
-    var _a;
-    for (const id of this.getModuleIds()) {
-      if (hasPageDataByViteID(internals, id)) {
-        let pageStyles = "";
-        for (const [_styleId, styles] of walkStyles(this, id)) {
-          pageStyles += styles;
-        }
-        if (!pageStyles)
-          continue;
-        const { code: minifiedCSS } = await esbuild.transform(pageStyles, {
-          loader: "css",
-          minify: true
-        });
-        const referenceId = this.emitFile({
-          name: "entry.css",
-          type: "asset",
-          source: minifiedCSS
-        });
-        const fileName = this.getFileName(referenceId);
-        (_a = getPageDataByViteID(internals, id)) == null ? void 0 : _a.css.add(fileName);
+  function* getTopLevelPages(id, ctx) {
+    for (const info of walkParentInfos(id, ctx)) {
+      const importers = ((info == null ? void 0 : info.importers) || []).concat((info == null ? void 0 : info.dynamicImporters) || []);
+      if (importers.length <= 2 && importers[0] === resolvedPagesVirtualModuleId) {
+        yield info.id;
       }
     }
   }
+  function createHashOfPageParents(id, ctx) {
+    const parents = Array.from(getTopLevelPages(id, ctx)).sort();
+    const hash = crypto.createHash("sha256");
+    for (const page of parents) {
+      hash.update(page, "utf-8");
+    }
+    return hash.digest("hex").slice(0, 8);
+  }
+  function* getParentClientOnlys(id, ctx) {
+    for (const info of walkParentInfos(id, ctx)) {
+      yield* getPageDatasByClientOnlyID(internals, info.id);
+    }
+  }
   return {
-    name: PLUGIN_NAME,
+    name: "@astrojs/rollup-plugin-build-css",
     configResolved(resolvedConfig) {
       const plugins = resolvedConfig.plugins;
       const viteCSSPostIndex = resolvedConfig.plugins.findIndex((p) => p.name === "vite:css-post");
       if (viteCSSPostIndex !== -1) {
         const viteCSSPost = plugins[viteCSSPostIndex];
-        delete viteCSSPost.renderChunk;
-        delete viteCSSPost.generateBundle;
-        const ourIndex = plugins.findIndex((p) => p.name === PLUGIN_NAME);
+        const renderChunk = viteCSSPost.renderChunk;
+        if (renderChunk) {
+          viteCSSPost.renderChunk = async function(...args) {
+            const minifyOption = resolvedConfig.build.minify;
+            if (minifyOption === false) {
+              resolvedConfig.build.minify = "esbuild";
+            }
+            const result = await renderChunk.apply(this, args);
+            if (typeof result === "string") {
+              return {
+                code: result
+              };
+            }
+            resolvedConfig.build.minify = minifyOption;
+            return result || null;
+          };
+        }
+        const ourIndex = plugins.findIndex((p) => p.name === "@astrojs/rollup-plugin-build-css");
         const ourPlugin = plugins[ourIndex];
         plugins.splice(ourIndex, 1);
         plugins.splice(viteCSSPostIndex - 1, 0, ourPlugin);
       }
     },
-    async resolveId(id) {
-      if (isPageStyleVirtualModule(id)) {
-        return id;
-      }
-      if (isStyleVirtualModule(id)) {
-        return id;
-      }
-      return void 0;
-    },
-    async transform(value, id) {
-      if (isStyleVirtualModule(id)) {
-        styleSourceMap.set(id, value);
-      }
-      if (isCSSRequest(id)) {
-        styleSourceMap.set(id, value);
-      }
-      return null;
-    },
-    async renderChunk(_code, chunk) {
-      if (options.target === "server")
-        return null;
-      let chunkCSS = "";
-      let isPureCSS = true;
-      for (const [id] of Object.entries(chunk.modules)) {
-        if (!isCSSRequest(id) && !isPageStyleVirtualModule(id)) {
-          isPureCSS = false;
-        }
-        if (styleSourceMap.has(id)) {
-          chunkCSS += styleSourceMap.get(id);
-        }
-      }
-      if (!chunkCSS)
-        return null;
-      if (isPureCSS) {
-        internals.pureCSSChunks.add(chunk);
-      }
-      const { code: minifiedCSS } = await esbuild.transform(chunkCSS, {
-        loader: "css",
-        minify: true
-      });
-      const referenceId = this.emitFile({
-        name: chunk.name + ".css",
-        type: "asset",
-        source: minifiedCSS
-      });
-      if (chunk.type === "chunk") {
-        const fileName = this.getFileName(referenceId);
-        for (const pageData of getPageDatasByChunk(internals, chunk)) {
-          pageData.css.add(fileName);
+    outputOptions(outputOptions) {
+      const manualChunks = outputOptions.manualChunks || Function.prototype;
+      outputOptions.manualChunks = function(id, ...args) {
+        if (typeof manualChunks == "object") {
+          if (id in manualChunks) {
+            return manualChunks[id];
+          }
+        } else if (typeof manualChunks === "function") {
+          const outid = manualChunks.call(this, id, ...args);
+          if (outid) {
+            return outid;
+          }
         }
-        for (const pageData of getPageDatasByClientOnlyChunk(internals, chunk)) {
-          pageData.css.add(fileName);
+        if (isCSSRequest(id)) {
+          return createHashOfPageParents(id, args[0]);
         }
-      }
-      return null;
+      };
     },
-    async generateBundle(opts, bundle) {
-      const hasPureCSSChunks = internals.pureCSSChunks.size;
-      const pureChunkFilenames = new Set([...internals.pureCSSChunks].map((chunk) => chunk.fileName));
-      const emptyChunkFiles = [...pureChunkFilenames].map((file) => path.basename(file)).join("|").replace(/\./g, "\\.");
-      const emptyChunkRE = new RegExp(opts.format === "es" ? `\\bimport\\s*"[^"]*(?:${emptyChunkFiles})";
-?` : `\\brequire\\(\\s*"[^"]*(?:${emptyChunkFiles})"\\);
-?`, "g");
-      await addStyles.call(this);
-      for (const [chunkId, chunk] of Object.entries(bundle)) {
+    async generateBundle(_outputOptions, bundle) {
+      for (const [_, chunk] of Object.entries(bundle)) {
         if (chunk.type === "chunk") {
-          if (hasPureCSSChunks) {
-            if (internals.pureCSSChunks.has(chunk) && !chunk.exports.length) {
-              delete bundle[chunkId];
-            } else {
-              chunk.code = chunk.code.replace(emptyChunkRE, (m) => `/* empty css ${"".padEnd(m.length - 15)}*/`);
+          const c = chunk;
+          if ("viteMetadata" in chunk) {
+            const meta = chunk["viteMetadata"];
+            if (meta.importedCss.size) {
+              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);
+                    }
+                  }
+                }
+              }
+              for (const [id] of Object.entries(c.modules)) {
+                for (const pageViteID of getTopLevelPages(id, this)) {
+                  const pageData = getPageDataByViteID(internals, pageViteID);
+                  for (const importedCssImport of meta.importedCss) {
+                    pageData == null ? void 0 : pageData.css.add(importedCssImport);
+                  }
+                }
+              }
             }
           }
         }
+        if (chunk.type === "chunk") {
+          const exp = new RegExp(`(\\bimport\\s*)[']([^']*(?:[a-z]+.[0-9a-z]+.m?js))['](;
+?)`, "g");
+          chunk.code = chunk.code.replace(exp, (_match, begin, chunkPath, end) => {
+            return begin + '"' + chunkPath + '"' + end;
+          });
+        }
       }
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.0-beta.34",
+  "version": "1.0.0-beta.35",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -66,7 +66,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^0.15.0",
+    "@astrojs/compiler": "^0.15.1",
     "@astrojs/language-server": "^0.13.4",
     "@astrojs/markdown-remark": "^0.10.1",
     "@astrojs/prism": "0.4.1",