astro 3.6.2 → 4.0.0-beta.1

package/dist/integrations/astroFeaturesValidation.js

@@ -7,16 +7,7 @@ const UNSUPPORTED_ASSETS_FEATURE = {
   isSquooshCompatible: false,
   isSharpCompatible: false
 };
-const ALL_UNSUPPORTED = {
-  serverOutput: UNSUPPORTED,
-  staticOutput: UNSUPPORTED,
-  hybridOutput: UNSUPPORTED,
-  assets: UNSUPPORTED_ASSETS_FEATURE,
-  i18n: {
-    detectBrowserLanguage: UNSUPPORTED
-  }
-};
-function validateSupportedFeatures(adapterName, featureMap = ALL_UNSUPPORTED, config, logger) {
+function validateSupportedFeatures(adapterName, featureMap, config, logger) {
   const {
     assets = UNSUPPORTED_ASSETS_FEATURE,
     serverOutput = UNSUPPORTED,
@@ -64,16 +55,19 @@ function validateSupportKind(supportKind, adapterName, logger, featureName, hasC
   }
 }
 function featureIsUnsupported(adapterName, logger, featureName) {
-  logger.error(
-    `${adapterName}`,
-    `The feature ${featureName} is not supported by the adapter ${adapterName}.`
-  );
+  logger.error("config", `The feature ${featureName} is not supported (used by ${adapterName}).`);
 }
 function featureIsExperimental(adapterName, logger) {
-  logger.warn(`${adapterName}`, "The feature is experimental and subject to issues or changes.");
+  logger.warn(
+    "config",
+    `The feature is experimental and subject to change (used by ${adapterName}).`
+  );
 }
 function featureIsDeprecated(adapterName, logger) {
-  logger.warn(`${adapterName}`, "The feature is deprecated and will be moved in the next release.");
+  logger.warn(
+    "config",
+    `The feature is deprecated and will be removed in the future (used by ${adapterName}).`
+  );
 }
 const SHARP_SERVICE = "astro/assets/services/sharp";
 const SQUOOSH_SERVICE = "astro/assets/services/squoosh";
@@ -85,14 +79,14 @@ function validateAssetsFeature(assets, adapterName, config, logger) {
   } = assets;
   if (config?.image?.service?.entrypoint === SHARP_SERVICE && !isSharpCompatible) {
     logger.warn(
-      "astro",
+      null,
       `The currently selected adapter \`${adapterName}\` is not compatible with the image service "Sharp".`
     );
     return false;
   }
   if (config?.image?.service?.entrypoint === SQUOOSH_SERVICE && !isSquooshCompatible) {
     logger.warn(
-      "astro",
+      null,
       `The currently selected adapter \`${adapterName}\` is not compatible with the image service "Squoosh".`
     );
     return false;

package/dist/integrations/index.js

@@ -1,4 +1,4 @@
-import { bold } from "kleur/colors";
+import { bold, cyan, underline } from "kleur/colors";
 import fs from "node:fs";
 import { fileURLToPath } from "node:url";
 import { buildClientDirectiveEntrypoint } from "../core/client-directive/index.js";
@@ -8,12 +8,18 @@ import { isServerLikeOutput } from "../prerender/utils.js";
 import { validateSupportedFeatures } from "./astroFeaturesValidation.js";
 async function withTakingALongTimeMsg({
   name,
+  hookName,
   hookResult,
   timeoutMs = 3e3,
   logger
 }) {
   const timeout = setTimeout(() => {
-    logger.info("build", `Waiting for the ${bold(name)} integration...`);
+    logger.info(
+      "build",
+      `Waiting for integration ${bold(JSON.stringify(name))}, hook ${bold(
+        JSON.stringify(hookName)
+      )}...`
+    );
   }, timeoutMs);
   const result = await hookResult;
   clearTimeout(timeout);
@@ -78,6 +84,13 @@ async function runHookConfigSetup({
           updatedConfig = mergeConfig(updatedConfig, newConfig);
         },
         injectRoute: (injectRoute) => {
+          if (injectRoute.entrypoint == null && "entryPoint" in injectRoute) {
+            logger.warn(
+              null,
+              `The injected route "${injectRoute.pattern}" by ${integration.name} specifies the entry point with the "entryPoint" property. This property is deprecated, please use "entrypoint" instead.`
+            );
+            injectRoute.entrypoint = injectRoute.entryPoint;
+          }
           updatedSettings.injectedRoutes.push(injectRoute);
         },
         addWatchFile: (path) => {
@@ -125,6 +138,7 @@ async function runHookConfigSetup({
       });
       await withTakingALongTimeMsg({
         name: integration.name,
+        hookName: "astro:config:setup",
         hookResult: integration.hooks["astro:config:setup"](hooks),
         logger
       });
@@ -147,6 +161,7 @@ async function runHookConfigDone({
     if (integration?.hooks?.["astro:config:done"]) {
       await withTakingALongTimeMsg({
         name: integration.name,
+        hookName: "astro:config:done",
         hookResult: integration.hooks["astro:config:done"]({
           config: settings.config,
           setAdapter(adapter) {
@@ -156,9 +171,8 @@ async function runHookConfigDone({
               );
             }
             if (!adapter.supportedAstroFeatures) {
-              logger.warn(
-                "astro",
-                `The adapter ${adapter.name} doesn't provide a feature map. From Astro 3.0, an adapter can provide a feature map. Not providing a feature map will cause an error in Astro 4.0.`
+              throw new Error(
+                `The adapter ${adapter.name} doesn't provide a feature map. It is required in Astro 4.0.`
               );
             } else {
               const validationResult = validateSupportedFeatures(
@@ -170,7 +184,7 @@ async function runHookConfigDone({
               for (const [featureName, supported] of Object.entries(validationResult)) {
                 if (!supported && featureName !== "assets") {
                   logger.error(
-                    "astro",
+                    null,
                     `The adapter ${adapter.name} doesn't support the feature ${featureName}. Your project won't be built. You should not use it.`
                   );
                 }
@@ -194,6 +208,7 @@ async function runHookServerSetup({
     if (integration?.hooks?.["astro:server:setup"]) {
       await withTakingALongTimeMsg({
         name: integration.name,
+        hookName: "astro:server:setup",
         hookResult: integration.hooks["astro:server:setup"]({
           server,
           logger: getLogger(integration, logger)
@@ -212,6 +227,7 @@ async function runHookServerStart({
     if (integration?.hooks?.["astro:server:start"]) {
       await withTakingALongTimeMsg({
         name: integration.name,
+        hookName: "astro:server:start",
         hookResult: integration.hooks["astro:server:start"]({
           address,
           logger: getLogger(integration, logger)
@@ -229,6 +245,7 @@ async function runHookServerDone({
     if (integration?.hooks?.["astro:server:done"]) {
       await withTakingALongTimeMsg({
         name: integration.name,
+        hookName: "astro:server:done",
         hookResult: integration.hooks["astro:server:done"]({
           logger: getLogger(integration, logger)
         }),
@@ -246,6 +263,7 @@ async function runHookBuildStart({
       const logger = getLogger(integration, logging);
       await withTakingALongTimeMsg({
         name: integration.name,
+        hookName: "astro:build:start",
         hookResult: integration.hooks["astro:build:start"]({ logger }),
         logger: logging
       });
@@ -264,6 +282,7 @@ async function runHookBuildSetup({
     if (integration?.hooks?.["astro:build:setup"]) {
       await withTakingALongTimeMsg({
         name: integration.name,
+        hookName: "astro:build:setup",
         hookResult: integration.hooks["astro:build:setup"]({
           vite,
           pages,
@@ -290,6 +309,7 @@ async function runHookBuildSsr({
     if (integration?.hooks?.["astro:build:ssr"]) {
       await withTakingALongTimeMsg({
         name: integration.name,
+        hookName: "astro:build:ssr",
         hookResult: integration.hooks["astro:build:ssr"]({
           manifest,
           entryPoints,
@@ -310,6 +330,7 @@ async function runHookBuildGenerated({
     if (integration?.hooks?.["astro:build:generated"]) {
       await withTakingALongTimeMsg({
         name: integration.name,
+        hookName: "astro:build:generated",
         hookResult: integration.hooks["astro:build:generated"]({
           dir,
           logger: getLogger(integration, logger)
@@ -327,6 +348,7 @@ async function runHookBuildDone({ config, pages, routes, logging }) {
       const logger = getLogger(integration, logging);
       await withTakingALongTimeMsg({
         name: integration.name,
+        hookName: "astro:build:done",
         hookResult: integration.hooks["astro:build:done"]({
           pages: pages.map((p) => ({ pathname: p })),
           dir,

package/dist/prefetch/vite-plugin-prefetch.js

@@ -2,14 +2,14 @@ import * as vite from "vite";
 const virtualModuleId = "astro:prefetch";
 const resolvedVirtualModuleId = "\0" + virtualModuleId;
 const prefetchInternalModuleFsSubpath = "astro/dist/prefetch/index.js";
-const prefetchCode = `import { init } from 'astro/prefetch';init()`;
+const prefetchCode = `import { init } from 'astro/virtual-modules/prefetch.js';init()`;
 function astroPrefetch({ settings }) {
   const prefetchOption = settings.config.prefetch;
   const prefetch = prefetchOption ? typeof prefetchOption === "object" ? prefetchOption : {} : void 0;
   if (prefetch && settings.scripts.every((s) => s.content !== prefetchCode)) {
     settings.scripts.push({
       stage: "page",
-      content: `import { init } from 'astro/prefetch';init()`
+      content: `import { init } from 'astro/virtual-modules/prefetch.js';init()`
     });
   }
   const throwPrefetchNotEnabledError = () => {
@@ -28,7 +28,7 @@ function astroPrefetch({ settings }) {
       if (id === resolvedVirtualModuleId) {
         if (!prefetch)
           throwPrefetchNotEnabledError();
-        return `export { prefetch } from "astro/prefetch";`;
+        return `export { prefetch } from "astro/virtual-modules/prefetch.js";`;
       }
     },
     transform(code, id) {

package/dist/runtime/client/dev-overlay/entrypoint.js

@@ -9,11 +9,16 @@ document.addEventListener("DOMContentLoaded", async () => {
     { default: astroXrayPlugin },
     { default: astroSettingsPlugin },
     { AstroDevOverlay, DevOverlayCanvas },
-    { DevOverlayCard },
-    { DevOverlayHighlight },
-    { DevOverlayTooltip },
-    { DevOverlayWindow },
-    { DevOverlayToggle },
+    {
+      DevOverlayCard,
+      DevOverlayHighlight,
+      DevOverlayTooltip,
+      DevOverlayWindow,
+      DevOverlayToggle,
+      DevOverlayButton,
+      DevOverlayBadge,
+      DevOverlayIcon
+    },
     { getIconElement, isDefinedIcon }
   ] = await Promise.all([
     // @ts-expect-error
@@ -23,11 +28,7 @@ document.addEventListener("DOMContentLoaded", async () => {
     import("./plugins/xray.js"),
     import("./plugins/settings.js"),
     import("./overlay.js"),
-    import("./ui-library/card.js"),
-    import("./ui-library/highlight.js"),
-    import("./ui-library/tooltip.js"),
-    import("./ui-library/window.js"),
-    import("./ui-library/toggle.js"),
+    import("./ui-library/index.js"),
     import("./ui-library/icons.js")
   ]);
   customElements.define("astro-dev-overlay", AstroDevOverlay);
@@ -37,6 +38,9 @@ document.addEventListener("DOMContentLoaded", async () => {
   customElements.define("astro-dev-overlay-highlight", DevOverlayHighlight);
   customElements.define("astro-dev-overlay-card", DevOverlayCard);
   customElements.define("astro-dev-overlay-toggle", DevOverlayToggle);
+  customElements.define("astro-dev-overlay-button", DevOverlayButton);
+  customElements.define("astro-dev-overlay-badge", DevOverlayBadge);
+  customElements.define("astro-dev-overlay-icon", DevOverlayIcon);
   overlay = document.createElement("astro-dev-overlay");
   const preparePlugin = (pluginDefinition, builtIn) => {
     const eventTarget = new EventTarget();

package/dist/runtime/client/dev-overlay/overlay.js

@@ -187,7 +187,7 @@ class AstroDevOverlay extends HTMLElement {
 				transition: opacity 0.2s ease-in-out;
 				pointer-events: auto;
 				border: 0;
-				color: white;
+				color: #13151A;
 				font-family: system-ui, sans-serif;
 				font-size: 1rem;
 				line-height: 1.2;

package/dist/runtime/client/dev-overlay/plugins/astro.d.ts

@@ -1,8 +1,21 @@
+export interface Integration {
+    name: string;
+    title: string;
+    description: string;
+    image?: string;
+    categories: string[];
+    repoUrl: string;
+    npmUrl: string;
+    homepageUrl: string;
+    official: boolean;
+    featured: number;
+    downloads: number;
+}
 declare const _default: {
     id: string;
     name: string;
     icon: "astro:logo";
-    init(canvas: ShadowRoot): void;
+    init(canvas: ShadowRoot, eventTarget: EventTarget): Promise<void>;
     beforeTogglingOff(canvas: ShadowRoot): Promise<boolean>;
 };
 export default _default;