astro 1.0.0-beta.4 → 1.0.0-beta.5

package/dist/cli/index.js

@@ -38,7 +38,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.4";
+  const version = "1.0.0-beta.5";
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
 }

package/dist/core/build/generate.js

@@ -116,6 +116,7 @@ async function generatePath(pathname, opts, gopts) {
       });
     }
   }
+  const ssr = isBuildingToSSR(opts.astroConfig);
   const url = new URL(origin + pathname);
   const options = {
     legacyBuild: false,
@@ -139,11 +140,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/vite-plugin-ssr.js

@@ -31,8 +31,14 @@ const _manifest = Object.assign(_deserializeManifest('${manifestReplace}'), {
 const _args = ${adapter.args ? JSON.stringify(adapter.args) : "undefined"};
 
 ${adapter.exports ? `const _exports = adapter.createExports(_manifest, _args);
-${adapter.exports.map((name) => `export const ${name} = _exports['${name}'];`).join("\n")}
-${adapter.exports.includes("_default") ? `export default _default` : ""}
+${adapter.exports.map((name) => {
+          if (name === "default") {
+            return `const _default = _exports['default'];
+export { _default as default };`;
+          } else {
+            return `export const ${name} = _exports['${name}'];`;
+          }
+        }).join("\n")}
 ` : ""}
 const _start = 'start';
 if(_start in adapter) {

package/dist/core/dev/index.js

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

package/dist/core/messages.js

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

package/dist/core/request.js

@@ -1,10 +1,30 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { warn } from "./logger/core.js";
 function createRequest({
   url,
   headers,
   method = "GET",
   body = void 0,
-  logging
+  logging,
+  ssr
 }) {
   let headersObj = headers instanceof Headers ? headers : new Headers(Object.entries(headers));
   const request = new Request(url.toString(), {
@@ -26,6 +46,16 @@ function createRequest({
       }
     }
   });
+  if (!ssr) {
+    const _headers = request.headers;
+    const headersDesc = Object.getOwnPropertyDescriptor(request, "headers") || {};
+    Object.defineProperty(request, "headers", __spreadProps(__spreadValues({}, headersDesc), {
+      get() {
+        warn(logging, "ssg", `Headers are not exposed in static-site generation (SSG) mode. To enable reading headers you need to set an SSR adapter in your config.`);
+        return _headers;
+      }
+    }));
+  }
   return request;
 }
 export {

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

@@ -9,6 +9,7 @@ export interface CreateRequestOptions {
     method?: string;
     body?: RequestBody | undefined;
     logging: LogOptions;
+    ssr: boolean;
 }
-export declare function createRequest({ url, headers, method, body, logging, }: CreateRequestOptions): Request;
+export declare function createRequest({ url, headers, method, body, logging, ssr, }: CreateRequestOptions): Request;
 export {};

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

@@ -34,7 +34,15 @@ function writeHtmlResponse(res, statusCode, html) {
 }
 async function writeWebResponse(res, webResponse) {
   const { status, headers, body } = webResponse;
-  res.writeHead(status, Object.fromEntries(headers.entries()));
+  let _headers = {};
+  if ("raw" in headers) {
+    for (const [key, value] of Object.entries(headers.raw())) {
+      res.setHeader(key, value);
+    }
+  } else {
+    _headers = Object.fromEntries(headers.entries());
+  }
+  res.writeHead(status, _headers);
   if (body) {
     if (body instanceof Readable) {
       body.pipe(res);
@@ -128,7 +136,8 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
     headers: buildingToSSR ? req.headers : new Headers(),
     method: req.method,
     body,
-    logging
+    logging,
+    ssr: buildingToSSR
   });
   try {
     if (!pathname.startsWith(devRoot)) {

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

@@ -33,6 +33,9 @@ function isStyleVirtualModule(id) {
 function isPageStyleVirtualModule(id) {
   return id.startsWith(ASTRO_PAGE_STYLE_PREFIX);
 }
+function isRawOrUrlModule(id) {
+  return id.match(/(\?|\&)([^=]+)(raw|url)/gm);
+}
 function rollupPluginAstroBuildCSS(options) {
   const { internals, legacy } = options;
   const styleSourceMap = /* @__PURE__ */ new Map();
@@ -44,7 +47,7 @@ function rollupPluginAstroBuildCSS(options) {
     const info = ctx.getModuleInfo(id);
     if (info) {
       for (const importedId of info.importedIds) {
-        if (!seen.has(importedId)) {
+        if (!seen.has(importedId) && !isRawOrUrlModule(importedId)) {
           yield* walkStyles(ctx, importedId, seen);
         }
       }

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

@@ -92,7 +92,8 @@ function rollupPluginAstroScanHTML(options) {
             request: createRequest({
               url: new URL(origin + pathname),
               headers: new Headers(),
-              logging
+              logging,
+              ssr: false
             }),
             mode: "production",
             origin,

package/package.json

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