astro 4.1.1 → 4.1.3

package/dist/runtime/client/{dev-overlay → dev-toolbar}/ui-library/window.js

@@ -1,4 +1,4 @@
-class DevOverlayWindow extends HTMLElement {
+class DevToolbarWindow extends HTMLElement {
   shadowRoot;
   constructor() {
     super();
@@ -32,7 +32,7 @@ class DevOverlayWindow extends HTMLElement {
 						background: white;
 					}
 				}
-				
+
 				@media (max-width: 640px) {
 					:host {
 						border-radius: 0;
@@ -79,5 +79,5 @@ class DevOverlayWindow extends HTMLElement {
   }
 }
 export {
-  DevOverlayWindow
+  DevToolbarWindow
 };

package/dist/transitions/router.js

@@ -98,12 +98,15 @@ function runScripts() {
   for (const script of Array.from(document.scripts)) {
     if (script.dataset.astroExec === "")
       continue;
+    const type = script.getAttribute("type");
+    if (type && type !== "module" && type !== "text/javascript")
+      continue;
     const newScript = document.createElement("script");
     newScript.innerHTML = script.innerHTML;
     for (const attr of script.attributes) {
       if (attr.name === "src") {
         const p = new Promise((r) => {
-          newScript.onload = r;
+          newScript.onload = newScript.onerror = r;
         });
         wait = wait.then(() => p);
       }

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

@@ -12,6 +12,7 @@ import { getAstroMetadata } from "./metadata.js";
 function astro({ settings, logger }) {
   const { config } = settings;
   let resolvedConfig;
+  let server;
   const srcRootWeb = config.srcDir.pathname.slice(config.root.pathname.length - 1);
   const isBrowserPath = (path) => path.startsWith(srcRootWeb) && srcRootWeb !== "/";
   const prePlugin = {
@@ -21,6 +22,9 @@ function astro({ settings, logger }) {
     configResolved(_resolvedConfig) {
       resolvedConfig = _resolvedConfig;
     },
+    configureServer(_server) {
+      server = _server;
+    },
     async load(id, opts) {
       const parsedId = parseAstroRequest(id);
       const query = parsedId.query;
@@ -28,9 +32,15 @@ function astro({ settings, logger }) {
         return null;
       }
       const filename = normalizePath(normalizeFilename(parsedId.filename, config.root));
-      const compileResult = getCachedCompileResult(config, filename);
+      let compileResult = getCachedCompileResult(config, filename);
       if (!compileResult) {
-        return null;
+        if (server) {
+          await server.transformRequest("/@fs" + filename);
+          compileResult = getCachedCompileResult(config, filename);
+        }
+        if (!compileResult) {
+          throw new Error("No cached compile result found for " + id);
+        }
       }
       switch (query.type) {
         case "style": {

package/dist/vite-plugin-astro-server/route.js

@@ -12,6 +12,7 @@ import {
 import { createRequest } from "../core/request.js";
 import { matchAllRoutes } from "../core/routing/index.js";
 import { isPage, resolveIdToUrl } from "../core/util.js";
+import { normalizeTheLocale } from "../i18n/index.js";
 import { createI18nMiddleware, i18nPipelineHook } from "../i18n/middleware.js";
 import { getSortedPreloadedMatches } from "../prerender/routing.js";
 import { isServerLikeOutput } from "../prerender/utils.js";
@@ -21,7 +22,6 @@ import { preload } from "./index.js";
 import { getComponentMetadata } from "./metadata.js";
 import { handle404Response, writeSSRResult, writeWebResponse } from "./response.js";
 import { getScriptsForURL } from "./scripts.js";
-import { normalizeTheLocale } from "../i18n/index.js";
 const clientLocalsSymbol = Symbol.for("astro.locals");
 function isLoggedRequest(url) {
   return url !== "/favicon.ico";
@@ -284,7 +284,10 @@ async function handleRoute({
     return;
   }
   if (status && response.status !== status && (status === 404 || status === 500)) {
-    response = new Response(response.body, { ...response, status });
+    response = new Response(response.body, {
+      status,
+      headers: response.headers
+    });
   }
   await writeSSRResult(request, response, incomingResponse);
 }
@@ -302,7 +305,7 @@ async function getScriptsAndStyles({ pipeline, filePath }) {
       scripts.add({
         props: {
           type: "module",
-          src: await resolveIdToUrl(moduleLoader, "astro/runtime/client/dev-overlay/entrypoint.js")
+          src: await resolveIdToUrl(moduleLoader, "astro/runtime/client/dev-toolbar/entrypoint.js")
         },
         children: ""
       });
@@ -313,7 +316,7 @@ async function getScriptsAndStyles({ pipeline, filePath }) {
       };
       scripts.add({
         props: {},
-        children: `window.__astro_dev_overlay__ = ${JSON.stringify(additionalMetadata)}`
+        children: `window.__astro_dev_toolbar__ = ${JSON.stringify(additionalMetadata)}`
       });
     }
   }

package/dist/vite-plugin-config-alias/index.js

@@ -48,6 +48,9 @@ function configAliasVitePlugin({
       for (const alias of configAlias) {
         if (alias.find.test(id)) {
           const updatedId = id.replace(alias.find, alias.replacement);
+          if (updatedId.includes("*")) {
+            return updatedId;
+          }
           const resolved = await this.resolve(updatedId, importer, { skipSelf: true, ...options });
           if (resolved)
             return resolved;

package/dist/{vite-plugin-dev-overlay/vite-plugin-dev-overlay.d.ts → vite-plugin-dev-toolbar/vite-plugin-dev-toolbar.d.ts}

@@ -1,3 +1,3 @@
 import type * as vite from 'vite';
 import type { AstroPluginOptions } from '../@types/astro.js';
-export default function astroDevOverlay({ settings }: AstroPluginOptions): vite.Plugin;
+export default function astroDevToolbar({ settings }: AstroPluginOptions): vite.Plugin;

package/dist/{vite-plugin-dev-overlay/vite-plugin-dev-overlay.js → vite-plugin-dev-toolbar/vite-plugin-dev-toolbar.js}

@@ -1,8 +1,8 @@
-const VIRTUAL_MODULE_ID = "astro:dev-overlay";
+const VIRTUAL_MODULE_ID = "astro:dev-toolbar";
 const resolvedVirtualModuleId = "\0" + VIRTUAL_MODULE_ID;
-function astroDevOverlay({ settings }) {
+function astroDevToolbar({ settings }) {
   return {
-    name: "astro:dev-overlay",
+    name: "astro:dev-toolbar",
     config() {
       return {
         optimizeDeps: {
@@ -19,7 +19,7 @@ function astroDevOverlay({ settings }) {
     async load(id) {
       if (id === resolvedVirtualModuleId) {
         return `
-					export const loadDevOverlayPlugins = async () => {
+					export const loadDevToolbarApps = async () => {
 						return [${settings.devToolbarApps.map((plugin) => `(await import(${JSON.stringify(plugin)})).default`).join(",")}];
 					};
 				`;
@@ -28,5 +28,5 @@ function astroDevOverlay({ settings }) {
   };
 }
 export {
-  astroDevOverlay as default
+  astroDevToolbar as default
 };

package/dist/vite-plugin-env/index.d.ts

@@ -3,5 +3,5 @@ import type { AstroSettings } from '../@types/astro.js';
 interface EnvPluginOptions {
     settings: AstroSettings;
 }
-export default function envVitePlugin({ settings }: EnvPluginOptions): vite.PluginOption;
+export default function envVitePlugin({ settings }: EnvPluginOptions): vite.Plugin;
 export {};

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

@@ -1,6 +1,9 @@
-import MagicString from "magic-string";
 import { fileURLToPath } from "node:url";
 import { loadEnv } from "vite";
+import { transform } from "esbuild";
+import MagicString from "magic-string";
+const importMetaEnvOnlyRe = /\bimport\.meta\.env\b(?!\.)/;
+const isValidIdentifierRe = /^[_$a-zA-Z][_$a-zA-Z0-9]*$/;
 function getPrivateEnv(viteConfig, astroConfig) {
   let envPrefixes = ["PUBLIC_"];
   if (viteConfig.envPrefix) {
@@ -13,7 +16,7 @@ function getPrivateEnv(viteConfig, astroConfig) {
   );
   const privateEnv = {};
   for (const key in fullEnv) {
-    if (envPrefixes.every((prefix) => !key.startsWith(prefix))) {
+    if (isValidIdentifierRe.test(key) && envPrefixes.every((prefix) => !key.startsWith(prefix))) {
       if (typeof process.env[key] !== "undefined") {
         let value = process.env[key];
         if (typeof value !== "string") {
@@ -29,10 +32,6 @@ function getPrivateEnv(viteConfig, astroConfig) {
       }
     }
   }
-  privateEnv.SITE = astroConfig.site ? JSON.stringify(astroConfig.site) : "undefined";
-  privateEnv.SSR = JSON.stringify(true);
-  privateEnv.BASE_URL = astroConfig.base ? JSON.stringify(astroConfig.base) : "undefined";
-  privateEnv.ASSETS_PREFIX = astroConfig.build.assetsPrefix ? JSON.stringify(astroConfig.build.assetsPrefix) : "undefined";
   return privateEnv;
 }
 function getReferencedPrivateKeys(source, privateEnv) {
@@ -44,63 +43,102 @@ function getReferencedPrivateKeys(source, privateEnv) {
   }
   return references;
 }
+async function replaceDefine(code, id, define, config) {
+  const replacementMarkers = {};
+  const env = define["import.meta.env"];
+  if (env) {
+    const marker = `__astro_import_meta_env${"_".repeat(
+      env.length - 23
+      /* length of preceding string */
+    )}`;
+    replacementMarkers[marker] = env;
+    define = { ...define, "import.meta.env": marker };
+  }
+  const esbuildOptions = config.esbuild || {};
+  const result = await transform(code, {
+    loader: "js",
+    charset: esbuildOptions.charset ?? "utf8",
+    platform: "neutral",
+    define,
+    sourcefile: id,
+    sourcemap: config.command === "build" ? !!config.build.sourcemap : true
+  });
+  for (const marker in replacementMarkers) {
+    result.code = result.code.replaceAll(marker, replacementMarkers[marker]);
+  }
+  return {
+    code: result.code,
+    map: result.map || null
+  };
+}
 function envVitePlugin({ settings }) {
   let privateEnv;
+  let defaultDefines;
+  let isDev;
+  let devImportMetaEnvPrepend;
   let viteConfig;
   const { config: astroConfig } = settings;
   return {
     name: "astro:vite-plugin-env",
-    enforce: "pre",
-    config() {
-      return {
-        define: {
-          "import.meta.env.BASE_URL": astroConfig.base ? JSON.stringify(astroConfig.base) : "undefined",
-          "import.meta.env.ASSETS_PREFIX": astroConfig.build.assetsPrefix ? JSON.stringify(astroConfig.build.assetsPrefix) : "undefined"
-        }
-      };
+    config(_, { command }) {
+      isDev = command !== "build";
     },
     configResolved(resolvedConfig) {
       viteConfig = resolvedConfig;
+      const viteDefinePluginIndex = resolvedConfig.plugins.findIndex(
+        (p) => p.name === "vite:define"
+      );
+      if (viteDefinePluginIndex !== -1) {
+        const myPluginIndex = resolvedConfig.plugins.findIndex(
+          (p) => p.name === "astro:vite-plugin-env"
+        );
+        if (myPluginIndex !== -1) {
+          const myPlugin = resolvedConfig.plugins[myPluginIndex];
+          resolvedConfig.plugins.splice(viteDefinePluginIndex, 0, myPlugin);
+          resolvedConfig.plugins.splice(myPluginIndex, 1);
+        }
+      }
     },
-    async transform(source, id, options) {
+    transform(source, id, options) {
       if (!options?.ssr || !source.includes("import.meta.env")) {
         return;
       }
-      let s;
-      const pattern = new RegExp(
-        // Do not allow preceding '.', but do allow preceding '...' for spread operations
-        `(?<!(?<!\\.\\.)\\.)\\b(import\\.meta\\.env\\.(.+?)|import\\.meta\\.env)\\b(?!\\s*?=[^=])`,
-        "g"
-      );
-      let references;
-      let match;
-      while (match = pattern.exec(source)) {
-        let replacement;
-        if (match[0] === "import.meta.env") {
-          privateEnv ??= getPrivateEnv(viteConfig, astroConfig);
-          references ??= getReferencedPrivateKeys(source, privateEnv);
-          replacement = `(Object.assign(import.meta.env,{`;
-          for (const key of references.values()) {
-            replacement += `${key}:${privateEnv[key]},`;
+      privateEnv ??= getPrivateEnv(viteConfig, astroConfig);
+      if (isDev) {
+        const s = new MagicString(source);
+        if (!devImportMetaEnvPrepend) {
+          devImportMetaEnvPrepend = `Object.assign(import.meta.env,{`;
+          for (const key in privateEnv) {
+            devImportMetaEnvPrepend += `${key}:${privateEnv[key]},`;
           }
-          replacement += "}))";
-        } else if (match[2]) {
-          privateEnv ??= getPrivateEnv(viteConfig, astroConfig);
-          replacement = privateEnv[match[2]];
-        }
-        if (replacement) {
-          const start = match.index;
-          const end = start + match[0].length;
-          s ??= new MagicString(source);
-          s.overwrite(start, end, replacement);
+          devImportMetaEnvPrepend += "});";
         }
-      }
-      if (s) {
+        s.prepend(devImportMetaEnvPrepend);
         return {
           code: s.toString(),
           map: s.generateMap({ hires: "boundary" })
         };
       }
+      if (!defaultDefines) {
+        defaultDefines = {};
+        for (const key in privateEnv) {
+          defaultDefines[`import.meta.env.${key}`] = privateEnv[key];
+        }
+      }
+      let defines = defaultDefines;
+      if (importMetaEnvOnlyRe.test(source)) {
+        const references = getReferencedPrivateKeys(source, privateEnv);
+        let replacement = `(Object.assign(import.meta.env,{`;
+        for (const key of references.values()) {
+          replacement += `${key}:${privateEnv[key]},`;
+        }
+        replacement += "}))";
+        defines = {
+          ...defaultDefines,
+          "import.meta.env": replacement
+        };
+      }
+      return replaceDefine(source, id, defines, viteConfig);
     }
   };
 }

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

@@ -10,7 +10,7 @@ import { normalizePath } from "vite";
 import { AstroError, AstroErrorData, MarkdownError } from "../core/errors/index.js";
 import { isMarkdownFile } from "../core/util.js";
 import { shorthash } from "../runtime/server/shorthash.js";
-import { escapeViteEnvReferences, getFileInfo } from "../vite-plugin-utils/index.js";
+import { getFileInfo } from "../vite-plugin-utils/index.js";
 import { getMarkdownCodeForImages } from "./images.js";
 function safeMatter(source, id) {
   try {
@@ -86,7 +86,7 @@ function markdown({ settings, logger }) {
             `[${id}] Astro now supports MDX! Support for components in ".md" (or alternative extensions like ".markdown") files using the "setup" frontmatter is no longer enabled by default. Migrate this file to MDX.`
           );
         }
-        const code = escapeViteEnvReferences(`
+        const code = `
 				import { unescapeHTML, spreadAttributes, createComponent, render, renderComponent, maybeRenderHead } from ${JSON.stringify(
           astroServerRuntimeModulePath
         )};
@@ -128,7 +128,7 @@ function markdown({ settings, logger }) {
 							})}\`;` : `render\`\${maybeRenderHead(result)}\${unescapeHTML(html)}\`;`}
 				});
 				export default Content;
-				`);
+				`;
         return {
           code,
           meta: {

package/dist/vite-plugin-utils/index.d.ts

@@ -1,10 +1,4 @@
 import type { AstroConfig } from '../@types/astro.js';
-/**
- * Converts the first dot in `import.meta.env` to its Unicode escape sequence,
- * which prevents Vite from replacing strings like `import.meta.env.SITE`
- * in our JS representation of modules like Markdown
- */
-export declare function escapeViteEnvReferences(code: string): string;
 export declare function getFileInfo(id: string, config: AstroConfig): {
     fileId: string;
     fileUrl: string | undefined;

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

@@ -6,9 +6,6 @@ import {
   removeLeadingForwardSlashWindows
 } from "../core/path.js";
 import { viteID } from "../core/util.js";
-function escapeViteEnvReferences(code) {
-  return code.replace(/import\.meta\.env/g, "import\\u002Emeta.env").replace(/process\.env/g, "process\\u002Eenv");
-}
 function getFileInfo(id, config) {
   const sitePathname = appendForwardSlash(
     config.site ? new URL(config.base, config.site).pathname : config.base
@@ -38,7 +35,6 @@ function cleanUrl(url) {
 }
 export {
   cleanUrl,
-  escapeViteEnvReferences,
   getFileInfo,
   normalizeFilename
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.1.1",
+  "version": "4.1.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -166,7 +166,7 @@
     "@astrojs/telemetry": "3.0.4"
   },
   "optionalDependencies": {
-    "sharp": "^0.33.1"
+    "sharp": "^0.32.6"
   },
   "devDependencies": {
     "@astrojs/check": "^0.3.1",

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

@@ -1,45 +0,0 @@
-import type { DevOverlayPlugin as DevOverlayPluginDefinition } from '../../../@types/astro.js';
-import { type Icon } from './ui-library/icons.js';
-export type DevOverlayPlugin = DevOverlayPluginDefinition & {
-    builtIn: boolean;
-    active: boolean;
-    status: 'ready' | 'loading' | 'error';
-    notification: {
-        state: boolean;
-    };
-    eventTarget: EventTarget;
-};
-export declare class AstroDevOverlay extends HTMLElement {
-    shadowRoot: ShadowRoot;
-    delayedHideTimeout: number | undefined;
-    devOverlay: HTMLDivElement | undefined;
-    plugins: DevOverlayPlugin[];
-    hasBeenInitialized: boolean;
-    customPluginsToShow: number;
-    constructor();
-    /**
-     * All one-time DOM setup runs through here. Only ever call this once,
-     * in connectedCallback(), and protect it from being called again.
-     */
-    init(): void;
-    connectedCallback(): void;
-    attachEvents(): void;
-    initPlugin(plugin: DevOverlayPlugin): Promise<void>;
-    getPluginTemplate(plugin: DevOverlayPlugin): string;
-    getPluginById(id: string): DevOverlayPlugin | undefined;
-    getPluginCanvasById(id: string): HTMLElement | null;
-    togglePluginStatus(plugin: DevOverlayPlugin): Promise<void>;
-    setPluginStatus(plugin: DevOverlayPlugin, newStatus: boolean): Promise<boolean>;
-    isHidden(): boolean;
-    getActivePlugin(): DevOverlayPlugin | undefined;
-    clearDelayedHide(): void;
-    triggerDelayedHide(): void;
-    setOverlayVisible(newStatus: boolean): void;
-    setNotificationVisible(newStatus: boolean): void;
-}
-export declare class DevOverlayCanvas extends HTMLElement {
-    shadowRoot: ShadowRoot;
-    constructor();
-    connectedCallback(): void;
-}
-export declare function getPluginIcon(icon: Icon): string;

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

@@ -1,8 +0,0 @@
-import type { DevOverlayHighlight } from '../../ui-library/highlight.js';
-import type { Icon } from '../../ui-library/icons.js';
-export declare function createHighlight(rect: DOMRect, icon?: Icon): DevOverlayHighlight;
-export declare function getElementsPositionInDocument(el: Element): {
-    isFixed: boolean;
-};
-export declare function positionHighlight(highlight: DevOverlayHighlight, rect: DOMRect): void;
-export declare function attachTooltipToHighlight(highlight: DevOverlayHighlight, tooltip: HTMLElement, originalElement: Element): void;

package/dist/runtime/client/dev-overlay/ui-library/index.d.ts

@@ -1,8 +0,0 @@
-export { DevOverlayBadge } from './badge.js';
-export { DevOverlayButton } from './button.js';
-export { DevOverlayCard } from './card.js';
-export { DevOverlayHighlight } from './highlight.js';
-export { DevOverlayIcon } from './icon.js';
-export { DevOverlayToggle } from './toggle.js';
-export { DevOverlayTooltip } from './tooltip.js';
-export { DevOverlayWindow } from './window.js';

package/dist/runtime/client/dev-overlay/ui-library/index.js

@@ -1,18 +0,0 @@
-import { DevOverlayBadge } from "./badge.js";
-import { DevOverlayButton } from "./button.js";
-import { DevOverlayCard } from "./card.js";
-import { DevOverlayHighlight } from "./highlight.js";
-import { DevOverlayIcon } from "./icon.js";
-import { DevOverlayToggle } from "./toggle.js";
-import { DevOverlayTooltip } from "./tooltip.js";
-import { DevOverlayWindow } from "./window.js";
-export {
-  DevOverlayBadge,
-  DevOverlayButton,
-  DevOverlayCard,
-  DevOverlayHighlight,
-  DevOverlayIcon,
-  DevOverlayToggle,
-  DevOverlayTooltip,
-  DevOverlayWindow
-};