astro 3.2.1 → 3.2.3

package/astro.js

@@ -3,7 +3,6 @@
 
 // ISOMORPHIC FILE: NO TOP-LEVEL IMPORT/REQUIRE() ALLOWED
 // This file has to run as both ESM and CJS on older Node.js versions
-// Needed for Stackblitz: https://github.com/stackblitz/webcontainer-core/issues/281
 
 const CI_INSTRUCTIONS = {
 	NETLIFY: 'https://docs.netlify.com/configure-builds/manage-dependencies/#node-js-and-javascript',
@@ -16,15 +15,11 @@ const CI_INSTRUCTIONS = {
 const engines = '>=18.14.1';
 const skipSemverCheckIfAbove = 19;
 
-// HACK (2023-08-18) Stackblitz does not support Node 18 yet, so we'll fake Node 16 support for some time until it's supported
-// TODO: Remove when Node 18 is supported on Stackblitz
-const isStackblitz = process.env.SHELL === '/bin/jsh' && process.versions.webcontainer != null;
-
 /** `astro *` */
 async function main() {
 	const version = process.versions.node;
 	// Fast-path for higher Node.js versions
-	if (!isStackblitz && (parseInt(version) || 0) <= skipSemverCheckIfAbove) {
+	if ((parseInt(version) || 0) <= skipSemverCheckIfAbove) {
 		try {
 			const semver = await import('semver');
 			if (!semver.satisfies(version, engines)) {

package/dist/@types/astro.d.ts

@@ -559,7 +559,7 @@ export interface AstroUserConfig {
      * @see output
      * @description
      *
-     * Deploy to your favorite server, serverless, or edge host with build adapters. Import one of our first-party adapters for [Netlify](https://docs.astro.build/en/guides/deploy/netlify/#adapter-for-ssredge), [Vercel](https://docs.astro.build/en/guides/deploy/vercel/#adapter-for-ssr), and more to engage Astro SSR.
+     * Deploy to your favorite server, serverless, or edge host with build adapters. Import one of our first-party adapters for [Netlify](https://docs.astro.build/en/guides/deploy/netlify/#adapter-for-ssr), [Vercel](https://docs.astro.build/en/guides/deploy/vercel/#adapter-for-ssr), and more to engage Astro SSR.
      *
      * [See our Server-side Rendering guide](https://docs.astro.build/en/guides/server-side-rendering/) for more on SSR, and [our deployment guides](https://docs.astro.build/en/guides/deploy/) for a complete list of hosts.
      *
@@ -1075,10 +1075,10 @@ export interface AstroUserConfig {
          * Pass [rehype plugins](https://github.com/remarkjs/remark-rehype) to customize how your Markdown's output HTML is processed. You can import and apply the plugin function (recommended), or pass the plugin name as a string.
          *
          * ```js
-         * import rehypeMinifyHtml from 'rehype-minify';
+         * import { rehypeAccessibleEmojis } from 'rehype-accessible-emojis';
          * {
          *   markdown: {
-         *     rehypePlugins: [rehypeMinifyHtml]
+         *     rehypePlugins: [rehypeAccessibleEmojis]
          *   }
          * }
          * ```
@@ -1967,7 +1967,7 @@ export interface SSRMetadata {
     hasRenderedHead: boolean;
     headInTree: boolean;
     extraHead: string[];
-    propagators: Map<AstroComponentFactory, AstroComponentInstance>;
+    propagators: Set<AstroComponentInstance>;
 }
 export interface PreviewServer {
     host?: string;

package/dist/cli/info/index.js

@@ -27,11 +27,20 @@ async function printInfo({ flags }) {
   }
   await copyToClipboard(output.trim());
 }
-const SUPPORTED_SYSTEM = /* @__PURE__ */ new Set(["darwin", "win32"]);
 async function copyToClipboard(text) {
   const system = platform();
-  if (!SUPPORTED_SYSTEM.has(system))
-    return;
+  let command = "";
+  if (system === "darwin") {
+    command = "pbcopy";
+  } else if (system === "win32") {
+    command = "clip";
+  } else {
+    const output = execSync("which xclip", { encoding: "utf8" });
+    if (output[0] !== "/") {
+      return;
+    }
+    command = "xclip -sel clipboard -l 1";
+  }
   console.log();
   const { shouldCopy } = await prompts({
     type: "confirm",
@@ -41,11 +50,10 @@ async function copyToClipboard(text) {
   });
   if (!shouldCopy)
     return;
-  const command = system === "darwin" ? "pbcopy" : "clip";
   try {
-    execSync(`echo ${JSON.stringify(text.trim())} | ${command}`, {
-      encoding: "utf8",
-      stdio: "ignore"
+    execSync(command, {
+      input: text.trim(),
+      encoding: "utf8"
     });
   } catch (e) {
     console.error(

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

@@ -49,7 +49,7 @@ function astroContentAssetPropagationPlugin({
           if (!devModuleLoader.getModuleById(basePath)?.ssrModule) {
             await devModuleLoader.import(basePath);
           }
-          const { stylesMap, urls } = await getStylesForURL(
+          const { styles, urls } = await getStylesForURL(
             pathToFileURL(basePath),
             devModuleLoader,
             "development"
@@ -60,7 +60,7 @@ function astroContentAssetPropagationPlugin({
             devModuleLoader
           );
           stringifiedLinks = JSON.stringify([...urls]);
-          stringifiedStyles = JSON.stringify([...stylesMap.values()]);
+          stringifiedStyles = JSON.stringify(styles.map((s) => s.content));
           stringifiedScripts = JSON.stringify([...hoistedScripts]);
         } else {
           stringifiedLinks = JSON.stringify(LINKS_PLACEHOLDER);

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

@@ -103,9 +103,15 @@ export const _internal = {
             }
             for (const modUrl of viteServer.moduleGraph.urlToModuleMap.keys()) {
               if (hasContentFlag(modUrl, CONTENT_FLAG) || hasContentFlag(modUrl, DATA_FLAG) || Boolean(getContentRendererByViteId(modUrl, settings))) {
-                const mod = await viteServer.moduleGraph.getModuleByUrl(modUrl);
-                if (mod) {
-                  viteServer.moduleGraph.invalidateModule(mod);
+                try {
+                  const mod = await viteServer.moduleGraph.getModuleByUrl(modUrl);
+                  if (mod) {
+                    viteServer.moduleGraph.invalidateModule(mod);
+                  }
+                } catch (e) {
+                  if (e.code === "ERR_CLOSED_SERVER")
+                    break;
+                  throw e;
                 }
               }
             }

package/dist/core/build/plugins/plugin-css.js

@@ -148,17 +148,21 @@ function rollupPluginAstroBuildCSS(options) {
     async generateBundle(_outputOptions, bundle) {
       const inlineConfig = settings.config.build.inlineStylesheets;
       const { assetsInlineLimit = 4096 } = settings.config.vite?.build ?? {};
-      Object.entries(bundle).forEach(([_, stylesheet]) => {
+      Object.entries(bundle).forEach(([id, stylesheet]) => {
         if (stylesheet.type !== "asset" || stylesheet.name?.endsWith(".css") !== true || typeof stylesheet.source !== "string")
           return;
         const assetSize = new TextEncoder().encode(stylesheet.source).byteLength;
         const toBeInlined = inlineConfig === "always" ? true : inlineConfig === "never" ? false : assetSize <= assetsInlineLimit;
         const sheet = toBeInlined ? { type: "inline", content: stylesheet.source } : { type: "external", src: stylesheet.fileName };
         const pages = Array.from(eachPageData(internals));
+        let sheetAddedToPage = false;
         pages.forEach((pageData) => {
           const orderingInfo = pagesToCss[pageData.moduleSpecifier]?.[stylesheet.fileName];
-          if (orderingInfo !== void 0)
-            return pageData.styles.push({ ...orderingInfo, sheet });
+          if (orderingInfo !== void 0) {
+            pageData.styles.push({ ...orderingInfo, sheet });
+            sheetAddedToPage = true;
+            return;
+          }
           const propagatedPaths = pagesToPropagatedCss[pageData.moduleSpecifier];
           if (propagatedPaths === void 0)
             return;
@@ -169,8 +173,17 @@ function rollupPluginAstroBuildCSS(options) {
               return;
             const propagatedStyles = pageData.propagatedStyles.get(pageInfoId) ?? pageData.propagatedStyles.set(pageInfoId, /* @__PURE__ */ new Set()).get(pageInfoId);
             propagatedStyles.add(sheet);
+            sheetAddedToPage = true;
           });
         });
+        if (toBeInlined && sheetAddedToPage) {
+          delete bundle[id];
+          for (const chunk of Object.values(bundle)) {
+            if (chunk.type === "chunk") {
+              chunk.viteMetadata?.importedCss?.delete(id);
+            }
+          }
+        }
       });
     }
   };

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

@@ -20,7 +20,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "3.2.1";
+  const currentVersion = "3.2.3";
   if (currentVersion.includes("-")) {
     logger.warn(null, msg.prerelease({ currentVersion }));
   }

package/dist/core/endpoint/index.d.ts

@@ -15,27 +15,8 @@ type CreateAPIContext = {
  */
 export declare function createAPIContext({ request, params, site, props, adapterName, }: CreateAPIContext): APIContext;
 type ResponseParameters = ConstructorParameters<typeof Response>;
-export declare let ResponseWithEncoding: ReturnType<typeof initResponseWithEncoding>;
-declare let initResponseWithEncoding: () => {
-    new (body: ResponseParameters[0], init: ResponseParameters[1], encoding?: BufferEncoding): {
-        readonly headers: Headers;
-        readonly ok: boolean;
-        readonly redirected: boolean;
-        readonly status: number;
-        readonly statusText: string;
-        readonly type: ResponseType;
-        readonly url: string;
-        clone(): Response;
-        readonly body: ReadableStream<Uint8Array> | null;
-        readonly bodyUsed: boolean;
-        arrayBuffer(): Promise<ArrayBuffer>;
-        blob(): Promise<Blob>;
-        formData(): Promise<FormData>;
-        json(): Promise<any>;
-        text(): Promise<string>;
-    };
-    error(): Response;
-    redirect(url: string | URL, status?: number | undefined): Response;
-};
+export declare class ResponseWithEncoding extends Response {
+    constructor(body: ResponseParameters[0], init: ResponseParameters[1], encoding?: BufferEncoding);
+}
 export declare function callEndpoint<MiddlewareResult = Response | EndpointOutput>(mod: EndpointHandler, env: Environment, ctx: RenderContext, onRequest?: MiddlewareHandler<MiddlewareResult> | undefined): Promise<Response>;
 export {};

package/dist/core/endpoint/index.js

@@ -14,7 +14,6 @@ function createAPIContext({
   props,
   adapterName
 }) {
-  initResponseWithEncoding();
   const context = {
     cookies: new AstroCookies(request),
     request,
@@ -61,28 +60,21 @@ function createAPIContext({
   });
   return context;
 }
-let ResponseWithEncoding;
-let initResponseWithEncoding = () => {
-  class LocalResponseWithEncoding extends Response {
-    constructor(body, init, encoding) {
-      if (typeof body === "string") {
-        if (typeof Buffer !== "undefined" && Buffer.from) {
-          body = Buffer.from(body, encoding);
-        } else if (encoding == null || encoding === "utf8" || encoding === "utf-8") {
-          body = encoder.encode(body);
-        }
-      }
-      super(body, init);
-      if (encoding) {
-        this.headers.set("X-Astro-Encoding", encoding);
+class ResponseWithEncoding extends Response {
+  constructor(body, init, encoding) {
+    if (typeof body === "string") {
+      if (typeof Buffer !== "undefined" && Buffer.from) {
+        body = Buffer.from(body, encoding);
+      } else if (encoding == null || encoding === "utf8" || encoding === "utf-8") {
+        body = encoder.encode(body);
       }
     }
+    super(body, init);
+    if (encoding) {
+      this.headers.set("X-Astro-Encoding", encoding);
+    }
   }
-  ResponseWithEncoding = LocalResponseWithEncoding;
-  initResponseWithEncoding = () => {
-  };
-  return LocalResponseWithEncoding;
-};
+}
 async function callEndpoint(mod, env, ctx, onRequest) {
   const context = createAPIContext({
     request: ctx.request,

package/dist/core/errors/errors-data.d.ts

@@ -1042,7 +1042,7 @@ export declare const ContentSchemaContainsSlugError: {
 /**
  * @docs
  * @message A collection queried via `getCollection()` does not exist.
- * @deprecated Collections that do not exist no longer result in an error. A warning is omitted instead.
+ * @deprecated Collections that do not exist no longer result in an error. A warning is given instead.
  * @description
  * When querying a collection, ensure a collection directory with the requested name exists under `src/content/`.
  */

package/dist/core/messages.js

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

package/dist/core/module-loader/vite.js

@@ -1,14 +1,41 @@
 import { EventEmitter } from "node:events";
+import path from "node:path";
 function createViteLoader(viteServer) {
   const events = new EventEmitter();
-  viteServer.watcher.on("add", (...args) => events.emit("file-add", args));
-  viteServer.watcher.on("unlink", (...args) => events.emit("file-unlink", args));
-  viteServer.watcher.on("change", (...args) => events.emit("file-change", args));
-  wrapMethod(viteServer.ws, "send", (msg) => {
+  let isTsconfigUpdated = false;
+  function isTsconfigUpdate(filePath) {
+    const result = path.basename(filePath) === "tsconfig.json";
+    if (result)
+      isTsconfigUpdated = true;
+    return result;
+  }
+  viteServer.watcher.on("add", (...args) => {
+    if (!isTsconfigUpdate(args[0])) {
+      events.emit("file-add", args);
+    }
+  });
+  viteServer.watcher.on("unlink", (...args) => {
+    if (!isTsconfigUpdate(args[0])) {
+      events.emit("file-unlink", args);
+    }
+  });
+  viteServer.watcher.on("change", (...args) => {
+    if (!isTsconfigUpdate(args[0])) {
+      events.emit("file-change", args);
+    }
+  });
+  const _wsSend = viteServer.ws.send;
+  viteServer.ws.send = function(...args) {
+    if (isTsconfigUpdated) {
+      isTsconfigUpdated = false;
+      return;
+    }
+    const msg = args[0];
     if (msg?.type === "error") {
       events.emit("hmr-error", msg);
     }
-  });
+    _wsSend.apply(this, args);
+  };
   return {
     import(src) {
       return viteServer.ssrLoadModule(src);
@@ -50,13 +77,6 @@ function createViteLoader(viteServer) {
     events
   };
 }
-function wrapMethod(object, method, newFn) {
-  const orig = object[method];
-  object[method] = function(...args) {
-    newFn.apply(this, args);
-    return orig.apply(this, args);
-  };
-}
 export {
   createViteLoader
 };

package/dist/core/polyfill.js

@@ -1,53 +1,6 @@
+import buffer from "node:buffer";
 import crypto from "node:crypto";
-import {
-  ByteLengthQueuingStrategy,
-  CountQueuingStrategy,
-  ReadableByteStreamController,
-  ReadableStream,
-  ReadableStreamBYOBReader,
-  ReadableStreamBYOBRequest,
-  ReadableStreamDefaultController,
-  ReadableStreamDefaultReader,
-  TransformStream,
-  WritableStream,
-  WritableStreamDefaultController,
-  WritableStreamDefaultWriter
-} from "node:stream/web";
-import { File, FormData, Headers, Request, Response, fetch } from "undici";
-const isStackblitz = process.env.SHELL === "/bin/jsh" && process.versions.webcontainer != null;
 function apply() {
-  if (isStackblitz) {
-    const neededPolyfills = {
-      ByteLengthQueuingStrategy,
-      CountQueuingStrategy,
-      ReadableByteStreamController,
-      ReadableStream,
-      ReadableStreamBYOBReader,
-      ReadableStreamBYOBRequest,
-      ReadableStreamDefaultController,
-      ReadableStreamDefaultReader,
-      TransformStream,
-      WritableStream,
-      WritableStreamDefaultController,
-      WritableStreamDefaultWriter,
-      File,
-      FormData,
-      Headers,
-      Request,
-      Response,
-      fetch
-    };
-    for (let polyfillName of Object.keys(neededPolyfills)) {
-      if (Object.hasOwnProperty.call(globalThis, polyfillName))
-        continue;
-      Object.defineProperty(globalThis, polyfillName, {
-        configurable: true,
-        enumerable: true,
-        writable: true,
-        value: neededPolyfills[polyfillName]
-      });
-    }
-  }
   if (!globalThis.crypto) {
     Object.defineProperty(globalThis, "crypto", {
       value: crypto.webcrypto
@@ -55,7 +8,7 @@ function apply() {
   }
   if (!globalThis.File) {
     Object.defineProperty(globalThis, "File", {
-      value: File
+      value: buffer.File
     });
   }
 }

package/dist/core/render/result.js

@@ -156,7 +156,7 @@ function createResult(args) {
       hasDirectives: /* @__PURE__ */ new Set(),
       headInTree: false,
       extraHead: [],
-      propagators: /* @__PURE__ */ new Map()
+      propagators: /* @__PURE__ */ new Set()
     }
   };
   return result;

package/dist/runtime/server/hydration.js

@@ -69,9 +69,10 @@ async function generateHydrateScript(scriptOptions, metadata) {
   const { renderer, result, astroId, props, attrs } = scriptOptions;
   const { hydrate, componentUrl, componentExport } = metadata;
   if (!componentExport.value) {
-    throw new Error(
-      `Unable to resolve a valid export for "${metadata.displayName}"! Please open an issue at https://astro.build/issues!`
-    );
+    throw new AstroError({
+      ...AstroErrorData.NoMatchingImport,
+      message: AstroErrorData.NoMatchingImport.message(metadata.displayName)
+    });
   }
   const island = {
     children: "",

package/dist/runtime/server/render/astro/instance.js

@@ -55,8 +55,8 @@ function validateComponentProps(props, displayName) {
 function createAstroComponentInstance(result, displayName, factory, props, slots = {}) {
   validateComponentProps(props, displayName);
   const instance = new AstroComponentInstance(result, props, slots, factory);
-  if (isAPropagatingComponent(result, factory) && !result._metadata.propagators.has(factory)) {
-    result._metadata.propagators.set(factory, instance);
+  if (isAPropagatingComponent(result, factory)) {
+    result._metadata.propagators.add(instance);
   }
   return instance;
 }

package/dist/vite-plugin-astro-server/css.d.ts

@@ -1,7 +1,13 @@
 import type { RuntimeMode } from '../@types/astro.js';
 import type { ModuleLoader } from '../core/module-loader/index.js';
+interface ImportedStyle {
+    id: string;
+    url: string;
+    content: string;
+}
 /** Given a filePath URL, crawl Vite’s module graph to find all style imports. */
 export declare function getStylesForURL(filePath: URL, loader: ModuleLoader, mode: RuntimeMode): Promise<{
     urls: Set<string>;
-    stylesMap: Map<string, string>;
+    styles: ImportedStyle[];
 }>;
+export {};

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

@@ -14,7 +14,11 @@ async function getStylesForURL(filePath, loader, mode) {
       }
       if (mode === "development" && // only inline in development
       typeof ssrModule?.default === "string") {
-        importedStylesMap.set(importedModule.id ?? importedModule.url, ssrModule.default);
+        importedStylesMap.set(importedModule.url, {
+          id: importedModule.id ?? importedModule.url,
+          url: importedModule.url,
+          content: ssrModule.default
+        });
       } else {
         importedCssUrls.add(importedModule.url);
       }
@@ -22,7 +26,7 @@ async function getStylesForURL(filePath, loader, mode) {
   }
   return {
     urls: importedCssUrls,
-    stylesMap: importedStylesMap
+    styles: [...importedStylesMap.values()]
   };
 }
 export {

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

@@ -213,7 +213,11 @@ async function getScriptsAndStyles({ pipeline, filePath }) {
       });
     }
   }
-  const { urls: styleUrls, stylesMap } = await getStylesForURL(filePath, moduleLoader, mode);
+  const { urls: styleUrls, styles: importedStyles } = await getStylesForURL(
+    filePath,
+    moduleLoader,
+    mode
+  );
   let links = /* @__PURE__ */ new Set();
   [...styleUrls].forEach((href) => {
     links.add({
@@ -225,7 +229,7 @@ async function getScriptsAndStyles({ pipeline, filePath }) {
     });
   });
   let styles = /* @__PURE__ */ new Set();
-  [...stylesMap].forEach(([url, content]) => {
+  importedStyles.forEach(({ id, url, content }) => {
     scripts.add({
       props: {
         type: "module",
@@ -235,7 +239,7 @@ async function getScriptsAndStyles({ pipeline, filePath }) {
     });
     styles.add({
       props: {
-        "data-vite-dev-id": url
+        "data-vite-dev-id": id
       },
       children: content
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -152,7 +152,6 @@
     "string-width": "^6.1.0",
     "strip-ansi": "^7.1.0",
     "tsconfig-resolver": "^3.0.1",
-    "undici": "^5.23.0",
     "unist-util-visit": "^4.1.2",
     "vfile": "^5.3.7",
     "vite": "^4.4.9",
@@ -160,9 +159,9 @@
     "which-pm": "^2.1.1",
     "yargs-parser": "^21.1.1",
     "zod": "3.21.1",
-    "@astrojs/internal-helpers": "0.2.0",
-    "@astrojs/markdown-remark": "3.2.0",
-    "@astrojs/telemetry": "3.0.2"
+    "@astrojs/internal-helpers": "0.2.1",
+    "@astrojs/markdown-remark": "3.2.1",
+    "@astrojs/telemetry": "3.0.3"
   },
   "optionalDependencies": {
     "sharp": "^0.32.5"
@@ -214,6 +213,9 @@
     "node": ">=18.14.1",
     "npm": ">=6.14.0"
   },
+  "publishConfig": {
+    "provenance": true
+  },
   "scripts": {
     "prebuild": "astro-scripts prebuild --to-string \"src/runtime/server/astro-island.ts\" \"src/runtime/client/{idle,load,media,only,visible}.ts\"",
     "build": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" && tsc && pnpm run postbuild",