astro 2.3.3 → 2.3.4

package/client-base.d.ts

@@ -3,7 +3,26 @@
 declare module 'astro:assets' {
 	// Exporting things one by one is a bit cumbersome, not sure if there's a better way - erika, 2023-02-03
 	type AstroAssets = {
-		getImage: typeof import('./dist/assets/index.js').getImage;
+		// getImage's type here is different from the internal function since the Vite module implicitly pass the service config
+		/**
+		 * Get an optimized image and the necessary attributes to render it.
+		 *
+		 * **Example**
+		 * ```astro
+		 * ---
+		 * import { getImage } from 'astro:assets';
+		 * import originalImage from '../assets/image.png';
+		 *
+		 * const optimizedImage = await getImage({src: originalImage, width: 1280 });
+		 * ---
+		 * <img src={optimizedImage.src} {...optimizedImage.attributes} />
+		 * ```
+		 *
+		 * This is functionally equivalent to using the `<Image />` component, as the component calls this function internally.
+		 */
+		getImage: (
+			options: import('./dist/assets/types.js').ImageTransform
+		) => Promise<import('./dist/assets/types.js').GetImageResult>;
 		getConfiguredImageService: typeof import('./dist/assets/index.js').getConfiguredImageService;
 		Image: typeof import('./components/Image.astro').default;
 	};

package/dist/assets/internal.d.ts

@@ -3,22 +3,6 @@ import { type ImageService } from './services/service.js';
 import type { GetImageResult, ImageMetadata, ImageTransform } from './types.js';
 export declare function isESMImportedImage(src: ImageMetadata | string): src is ImageMetadata;
 export declare function getConfiguredImageService(): Promise<ImageService>;
-/**
- * Get an optimized image and the necessary attributes to render it.
- *
- * **Example**
- * ```astro
- * ---
- * import { getImage } from 'astro:assets';
- * import originalImage from '../assets/image.png';
- *
- * const optimizedImage = await getImage({src: originalImage, width: 1280 });
- * ---
- * <img src={optimizedImage.src} {...optimizedImage.attributes} />
- * ```
- *
- * This is functionally equivalent to using the `<Image />` component, as the component calls this function internally.
- */
 export declare function getImage(options: ImageTransform, serviceConfig: Record<string, any>): Promise<GetImageResult>;
 export declare function getStaticImageList(): Iterable<[
     string,

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

@@ -90,7 +90,7 @@ function astroContentImportPlugin({
   if (settings.contentEntryTypes.some((t) => t.getRenderModule)) {
     plugins.push({
       name: "astro:content-render-imports",
-      async load(viteId) {
+      async transform(_, viteId) {
         const contentRenderer = getContentRendererByViteId(viteId, settings);
         if (!contentRenderer)
           return;

package/dist/core/build/generate.js

@@ -28,12 +28,7 @@ import { createRequest } from "../request.js";
 import { matchRoute } from "../routing/match.js";
 import { getOutputFilename } from "../util.js";
 import { getOutDirWithinCwd, getOutFile, getOutFolder } from "./common.js";
-import {
-  eachPageData,
-  eachPrerenderedPageData,
-  getPageDataByComponent,
-  sortedCSS
-} from "./internal.js";
+import { eachPageData, getPageDataByComponent, sortedCSS } from "./internal.js";
 import { getTimeStat } from "./util.js";
 function shouldSkipDraft(pageModule, settings) {
   var _a;
@@ -73,8 +68,9 @@ ${bgGreen(black(` ${verb} static routes `))}`);
   const ssrEntry = await import(ssrEntryURL.toString());
   const builtPaths = /* @__PURE__ */ new Set();
   if (ssr) {
-    for (const pageData of eachPrerenderedPageData(internals)) {
-      await generatePage(opts, internals, pageData, ssrEntry, builtPaths);
+    for (const pageData of eachPageData(internals)) {
+      if (pageData.route.prerender)
+        await generatePage(opts, internals, pageData, ssrEntry, builtPaths);
     }
   } else {
     for (const pageData of eachPageData(internals)) {

package/dist/core/build/internal.d.ts

@@ -77,8 +77,6 @@ export declare function getPageDataByViteID(internals: BuildInternals, viteid: V
 export declare function hasPageDataByViteID(internals: BuildInternals, viteid: ViteID): boolean;
 export declare function eachPageData(internals: BuildInternals): Generator<PageBuildData, void, undefined>;
 export declare function hasPrerenderedPages(internals: BuildInternals): boolean;
-export declare function eachPrerenderedPageData(internals: BuildInternals): Generator<PageBuildData, void, unknown>;
-export declare function eachServerPageData(internals: BuildInternals): Generator<PageBuildData, void, unknown>;
 /**
  * Sort a page's CSS by depth. A higher depth means that the CSS comes from shared subcomponents.
  * A lower depth means it comes directly from the top-level page.

package/dist/core/build/internal.js

@@ -83,30 +83,13 @@ function* eachPageData(internals) {
   yield* internals.pagesByComponent.values();
 }
 function hasPrerenderedPages(internals) {
-  var _a;
-  for (const id of internals.pagesByViteID.keys()) {
-    if ((_a = internals.pageOptionsByPage.get(id)) == null ? void 0 : _a.prerender) {
+  for (const pageData of eachPageData(internals)) {
+    if (pageData.route.prerender) {
       return true;
     }
   }
   return false;
 }
-function* eachPrerenderedPageData(internals) {
-  var _a;
-  for (const [id, pageData] of internals.pagesByViteID.entries()) {
-    if ((_a = internals.pageOptionsByPage.get(id)) == null ? void 0 : _a.prerender) {
-      yield pageData;
-    }
-  }
-}
-function* eachServerPageData(internals) {
-  var _a;
-  for (const [id, pageData] of internals.pagesByViteID.entries()) {
-    if (!((_a = internals.pageOptionsByPage.get(id)) == null ? void 0 : _a.prerender)) {
-      yield pageData;
-    }
-  }
-}
 function sortedCSS(pageData) {
   return Array.from(pageData.css).sort((a, b) => {
     let depthA = a[1].depth, depthB = b[1].depth, orderA = a[1].order, orderB = b[1].order;
@@ -146,8 +129,6 @@ function* getPageDatasByHoistedScriptId(internals, id) {
 export {
   createBuildInternals,
   eachPageData,
-  eachPrerenderedPageData,
-  eachServerPageData,
   getPageDataByComponent,
   getPageDataByViteID,
   getPageDatasByChunk,

package/dist/core/build/plugins/plugin-component-entry.d.ts

@@ -1,6 +1,7 @@
 import type { Plugin as VitePlugin } from 'vite';
 import type { BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin.js';
+export declare const astroEntryPrefix = "\0astro-entry:";
 /**
  * When adding hydrated or client:only components as Rollup inputs, sometimes we're not using all
  * of the export names, e.g. `import { Counter } from './ManyComponents.jsx'`. This plugin proxies

package/dist/core/build/plugins/plugin-component-entry.js

@@ -68,6 +68,7 @@ function pluginComponentEntry(internals) {
   };
 }
 export {
+  astroEntryPrefix,
   normalizeEntryId,
   pluginComponentEntry,
   vitePluginComponentEntry

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

@@ -7,7 +7,7 @@ import { joinPaths, prependForwardSlash } from "../../path.js";
 import { serializeRouteData } from "../../routing/index.js";
 import { addRollupInput } from "../add-rollup-input.js";
 import { getOutFile, getOutFolder } from "../common.js";
-import { eachPrerenderedPageData, eachServerPageData, sortedCSS } from "../internal.js";
+import { eachPageData, sortedCSS } from "../internal.js";
 const virtualModuleId = "@astrojs-ssr-virtual-entry";
 const resolvedVirtualModuleId = "\0" + virtualModuleId;
 const manifestReplace = "@@ASTRO_MANIFEST_REPLACE@@";
@@ -111,7 +111,9 @@ function buildManifest(opts, internals, staticFiles) {
       return prependForwardSlash(joinPaths(settings.config.base, pth));
     }
   };
-  for (const pageData of eachPrerenderedPageData(internals)) {
+  for (const pageData of eachPageData(internals)) {
+    if (!pageData.route.prerender)
+      continue;
     if (!pageData.route.pathname)
       continue;
     const outFolder = getOutFolder(
@@ -134,7 +136,9 @@ function buildManifest(opts, internals, staticFiles) {
     });
     staticFiles.push(file);
   }
-  for (const pageData of eachServerPageData(internals)) {
+  for (const pageData of eachPageData(internals)) {
+    if (pageData.route.prerender)
+      continue;
     const scripts = [];
     if (pageData.hoistedScript) {
       const hoistedValue = pageData.hoistedScript.value;

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

@@ -8,7 +8,7 @@ import { fileURLToPath } from "url";
 import * as vite from "vite";
 import {
   createBuildInternals,
-  eachPrerenderedPageData
+  eachPageData
 } from "../../core/build/internal.js";
 import { emptyDir, removeEmptyDirs } from "../../core/fs/index.js";
 import { appendForwardSlash, prependForwardSlash } from "../../core/path.js";
@@ -219,8 +219,9 @@ async function runPostBuildHooks(container, ssrReturn, clientReturn) {
 }
 async function cleanStaticOutput(opts, internals) {
   const allStaticFiles = /* @__PURE__ */ new Set();
-  for (const pageData of eachPrerenderedPageData(internals)) {
-    allStaticFiles.add(internals.pageToBundleMap.get(pageData.moduleSpecifier));
+  for (const pageData of eachPageData(internals)) {
+    if (pageData.route.prerender)
+      allStaticFiles.add(internals.pageToBundleMap.get(pageData.moduleSpecifier));
   }
   const ssr = opts.settings.config.output === "server";
   const out = ssr ? opts.buildConfig.server : getOutDirWithinCwd(opts.settings.config.outDir);

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

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

package/dist/core/messages.js

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

package/dist/core/path.js

@@ -40,7 +40,15 @@ function isString(path) {
   return typeof path === "string" || path instanceof String;
 }
 function joinPaths(...paths) {
-  return paths.filter(isString).map(trimSlashes).join("/");
+  return paths.filter(isString).map((path, i) => {
+    if (i === 0) {
+      return removeTrailingForwardSlash(path);
+    } else if (i === paths.length - 1) {
+      return removeLeadingForwardSlash(path);
+    } else {
+      return trimSlashes(path);
+    }
+  }).join("/");
 }
 function removeFileExtension(path) {
   let idx = path.lastIndexOf(".");

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

@@ -15,7 +15,12 @@ function getPrivateEnv(viteConfig, astroConfig) {
   for (const key in fullEnv) {
     if (envPrefixes.every((prefix) => !key.startsWith(prefix))) {
       if (typeof process.env[key] !== "undefined") {
-        privateEnv[key] = `process.env.${key}`;
+        const value = process.env[key];
+        if (value === "0" || value === "1" || value === "true" || value === "false") {
+          privateEnv[key] = value;
+        } else {
+          privateEnv[key] = `process.env.${key}`;
+        }
       } else {
         privateEnv[key] = JSON.stringify(fullEnv[key]);
       }

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

@@ -5,6 +5,7 @@ import babel from "@babel/core";
 import * as colors from "kleur/colors";
 import path from "path";
 import { CONTENT_FLAG, PROPAGATED_ASSET_FLAG } from "../content/index.js";
+import { astroEntryPrefix } from "../core/build/plugins/plugin-component-entry.js";
 import { error } from "../core/logger/core.js";
 import { removeQueryString } from "../core/path.js";
 import { detectImportSource } from "./import-source.js";
@@ -104,7 +105,7 @@ function jsx({ settings, logging }) {
     },
     async transform(code, id, opts) {
       const ssr = Boolean(opts == null ? void 0 : opts.ssr);
-      if (SPECIAL_QUERY_REGEX.test(id)) {
+      if (SPECIAL_QUERY_REGEX.test(id) || id.startsWith(astroEntryPrefix)) {
         return null;
       }
       id = removeQueryString(id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -168,7 +168,6 @@
     "@types/rimraf": "^3.0.2",
     "@types/send": "^0.17.1",
     "@types/server-destroy": "^1.0.1",
-    "@types/sharp": "^0.31.1",
     "@types/unist": "^2.0.6",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.11",
@@ -182,14 +181,14 @@
     "remark-code-titles": "^0.1.2",
     "rollup": "^3.9.0",
     "sass": "^1.52.2",
-    "sharp": "^0.31.3",
+    "sharp": "^0.32.1",
     "srcset-parse": "^1.1.0",
     "undici": "^5.22.0",
     "unified": "^10.1.2",
     "astro-scripts": "0.0.14"
   },
   "peerDependencies": {
-    "sharp": "^0.31.3"
+    "sharp": ">=0.31.0"
   },
   "peerDependenciesMeta": {
     "sharp": {