astro 1.4.6 → 1.5.0

package/dist/integrations/index.d.ts

@@ -5,10 +5,11 @@ import { AstroConfig, AstroSettings, BuildConfig, RouteData } from '../@types/as
 import type { SerializedSSRManifest } from '../core/app/types';
 import type { PageBuildData } from '../core/build/types';
 import { LogOptions } from '../core/logger/core.js';
-export declare function runHookConfigSetup({ settings, command, logging, }: {
+export declare function runHookConfigSetup({ settings, command, logging, isRestart, }: {
     settings: AstroSettings;
-    command: 'dev' | 'build';
+    command: 'dev' | 'build' | 'preview';
     logging: LogOptions;
+    isRestart?: boolean;
 }): Promise<AstroSettings>;
 export declare function runHookConfigDone({ settings, logging, }: {
     settings: AstroSettings;

package/dist/integrations/index.js

@@ -1,6 +1,7 @@
 import { bold } from "kleur/colors";
+import { fileURLToPath } from "node:url";
 import { mergeConfig } from "../core/config/config.js";
-import { info } from "../core/logger/core.js";
+import { info, warn } from "../core/logger/core.js";
 async function withTakingALongTimeMsg({
   name,
   hookResult,
@@ -17,7 +18,8 @@ async function withTakingALongTimeMsg({
 async function runHookConfigSetup({
   settings,
   command,
-  logging
+  logging,
+  isRestart = false
 }) {
   var _a;
   if (settings.config.adapter) {
@@ -35,6 +37,7 @@ async function runHookConfigSetup({
       const hooks = {
         config: updatedConfig,
         command,
+        isRestart,
         addRenderer(renderer) {
           if (!renderer.name) {
             throw new Error(`Integration ${bold(integration.name)} has an unnamed renderer.`);
@@ -52,6 +55,9 @@ async function runHookConfigSetup({
         },
         injectRoute: (injectRoute) => {
           updatedSettings.injectedRoutes.push(injectRoute);
+        },
+        addWatchFile: (path) => {
+          updatedSettings.watchFiles.push(path instanceof URL ? fileURLToPath(path) : path);
         }
       };
       Object.defineProperty(hooks, "addPageExtension", {
@@ -147,13 +153,44 @@ async function runHookBuildStart({
   logging
 }) {
   var _a;
+  function warnDeprecated(integration, prop) {
+    let value = Reflect.get(buildConfig, prop);
+    Object.defineProperty(buildConfig, prop, {
+      enumerable: true,
+      get() {
+        return value;
+      },
+      set(newValue) {
+        value = newValue;
+        warn(
+          logging,
+          "astro:build:start",
+          `Your adapter ${bold(integration.name)} is using a deprecated API, buildConfig. ${bold(
+            prop
+          )} config should be set via config.build.${prop} instead.`
+        );
+      }
+    });
+    return () => {
+      Object.defineProperty(buildConfig, prop, {
+        enumerable: true,
+        value
+      });
+    };
+  }
   for (const integration of config.integrations) {
     if ((_a = integration == null ? void 0 : integration.hooks) == null ? void 0 : _a["astro:build:start"]) {
+      const undoClientWarning = warnDeprecated(integration, "client");
+      const undoServerWarning = warnDeprecated(integration, "server");
+      const undoServerEntryWarning = warnDeprecated(integration, "serverEntry");
       await withTakingALongTimeMsg({
         name: integration.name,
         hookResult: integration.hooks["astro:build:start"]({ buildConfig }),
         logging
       });
+      undoClientWarning();
+      undoServerEntryWarning();
+      undoServerWarning();
     }
   }
 }

package/dist/runtime/server/astro-global.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "1.4.6";
+import { ASTRO_VERSION } from "../../core/constants.js";
 function createDeprecatedFetchContentFn() {
   return () => {
     throw new Error("Deprecated: Astro.fetchContent() has been replaced with Astro.glob().");

package/dist/runtime/server/hydration.js

@@ -84,7 +84,7 @@ async function generateHydrateScript(scriptOptions, metadata) {
   };
   if (attrs) {
     for (const [key, value] of Object.entries(attrs)) {
-      island.props[key] = value;
+      island.props[key] = escapeHTML(value);
     }
   }
   island.props["component-url"] = await result.resolve(decodeURI(componentUrl));

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

@@ -14,6 +14,7 @@ async function iterableToHTMLBytes(result, iterable, onDocTypeInjection) {
   for await (const chunk of iterable) {
     if (isHTMLString(chunk)) {
       if (i === 0) {
+        i++;
         if (!/<!doctype html/i.test(String(chunk))) {
           parts.append("<!DOCTYPE html>\n", result);
           if (onDocTypeInjection) {

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

@@ -61,13 +61,14 @@ async function transformJSX({
   mode,
   id,
   ssr,
-  renderer
+  renderer,
+  root
 }) {
   const { jsxTransformOptions } = renderer;
   const options = await jsxTransformOptions({ mode, ssr });
   const plugins = [...options.plugins || []];
   if (ssr) {
-    plugins.push(tagExportsPlugin({ rendererName: renderer.name }));
+    plugins.push(await tagExportsPlugin({ rendererName: renderer.name, root }));
   }
   const result = await babel.transformAsync(code, {
     presets: options.presets,
@@ -142,7 +143,8 @@ function jsx({ settings, logging }) {
           id,
           renderer: astroJSXRenderer,
           mode,
-          ssr
+          ssr,
+          root: settings.config.root
         });
       }
       if (defaultJSXRendererEntry && jsxRenderersIntegrationOnly.size === 1) {
@@ -157,7 +159,8 @@ function jsx({ settings, logging }) {
           id,
           renderer: defaultJSXRendererEntry[1],
           mode,
-          ssr
+          ssr,
+          root: settings.config.root
         });
       }
       let importSource = detectImportSourceFromComments(code);
@@ -214,7 +217,8 @@ https://docs.astro.build/en/core-concepts/framework-components/#installing-integ
         id,
         renderer: selectedJsxRenderer,
         mode,
-        ssr
+        ssr,
+        root: settings.config.root
       });
     }
   };

package/dist/vite-plugin-jsx/tag.d.ts

@@ -7,6 +7,7 @@ import type { PluginObj } from '@babel/core';
  * This plugin crawls each export in the file and "tags" each export with a given `rendererName`.
  * This allows us to automatically match a component to a renderer and skip the usual `check()` calls.
  */
-export default function tagExportsWithRenderer({ rendererName, }: {
+export default function tagExportsWithRenderer({ rendererName, root, }: {
     rendererName: string;
-}): PluginObj;
+    root: URL;
+}): Promise<PluginObj>;

package/dist/vite-plugin-jsx/tag.js

@@ -1,7 +1,13 @@
 import * as t from "@babel/types";
-function tagExportsWithRenderer({
-  rendererName
+import { resolve as importMetaResolve } from "import-meta-resolve";
+import { fileURLToPath } from "url";
+async function tagExportsWithRenderer({
+  rendererName,
+  root
 }) {
+  const astroServerPath = fileURLToPath(
+    await importMetaResolve("astro/server/index.js", root.toString())
+  );
   return {
     visitor: {
       Program: {
@@ -16,7 +22,7 @@ function tagExportsWithRenderer({
                   t.identifier("__astro_tag_component__")
                 )
               ],
-              t.stringLiteral("astro/server/index.js")
+              t.stringLiteral(astroServerPath)
             )
           );
         },
@@ -83,7 +89,7 @@ function tagExportsWithRenderer({
                   addTag(property.key.name);
                 }
               });
-            } else if (t.isExportNamedDeclaration(node)) {
+            } else if (t.isExportNamedDeclaration(node) && !node.source) {
               node.specifiers.forEach((specifier) => {
                 if (t.isExportSpecifier(specifier) && t.isIdentifier(specifier.exported)) {
                   addTag(specifier.local.name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.4.6",
+  "version": "1.5.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -82,7 +82,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^0.26.0",
+    "@astrojs/compiler": "^0.27.1",
     "@astrojs/language-server": "^0.26.2",
     "@astrojs/markdown-remark": "^1.1.3",
     "@astrojs/telemetry": "^1.0.1",
@@ -103,6 +103,7 @@
     "common-ancestor-path": "^1.0.1",
     "cookie": "^0.5.0",
     "debug": "^4.3.4",
+    "deepmerge-ts": "^4.2.2",
     "diff": "^5.1.0",
     "eol": "^0.9.1",
     "es-module-lexer": "^0.10.5",
@@ -113,6 +114,7 @@
     "gray-matter": "^4.0.3",
     "html-entities": "^2.3.3",
     "html-escaper": "^3.0.3",
+    "import-meta-resolve": "^2.1.0",
     "kleur": "^4.1.4",
     "magic-string": "^0.25.9",
     "mime": "^3.0.0",