astro 1.3.0 → 1.3.1

package/dist/cli/index.js

@@ -187,7 +187,7 @@ async function runCommand(cmd, flags) {
       });
     }
     case "build": {
-      return await build(settings, { logging, telemetry });
+      return await build(settings, { ...flags, logging, telemetry });
     }
     case "check": {
       const ret = await check(settings);

package/dist/core/build/index.js

@@ -64,6 +64,7 @@ class AstroBuilder {
       serverEntry: "entry.mjs"
     };
     await runHookBuildStart({ config: this.settings.config, buildConfig, logging: this.logging });
+    this.validateConfig();
     info(this.logging, "build", `output target: ${colors.green(this.settings.config.output)}`);
     if (this.settings.adapter) {
       info(this.logging, "build", `deploy adapter: ${colors.green(this.settings.adapter.name)}`);
@@ -129,6 +130,14 @@ class AstroBuilder {
       throw fixViteErrorMessage(_err);
     }
   }
+  validateConfig() {
+    const { config } = this.settings;
+    if (config.outDir.toString() === config.root.toString()) {
+      throw new Error(
+        `the outDir cannot be the root folder. Please build to a folder such as dist.`
+      );
+    }
+  }
   async printStats({
     logging,
     timeStart,

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

@@ -1,6 +1,7 @@
 import glob from "fast-glob";
 import fs from "fs";
 import { bgGreen, bgMagenta, black, dim } from "kleur/colors";
+import path from "path";
 import { fileURLToPath } from "url";
 import * as vite from "vite";
 import { createBuildInternals } from "../../core/build/internal.js";
@@ -82,8 +83,8 @@ async function ssrBuild(opts, internals, input) {
   const out = ssr ? opts.buildConfig.server : getOutDirWithinCwd(settings.config.outDir);
   const viteBuildConfig = {
     ...viteConfig,
+    mode: viteConfig.mode || "production",
     logLevel: opts.viteConfig.logLevel ?? "error",
-    mode: "production",
     build: {
       target: "esnext",
       ...viteConfig.build,
@@ -147,8 +148,8 @@ async function clientBuild(opts, internals, input) {
 ${bgGreen(black(" building client "))}`);
   const viteBuildConfig = {
     ...viteConfig,
+    mode: viteConfig.mode || "production",
     logLevel: "info",
-    mode: "production",
     build: {
       target: "esnext",
       ...viteConfig.build,
@@ -194,19 +195,38 @@ ${bgGreen(black(" building client "))}`);
 }
 async function cleanSsrOutput(opts) {
   const out = getOutDirWithinCwd(opts.settings.config.outDir);
+  const files = await glob("**/*.mjs", {
+    cwd: fileURLToPath(out)
+  });
+  if (files.length) {
+    await Promise.all(
+      files.map(async (filename) => {
+        const url = new URL(filename, out);
+        await fs.promises.rm(url);
+      })
+    );
+    const directories = /* @__PURE__ */ new Set();
+    files.forEach((i) => {
+      const splitFilePath = i.split(path.sep);
+      if (splitFilePath.length > 1) {
+        directories.add(splitFilePath[0]);
+      }
+    });
+    await Promise.all(
+      Array.from(directories).map(async (filename) => {
+        const url = new URL(filename, out);
+        const folder = await fs.promises.readdir(url);
+        if (!folder.length) {
+          await fs.promises.rmdir(url, { recursive: true });
+        }
+      })
+    );
+  }
   if (out.toString() !== opts.settings.config.outDir.toString()) {
+    copyFiles(out, opts.settings.config.outDir);
     await fs.promises.rm(out, { recursive: true });
     return;
   }
-  const files = await glob("**/*.mjs", {
-    cwd: fileURLToPath(out)
-  });
-  await Promise.all(
-    files.map(async (filename) => {
-      const url = new URL(filename, out);
-      await fs.promises.rm(url);
-    })
-  );
 }
 async function copyFiles(fromFolder, toFolder) {
   const files = await glob("**/*", {

package/dist/core/dev/index.js

@@ -46,7 +46,7 @@ async function dev(settings, options) {
       isRestart
     })
   );
-  const currentVersion = "1.3.0";
+  const currentVersion = "1.3.1";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/endpoint/index.js

@@ -8,7 +8,7 @@ async function call(mod, opts) {
     );
   }
   const [params] = paramsAndPropsResp;
-  const response = await renderEndpoint(mod, opts.request, params);
+  const response = await renderEndpoint(mod, opts.request, params, opts.ssr);
   if (response instanceof Response) {
     return {
       type: "response",

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   site,
   isRestart = false
 }) {
-  const version = "1.3.0";
+  const version = "1.3.1";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -97,12 +97,12 @@ function resolveServerUrls({
     const ipv4Networks = Object.values(os.networkInterfaces()).flatMap((networkInterface) => networkInterface ?? []).filter(
       (networkInterface) => (networkInterface == null ? void 0 : networkInterface.address) && (networkInterface == null ? void 0 : networkInterface.family) === (nodeVersion < 18 || nodeVersion >= 18.4 ? "IPv4" : 4)
     );
-    for (let { address: address2 } of ipv4Networks) {
-      if (address2.includes("127.0.0.1")) {
-        const displayAddress = address2.replace("127.0.0.1", localAddress);
+    for (let { address: ipv4Address } of ipv4Networks) {
+      if (ipv4Address.includes("127.0.0.1")) {
+        const displayAddress = ipv4Address.replace("127.0.0.1", localAddress);
         local = toDisplayUrl(displayAddress);
       } else {
-        network = toDisplayUrl(address2);
+        network = toDisplayUrl(ipv4Address);
       }
     }
   }
@@ -250,7 +250,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"1.3.0"}`
+        `v${"1.3.1"}`
       )} ${headline}`
     );
   }

package/dist/core/path.d.ts

@@ -1,3 +1,4 @@
+export declare function appendExtension(path: string, extension: string): string;
 export declare function appendForwardSlash(path: string): string;
 export declare function prependForwardSlash(path: string): string;
 export declare function removeTrailingForwardSlash(path: string): string;

package/dist/core/path.js

@@ -1,3 +1,6 @@
+function appendExtension(path, extension) {
+  return path + "." + extension;
+}
 function appendForwardSlash(path) {
   return path.endsWith("/") ? path : path + "/";
 }
@@ -41,6 +44,7 @@ function removeFileExtension(path) {
   return idx === -1 ? path : path.slice(0, idx);
 }
 export {
+  appendExtension,
   appendForwardSlash,
   isRelativePath,
   joinPaths,

package/dist/core/render/route-cache.js

@@ -62,14 +62,11 @@ class RouteCache {
 }
 function findPathItemByKey(staticPaths, params) {
   const paramsKey = stringifyParams(params);
-  let matchedStaticPath = staticPaths.keyed.get(paramsKey);
+  const matchedStaticPath = staticPaths.keyed.get(paramsKey);
   if (matchedStaticPath) {
     return matchedStaticPath;
   }
   debug("findPathItemByKey", `Unexpected cache miss looking for ${paramsKey}`);
-  matchedStaticPath = staticPaths.find(
-    ({ params: _params }) => JSON.stringify(_params) === paramsKey
-  );
 }
 export {
   RouteCache,

package/dist/core/routing/params.js

@@ -17,7 +17,7 @@ function stringifyParams(params) {
   const validatedParams = Object.entries(params).reduce((acc, next) => {
     validateGetStaticPathsParameter(next);
     const [key, value] = next;
-    acc[key] = `${value}`;
+    acc[key] = typeof value === "undefined" ? void 0 : `${value}`;
     return acc;
   }, {});
   return JSON.stringify(validatedParams, Object.keys(params).sort());

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.3.0";
+const ASTRO_VERSION = "1.3.1";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }
@@ -87,7 +87,7 @@ function resolveDependency(dep, projectRoot) {
   return pathToFileURL(resolved).toString();
 }
 function viteID(filePath) {
-  return slash(fileURLToPath(filePath) + filePath.search);
+  return slash(fileURLToPath(filePath) + filePath.search).replace(/\\/g, "/");
 }
 const VALID_ID_PREFIX = `/@id/`;
 function unwrapId(id) {

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

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

package/dist/runtime/server/endpoint.d.ts

@@ -1,3 +1,3 @@
 import type { EndpointHandler, Params } from '../../@types/astro';
 /** Renders an endpoint request to completion, returning the body. */
-export declare function renderEndpoint(mod: EndpointHandler, request: Request, params: Params): Promise<Response | import("../../@types/astro").EndpointOutput>;
+export declare function renderEndpoint(mod: EndpointHandler, request: Request, params: Params, ssr?: boolean): Promise<Response | import("../../@types/astro").EndpointOutput>;

package/dist/runtime/server/endpoint.js

@@ -10,10 +10,14 @@ function getHandlerFromModule(mod, method) {
   }
   return void 0;
 }
-async function renderEndpoint(mod, request, params) {
+async function renderEndpoint(mod, request, params, ssr) {
   var _a;
   const chosenMethod = (_a = request.method) == null ? void 0 : _a.toLowerCase();
   const handler = getHandlerFromModule(mod, chosenMethod);
+  if (!ssr && ssr === false && chosenMethod && chosenMethod !== "get") {
+    console.warn(`
+${chosenMethod} requests are not available when building a static site. Update your config to output: 'server' to handle ${chosenMethod} requests.`);
+  }
   if (!handler || typeof handler !== "function") {
     let response = new Response(null, {
       status: 404,

package/dist/runtime/server/escape.d.ts

@@ -1,7 +1,6 @@
 import { escape } from 'html-escaper';
 export declare const escapeHTML: typeof escape;
 export declare class HTMLBytes extends Uint8Array {
-    get [Symbol.toStringTag](): string;
 }
 /**
  * A "blessed" extension of String that tells Astro that the string

package/dist/runtime/server/escape.js

@@ -1,10 +1,12 @@
 import { escape } from "html-escaper";
 const escapeHTML = escape;
 class HTMLBytes extends Uint8Array {
-  get [Symbol.toStringTag]() {
+}
+Object.defineProperty(HTMLBytes.prototype, Symbol.toStringTag, {
+  get() {
     return "HTMLBytes";
   }
-}
+});
 class HTMLString extends String {
   get [Symbol.toStringTag]() {
     return "HTMLString";

package/dist/runtime/server/hydration.js

@@ -59,7 +59,9 @@ function extractDirectives(inputProps) {
         }
       }
     } else if (key === "class:list") {
-      extracted.props[key.slice(0, -5)] = serializeListValue(value);
+      if (value) {
+        extracted.props[key.slice(0, -5)] = serializeListValue(value);
+      }
     } else {
       extracted.props[key] = value;
     }

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

@@ -88,9 +88,11 @@ async function renderPage(result, componentFactory, props, children, streaming)
     }
     let response = createResponse(body, { ...init, headers });
     return response;
-  } else {
-    return factoryReturnValue;
   }
+  if (!(factoryReturnValue instanceof Response)) {
+    throw new Error("Only instance of Response can be returned from an Astro file");
+  }
+  return factoryReturnValue;
 }
 export {
   renderPage

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

@@ -5,7 +5,7 @@ const htmlBooleanAttributes = /^(allowfullscreen|async|autofocus|autoplay|contro
 const htmlEnumAttributes = /^(contenteditable|draggable|spellcheck|value)$/i;
 const svgEnumAttributes = /^(autoReverse|externalResourcesRequired|focusable|preserveAlpha)$/i;
 const STATIC_DIRECTIVES = /* @__PURE__ */ new Set(["set:html", "set:text"]);
-const toIdent = (k) => k.trim().replace(/(?:(?<!^)\b\w|\s+|[^\w]+)/g, (match, index) => {
+const toIdent = (k) => k.trim().replace(/(?:(?!^)\b\w|\s+|[^\w]+)/g, (match, index) => {
   if (/[^\w]|\s/.test(match))
     return "";
   return index === 0 ? match : match.toUpperCase();
@@ -16,7 +16,7 @@ const toStyleString = (obj) => Object.entries(obj).map(([k, v]) => `${kebab(k)}:
 function defineScriptVars(vars) {
   let output = "";
   for (const [key, value] of Object.entries(vars)) {
-    output += `let ${toIdent(key)} = ${JSON.stringify(value)};
+    output += `const ${toIdent(key)} = ${JSON.stringify(value)};
 `;
   }
   return markHTMLString(output);

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

@@ -3,9 +3,10 @@ import { invalidateCompilation, isCached } from "../core/compile/index.js";
 import { info } from "../core/logger/core.js";
 import * as msg from "../core/messages.js";
 import { isAstroScript } from "./query.js";
-const PKG_PREFIX = new URL("../../", import.meta.url);
+const PKG_PREFIX = fileURLToPath(new URL("../../", import.meta.url));
+const E2E_PREFIX = fileURLToPath(new URL("../../e2e", 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));
+  return id && id.startsWith(PKG_PREFIX) && !id.startsWith(E2E_PREFIX);
 };
 async function handleHotUpdate(ctx, { config, logging, compile }) {
   let isStyleOnlyChange = false;

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

@@ -1,6 +1,8 @@
 import { renderMarkdown } from "@astrojs/markdown-remark";
 import fs from "fs";
 import matter from "gray-matter";
+import { fileURLToPath } from "node:url";
+import { normalizePath } from "vite";
 import { collectErrorMetadata } from "../core/errors.js";
 import { warn } from "../core/logger/core.js";
 import { getFileInfo, safelyGetAstroData } from "../vite-plugin-utils/index.js";
@@ -12,6 +14,9 @@ function safeMatter(source, id) {
     throw collectErrorMetadata(e);
   }
 }
+const astroJsxRuntimeModulePath = normalizePath(
+  fileURLToPath(new URL("../jsx-runtime/index.js", import.meta.url))
+);
 function markdown({ settings, logging }) {
   return {
     enforce: "pre",
@@ -42,7 +47,7 @@ function markdown({ settings, logging }) {
           );
         }
         const code = escapeViteEnvReferences(`
-				import { Fragment, jsx as h } from 'astro/jsx-runtime';
+				import { Fragment, jsx as h } from '${astroJsxRuntimeModulePath}';
 				${layout ? `import Layout from ${JSON.stringify(layout)};` : ""}
 
 				const html = ${JSON.stringify(html)};

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

@@ -1,4 +1,4 @@
-import { appendForwardSlash } from "../core/path.js";
+import { appendExtension, appendForwardSlash } from "../core/path.js";
 function getFileInfo(id, config) {
   const sitePathname = appendForwardSlash(
     config.site ? new URL(config.base, config.site).pathname : config.base
@@ -8,6 +8,9 @@ function getFileInfo(id, config) {
   if (fileUrl && config.trailingSlash === "always") {
     fileUrl = appendForwardSlash(fileUrl);
   }
+  if (fileUrl && config.build.format === "file") {
+    fileUrl = appendExtension(fileUrl, "html");
+  }
   return { fileId, fileUrl };
 }
 function isValidAstroData(obj) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -86,7 +86,7 @@
     "@astrojs/language-server": "^0.26.2",
     "@astrojs/markdown-remark": "^1.1.2",
     "@astrojs/telemetry": "^1.0.0",
-    "@astrojs/webapi": "^1.0.0",
+    "@astrojs/webapi": "^1.1.0",
     "@babel/core": "^7.18.2",
     "@babel/generator": "^7.18.2",
     "@babel/parser": "^7.18.4",
@@ -161,7 +161,7 @@
     "@types/send": "^0.17.1",
     "@types/unist": "^2.0.6",
     "ast-types": "^0.14.2",
-    "astro-scripts": "0.0.7",
+    "astro-scripts": "0.0.8",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.11",
     "mocha": "^9.2.2",