astro 2.0.9 → 2.0.11

package/astro-jsx.d.ts

@@ -936,10 +936,10 @@ declare namespace astroHTML.JSX {
 	interface TableHTMLAttributes extends HTMLAttributes {
 		align?: 'left' | 'center' | 'right' | undefined | null;
 		bgcolor?: string | undefined | null;
-		border?: number | undefined | null;
+		border?: string | number | undefined | null;
 		cellpadding?: number | string | undefined | null;
 		cellspacing?: number | string | undefined | null;
-		frame?: boolean | undefined | null;
+		frame?: boolean | 'false' | 'true' | undefined | null;
 		rules?: 'none' | 'groups' | 'rows' | 'columns' | 'all' | undefined | null;
 		summary?: string | undefined | null;
 		width?: number | string | undefined | null;

package/components/Shiki.js

@@ -15,14 +15,14 @@ function stringify(opts) {
 
 /**
  * @param {import('shiki').HighlighterOptions} opts
- * @returns {Promise<import('shiki').Highlighter>}
+ * @returns {Promise<import('shiki').HighlighterOptions>}
  */
-async function resolveHighlighter(opts) {
+export async function resolveHighlighterOptions(opts) {
 	const resolvedThemes = [];
-	if (Object.keys(opts.theme).length) {
-		resolvedThemes.push(opts.theme);
-	} else if (opts.theme && opts.theme in themes) {
+	if (opts.theme && opts.theme in themes) {
 		resolvedThemes.push(await themes[opts.theme]());
+	} else if (Object.keys(opts.theme).length) {
+		resolvedThemes.push(opts.theme);
 	}
 
 	let resolvedLanguages;
@@ -47,6 +47,16 @@ async function resolveHighlighter(opts) {
 	// Do not pass through the theme as that will attempt to load it, even if it's included in themes
 	delete highlighterOptions['theme'];
 
+	return highlighterOptions;
+}
+
+/**
+ * @param {import('shiki').HighlighterOptions} opts
+ * @returns {Promise<import('shiki').Highlighter>}
+ */
+async function resolveHighlighter(opts) {
+	const highlighterOptions = await resolveHighlighterOptions(opts);
+
 	// Start the async getHighlighter call and cache the Promise
 	const highlighter = getShikiHighlighter(highlighterOptions).then((hl) => {
 		hl.setColorReplacements({

package/dist/content/utils.js

@@ -5,7 +5,6 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import { normalizePath } from "vite";
 import { z } from "zod";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
-import { appendForwardSlash } from "../core/path.js";
 import { contentFileExts, CONTENT_TYPES_FILE } from "./consts.js";
 const collectionConfigParser = z.object({
   schema: z.any().optional()
@@ -104,10 +103,9 @@ function getEntryInfo({
   return res;
 }
 function getEntryType(entryPath, paths) {
-  const { dir: rawDir, ext, base } = path.parse(entryPath);
-  const dir = appendForwardSlash(pathToFileURL(rawDir).href);
-  const fileUrl = new URL(base, dir);
-  if (hasUnderscoreInPath(fileUrl) || isOnIgnoreList(fileUrl)) {
+  const { ext, base } = path.parse(entryPath);
+  const fileUrl = pathToFileURL(entryPath);
+  if (hasUnderscoreInPath(fileUrl) || isOnIgnoreList(base)) {
     return "ignored";
   } else if (contentFileExts.includes(ext)) {
     return "content";
@@ -117,9 +115,8 @@ function getEntryType(entryPath, paths) {
     return "unsupported";
   }
 }
-function isOnIgnoreList(fileUrl) {
-  const { base } = path.parse(fileURLToPath(fileUrl));
-  return [".DS_Store"].includes(base);
+function isOnIgnoreList(fileName) {
+  return [".DS_Store"].includes(fileName);
 }
 function hasUnderscoreInPath(fileUrl) {
   const parts = fileUrl.pathname.split("/");

package/dist/content/vite-plugin-content-assets.js

@@ -83,6 +83,7 @@ function astroConfigBuildPlugin(options, internals) {
       "build:post": ({ ssrOutputs, clientOutputs, mutate }) => {
         var _a, _b;
         const outputs = ssrOutputs.flatMap((o) => o.output);
+        const prependBase = (src) => prependForwardSlash(npath.posix.join(options.settings.config.base, src));
         for (const chunk of outputs) {
           if (chunk.type === "chunk" && (chunk.code.includes(LINKS_PLACEHOLDER) || chunk.code.includes(SCRIPTS_PLACEHOLDER))) {
             let entryCSS = /* @__PURE__ */ new Set();
@@ -113,7 +114,7 @@ function astroConfigBuildPlugin(options, internals) {
             if (entryCSS.size) {
               newCode = newCode.replace(
                 JSON.stringify(LINKS_PLACEHOLDER),
-                JSON.stringify([...entryCSS])
+                JSON.stringify(Array.from(entryCSS).map(prependBase))
               );
             }
             if (entryScripts.size) {
@@ -134,7 +135,7 @@ function astroConfigBuildPlugin(options, internals) {
                 JSON.stringify(
                   [...entryFileNames].map((src) => ({
                     props: {
-                      src: prependForwardSlash(npath.posix.join(options.settings.config.base, src)),
+                      src: prependBase(src),
                       type: "module"
                     },
                     children: ""

package/dist/core/build/generate.js

@@ -276,7 +276,8 @@ async function generatePath(pathname, opts, gopts) {
       throwIfRedirectNotAllowed(result.response, opts.settings.config);
       if (!result.response.body)
         return;
-      body = await result.response.text();
+      const ab = await result.response.arrayBuffer();
+      body = new Uint8Array(ab);
     } else {
       body = result.body;
       encoding = result.encoding;

package/dist/core/config/schema.d.ts

@@ -209,74 +209,9 @@ export declare const AstroConfigSchema: z.ZodObject<{
     experimental?: {} | undefined;
     legacy?: {} | undefined;
 }>;
-export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL): z.ZodEffects<z.ZodObject<z.extendShape<{
-    root: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
-    srcDir: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
-    publicDir: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
-    outDir: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
+export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL): z.ZodEffects<z.ZodObject<{
     site: z.ZodOptional<z.ZodString>;
     base: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    trailingSlash: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"always">, z.ZodLiteral<"never">, z.ZodLiteral<"ignore">]>>>;
-    output: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"static">, z.ZodLiteral<"server">]>>>;
-    adapter: z.ZodOptional<z.ZodObject<{
-        name: z.ZodString;
-        hooks: z.ZodDefault<z.ZodObject<{}, "passthrough", z.ZodTypeAny, {}, {}>>;
-    }, "strip", z.ZodTypeAny, {
-        name: string;
-        hooks: {};
-    }, {
-        hooks?: {} | undefined;
-        name: string;
-    }>>;
-    integrations: z.ZodEffects<z.ZodDefault<z.ZodArray<z.ZodObject<{
-        name: z.ZodString;
-        hooks: z.ZodDefault<z.ZodObject<{}, "passthrough", z.ZodTypeAny, {}, {}>>;
-    }, "strip", z.ZodTypeAny, {
-        name: string;
-        hooks: {};
-    }, {
-        hooks?: {} | undefined;
-        name: string;
-    }>, "many">>, {
-        name: string;
-        hooks: {};
-    }[], unknown>;
-    build: z.ZodDefault<z.ZodOptional<z.ZodObject<{
-        format: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"file">, z.ZodLiteral<"directory">]>>>;
-        client: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
-        server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
-        assets: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-        serverEntry: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    }, "strip", z.ZodTypeAny, {
-        assets: string;
-        server: URL;
-        format: "file" | "directory";
-        client: URL;
-        serverEntry: string;
-    }, {
-        assets?: string | undefined;
-        server?: string | undefined;
-        format?: "file" | "directory" | undefined;
-        client?: string | undefined;
-        serverEntry?: string | undefined;
-    }>>>;
-    server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodObject<{
-        host: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodBoolean]>>>;
-        port: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-        headers: z.ZodOptional<z.ZodType<OutgoingHttpHeaders, z.ZodTypeDef, OutgoingHttpHeaders>>;
-    }, "strip", z.ZodTypeAny, {
-        headers?: OutgoingHttpHeaders | undefined;
-        host: string | boolean;
-        port: number;
-    }, {
-        host?: string | boolean | undefined;
-        port?: number | undefined;
-        headers?: OutgoingHttpHeaders | undefined;
-    }>>>, {
-        headers?: OutgoingHttpHeaders | undefined;
-        host: string | boolean;
-        port: number;
-    }, unknown>;
     markdown: z.ZodDefault<z.ZodObject<{
         drafts: z.ZodDefault<z.ZodBoolean>;
         syntaxHighlight: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"shiki">, z.ZodLiteral<"prism">, z.ZodLiteral<false>]>>;
@@ -325,10 +260,34 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         gfm?: boolean | undefined;
         smartypants?: boolean | undefined;
     }>>;
+    output: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"static">, z.ZodLiteral<"server">]>>>;
+    trailingSlash: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"always">, z.ZodLiteral<"never">, z.ZodLiteral<"ignore">]>>>;
+    adapter: z.ZodOptional<z.ZodObject<{
+        name: z.ZodString;
+        hooks: z.ZodDefault<z.ZodObject<{}, "passthrough", z.ZodTypeAny, {}, {}>>;
+    }, "strip", z.ZodTypeAny, {
+        name: string;
+        hooks: {};
+    }, {
+        hooks?: {} | undefined;
+        name: string;
+    }>>;
+    integrations: z.ZodEffects<z.ZodDefault<z.ZodArray<z.ZodObject<{
+        name: z.ZodString;
+        hooks: z.ZodDefault<z.ZodObject<{}, "passthrough", z.ZodTypeAny, {}, {}>>;
+    }, "strip", z.ZodTypeAny, {
+        name: string;
+        hooks: {};
+    }, {
+        hooks?: {} | undefined;
+        name: string;
+    }>, "many">>, {
+        name: string;
+        hooks: {};
+    }[], unknown>;
     vite: z.ZodDefault<z.ZodType<ViteUserConfig, z.ZodTypeDef, ViteUserConfig>>;
     experimental: z.ZodDefault<z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>>;
     legacy: z.ZodDefault<z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>>;
-}, {
     root: z.ZodEffects<z.ZodDefault<z.ZodString>, URL, string | undefined>;
     srcDir: z.ZodEffects<z.ZodDefault<z.ZodString>, URL, string | undefined>;
     publicDir: z.ZodEffects<z.ZodDefault<z.ZodString>, URL, string | undefined>;
@@ -373,7 +332,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         port: number;
         streaming: boolean;
     }, unknown>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     site?: string | undefined;
     adapter?: {
         name: string;

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

@@ -5,7 +5,7 @@ import * as msg from "../messages.js";
 import { startContainer } from "./container.js";
 import { createContainerWithAutomaticRestart } from "./restart.js";
 async function dev(settings, options) {
-  var _a, _b;
+  var _a, _b, _c;
   const devStart = performance.now();
   await options.telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({
@@ -14,6 +14,7 @@ async function dev(settings, options) {
     beforeRestart: () => console.clear(),
     params: {
       settings,
+      root: (_a = options.flags) == null ? void 0 : _a.root,
       logging: options.logging,
       isRestart: options.isRestart
     }
@@ -30,11 +31,11 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "2.0.9";
+  const currentVersion = "2.0.11";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }
-  if (((_b = (_a = restart.container.viteConfig.server) == null ? void 0 : _a.fs) == null ? void 0 : _b.strict) === false) {
+  if (((_c = (_b = restart.container.viteConfig.server) == null ? void 0 : _b.fs) == null ? void 0 : _c.strict) === false) {
     warn(options.logging, null, msg.fsStrictWarning());
   }
   await attachContentServerListeners(restart.container);

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.0.9";
+  const version = "2.0.11";
   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.9"}`
+        `v${"2.0.11"}`
       )} ${headline}`
     );
   }

package/dist/core/render/paginate.js

@@ -43,7 +43,7 @@ function generatePaginateFunction(routeMatch) {
               next: pageNum === lastPage ? void 0 : routeMatch.generate({ ...params, page: String(pageNum + 1) }),
               prev: pageNum === 1 ? void 0 : routeMatch.generate({
                 ...params,
-                page: !includesFirstPageNumber && pageNum - 1 === 1 ? void 0 : String(pageNum - 1)
+                page: !includesFirstPageNumber && pageNum - 1 === 1 ? "" : String(pageNum - 1)
               })
             }
           }

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

@@ -5,7 +5,7 @@ import {
   getPrescripts
 } from "../scripts.js";
 import { renderAllHeadContent } from "./head.js";
-import { ScopeFlags } from "./scope.js";
+import { hasScopeFlag, ScopeFlags } from "./scope.js";
 import { isSlotString } from "./slot.js";
 const Fragment = Symbol.for("astro:fragment");
 const Renderer = Symbol.for("astro:renderer");
@@ -44,6 +44,25 @@ function stringifyChunk(result, chunk) {
           case ScopeFlags.JSX | ScopeFlags.Slot | ScopeFlags.Astro | ScopeFlags.HeadBuffer: {
             return "";
           }
+          case ScopeFlags.JSX | ScopeFlags.Astro: {
+            if (hasScopeFlag(result, ScopeFlags.JSX)) {
+              return "";
+            }
+            break;
+          }
+          case ScopeFlags.Slot:
+          case ScopeFlags.Slot | ScopeFlags.HeadBuffer: {
+            if (hasScopeFlag(result, ScopeFlags.RenderSlot)) {
+              return "";
+            }
+            break;
+          }
+          case ScopeFlags.HeadBuffer: {
+            if (hasScopeFlag(result, ScopeFlags.JSX | ScopeFlags.HeadBuffer)) {
+              return "";
+            }
+            break;
+          }
           case ScopeFlags.RenderSlot | ScopeFlags.Astro:
           case ScopeFlags.RenderSlot | ScopeFlags.Astro | ScopeFlags.JSX:
           case ScopeFlags.RenderSlot | ScopeFlags.Astro | ScopeFlags.JSX | ScopeFlags.HeadBuffer: {

package/dist/runtime/server/render/scope.d.ts

@@ -9,5 +9,6 @@ export declare const ScopeFlags: {
 type ScopeFlagValues = (typeof ScopeFlags)[keyof typeof ScopeFlags];
 export declare function addScopeFlag(result: SSRResult, flag: ScopeFlagValues): void;
 export declare function removeScopeFlag(result: SSRResult, flag: ScopeFlagValues): void;
+export declare function hasScopeFlag(result: SSRResult, flag: ScopeFlagValues): boolean;
 export declare function createScopedResult(result: SSRResult, flag?: ScopeFlagValues): SSRResult;
 export {};

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

@@ -11,6 +11,9 @@ function addScopeFlag(result, flag) {
 function removeScopeFlag(result, flag) {
   result.scope &= ~flag;
 }
+function hasScopeFlag(result, flag) {
+  return (result.scope & flag) === flag;
+}
 function createScopedResult(result, flag) {
   const scopedResult = Object.create(result, {
     scope: {
@@ -27,5 +30,6 @@ export {
   ScopeFlags,
   addScopeFlag,
   createScopedResult,
+  hasScopeFlag,
   removeScopeFlag
 };

package/package.json

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