astro 5.5.0 → 5.5.2

package/dist/content/content-layer.js

@@ -153,7 +153,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.5.0") {
+    if (previousAstroVersion && previousAstroVersion !== "5.5.2") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -161,8 +161,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.5.0") {
-      await this.#store.metaStore().set("astro-version", "5.5.0");
+    if ("5.5.2") {
+      await this.#store.metaStore().set("astro-version", "5.5.2");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

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

@@ -101,6 +101,22 @@ function rollupPluginAstroBuildCSS(options) {
       }
     }
   };
+  const cssScopeToPlugin = {
+    name: "astro:rollup-plugin-css-scope-to",
+    renderChunk(_, chunk, __, meta) {
+      for (const id in chunk.modules) {
+        const modMeta = this.getModuleInfo(id)?.meta;
+        const cssScopeTo = modMeta?.astroCss?.cssScopeTo;
+        if (cssScopeTo && !isCssScopeToRendered(cssScopeTo, Object.values(meta.chunks))) {
+          delete chunk.modules[id];
+          const moduleIdsIndex = chunk.moduleIds.indexOf(id);
+          if (moduleIdsIndex > -1) {
+            chunk.moduleIds.splice(moduleIdsIndex, 1);
+          }
+        }
+      }
+    }
+  };
   const singleCssPlugin = {
     name: "astro:rollup-plugin-single-css",
     enforce: "post",
@@ -162,7 +178,7 @@ function rollupPluginAstroBuildCSS(options) {
       });
     }
   };
-  return [cssBuildPlugin, singleCssPlugin, inlineStylesheetsPlugin];
+  return [cssBuildPlugin, cssScopeToPlugin, singleCssPlugin, inlineStylesheetsPlugin];
 }
 function* getParentClientOnlys(id, ctx, internals) {
   for (const info of getParentModuleInfos(id, ctx)) {
@@ -187,6 +203,16 @@ function appendCSSToPage(pageData, meta, pagesToCss, depth, order) {
     }
   }
 }
+function isCssScopeToRendered(cssScopeTo, chunks) {
+  for (const moduleId in cssScopeTo) {
+    const exports = cssScopeTo[moduleId];
+    const renderedModule = chunks.find((c) => c.moduleIds.includes(moduleId))?.modules[moduleId];
+    if (renderedModule?.renderedExports.some((e) => exports.includes(e))) {
+      return true;
+    }
+  }
+  return false;
+}
 export {
   pluginCSS
 };

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

@@ -137,15 +137,7 @@ async function ssrBuild(opts, internals, input, container) {
             const encoded = encodeName(name);
             return [prefix, encoded, suffix].join("");
           },
-          assetFileNames(chunkInfo) {
-            const { names } = chunkInfo;
-            const name = names[0] ?? "";
-            if (name.includes(ASTRO_PAGE_EXTENSION_POST_PATTERN)) {
-              const [sanitizedName] = name.split(ASTRO_PAGE_EXTENSION_POST_PATTERN);
-              return `${settings.config.build.assets}/${sanitizedName}.[hash][extname]`;
-            }
-            return `${settings.config.build.assets}/[name].[hash][extname]`;
-          },
+          assetFileNames: `${settings.config.build.assets}/[name].[hash][extname]`,
           ...viteConfig.build?.rollupOptions?.output,
           entryFileNames(chunkInfo) {
             if (chunkInfo.facadeModuleId?.startsWith(ASTRO_PAGE_RESOLVED_MODULE_ID)) {

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.5.0";
+const ASTRO_VERSION = "5.5.2";
 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.5.0";
+  const currentVersion = "5.5.2";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.js

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

package/dist/core/session.js

@@ -53,6 +53,7 @@ class AstroSession {
   // When we load the data from storage, we need to merge it with the local partial data,
   // preserving in-memory changes and deletions.
   #partial = true;
+  static #sharedStorage = /* @__PURE__ */ new Map();
   constructor(cookies, {
     cookie: cookieConfig = DEFAULT_COOKIE_NAME,
     ...config
@@ -314,6 +315,10 @@ class AstroSession {
     if (this.#storage) {
       return this.#storage;
     }
+    if (AstroSession.#sharedStorage.has(this.#config.driver)) {
+      this.#storage = AstroSession.#sharedStorage.get(this.#config.driver);
+      return this.#storage;
+    }
     if (this.#config.driver === "test") {
       this.#storage = this.#config.options.mockStorage;
       return this.#storage;
@@ -367,6 +372,7 @@ class AstroSession {
       this.#storage = createStorage({
         driver: driver(this.#config.options)
       });
+      AstroSession.#sharedStorage.set(this.#config.driver, this.#storage);
       return this.#storage;
     } catch (err) {
       throw new AstroError(

package/dist/types/public/config.d.ts

@@ -2096,7 +2096,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          * ```
          *
          */
-        preserveScriptOrder: boolean;
+        preserveScriptOrder?: boolean;
     };
 }
 /**

package/dist/vite-plugin-astro/index.d.ts

@@ -1,9 +1,9 @@
 import type * as vite from 'vite';
 import type { Logger } from '../core/logger/core.js';
 import type { AstroSettings } from '../types/astro.js';
-import type { PluginMetadata as AstroPluginMetadata } from './types.js';
+import type { PluginCssMetadata as AstroPluginCssMetadata, PluginMetadata as AstroPluginMetadata } from './types.js';
 export { getAstroMetadata } from './metadata.js';
-export type { AstroPluginMetadata };
+export type { AstroPluginMetadata, AstroPluginCssMetadata };
 interface AstroPluginOptions {
     settings: AstroSettings;
     logger: Logger;

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

@@ -89,9 +89,15 @@ function astro({ settings, logger }) {
           result.dependencies?.forEach((dep) => this.addWatchFile(dep));
           return {
             code: result.code,
-            // `vite.cssScopeTo` is a Vite feature that allows this CSS to be treeshaken
-            // if the Astro component's default export is not used
-            meta: result.isGlobal ? void 0 : { vite: { cssScopeTo: [filename, "default"] } }
+            // This metadata is used by `cssScopeToPlugin` to remove this module from the bundle
+            // if the `filename` default export (the Astro component) is unused.
+            meta: result.isGlobal ? void 0 : {
+              astroCss: {
+                cssScopeTo: {
+                  [filename]: ["default"]
+                }
+              }
+            }
           };
         }
         case "script": {

package/dist/vite-plugin-astro/types.d.ts

@@ -15,6 +15,26 @@ export interface PluginMetadata {
         pageOptions: PageOptions;
     };
 }
+export interface PluginCssMetadata {
+    astroCss: {
+        /**
+         * For Astro CSS virtual modules, it can scope to the main Astro module's default export
+         * so that if those exports are treeshaken away, the CSS module will also be treeshaken.
+         *
+         * Example config if the CSS id is `/src/Foo.astro?astro&type=style&lang.css`:
+         * ```js
+         * cssScopeTo: {
+         *   '/src/Foo.astro': ['default']
+         * }
+         * ```
+         *
+         * The above is the only config we use today, but we're exposing as a `Record` to follow the
+         * upstream Vite implementation: https://github.com/vitejs/vite/pull/16058. When/If that lands,
+         * we can also remove our custom implementation.
+         */
+        cssScopeTo: Record<string, string[]>;
+    };
+}
 export interface CompileMetadata {
     /** Used for HMR to compare code changes */
     originalCode: string;

package/package.json

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