astro 5.0.6 → 5.0.8

package/dist/content/content-layer.js

@@ -114,7 +114,7 @@ class ContentLayer {
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion !== "5.0.6") {
+    if (previousAstroVersion !== "5.0.8") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -122,8 +122,8 @@ class ContentLayer {
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.0.6") {
-      await this.#store.metaStore().set("astro-version", "5.0.6");
+    if ("5.0.8") {
+      await this.#store.metaStore().set("astro-version", "5.0.8");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("config-digest", currentConfigDigest);

package/dist/core/build/index.js

@@ -139,12 +139,12 @@ class AstroBuilder {
       viteConfig,
       key: keyPromise
     };
-    const { internals, ssrOutputChunkNames, ssrOutputAssetNames, contentFileNames } = await viteBuild(opts);
+    const { internals, ssrOutputChunkNames } = await viteBuild(opts);
     const hasServerIslands = this.settings.serverIslandNameMap.size > 0;
     if (hasServerIslands && this.settings.buildOutput !== "server") {
       throw new AstroError(AstroErrorData.NoAdapterInstalledServerIslands);
     }
-    await staticBuild(opts, internals, ssrOutputChunkNames, ssrOutputAssetNames, contentFileNames);
+    await staticBuild(opts, internals, ssrOutputChunkNames);
     this.timer.assetsStart = performance.now();
     Object.keys(assets).map((k) => {
       if (!assets[k]) return;

package/dist/core/build/static-build.d.ts

@@ -4,10 +4,8 @@ import type { StaticBuildOptions } from './types.js';
 export declare function viteBuild(opts: StaticBuildOptions): Promise<{
     internals: BuildInternals;
     ssrOutputChunkNames: string[];
-    ssrOutputAssetNames: string[];
-    contentFileNames: undefined;
 }>;
-export declare function staticBuild(opts: StaticBuildOptions, internals: BuildInternals, ssrOutputChunkNames: string[], ssrOutputAssetNames: string[], contentFileNames?: string[]): Promise<void>;
+export declare function staticBuild(opts: StaticBuildOptions, internals: BuildInternals, ssrOutputChunkNames: string[]): Promise<void>;
 export declare function copyFiles(fromFolder: URL, toFolder: URL, includeDotfiles?: boolean): Promise<void[] | undefined>;
 /**
  * This function takes the virtual module name of any page entrypoint and

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

@@ -62,38 +62,33 @@ async function viteBuild(opts) {
   const ssrOutputs = viteBuildReturnToRollupOutputs(ssrOutput);
   const clientOutputs = viteBuildReturnToRollupOutputs(clientOutput ?? []);
   await runPostBuildHooks(container, ssrOutputs, clientOutputs);
-  let contentFileNames = void 0;
   settings.timer.end("Client build");
   internals.ssrEntryChunk = void 0;
   if (opts.teardownCompiler) {
     teardown();
   }
   const ssrOutputChunkNames = [];
-  const ssrOutputAssetNames = [];
   for (const output of ssrOutputs) {
     for (const chunk of output.output) {
       if (chunk.type === "chunk") {
         ssrOutputChunkNames.push(chunk.fileName);
       }
-      if (chunk.type === "asset") {
-        ssrOutputAssetNames.push(chunk.fileName);
-      }
     }
   }
-  return { internals, ssrOutputChunkNames, ssrOutputAssetNames, contentFileNames };
+  return { internals, ssrOutputChunkNames };
 }
-async function staticBuild(opts, internals, ssrOutputChunkNames, ssrOutputAssetNames, contentFileNames) {
+async function staticBuild(opts, internals, ssrOutputChunkNames) {
   const { settings } = opts;
   if (settings.buildOutput === "static") {
     settings.timer.start("Static generate");
     await generatePages(opts, internals);
-    await cleanServerOutput(opts, ssrOutputChunkNames, contentFileNames, internals);
+    await cleanServerOutput(opts, ssrOutputChunkNames, internals);
     settings.timer.end("Static generate");
   } else if (settings.buildOutput === "server") {
     settings.timer.start("Server generate");
     await generatePages(opts, internals);
     await cleanStaticOutput(opts, internals);
-    await ssrMoveAssets(opts, ssrOutputAssetNames);
+    await ssrMoveAssets(opts);
     settings.timer.end("Server generate");
   }
 }
@@ -266,9 +261,9 @@ async function cleanStaticOutput(opts, internals) {
     })
   );
 }
-async function cleanServerOutput(opts, ssrOutputChunkNames, contentFileNames, internals) {
+async function cleanServerOutput(opts, ssrOutputChunkNames, internals) {
   const out = getOutDirWithinCwd(opts.settings.config.outDir);
-  const files = ssrOutputChunkNames.filter((f) => f.endsWith(".mjs")).concat(contentFileNames ?? []);
+  const files = ssrOutputChunkNames.filter((f) => f.endsWith(".mjs"));
   if (internals.manifestFileName) {
     files.push(internals.manifestFileName);
   }
@@ -276,7 +271,9 @@ async function cleanServerOutput(opts, ssrOutputChunkNames, contentFileNames, in
     await Promise.all(
       files.map(async (filename) => {
         const url = new URL(filename, out);
-        await fs.promises.rm(url);
+        const map = new URL(url + ".map");
+        await Promise.all([fs.promises.rm(url), fs.promises.rm(new URL(map)).catch((e) => {
+        })]);
       })
     );
     removeEmptyDirs(fileURLToPath(out));
@@ -309,15 +306,22 @@ async function copyFiles(fromFolder, toFolder, includeDotfiles = false) {
     })
   );
 }
-async function ssrMoveAssets(opts, ssrOutputAssetNames) {
+async function ssrMoveAssets(opts) {
   opts.logger.info("build", "Rearranging server assets...");
   const serverRoot = opts.settings.buildOutput === "static" ? opts.settings.config.build.client : opts.settings.config.build.server;
   const clientRoot = opts.settings.config.build.client;
-  if (ssrOutputAssetNames.length > 0) {
+  const assets = opts.settings.config.build.assets;
+  const serverAssets = new URL(`./${assets}/`, appendForwardSlash(serverRoot.toString()));
+  const clientAssets = new URL(`./${assets}/`, appendForwardSlash(clientRoot.toString()));
+  const files = await glob(`**/*`, {
+    cwd: fileURLToPath(serverAssets)
+  });
+  console.log("FILES2", files);
+  if (files.length > 0) {
     await Promise.all(
-      ssrOutputAssetNames.map(async function moveAsset(filename) {
-        const currentUrl = new URL(filename, appendForwardSlash(serverRoot.toString()));
-        const clientUrl = new URL(filename, appendForwardSlash(clientRoot.toString()));
+      files.map(async function moveAsset(filename) {
+        const currentUrl = new URL(filename, appendForwardSlash(serverAssets.toString()));
+        const clientUrl = new URL(filename, appendForwardSlash(clientAssets.toString()));
         const dir = new URL(path.parse(clientUrl.href).dir);
         if (!fs.existsSync(dir)) await fs.promises.mkdir(dir, { recursive: true });
         return fs.promises.rename(currentUrl, clientUrl);

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.0.6";
+const ASTRO_VERSION = "5.0.8";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/dev/dev.js

@@ -22,7 +22,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "5.0.6";
+  const currentVersion = "5.0.8";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.0.6";
+  const version = "5.0.8";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -276,7 +276,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"5.0.6"}`
+        `v${"5.0.8"}`
       )} ${headline}`
     );
   }

package/package.json

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