astro 1.4.7 → 1.5.0

package/dist/core/preview/index.js

@@ -1,134 +1,40 @@
-import fs from "fs";
-import http from "http";
-import { performance } from "perf_hooks";
-import sirv from "sirv";
-import { fileURLToPath } from "url";
-import { notFoundTemplate, subpathNotUsedTemplate } from "../../template/4xx.js";
-import { error, info } from "../logger/core.js";
-import * as msg from "../messages.js";
+import { createRequire } from "module";
+import { runHookConfigDone, runHookConfigSetup } from "../../integrations/index.js";
+import createStaticPreviewServer from "./static-preview-server.js";
 import { getResolvedHostForHttpServer } from "./util.js";
-const HAS_FILE_EXTENSION_REGEXP = /^.*\.[^\\]+$/;
-async function preview(settings, { logging }) {
-  if (settings.config.output === "server") {
-    throw new Error(
-      `[preview] 'output: server' not supported. Use your deploy platform's preview command directly instead, if one exists. (ex: 'netlify dev', 'vercel dev', 'wrangler', etc.)`
-    );
-  }
-  const startServerTime = performance.now();
-  const defaultOrigin = "http://localhost";
-  const trailingSlash = settings.config.trailingSlash;
-  let baseURL = new URL(settings.config.base, new URL(settings.config.site || "/", defaultOrigin));
-  const staticFileServer = sirv(fileURLToPath(settings.config.outDir), {
-    dev: true,
-    etag: true,
-    maxAge: 0
-  });
-  const server = http.createServer((req, res) => {
-    var _a;
-    const requestURL = new URL(req.url, defaultOrigin);
-    if (!requestURL.pathname.startsWith(baseURL.pathname)) {
-      res.statusCode = 404;
-      res.end(subpathNotUsedTemplate(baseURL.pathname, requestURL.pathname));
-      return;
-    }
-    const pathname = requestURL.pathname.slice(baseURL.pathname.length - 1);
-    const isRoot = pathname === "/";
-    const hasTrailingSlash = isRoot || pathname.endsWith("/");
-    function sendError(message) {
-      res.statusCode = 404;
-      res.end(notFoundTemplate(pathname, message));
-    }
-    switch (true) {
-      case (hasTrailingSlash && trailingSlash == "never" && !isRoot):
-        sendError('Not Found (trailingSlash is set to "never")');
-        return;
-      case (!hasTrailingSlash && trailingSlash == "always" && !isRoot && !HAS_FILE_EXTENSION_REGEXP.test(pathname)):
-        sendError('Not Found (trailingSlash is set to "always")');
-        return;
-      default: {
-        req.url = "/" + ((_a = req.url) == null ? void 0 : _a.replace(baseURL.pathname, ""));
-        staticFileServer(req, res, () => {
-          const errorPagePath = fileURLToPath(settings.config.outDir + "/404.html");
-          if (fs.existsSync(errorPagePath)) {
-            res.statusCode = 404;
-            res.setHeader("Content-Type", "text/html;charset=utf-8");
-            res.end(fs.readFileSync(errorPagePath));
-          } else {
-            staticFileServer(req, res, () => {
-              sendError("Not Found");
-            });
-          }
-        });
-        return;
-      }
-    }
+async function preview(_settings, { logging }) {
+  const settings = await runHookConfigSetup({
+    settings: _settings,
+    command: "preview",
+    logging
   });
-  let { port } = settings.config.server;
+  await runHookConfigDone({ settings, logging });
   const host = getResolvedHostForHttpServer(settings.config.server.host);
-  let httpServer;
-  function startServer(timerStart) {
-    let showedPortTakenMsg = false;
-    let showedListenMsg = false;
-    return new Promise((resolve, reject) => {
-      const listen = () => {
-        httpServer = server.listen(port, host, async () => {
-          if (!showedListenMsg) {
-            const resolvedUrls = msg.resolveServerUrls({
-              address: server.address(),
-              host: settings.config.server.host,
-              https: false
-            });
-            info(
-              logging,
-              null,
-              msg.serverStart({
-                startupTime: performance.now() - timerStart,
-                resolvedUrls,
-                host: settings.config.server.host,
-                site: baseURL
-              })
-            );
-          }
-          showedListenMsg = true;
-          resolve();
-        });
-        httpServer == null ? void 0 : httpServer.on("error", onError);
-      };
-      const onError = (err) => {
-        if (err.code && err.code === "EADDRINUSE") {
-          if (!showedPortTakenMsg) {
-            info(logging, "astro", msg.portInUse({ port }));
-            showedPortTakenMsg = true;
-          }
-          port++;
-          return listen();
-        } else {
-          error(logging, "astro", err.stack || err.message);
-          httpServer == null ? void 0 : httpServer.removeListener("error", onError);
-          reject(err);
-        }
-      };
-      listen();
-    });
+  const { port } = settings.config.server;
+  if (settings.config.output === "static") {
+    const server2 = await createStaticPreviewServer(settings, { logging, host, port });
+    return server2;
+  }
+  if (!settings.adapter) {
+    throw new Error(`[preview] No adapter found.`);
   }
-  await startServer(startServerTime);
-  function closed() {
-    return new Promise((resolve, reject) => {
-      httpServer.addListener("close", resolve);
-      httpServer.addListener("error", reject);
-    });
+  if (!settings.adapter.previewEntrypoint) {
+    throw new Error(`[preview] adapter does not have previewEntrypoint.`);
   }
-  return {
+  const require2 = createRequire(settings.config.root);
+  const previewEntrypoint = require2.resolve(settings.adapter.previewEntrypoint);
+  const previewModule = await import(previewEntrypoint);
+  if (typeof previewModule.default !== "function") {
+    throw new Error(`[preview] ${settings.adapter.name} cannot preview your app.`);
+  }
+  const server = await previewModule.default({
+    outDir: settings.config.outDir,
+    client: settings.config.build.client,
+    serverEntrypoint: new URL(settings.config.build.serverEntry, settings.config.build.server),
     host,
-    port,
-    closed,
-    server: httpServer,
-    stop: async () => {
-      await new Promise((resolve, reject) => {
-        httpServer.close((err) => err ? reject(err) : resolve(void 0));
-      });
-    }
-  };
+    port
+  });
+  return server;
 }
 export {
   preview as default

package/dist/core/preview/static-preview-server.d.ts

@@ -0,0 +1,17 @@
+/// <reference types="node" />
+import type { AstroSettings } from '../../@types/astro';
+import type { LogOptions } from '../logger/core';
+import http from 'http';
+export interface PreviewServer {
+    host?: string;
+    port: number;
+    server: http.Server;
+    closed(): Promise<void>;
+    stop(): Promise<void>;
+}
+/** The primary dev action */
+export default function createStaticPreviewServer(settings: AstroSettings, { logging, host, port }: {
+    logging: LogOptions;
+    host: string | undefined;
+    port: number;
+}): Promise<PreviewServer>;

package/dist/core/preview/static-preview-server.js

@@ -0,0 +1,127 @@
+import fs from "fs";
+import http from "http";
+import { performance } from "perf_hooks";
+import sirv from "sirv";
+import { fileURLToPath } from "url";
+import { notFoundTemplate, subpathNotUsedTemplate } from "../../template/4xx.js";
+import { error, info } from "../logger/core.js";
+import * as msg from "../messages.js";
+const HAS_FILE_EXTENSION_REGEXP = /^.*\.[^\\]+$/;
+async function createStaticPreviewServer(settings, { logging, host, port }) {
+  const startServerTime = performance.now();
+  const defaultOrigin = "http://localhost";
+  const trailingSlash = settings.config.trailingSlash;
+  let baseURL = new URL(settings.config.base, new URL(settings.config.site || "/", defaultOrigin));
+  const staticFileServer = sirv(fileURLToPath(settings.config.outDir), {
+    dev: true,
+    etag: true,
+    maxAge: 0
+  });
+  const server = http.createServer((req, res) => {
+    var _a;
+    const requestURL = new URL(req.url, defaultOrigin);
+    if (!requestURL.pathname.startsWith(baseURL.pathname)) {
+      res.statusCode = 404;
+      res.end(subpathNotUsedTemplate(baseURL.pathname, requestURL.pathname));
+      return;
+    }
+    const pathname = requestURL.pathname.slice(baseURL.pathname.length - 1);
+    const isRoot = pathname === "/";
+    const hasTrailingSlash = isRoot || pathname.endsWith("/");
+    function sendError(message) {
+      res.statusCode = 404;
+      res.end(notFoundTemplate(pathname, message));
+    }
+    switch (true) {
+      case (hasTrailingSlash && trailingSlash == "never" && !isRoot):
+        sendError('Not Found (trailingSlash is set to "never")');
+        return;
+      case (!hasTrailingSlash && trailingSlash == "always" && !isRoot && !HAS_FILE_EXTENSION_REGEXP.test(pathname)):
+        sendError('Not Found (trailingSlash is set to "always")');
+        return;
+      default: {
+        req.url = "/" + ((_a = req.url) == null ? void 0 : _a.replace(baseURL.pathname, ""));
+        staticFileServer(req, res, () => {
+          const errorPagePath = fileURLToPath(settings.config.outDir + "/404.html");
+          if (fs.existsSync(errorPagePath)) {
+            res.statusCode = 404;
+            res.setHeader("Content-Type", "text/html;charset=utf-8");
+            res.end(fs.readFileSync(errorPagePath));
+          } else {
+            staticFileServer(req, res, () => {
+              sendError("Not Found");
+            });
+          }
+        });
+        return;
+      }
+    }
+  });
+  let httpServer;
+  function startServer(timerStart) {
+    let showedPortTakenMsg = false;
+    let showedListenMsg = false;
+    return new Promise((resolve, reject) => {
+      const listen = () => {
+        httpServer = server.listen(port, host, async () => {
+          if (!showedListenMsg) {
+            const resolvedUrls = msg.resolveServerUrls({
+              address: server.address(),
+              host: settings.config.server.host,
+              https: false
+            });
+            info(
+              logging,
+              null,
+              msg.serverStart({
+                startupTime: performance.now() - timerStart,
+                resolvedUrls,
+                host: settings.config.server.host,
+                site: baseURL
+              })
+            );
+          }
+          showedListenMsg = true;
+          resolve();
+        });
+        httpServer == null ? void 0 : httpServer.on("error", onError);
+      };
+      const onError = (err) => {
+        if (err.code && err.code === "EADDRINUSE") {
+          if (!showedPortTakenMsg) {
+            info(logging, "astro", msg.portInUse({ port }));
+            showedPortTakenMsg = true;
+          }
+          port++;
+          return listen();
+        } else {
+          error(logging, "astro", err.stack || err.message);
+          httpServer == null ? void 0 : httpServer.removeListener("error", onError);
+          reject(err);
+        }
+      };
+      listen();
+    });
+  }
+  await startServer(startServerTime);
+  function closed() {
+    return new Promise((resolve, reject) => {
+      httpServer.addListener("close", resolve);
+      httpServer.addListener("error", reject);
+    });
+  }
+  return {
+    host,
+    port,
+    closed,
+    server: httpServer,
+    stop: async () => {
+      await new Promise((resolve, reject) => {
+        httpServer.close((err) => err ? reject(err) : resolve(void 0));
+      });
+    }
+  };
+}
+export {
+  createStaticPreviewServer as default
+};

package/dist/core/render/core.d.ts

@@ -15,7 +15,7 @@ export declare const enum GetParamsAndPropsError {
 }
 export declare function getParamsAndProps(opts: GetParamsAndPropsOptions): Promise<[Params, Props] | GetParamsAndPropsError>;
 export interface RenderOptions {
-    adapterName: string | undefined;
+    adapterName?: string;
     logging: LogOptions;
     links: Set<SSRElement>;
     styles?: Set<SSRElement>;

package/dist/core/render/result.js

@@ -166,9 +166,9 @@ function createResult(args) {
         props,
         request,
         url,
-        redirect: args.ssr ? (path) => {
+        redirect: args.ssr ? (path, status) => {
           return new Response(null, {
-            status: 302,
+            status: status || 302,
             headers: {
               Location: path
             }

package/dist/core/util.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="node" />
 import type { ErrorPayload, ViteDevServer } from 'vite';
 import type { AstroConfig, AstroSettings, RouteType } from '../@types/astro';
-export declare const ASTRO_VERSION: string;
 /** Returns true if argument is an object of any prototype/class (but not null). */
 export declare function isObject(value: unknown): value is Record<string, any>;
+/** Cross-realm compatible URL */
+export declare function isURL(value: unknown): value is URL;
 /** Wraps an object in an array. If an array is passed, ignore it. */
 export declare function arraify<T>(target: T | T[]): T[];
 export declare function padMultilineString(source: string, n?: number): string;
@@ -45,15 +45,4 @@ export declare function getLocalAddress(serverAddress: string, host: string | bo
  */
 export declare function resolveIdToUrl(viteServer: ViteDevServer, id: string): Promise<string>;
 export declare function resolveJsToTs(filePath: string): string;
-export declare const AggregateError: AggregateErrorConstructor | {
-    new (errors: Iterable<any>, message?: string | undefined): {
-        errors: Array<any>;
-        name: string;
-        message: string;
-        stack?: string | undefined;
-        cause?: unknown;
-    };
-    captureStackTrace(targetObject: object, constructorOpt?: Function | undefined): void;
-    prepareStackTrace?: ((err: Error, stackTraces: NodeJS.CallSite[]) => any) | undefined;
-    stackTraceLimit: number;
-};
+export declare const AggregateError: any;

package/dist/core/util.js

@@ -5,10 +5,12 @@ import resolve from "resolve";
 import slash from "slash";
 import { fileURLToPath, pathToFileURL } from "url";
 import { prependForwardSlash, removeTrailingForwardSlash } from "./path.js";
-const ASTRO_VERSION = "1.4.7";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }
+function isURL(value) {
+  return Object.prototype.toString.call(value) === "[object URL]";
+}
 function arraify(target) {
   return Array.isArray(target) ? target : [target];
 }
@@ -175,7 +177,6 @@ const AggregateError = typeof globalThis.AggregateError !== "undefined" ? global
   }
 };
 export {
-  ASTRO_VERSION,
   AggregateError,
   VALID_ID_PREFIX,
   arraify,
@@ -187,6 +188,7 @@ export {
   isModeServerWithNoAdapter,
   isObject,
   isPage,
+  isURL,
   padMultilineString,
   parseNpmName,
   relativeToSrcDir,

package/dist/events/index.js

@@ -1,6 +1,6 @@
 import { AstroTelemetry } from "@astrojs/telemetry";
 import { createRequire } from "module";
-import { ASTRO_VERSION } from "../core/util.js";
+import { ASTRO_VERSION } from "../core/constants.js";
 const require2 = createRequire(import.meta.url);
 function getViteVersion() {
   try {

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.7";
+import { ASTRO_VERSION } from "../../core/constants.js";
 function createDeprecatedFetchContentFn() {
   return () => {
     throw new Error("Deprecated: Astro.fetchContent() has been replaced with Astro.glob().");

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.7",
+  "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",