astro 2.0.0 → 2.0.2

package/components/Code.astro

@@ -58,7 +58,6 @@ const highlighter = await getHighlighter({
 });
 const _html = highlighter.codeToHtml(code, {
 	lang: typeof lang === 'string' ? lang : lang.id,
-	theme,
 });
 const html = repairShikiTheme(_html);
 ---

package/components/Shiki.js

@@ -19,7 +19,9 @@ function stringify(opts) {
  */
 async function resolveHighlighter(opts) {
 	const resolvedThemes = [];
-	if (opts.theme && opts.theme in themes) {
+	if (Object.keys(opts.theme).length) {
+		resolvedThemes.push(opts.theme);
+	} else if (opts.theme && opts.theme in themes) {
 		resolvedThemes.push(await themes[opts.theme]());
 	}
 

package/dist/content/utils.js

@@ -159,7 +159,8 @@ async function loadContentConfig({
     return void 0;
   }
   try {
-    unparsedConfig = await tempConfigServer.ssrLoadModule(contentPaths.config.pathname);
+    const configPathname = fileURLToPath(contentPaths.config);
+    unparsedConfig = await tempConfigServer.ssrLoadModule(configPathname);
   } catch (e) {
     throw e;
   } finally {

package/dist/core/app/node.js

@@ -1,10 +1,12 @@
 import * as fs from "fs";
+import { TLSSocket } from "tls";
 import { deserializeManifest } from "./common.js";
 import { App } from "./index.js";
 const clientAddressSymbol = Symbol.for("astro.clientAddress");
 function createRequestFromNodeRequest(req, body) {
   var _a;
-  let url = `http://${req.headers.host}${req.url}`;
+  const protocol = req.socket instanceof TLSSocket || req.headers["x-forwarded-proto"] === "https" ? "https" : "http";
+  let url = `${protocol}://${req.headers.host}${req.url}`;
   let rawHeaders = req.headers;
   const entries = Object.entries(rawHeaders);
   const method = req.method || "GET";

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.0.0";
+const ASTRO_VERSION = "2.0.2";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/dev.js

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

package/dist/core/logger/core.js

@@ -55,10 +55,15 @@ function padStr(str, len) {
 }
 let defaultLogLevel;
 if (typeof process !== "undefined") {
-  if (process.argv.includes("--verbose")) {
-    defaultLogLevel = "debug";
-  } else if (process.argv.includes("--silent")) {
-    defaultLogLevel = "silent";
+  let proc = process;
+  if ("argv" in proc && Array.isArray(proc.argv)) {
+    if (proc.argv.includes("--verbose")) {
+      defaultLogLevel = "debug";
+    } else if (proc.argv.includes("--silent")) {
+      defaultLogLevel = "silent";
+    } else {
+      defaultLogLevel = "info";
+    }
   } else {
     defaultLogLevel = "info";
   }

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.0.0";
+  const version = "2.0.2";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -233,7 +233,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"2.0.0"}`
+        `v${"2.0.2"}`
       )} ${headline}`
     );
   }

package/dist/core/render/core.js

@@ -25,7 +25,7 @@ async function getParamsAndProps(opts) {
       routeCache.set(route, routeCacheEntry);
     }
     const matchedStaticPath = findPathItemByKey(routeCacheEntry.staticPaths, params, route);
-    if (!matchedStaticPath && !ssr) {
+    if (!matchedStaticPath && (ssr ? mod.prerender : true)) {
       return 0 /* NoMatchingStaticPath */;
     }
     pageProps = (matchedStaticPath == null ? void 0 : matchedStaticPath.props) ? { ...matchedStaticPath.props } : {};

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

@@ -25,12 +25,12 @@ function guessRenderers(componentUrl) {
       return ["@astrojs/vue"];
     case "jsx":
     case "tsx":
-      return ["@astrojs/react", "@astrojs/preact", "@astrojs/solid", "@astrojs/vue (jsx)"];
+      return ["@astrojs/react", "@astrojs/preact", "@astrojs/solid-js", "@astrojs/vue (jsx)"];
     default:
       return [
         "@astrojs/react",
         "@astrojs/preact",
-        "@astrojs/solid",
+        "@astrojs/solid-js",
         "@astrojs/vue",
         "@astrojs/svelte"
       ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -87,7 +87,7 @@
   "dependencies": {
     "@astrojs/compiler": "^1.0.1",
     "@astrojs/language-server": "^0.28.3",
-    "@astrojs/markdown-remark": "^2.0.0",
+    "@astrojs/markdown-remark": "^2.0.1",
     "@astrojs/telemetry": "^2.0.0",
     "@astrojs/webapi": "^2.0.0",
     "@babel/core": "^7.18.2",
@@ -122,7 +122,7 @@
     "preferred-pm": "^3.0.3",
     "prompts": "^2.4.2",
     "rehype": "^12.0.1",
-    "semver": "^7.3.7",
+    "semver": "^7.3.8",
     "server-destroy": "^1.0.1",
     "shiki": "^0.11.1",
     "slash": "^4.0.0",

package/src/content/template/types.d.ts

@@ -44,10 +44,10 @@ declare module 'astro:content' {
 	): E extends ValidEntrySlug<C>
 		? Promise<CollectionEntry<C>>
 		: Promise<CollectionEntry<C> | undefined>;
-	export function getCollection<C extends keyof typeof entryMap>(
+	export function getCollection<C extends keyof typeof entryMap, E extends CollectionEntry<C>>(
 		collection: C,
-		filter?: (data: CollectionEntry<C>) => boolean
-	): Promise<CollectionEntry<C>[]>;
+		filter?: (entry: CollectionEntry<C>) => entry is E
+	): Promise<E[]>;
 
 	type InferEntrySchema<C extends keyof typeof entryMap> = import('astro/zod').infer<
 		Required<ContentConfig['collections'][C]>['schema']