astro 1.6.13 → 1.6.15

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

@@ -12,6 +12,7 @@ import { normalizeFilename } from "../vite-plugin-utils/index.js";
 import { cachedFullCompilation } from "./compile.js";
 import { handleHotUpdate } from "./hmr.js";
 import { parseAstroRequest } from "./query.js";
+import { getAstroMetadata } from "./metadata.js";
 function astro({ settings, logging }) {
   const { config } = settings;
   let resolvedConfig;
@@ -157,6 +158,7 @@ File: ${filename}`
         astroConfig: config,
         viteConfig: resolvedConfig,
         filename,
+        id,
         source
       };
       const transformResult = await cachedFullCompilation({
@@ -170,7 +172,8 @@ File: ${filename}`
       const astroMetadata = {
         clientOnlyComponents: transformResult.clientOnlyComponents,
         hydratedComponents: transformResult.hydratedComponents,
-        scripts: transformResult.scripts
+        scripts: transformResult.scripts,
+        propagation: "none"
       };
       return {
         code: transformResult.code,
@@ -184,12 +187,14 @@ File: ${filename}`
       };
     },
     async handleHotUpdate(context) {
+      var _a;
       if (context.server.config.isProduction)
         return;
       const compileProps = {
         astroConfig: config,
         viteConfig: resolvedConfig,
         filename: context.file,
+        id: ((_a = context.modules[0]) == null ? void 0 : _a.id) ?? void 0,
         source: await context.read()
       };
       const compile = () => cachedCompilation(compileProps);
@@ -210,5 +215,6 @@ function appendSourceMap(content, map) {
   ).toString("base64")}`;
 }
 export {
-  astro as default
+  astro as default,
+  getAstroMetadata
 };

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

@@ -0,0 +1,3 @@
+import type { ModuleInfo } from '../core/module-loader';
+import type { PluginMetadata } from './types';
+export declare function getAstroMetadata(modInfo: ModuleInfo): PluginMetadata['astro'] | undefined;

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

@@ -0,0 +1,10 @@
+function getAstroMetadata(modInfo) {
+  var _a;
+  if ((_a = modInfo.meta) == null ? void 0 : _a.astro) {
+    return modInfo.meta.astro;
+  }
+  return void 0;
+}
+export {
+  getAstroMetadata
+};

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

@@ -1,8 +1,10 @@
 import type { TransformResult } from '@astrojs/compiler';
+import type { PropagationHint } from '../@types/astro';
 export interface PluginMetadata {
     astro: {
         hydratedComponents: TransformResult['hydratedComponents'];
         clientOnlyComponents: TransformResult['clientOnlyComponents'];
         scripts: TransformResult['scripts'];
+        propagation: PropagationHint;
     };
 }

package/dist/vite-plugin-head-propagation/index.d.ts

@@ -0,0 +1,11 @@
+import type { AstroSettings } from '../@types/astro';
+import * as vite from 'vite';
+/**
+ * If any component is marked as doing head injection, walk up the tree
+ * and mark parent Astro components as having head injection in the tree.
+ * This is used at runtime to determine if we should wait for head content
+ * to be be populated before rendering the entire tree.
+ */
+export default function configHeadPropagationVitePlugin({ settings, }: {
+    settings: AstroSettings;
+}): vite.Plugin;

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

@@ -0,0 +1,42 @@
+import { getAstroMetadata } from "../vite-plugin-astro/index.js";
+const injectExp = /^\/\/\s*astro-head-inject/;
+function configHeadPropagationVitePlugin({
+  settings
+}) {
+  function addHeadInjectionInTree(graph, id, getInfo, seen = /* @__PURE__ */ new Set()) {
+    const mod = server.moduleGraph.getModuleById(id);
+    for (const parent of (mod == null ? void 0 : mod.importers) || []) {
+      if (parent.id) {
+        if (seen.has(parent.id)) {
+          continue;
+        }
+        const info = getInfo(parent.id);
+        if (info == null ? void 0 : info.meta.astro) {
+          const astroMetadata = getAstroMetadata(info);
+          if (astroMetadata) {
+            astroMetadata.propagation = "in-tree";
+          }
+        }
+        addHeadInjectionInTree(graph, parent.id, getInfo, seen);
+      }
+    }
+  }
+  let server;
+  return {
+    name: "astro:head-propagation",
+    configureServer(_server) {
+      server = _server;
+    },
+    transform(source, id) {
+      if (!server) {
+        return;
+      }
+      if (injectExp.test(source)) {
+        addHeadInjectionInTree(server.moduleGraph, id, (child) => this.getModuleInfo(child));
+      }
+    }
+  };
+}
+export {
+  configHeadPropagationVitePlugin as default
+};

package/dist/vite-plugin-load-fallback/index.js

@@ -29,7 +29,7 @@ function loadFallbackPlugin({
       enforce: "post",
       async resolveId(id, parent) {
         if (parent) {
-          const candidateId = npath.posix.join(npath.posix.dirname(parent), id);
+          const candidateId = npath.posix.join(npath.posix.dirname(slashify(parent)), id);
           try {
             const stats = await fs.promises.stat(candidateId);
             if (!stats.isDirectory()) {

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

@@ -127,7 +127,8 @@ function markdown({ settings, logging }) {
             astro: {
               hydratedComponents: [],
               clientOnlyComponents: [],
-              scripts: []
+              scripts: [],
+              propagation: "none"
             },
             vite: {
               lang: "ts"

package/dist/vite-plugin-markdown-legacy/index.js

@@ -159,7 +159,8 @@ ${astroResult}
           astroConfig: config,
           viteConfig: resolvedConfig,
           filename,
-          source: astroResult
+          source: astroResult,
+          id
         };
         let transformResult = await cachedCompilation(compileProps);
         let { code: tsResult } = transformResult;
@@ -180,7 +181,8 @@ ${tsResult}`;
         const astroMetadata = {
           clientOnlyComponents: transformResult.clientOnlyComponents,
           hydratedComponents: transformResult.hydratedComponents,
-          scripts: transformResult.scripts
+          scripts: transformResult.scripts,
+          propagation: "none"
         };
         return {
           code: escapeViteEnvReferences(code),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.6.13",
+  "version": "1.6.15",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -87,7 +87,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^0.29.15",
+    "@astrojs/compiler": "^0.31.0",
     "@astrojs/language-server": "^0.28.3",
     "@astrojs/markdown-remark": "^1.1.3",
     "@astrojs/telemetry": "^1.0.1",
@@ -98,11 +98,11 @@
     "@babel/plugin-transform-react-jsx": "^7.17.12",
     "@babel/traverse": "^7.18.2",
     "@babel/types": "^7.18.4",
+    "@proload/core": "^0.3.3",
+    "@proload/plugin-tsm": "^0.2.1",
     "@types/babel__core": "^7.1.19",
     "@types/html-escaper": "^3.0.0",
     "@types/yargs-parser": "^21.0.0",
-    "@proload/core": "^0.3.3",
-    "@proload/plugin-tsm": "^0.2.1",
     "boxen": "^6.2.1",
     "ci-info": "^3.3.1",
     "common-ancestor-path": "^1.0.1",
@@ -119,7 +119,7 @@
     "html-escaper": "^3.0.3",
     "import-meta-resolve": "^2.1.0",
     "kleur": "^4.1.4",
-    "magic-string": "^0.25.9",
+    "magic-string": "^0.27.0",
     "mime": "^3.0.0",
     "ora": "^6.1.0",
     "path-browserify": "^1.0.1",

package/dist/runtime/server/render/astro.d.ts

@@ -1,18 +0,0 @@
-import type { SSRResult } from '../../../@types/astro';
-import type { AstroComponentFactory } from './index';
-import type { RenderInstruction } from './types';
-import { HTMLBytes } from '../escape.js';
-export declare class AstroComponent {
-    private htmlParts;
-    private expressions;
-    private error;
-    constructor(htmlParts: TemplateStringsArray, expressions: any[]);
-    get [Symbol.toStringTag](): string;
-    [Symbol.asyncIterator](): AsyncGenerator<any, void, undefined>;
-}
-export declare function isAstroComponent(obj: any): obj is AstroComponent;
-export declare function isAstroComponentFactory(obj: any): obj is AstroComponentFactory;
-export declare function renderAstroComponent(component: InstanceType<typeof AstroComponent>): AsyncIterable<string | HTMLBytes | RenderInstruction>;
-export declare function renderToString(result: SSRResult, componentFactory: AstroComponentFactory, props: any, children: any): Promise<string>;
-export declare function renderToIterable(result: SSRResult, componentFactory: AstroComponentFactory, displayName: string, props: any, children: any): Promise<AsyncIterable<string | HTMLBytes | RenderInstruction>>;
-export declare function renderTemplate(htmlParts: TemplateStringsArray, ...expressions: any[]): Promise<AstroComponent>;

package/dist/runtime/server/render/astro.js

@@ -1,105 +0,0 @@
-import { markHTMLString } from "../escape.js";
-import { HydrationDirectiveProps } from "../hydration.js";
-import { isPromise } from "../util.js";
-import { renderChild } from "./any.js";
-import { HTMLParts } from "./common.js";
-function validateComponentProps(props, displayName) {
-  if (props != null) {
-    for (const prop of Object.keys(props)) {
-      if (HydrationDirectiveProps.has(prop)) {
-        console.warn(
-          `You are attempting to render <${displayName} ${prop} />, but ${displayName} is an Astro component. Astro components do not render in the client and should not have a hydration directive. Please use a framework component for client rendering.`
-        );
-      }
-    }
-  }
-}
-class AstroComponent {
-  constructor(htmlParts, expressions) {
-    this.htmlParts = htmlParts;
-    this.error = void 0;
-    this.expressions = expressions.map((expression) => {
-      if (isPromise(expression)) {
-        return Promise.resolve(expression).catch((err) => {
-          if (!this.error) {
-            this.error = err;
-            throw err;
-          }
-        });
-      }
-      return expression;
-    });
-  }
-  get [Symbol.toStringTag]() {
-    return "AstroComponent";
-  }
-  async *[Symbol.asyncIterator]() {
-    const { htmlParts, expressions } = this;
-    for (let i = 0; i < htmlParts.length; i++) {
-      const html = htmlParts[i];
-      const expression = expressions[i];
-      yield markHTMLString(html);
-      yield* renderChild(expression);
-    }
-  }
-}
-function isAstroComponent(obj) {
-  return typeof obj === "object" && Object.prototype.toString.call(obj) === "[object AstroComponent]";
-}
-function isAstroComponentFactory(obj) {
-  return obj == null ? false : obj.isAstroComponentFactory === true;
-}
-async function* renderAstroComponent(component) {
-  for await (const value of component) {
-    if (value || value === 0) {
-      for await (const chunk of renderChild(value)) {
-        switch (chunk.type) {
-          case "directive": {
-            yield chunk;
-            break;
-          }
-          default: {
-            yield markHTMLString(chunk);
-            break;
-          }
-        }
-      }
-    }
-  }
-}
-async function renderToString(result, componentFactory, props, children) {
-  const Component = await componentFactory(result, props, children);
-  if (!isAstroComponent(Component)) {
-    const response = Component;
-    throw response;
-  }
-  let parts = new HTMLParts();
-  for await (const chunk of renderAstroComponent(Component)) {
-    parts.append(chunk, result);
-  }
-  return parts.toString();
-}
-async function renderToIterable(result, componentFactory, displayName, props, children) {
-  validateComponentProps(props, displayName);
-  const Component = await componentFactory(result, props, children);
-  if (!isAstroComponent(Component)) {
-    console.warn(
-      `Returning a Response is only supported inside of page components. Consider refactoring this logic into something like a function that can be used in the page.`
-    );
-    const response = Component;
-    throw response;
-  }
-  return renderAstroComponent(Component);
-}
-async function renderTemplate(htmlParts, ...expressions) {
-  return new AstroComponent(htmlParts, expressions);
-}
-export {
-  AstroComponent,
-  isAstroComponent,
-  isAstroComponentFactory,
-  renderAstroComponent,
-  renderTemplate,
-  renderToIterable,
-  renderToString
-};