astro 3.0.6 → 3.0.7

package/components/index.ts

@@ -1,6 +1,6 @@
-// The `ts-expect-error` comments here are necessary because we're importing this file inside the `astro:components`
+// The `ts-ignore` comments here are necessary because we're importing this file inside the `astro:components`
 // virtual module's types, which means that `tsc` will try to resolve these imports. Don't mind the editor errors.
-// @ts-expect-error
+// @ts-ignore
 export { default as Code } from './Code.astro';
-// @ts-expect-error
+// @ts-ignore
 export { default as Debug } from './Debug.astro';

package/dist/assets/build/generate.d.ts

@@ -12,11 +12,8 @@ interface GenerationDataCached {
 }
 type GenerationData = GenerationDataUncached | GenerationDataCached;
 export declare function generateImage(pipeline: BuildPipeline, options: ImageTransform, filepath: string): Promise<GenerationData | undefined>;
-export declare function getStaticImageList(): Iterable<[
-    string,
-    {
-        path: string;
-        options: ImageTransform;
-    }
-]>;
+export declare function getStaticImageList(): Map<string, {
+    path: string;
+    options: ImageTransform;
+}>;
 export {};

package/dist/assets/build/generate.js

@@ -105,9 +105,9 @@ async function generateImage(pipeline, options, filepath) {
 }
 function getStaticImageList() {
   if (!globalThis?.astroAsset?.staticImages) {
-    return [];
+    return /* @__PURE__ */ new Map();
   }
-  return globalThis.astroAsset.staticImages?.entries();
+  return globalThis.astroAsset.staticImages;
 }
 export {
   generateImage,

package/dist/core/build/generate.js

@@ -145,10 +145,20 @@ ${bgGreen(black(` ${verb} static routes `))}`);
       }
     }
   }
-  logger.info(null, `
+  const staticImageList = getStaticImageList();
+  if (staticImageList.size)
+    logger.info(null, `
 ${bgGreen(black(` generating optimized images `))}`);
-  for (const imageData of getStaticImageList()) {
-    await generateImage(pipeline, imageData[1].options, imageData[1].path);
+  let count = 0;
+  for (const imageData of staticImageList.entries()) {
+    count++;
+    await generateImage(
+      pipeline,
+      imageData[1].options,
+      imageData[1].path,
+      count,
+      staticImageList.size
+    );
   }
   delete globalThis?.astroAsset?.addStaticImage;
   await runHookBuildGenerated({
@@ -158,7 +168,7 @@ ${bgGreen(black(` generating optimized images `))}`);
   logger.info(null, dim(`Completed in ${getTimeStat(timer, performance.now())}.
 `));
 }
-async function generateImage(pipeline, transform, path) {
+async function generateImage(pipeline, transform, path, count, totalCount) {
   const logger = pipeline.getLogger();
   let timeStart = performance.now();
   const generationData = await generateImageInternal(pipeline, transform, path);
@@ -168,8 +178,12 @@ async function generateImage(pipeline, transform, path) {
   const timeEnd = performance.now();
   const timeChange = getTimeStat(timeStart, timeEnd);
   const timeIncrease = `(+${timeChange})`;
-  const statsText = generationData.cached ? `(reused cache entry)` : `(before: ${generationData.weight.before}kb, after: ${generationData.weight.after}kb)`;
-  logger.info(null, `  ${green("\u25B6")} ${path} ${dim(statsText)} ${dim(timeIncrease)}`);
+  const statsText = generationData.cached ? `(reused cache entry)` : `(before: ${generationData.weight.before}kB, after: ${generationData.weight.after}kB)`;
+  const counter = `(${count}/${totalCount})`;
+  logger.info(
+    null,
+    `  ${green("\u25B6")} ${path} ${dim(statsText)} ${dim(timeIncrease)} ${dim(counter)}}`
+  );
 }
 async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
   let timeStart = performance.now();

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

@@ -127,7 +127,18 @@ async function ssrBuild(opts, internals, input, container) {
           format: "esm",
           // Server chunks can't go in the assets (_astro) folder
           // We need to keep these separate
-          chunkFileNames: `chunks/[name].[hash].mjs`,
+          chunkFileNames(chunkInfo) {
+            const { name } = chunkInfo;
+            if (name.includes(ASTRO_PAGE_EXTENSION_POST_PATTERN)) {
+              const [sanitizedName] = name.split(ASTRO_PAGE_EXTENSION_POST_PATTERN);
+              return `chunks/${sanitizedName}_[hash].mjs`;
+            }
+            if (name.startsWith("pages/")) {
+              const sanitizedName = name.split(".")[0];
+              return `chunks/${sanitizedName}_[hash].mjs`;
+            }
+            return `chunks/[name]_[hash].mjs`;
+          },
           assetFileNames: `${settings.config.build.assets}/[name].[hash][extname]`,
           ...viteConfig.build?.rollupOptions?.output,
           entryFileNames(chunkInfo) {
@@ -144,7 +155,7 @@ async function ssrBuild(opts, internals, input, container) {
             } else if (chunkInfo.facadeModuleId === RESOLVED_RENDERERS_MODULE_ID) {
               return "renderers.mjs";
             } else if (chunkInfo.facadeModuleId === RESOLVED_SSR_MANIFEST_VIRTUAL_MODULE_ID) {
-              return "manifest.[hash].mjs";
+              return "manifest_[hash].mjs";
             } else {
               return "[name].mjs";
             }

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "3.0.6";
+const ASTRO_VERSION = "3.0.7";
 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.0.6";
+  const currentVersion = "3.0.7";
   if (currentVersion.includes("-")) {
     logger.warn(null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -50,7 +50,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "3.0.6";
+  const version = "3.0.7";
   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.0.6"}`
+        `v${"3.0.7"}`
       )} ${headline}`
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -161,7 +161,7 @@
     "zod": "3.21.1",
     "@astrojs/internal-helpers": "0.2.0",
     "@astrojs/markdown-remark": "3.0.0",
-    "@astrojs/telemetry": "3.0.0"
+    "@astrojs/telemetry": "3.0.1"
   },
   "devDependencies": {
     "@astrojs/check": "^0.1.0",