astro 1.0.0-beta.2 → 1.0.0-beta.22

package/LICENSE

@@ -0,0 +1,61 @@
+MIT License
+
+Copyright (c) 2021 Fred K. Schott
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+"""
+This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/sveltejs/kit repository:
+
+Copyright (c) 2020 [these people](https://github.com/sveltejs/kit/graphs/contributors)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+"""
+
+
+"""
+This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/vitejs/vite repository:
+
+MIT License
+
+Copyright (c) 2019-present, Yuxi (Evan) You and Vite contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""

package/astro-jsx.d.ts

@@ -621,7 +621,10 @@ declare namespace astroHTML.JSX {
 	//   - "number | string"
 	//   - "string"
 	//   - union of string literals
-	interface SVGAttributes<T extends EventTarget> extends AriaAttributes, DOMAttributes<T> {
+	interface SVGAttributes<T extends EventTarget>
+		extends AriaAttributes,
+			DOMAttributes<T>,
+			AstroBuiltinAttributes {
 		// Attributes which also defined in HTMLAttributes
 		className?: string | undefined | null;
 		class?: string | undefined | null;

package/components/Code.astro

@@ -1,6 +1,6 @@
 ---
 import type * as shiki from 'shiki';
-import { getHighlighter } from 'shiki';
+import { getHighlighter } from './Shiki.js';
 
 export interface Props {
 	/** The code to highlight. Required. */

package/components/Shiki.js

@@ -0,0 +1,24 @@
+import { getHighlighter as getShikiHighlighter } from 'shiki';
+
+// Caches Promise<Highligher> for reuse when the same theme and langs are provided
+const _resolvedHighlighters = new Map();
+
+function stringify(opts) {
+	// Always sort keys before stringifying to make sure objects match regardless of parameter ordering
+	return JSON.stringify(opts, Object.keys(opts).sort());
+}
+
+export function getHighlighter(opts) {
+	const key = stringify(opts);
+
+	// Highlighter has already been requested, reuse the same instance
+	if (_resolvedHighlighters.has(key)) {
+		return _resolvedHighlighters.get(key);
+	}
+
+	// Start the async getHighlighter call and cache the Promise
+	const highlighter = getShikiHighlighter(opts);
+	_resolvedHighlighters.set(key, highlighter);
+
+	return highlighter;
+}

package/dist/cli/index.js

@@ -1,12 +1,16 @@
 import * as colors from "kleur/colors";
 import yargs from "yargs-parser";
 import { z } from "zod";
+import { AstroTelemetry } from "@astrojs/telemetry";
+import * as event from "@astrojs/telemetry/events";
 import { nodeLogDestination, enableVerboseLogging } from "../core/logger/node.js";
 import build from "../core/build/index.js";
 import add from "../core/add/index.js";
 import devServer from "../core/dev/index.js";
 import preview from "../core/preview/index.js";
 import { check } from "./check.js";
+import { openInBrowser } from "./open.js";
+import * as telemetryHandler from "./telemetry.js";
 import { loadConfig } from "../core/config.js";
 import { printHelp, formatErrorMessage, formatConfigErrorMessage } from "../core/messages.js";
 import { createSafeError } from "../core/util.js";
@@ -16,10 +20,12 @@ function printAstroHelp() {
     headline: "Futuristic web development tool.",
     commands: [
       ["add", "Add an integration to your configuration."],
+      ["docs", "Launch Astro's Doc site directly from the terminal. "],
       ["dev", "Run Astro in development mode."],
       ["build", "Build a pre-compiled production-ready site."],
       ["preview", "Preview your build locally before deploying."],
       ["check", "Check your project for errors."],
+      ["telemetry", "Enable/disable anonymous data collection."],
       ["--version", "Show the version number and exit."],
       ["--help", "Show this help message."]
     ],
@@ -27,8 +33,6 @@ function printAstroHelp() {
       ["--host [optional IP]", "Expose server on network"],
       ["--config <path>", "Specify the path to the Astro config file."],
       ["--root <path>", "Specify the path to the project root folder."],
-      ["--legacy-build", "Use the build strategy prior to 0.24.0"],
-      ["--experimental-ssr", "Enable SSR compilation fot 3rd-party adapters."],
       ["--drafts", "Include markdown draft pages in the build."],
       ["--verbose", "Enable verbose logging"],
       ["--silent", "Disable logging"]
@@ -36,7 +40,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.2";
+  const version = "1.0.0-beta.22";
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
 }
@@ -44,17 +48,20 @@ function resolveCommand(flags) {
   const cmd = flags._[2];
   if (cmd === "add")
     return "add";
+  if (cmd === "telemetry")
+    return "telemetry";
   if (flags.version)
     return "version";
   else if (flags.help)
     return "help";
-  const supportedCommands = /* @__PURE__ */ new Set(["dev", "build", "preview", "check"]);
+  const supportedCommands = /* @__PURE__ */ new Set(["dev", "build", "preview", "check", "docs"]);
   if (supportedCommands.has(cmd)) {
     return cmd;
   }
   return "help";
 }
 async function cli(args) {
+  var _a;
   const flags = yargs(args);
   const cmd = resolveCommand(flags);
   const root = flags.root;
@@ -76,24 +83,33 @@ async function cli(args) {
   } else if (flags.silent) {
     logging.level = "silent";
   }
-  let config;
-  try {
-    config = await loadConfig({ cwd: root, flags, cmd });
-  } catch (err) {
-    return throwAndExit(err);
+  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.22" });
+  if (cmd === "telemetry") {
+    try {
+      const subcommand = (_a = flags._[3]) == null ? void 0 : _a.toString();
+      return await telemetryHandler.update(subcommand, { flags, telemetry });
+    } catch (err) {
+      return throwAndExit(err);
+    }
   }
   switch (cmd) {
     case "add": {
       try {
         const packages = flags._.slice(3);
-        return await add(packages, { cwd: root, flags, logging });
+        telemetry.record(event.eventCliSession({
+          astroVersion: "1.0.0-beta.22",
+          cliCommand: "add"
+        }));
+        return await add(packages, { cwd: root, flags, logging, telemetry });
       } catch (err) {
         return throwAndExit(err);
       }
     }
     case "dev": {
       try {
-        await devServer(config, { logging });
+        const config = await loadConfig({ cwd: root, flags, cmd });
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.22", cliCommand: "dev" }, config));
+        await devServer(config, { logging, telemetry });
         return await new Promise(() => {
         });
       } catch (err) {
@@ -102,18 +118,36 @@ async function cli(args) {
     }
     case "build": {
       try {
-        return await build(config, { logging });
+        const config = await loadConfig({ cwd: root, flags, cmd });
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.22", cliCommand: "build" }, config));
+        return await build(config, { logging, telemetry });
       } catch (err) {
         return throwAndExit(err);
       }
     }
     case "check": {
+      const config = await loadConfig({ cwd: root, flags, cmd });
+      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.22", cliCommand: "check" }, config));
       const ret = await check(config);
       return process.exit(ret);
     }
     case "preview": {
       try {
-        return await preview(config, { logging });
+        const config = await loadConfig({ cwd: root, flags, cmd });
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.22", cliCommand: "preview" }, config));
+        const server = await preview(config, { logging, telemetry });
+        return await server.closed();
+      } catch (err) {
+        return throwAndExit(err);
+      }
+    }
+    case "docs": {
+      try {
+        await telemetry.record(event.eventCliSession({
+          astroVersion: "1.0.0-beta.22",
+          cliCommand: "docs"
+        }));
+        return await openInBrowser("https://docs.astro.build/");
       } catch (err) {
         return throwAndExit(err);
       }

package/dist/cli/open.js

@@ -0,0 +1,26 @@
+import { execa } from "execa";
+const getPlatformSpecificCommand = () => {
+  const isGitPod = Boolean(process.env.GITPOD_REPO_ROOT);
+  const platform = isGitPod ? "gitpod" : process.platform;
+  switch (platform) {
+    case "android":
+    case "linux":
+      return ["xdg-open"];
+    case "darwin":
+      return ["open"];
+    case "win32":
+      return ["cmd", ["/c", "start"]];
+    case "gitpod":
+      return ["/ide/bin/remote-cli/gitpod-code", ["--openExternal"]];
+    default:
+      throw new Error(`It looks like your platform ("${platform}") isn't supported!
+To view Astro's docs, please visit https://docs.astro.build`);
+  }
+};
+async function openInBrowser(url) {
+  const [command, args = []] = getPlatformSpecificCommand();
+  return execa(command, [...args, encodeURI(url)]);
+}
+export {
+  openInBrowser
+};

package/dist/cli/telemetry.js

@@ -0,0 +1,36 @@
+import * as msg from "../core/messages.js";
+async function update(subcommand, { flags, telemetry }) {
+  const isValid = ["enable", "disable", "reset"].includes(subcommand);
+  if (flags.help || !isValid) {
+    msg.printHelp({
+      commandName: "astro telemetry",
+      usage: "<enable|disable|reset>",
+      commands: [
+        ["enable", "Enable anonymous data collection."],
+        ["disable", "Disable anonymous data collection."],
+        ["reset", "Reset anonymous data collection settings."]
+      ]
+    });
+    return;
+  }
+  switch (subcommand) {
+    case "enable": {
+      telemetry.setEnabled(true);
+      console.log(msg.telemetryEnabled());
+      return;
+    }
+    case "disable": {
+      telemetry.setEnabled(false);
+      console.log(msg.telemetryDisabled());
+      return;
+    }
+    case "reset": {
+      telemetry.clear();
+      console.log(msg.telemetryReset());
+      return;
+    }
+  }
+}
+export {
+  update
+};

package/dist/core/add/index.js

@@ -18,7 +18,8 @@ import { parseNpmName } from "../util.js";
 import { wrapDefaultExport } from "./wrapper.js";
 import { ensureImport } from "./imports.js";
 import { t, parse, visit, generate } from "./babel.js";
-async function add(names, { cwd, flags, logging }) {
+import { appendForwardSlash } from "../path.js";
+async function add(names, { cwd, flags, logging, telemetry }) {
   if (flags.help) {
     printHelp({
       commandName: "astro add",
@@ -65,7 +66,7 @@ async function add(names, { cwd, flags, logging }) {
     debug("add", `Found config at ${configURL}`);
   } else {
     info(logging, "add", `Unable to locate a config file, generating one for you.`);
-    configURL = new URL("./astro.config.mjs", root);
+    configURL = new URL("./astro.config.mjs", appendForwardSlash(root.href));
     await fs.writeFile(fileURLToPath(configURL), CONSTS.CONFIG_STUB, { encoding: "utf-8" });
   }
   const integrations = await validateIntegrations(names);

package/dist/core/app/common.js

@@ -27,7 +27,9 @@ function deserializeManifest(serializedManifest) {
     const route = serializedRoute;
     route.routeData = deserializeRouteData(serializedRoute.routeData);
   }
+  const assets = new Set(serializedManifest.assets);
   return __spreadProps(__spreadValues({}, serializedManifest), {
+    assets,
     routes
   });
 }

package/dist/core/app/index.js

@@ -33,6 +33,8 @@ import {
   createModuleScriptElementWithSrcSet
 } from "../render/ssr-element.js";
 import { prependForwardSlash } from "../path.js";
+const pagesVirtualModuleId = "@astrojs-pages-virtual-entry";
+const resolvedPagesVirtualModuleId = "\0" + pagesVirtualModuleId;
 class App {
   constructor(manifest) {
     __privateAdd(this, _renderPage);
@@ -92,10 +94,9 @@ renderPage_fn = async function(request, routeData, mod) {
   const links = createLinkStylesheetElementSet(info.links, manifest.site);
   const scripts = createModuleScriptElementWithSrcSet(info.scripts, manifest.site);
   const result = await render({
-    legacyBuild: false,
     links,
     logging: __privateGet(this, _logging),
-    markdownRender: manifest.markdown.render,
+    markdown: manifest.markdown,
     mod,
     origin: url.origin,
     pathname: url.pathname,
@@ -128,7 +129,7 @@ renderPage_fn = async function(request, routeData, mod) {
   });
 };
 _callEndpoint = new WeakSet();
-callEndpoint_fn = async function(request, _routeData, mod) {
+callEndpoint_fn = async function(request, routeData, mod) {
   const url = new URL(request.url);
   const handler = mod;
   const result = await callEndpoint(handler, {
@@ -136,6 +137,7 @@ callEndpoint_fn = async function(request, _routeData, mod) {
     origin: url.origin,
     pathname: url.pathname,
     request,
+    route: routeData,
     routeCache: __privateGet(this, _routeCache),
     ssr: true
   });
@@ -158,5 +160,7 @@ callEndpoint_fn = async function(request, _routeData, mod) {
 };
 export {
   App,
-  deserializeManifest
+  deserializeManifest,
+  pagesVirtualModuleId,
+  resolvedPagesVirtualModuleId
 };

package/dist/core/build/generate.js

@@ -1,10 +1,9 @@
-import astroRemark from "@astrojs/markdown-remark";
 import fs from "fs";
 import { bgGreen, black, cyan, dim, green, magenta } from "kleur/colors";
 import npath from "path";
 import { fileURLToPath } from "url";
 import { debug, info } from "../logger/core.js";
-import { prependForwardSlash } from "../../core/path.js";
+import { joinPaths, prependForwardSlash, removeLeadingForwardSlash } from "../../core/path.js";
 import { BEFORE_HYDRATION_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
 import { call as callEndpoint } from "../endpoint/index.js";
 import { render } from "../render/core.js";
@@ -99,13 +98,14 @@ function addPageName(pathname, opts) {
   opts.pageNames.push(pathname.replace(/\/?$/, "/").replace(/^\//, ""));
 }
 async function generatePath(pathname, opts, gopts) {
+  var _a;
   const { astroConfig, logging, origin, routeCache } = opts;
   const { mod, internals, linkIds, hoistedId, pageData, renderers } = gopts;
   if (pageData.route.type === "page") {
     addPageName(pathname, opts);
   }
   debug("build", `Generating: ${pathname}`);
-  const site = astroConfig.site;
+  const site = astroConfig.base !== "/" ? joinPaths(((_a = astroConfig.site) == null ? void 0 : _a.toString()) || "http://localhost/", astroConfig.base) : astroConfig.site;
   const links = createLinkStylesheetElementSet(linkIds.reverse(), site);
   const scripts = createModuleScriptElementWithSrcSet(hoistedId ? [hoistedId] : [], site);
   for (const script of astroConfig._ctx.scripts) {
@@ -116,12 +116,12 @@ async function generatePath(pathname, opts, gopts) {
       });
     }
   }
-  const url = new URL(origin + pathname);
+  const ssr = isBuildingToSSR(opts.astroConfig);
+  const url = new URL(opts.astroConfig.base + removeLeadingForwardSlash(pathname), origin);
   const options = {
-    legacyBuild: false,
     links,
     logging,
-    markdownRender: [astroRemark, astroConfig.markdown],
+    markdown: astroConfig.markdown,
     mod,
     origin,
     pathname,
@@ -139,11 +139,11 @@ async function generatePath(pathname, opts, gopts) {
       const fullyRelativePath = relPath[0] === "." ? relPath : "./" + relPath;
       return fullyRelativePath;
     },
-    request: createRequest({ url, headers: new Headers(), logging }),
+    request: createRequest({ url, headers: new Headers(), logging, ssr }),
     route: pageData.route,
     routeCache,
     site: astroConfig.site ? new URL(astroConfig.base, astroConfig.site).toString() : astroConfig.site,
-    ssr: isBuildingToSSR(opts.astroConfig)
+    ssr
   };
   let body;
   if (pageData.route.type === "endpoint") {

package/dist/core/build/index.js

@@ -11,7 +11,6 @@ import {
   timerMessage,
   warnIfUsingExperimentalSSR
 } from "../logger/core.js";
-import { nodeLogOptions } from "../logger/node.js";
 import { createRouteManifest } from "../routing/index.js";
 import { collectPagesData } from "./page-data.js";
 import { staticBuild } from "./static-build.js";
@@ -25,7 +24,7 @@ import {
 import { getTimeStat } from "./util.js";
 import { createSafeError, isBuildingToSSR } from "../util.js";
 import { fixViteErrorMessage } from "../errors.js";
-async function build(config, options = { logging: nodeLogOptions }) {
+async function build(config, options) {
   applyPolyfill();
   const builder = new AstroBuilder(config, options);
   await builder.run();
@@ -122,6 +121,7 @@ class AstroBuilder {
     await viteServer.close();
     await runHookBuildDone({
       config: this.config,
+      buildConfig,
       pages: pageNames,
       routes: Object.values(allPages).map((pd) => pd.route)
     });
@@ -150,7 +150,6 @@ class AstroBuilder {
     pageCount,
     buildMode
   }) {
-    const buildTime = performance.now() - timeStart;
     const total = getTimeStat(timeStart, performance.now());
     let messages = [];
     if (buildMode === "static") {

package/dist/core/build/internal.js

@@ -7,13 +7,11 @@ function createBuildInternals() {
   const hoistedScriptIdToHoistedMap = /* @__PURE__ */ new Map();
   return {
     pureCSSChunks,
-    chunkToReferenceIdMap,
-    astroStyleMap,
-    astroPageStyleMap,
     hoistedScriptIdToHoistedMap,
     entrySpecifierToBundleMap: /* @__PURE__ */ new Map(),
     pagesByComponent: /* @__PURE__ */ new Map(),
-    pagesByViteID: /* @__PURE__ */ new Map()
+    pagesByViteID: /* @__PURE__ */ new Map(),
+    pagesByClientOnly: /* @__PURE__ */ new Map()
   };
 }
 function trackPageData(internals, component, pageData, componentModuleId, componentURL) {
@@ -21,6 +19,19 @@ function trackPageData(internals, component, pageData, componentModuleId, compon
   internals.pagesByComponent.set(component, pageData);
   internals.pagesByViteID.set(viteID(componentURL), pageData);
 }
+function trackClientOnlyPageDatas(internals, pageData, clientOnlys, astroConfig) {
+  for (const clientOnlyComponent of clientOnlys) {
+    const coPath = viteID(new URL("." + clientOnlyComponent, astroConfig.root));
+    let pageDataSet;
+    if (internals.pagesByClientOnly.has(coPath)) {
+      pageDataSet = internals.pagesByClientOnly.get(coPath);
+    } else {
+      pageDataSet = /* @__PURE__ */ new Set();
+      internals.pagesByClientOnly.set(coPath, pageDataSet);
+    }
+    pageDataSet.add(pageData);
+  }
+}
 function* getPageDatasByChunk(internals, chunk) {
   const pagesByViteID = internals.pagesByViteID;
   for (const [modulePath] of Object.entries(chunk.modules)) {
@@ -29,6 +40,18 @@ function* getPageDatasByChunk(internals, chunk) {
     }
   }
 }
+function* getPageDatasByClientOnlyChunk(internals, chunk) {
+  const pagesByClientOnly = internals.pagesByClientOnly;
+  if (pagesByClientOnly.size) {
+    for (const [modulePath] of Object.entries(chunk.modules)) {
+      if (pagesByClientOnly.has(modulePath)) {
+        for (const pageData of pagesByClientOnly.get(modulePath)) {
+          yield pageData;
+        }
+      }
+    }
+  }
+}
 function getPageDataByComponent(internals, component) {
   if (internals.pagesByComponent.has(component)) {
     return internals.pagesByComponent.get(component);
@@ -53,6 +76,8 @@ export {
   getPageDataByComponent,
   getPageDataByViteID,
   getPageDatasByChunk,
+  getPageDatasByClientOnlyChunk,
   hasPageDataByViteID,
+  trackClientOnlyPageDatas,
   trackPageData
 };

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

@@ -17,6 +17,7 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import { trackClientOnlyPageDatas } from "../../core/build/internal.js";
 import glob from "fast-glob";
 import fs from "fs";
 import { bgGreen, bgMagenta, black, dim } from "kleur/colors";
@@ -52,9 +53,11 @@ async function staticBuild(opts) {
     if (pageData.route.type === "page") {
       const [renderers, mod] = pageData.preload;
       const metadata = mod.$$metadata;
+      const clientOnlys = Array.from(metadata.clientOnlyComponentPaths());
+      trackClientOnlyPageDatas(internals, pageData, clientOnlys, astroConfig);
       const topLevelImports = /* @__PURE__ */ new Set([
         ...metadata.hydratedComponentPaths(),
-        ...metadata.clientOnlyComponentPaths(),
+        ...clientOnlys,
         ...metadata.hydrationDirectiveSpecifiers(),
         ...renderers.filter((renderer) => !!renderer.clientEntrypoint).map((renderer) => renderer.clientEntrypoint)
       ]);
@@ -121,7 +124,7 @@ async function ssrBuild(opts, internals, input) {
       vitePluginPages(opts, internals),
       rollupPluginAstroBuildCSS({
         internals,
-        legacy: false
+        target: "server"
       }),
       ...viteConfig.plugins || [],
       isBuildingToSSR(opts.astroConfig) && vitePluginSSR(opts, internals, opts.astroConfig._ctx.adapter)
@@ -175,7 +178,7 @@ ${bgGreen(black(" building client "))}`);
       vitePluginHoistedScripts(astroConfig, internals),
       rollupPluginAstroBuildCSS({
         internals,
-        legacy: false
+        target: "client"
       }),
       ...viteConfig.plugins || []
     ],
@@ -204,11 +207,11 @@ async function copyFiles(fromFolder, toFolder) {
   const files = await glob("**/*", {
     cwd: fileURLToPath(fromFolder)
   });
-  await fs.promises.mkdir(toFolder, { recursive: true });
   await Promise.all(files.map(async (filename) => {
     const from = new URL(filename, fromFolder);
     const to = new URL(filename, toFolder);
-    return fs.promises.copyFile(from, to);
+    const lastFolder = new URL("./", to);
+    return fs.promises.mkdir(lastFolder, { recursive: true }).then(() => fs.promises.copyFile(from, to));
   }));
 }
 async function ssrMoveAssets(opts) {

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

@@ -1,23 +1,22 @@
 import { addRollupInput } from "./add-rollup-input.js";
 import { eachPageData } from "./internal.js";
 import { isBuildingToSSR } from "../util.js";
-const virtualModuleId = "@astrojs-pages-virtual-entry";
-const resolvedVirtualModuleId = "\0" + virtualModuleId;
+import { resolvedPagesVirtualModuleId, pagesVirtualModuleId } from "../app/index.js";
 function vitePluginPages(opts, internals) {
   return {
     name: "@astro/plugin-build-pages",
     options(options) {
       if (!isBuildingToSSR(opts.astroConfig)) {
-        return addRollupInput(options, [virtualModuleId]);
+        return addRollupInput(options, [pagesVirtualModuleId]);
       }
     },
     resolveId(id) {
-      if (id === virtualModuleId) {
-        return resolvedVirtualModuleId;
+      if (id === pagesVirtualModuleId) {
+        return resolvedPagesVirtualModuleId;
       }
     },
     load(id) {
-      if (id === resolvedVirtualModuleId) {
+      if (id === resolvedPagesVirtualModuleId) {
         let importMap = "";
         let imports = [];
         let i = 0;
@@ -31,7 +30,7 @@ function vitePluginPages(opts, internals) {
         let rendererItems = "";
         for (const renderer of opts.astroConfig._ctx.renderers) {
           const variable = `_renderer${i}`;
-          imports.push(`import ${variable} from '${renderer.serverEntrypoint}';`);
+          imports.unshift(`import ${variable} from '${renderer.serverEntrypoint}';`);
           rendererItems += `Object.assign(${JSON.stringify(renderer)}, { ssr: ${variable} }),`;
           i++;
         }
@@ -45,7 +44,5 @@ export const renderers = [${rendererItems}];`;
   };
 }
 export {
-  resolvedVirtualModuleId,
-  virtualModuleId,
   vitePluginPages
 };