astro 3.0.11 → 3.0.12

package/client.d.ts

@@ -57,17 +57,15 @@ declare module 'astro:assets' {
 		Image: typeof import('./components/Image.astro').default;
 	};
 
-	type WithRequired<T, K extends keyof T> = T & { [P in K]-?: T[P] };
-	type Simplify<T> = { [KeyType in keyof T]: T[KeyType] } & {};
-	type ImgAttributes = WithRequired<
+	type ImgAttributes = import('./dist/type-utils.js').WithRequired<
 		Omit<import('./types').HTMLAttributes<'img'>, 'src' | 'width' | 'height'>,
 		'alt'
 	>;
 
-	export type LocalImageProps = Simplify<
+	export type LocalImageProps = import('./dist/type-utils.js').Simplify<
 		import('./dist/assets/types.js').LocalImageProps<ImgAttributes>
 	>;
-	export type RemoteImageProps = Simplify<
+	export type RemoteImageProps = import('./dist/type-utils.js').Simplify<
 		import('./dist/assets/types.js').RemoteImageProps<ImgAttributes>
 	>;
 	export const { getImage, getConfiguredImageService, imageConfig, Image }: AstroAssets;

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

@@ -17,6 +17,7 @@ import type { AstroCookies } from '../core/cookies';
 import type { ResponseWithEncoding } from '../core/endpoint/index.js';
 import type { AstroIntegrationLogger, Logger, LoggerLevel } from '../core/logger/core';
 import type { AstroComponentFactory, AstroComponentInstance } from '../runtime/server';
+import type { OmitIndexSignature, Simplify } from '../type-utils';
 import type { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './../core/constants.js';
 export { type AstroIntegrationLogger };
 export type { MarkdownHeading, MarkdownMetadata, MarkdownRenderingResult, RehypePlugins, RemarkPlugins, ShikiConfig, } from '@astrojs/markdown-remark';
@@ -1556,12 +1557,6 @@ export interface Page<T = any> {
         next: string | undefined;
     };
 }
-type OmitIndexSignature<ObjectType> = {
-    [KeyType in keyof ObjectType as {} extends Record<KeyType, unknown> ? never : KeyType]: ObjectType[KeyType];
-};
-type Simplify<T> = {
-    [KeyType in keyof T]: T[KeyType];
-} & {};
 export type PaginateFunction = <PaginateData, AdditionalPaginateProps extends Props, AdditionalPaginateParams extends Params>(data: PaginateData[], args?: PaginateOptions<AdditionalPaginateProps, AdditionalPaginateParams>) => {
     params: Simplify<{
         page: string | undefined;

package/dist/assets/types.d.ts

@@ -1,3 +1,4 @@
+import type { WithRequired } from '../type-utils.js';
 import type { VALID_INPUT_FORMATS, VALID_OUTPUT_FORMATS } from './consts.js';
 import type { ImageService } from './services/service.js';
 export type ImageQualityPreset = 'low' | 'mid' | 'high' | 'max' | (string & {});
@@ -46,9 +47,6 @@ export interface GetImageResult {
     src: string;
     attributes: Record<string, any>;
 }
-type WithRequired<T, K extends keyof T> = T & {
-    [P in K]-?: T[P];
-};
 type ImageSharedProps<T> = T & {
     /**
      * Width of the image, the value of this property will be used to assign the `width` property on the final `img` element.

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "3.0.11";
+const ASTRO_VERSION = "3.0.12";
 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.11";
+  const currentVersion = "3.0.12";
   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.11";
+  const version = "3.0.12";
   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.11"}`
+        `v${"3.0.12"}`
       )} ${headline}`
     );
   }

package/dist/type-utils.d.ts

@@ -0,0 +1,10 @@
+export type Simplify<T> = {
+    [KeyType in keyof T]: T[KeyType];
+} & {};
+export type WithRequired<T, K extends keyof T> = T & {
+    [P in K]-?: T[P];
+};
+export type OmitIndexSignature<ObjectType> = {
+    [KeyType in keyof ObjectType as {} extends Record<KeyType, unknown> ? never : KeyType]: ObjectType[KeyType];
+};
+export type ValueOf<T> = T[keyof T];

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

@@ -125,7 +125,7 @@ File: ${id}`
         hydratedComponents: transformResult.hydratedComponents,
         scripts: transformResult.scripts,
         containsHead: transformResult.containsHead,
-        propagation: "none",
+        propagation: transformResult.propagation ? "self" : "none",
         pageOptions: {}
       };
       return {

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

@@ -34,6 +34,14 @@ function configHeadVitePlugin() {
       if (info && getAstroMetadata(info)?.containsHead) {
         propagateMetadata.call(this, id, "containsHead", true);
       }
+      if (info && getAstroMetadata(info)?.propagation === "self") {
+        const mod = server.moduleGraph.getModuleById(id);
+        for (const parent of mod?.importers ?? []) {
+          if (parent.id) {
+            propagateMetadata.call(this, parent.id, "propagation", "in-tree");
+          }
+        }
+      }
       if (injectExp.test(source)) {
         propagateMetadata.call(this, id, "propagation", "in-tree");
       }
@@ -65,10 +73,21 @@ function astroHeadBuildPlugin(internals) {
                   continue;
                 for (const [id, mod] of Object.entries(output.modules)) {
                   const modinfo = this.getModuleInfo(id);
-                  if (modinfo && getAstroMetadata(modinfo)?.containsHead) {
-                    for (const [pageInfo] of getTopLevelPages(id, this)) {
-                      let metadata = getOrCreateMetadata(pageInfo.id);
-                      metadata.containsHead = true;
+                  if (modinfo) {
+                    const meta = getAstroMetadata(modinfo);
+                    if (meta?.containsHead) {
+                      for (const [pageInfo] of getTopLevelPages(id, this)) {
+                        let metadata = getOrCreateMetadata(pageInfo.id);
+                        metadata.containsHead = true;
+                      }
+                    }
+                    if (meta?.propagation === "self") {
+                      for (const [info] of walkParentInfos(id, this)) {
+                        let metadata = getOrCreateMetadata(info.id);
+                        if (metadata.propagation !== "self") {
+                          metadata.propagation = "in-tree";
+                        }
+                      }
                     }
                   }
                   if (mod.code && injectExp.test(mod.code)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.0.11",
+  "version": "3.0.12",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -106,7 +106,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^2.0.1",
+    "@astrojs/compiler": "^2.1.0",
     "@babel/core": "^7.22.10",
     "@babel/generator": "^7.22.10",
     "@babel/parser": "^7.22.10",