astro 4.11.1 → 4.11.2

package/dist/@types/astro.d.ts

@@ -647,8 +647,11 @@ export interface AstroUserConfig {
      * @type {boolean}
      * @default `true`
      * @description
-     * This is an option to minify your HTML output and reduce the size of your HTML files. By default, Astro removes all whitespace from your HTML, including line breaks, from `.astro` components. This occurs both in development mode and in the final build.
-     * To disable HTML compression, set the `compressHTML` flag to `false`.
+     *
+     * This is an option to minify your HTML output and reduce the size of your HTML files, occuring both in development mode and in the final build.
+     * By default, Astro removes whitespace from your HTML, including line breaks, from .astro components in a lossless manner.
+     * It is important to note that some whitespace may be kept to preserve the visual rendering of your HTML.
+     * To disable HTML compression, set the compressHTML flag to false.
      *
      * ```js
      * {

package/dist/actions/runtime/virtual/server.d.ts

@@ -14,7 +14,7 @@ export type ActionClient<TOutput, TAccept extends Accept, TInputSchema extends I
 } : ((input?: any) => Promise<Awaited<TOutput>>) & {
     safe: (input?: any) => Promise<SafeResult<never, Awaited<TOutput>>>;
 };
-export declare function defineAction<TOutput, TAccept extends Accept, TInputSchema extends InputSchema<Accept> | undefined = TAccept extends 'form' ? z.ZodType<FormData> : undefined>({ accept, input: inputSchema, handler, }: {
+export declare function defineAction<TOutput, TAccept extends Accept = 'json', TInputSchema extends InputSchema<Accept> | undefined = TAccept extends 'form' ? z.ZodType<FormData> : undefined>({ accept, input: inputSchema, handler, }: {
     input?: TInputSchema;
     accept?: TAccept;
     handler: Handler<TInputSchema, TOutput>;

package/dist/cli/install-package.d.ts

@@ -1,4 +1,4 @@
-import { type Logger } from '../core/logger/core.js';
+import type { Logger } from '../core/logger/core.js';
 type GetPackageOptions = {
     skipAsk?: boolean;
     optional?: boolean;

package/dist/cli/install-package.js

@@ -1,5 +1,4 @@
 import { createRequire } from "node:module";
-import { pathToFileURL } from "node:url";
 import boxen from "boxen";
 import ci from "ci-info";
 import { execa } from "execa";
@@ -7,21 +6,10 @@ import { bold, cyan, dim, magenta } from "kleur/colors";
 import ora from "ora";
 import preferredPM from "preferred-pm";
 import prompts from "prompts";
-import resolvePackage from "resolve";
 import whichPm from "which-pm";
-import {} from "../core/logger/core.js";
-const require2 = createRequire(import.meta.url);
 async function getPackage(packageName, logger, options, otherDeps = []) {
   try {
-    if (packageName === "@astrojs/db") {
-      const packageJsonLoc = require2.resolve(packageName + "/package.json", {
-        paths: [options.cwd ?? process.cwd()]
-      });
-      const packageLoc = pathToFileURL(packageJsonLoc.replace(`package.json`, "dist/index.js"));
-      const packageImport2 = await import(packageLoc.toString());
-      return packageImport2;
-    }
-    await tryResolve(packageName, options.cwd ?? process.cwd());
+    createRequire(options.cwd ?? process.cwd()).resolve(packageName);
     const packageImport = await import(packageName);
     return packageImport;
   } catch (e) {
@@ -45,23 +33,6 @@ async function getPackage(packageName, logger, options, otherDeps = []) {
     }
   }
 }
-function tryResolve(packageName, cwd) {
-  return new Promise((resolve, reject) => {
-    resolvePackage(
-      packageName,
-      {
-        basedir: cwd
-      },
-      (err) => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve(0);
-        }
-      }
-    );
-  });
-}
 function getInstallCommand(packages, packageManager) {
   switch (packageManager) {
     case "npm":

package/dist/config/index.js

@@ -37,7 +37,7 @@ function getViteConfig(userViteConfig, inlineAstroConfig = {}) {
           astroContentListenPlugin({ settings, logger, fs })
         ]
       },
-      { settings, logger, mode }
+      { settings, logger, mode, sync: false }
     );
     await runHookConfigDone({ settings, logger });
     return mergeConfig(viteConfig, userViteConfig);

package/dist/core/build/index.js

@@ -85,7 +85,7 @@ class AstroBuilder {
           middlewareMode: true
         }
       },
-      { settings: this.settings, logger: this.logger, mode: "build", command: "build" }
+      { settings: this.settings, logger: this.logger, mode: "build", command: "build", sync: false }
     );
     await runHookConfigDone({ settings: this.settings, logger });
     const { syncContentCollections } = await import("../sync/index.js");

package/dist/core/build/plugins/plugin-content.js

@@ -378,11 +378,13 @@ function pluginContent(opts, internals) {
         if (!isContentCollectionsCacheEnabled(opts.settings.config)) {
           return;
         }
+        const promises = [];
         for (const { cached, dist } of cachedBuildOutput) {
           if (fsMod.existsSync(dist)) {
-            await copyFiles(dist, cached, true);
+            promises.push(copyFiles(dist, cached, true));
           }
         }
+        if (promises.length) await Promise.all(promises);
       }
     }
   };

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.11.1";
+const ASTRO_VERSION = "4.11.2";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 const DEFAULT_404_COMPONENT = "astro-default-404.astro";

package/dist/core/create-vite.d.ts

@@ -8,7 +8,8 @@ interface CreateViteOptions {
     mode: 'dev' | 'build' | string;
     command?: 'dev' | 'build';
     fs?: typeof nodeFs;
+    sync: boolean;
 }
 /** Return a base vite config as a common starting point for all Vite commands. */
-export declare function createVite(commandConfig: vite.InlineConfig, { settings, logger, mode, command, fs }: CreateViteOptions): Promise<vite.InlineConfig>;
+export declare function createVite(commandConfig: vite.InlineConfig, { settings, logger, mode, command, fs, sync }: CreateViteOptions): Promise<vite.InlineConfig>;
 export {};

package/dist/core/create-vite.js

@@ -54,7 +54,7 @@ const ONLY_DEV_EXTERNAL = [
   // Imported by `astro/assets` -> `packages/astro/src/core/logger/core.ts`
   "string-width"
 ];
-async function createVite(commandConfig, { settings, logger, mode, command, fs = nodeFs }) {
+async function createVite(commandConfig, { settings, logger, mode, command, fs = nodeFs, sync }) {
   const astroPkgsConfig = await crawlFrameworkPkgs({
     root: fileURLToPath(settings.config.root),
     isBuild: mode === "build",
@@ -112,7 +112,7 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       // the build to run very slow as the filewatcher is triggered often.
       mode !== "build" && vitePluginAstroServer({ settings, logger, fs }),
       envVitePlugin({ settings }),
-      astroEnv({ settings, mode, fs }),
+      astroEnv({ settings, mode, fs, sync }),
       markdownVitePlugin({ settings, logger }),
       htmlVitePlugin(),
       mdxVitePlugin(),

package/dist/core/dev/container.js

@@ -38,7 +38,7 @@ async function createContainer({
         include: rendererClientEntries
       }
     },
-    { settings, logger, mode: "dev", command: "dev", fs }
+    { settings, logger, mode: "dev", command: "dev", fs, sync: false }
   );
   await runHookConfigDone({ settings, logger });
   const viteServer = await vite.createServer(viteConfig);

package/dist/core/dev/dev.js

@@ -19,7 +19,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "4.11.1";
+  const currentVersion = "4.11.2";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.11.1";
+  const version = "4.11.2";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -269,7 +269,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.11.1"}`
+        `v${"4.11.2"}`
       )} ${headline}`
     );
   }

package/dist/core/sync/index.js

@@ -6,6 +6,7 @@ import { createServer } from "vite";
 import { getPackage } from "../../cli/install-package.js";
 import { createContentTypesGenerator } from "../../content/index.js";
 import { globalContentConfigObserver } from "../../content/utils.js";
+import { syncAstroEnv } from "../../env/sync.js";
 import { telemetry } from "../../events/index.js";
 import { eventCliSession } from "../../events/session.js";
 import { runHookConfigSetup } from "../../integrations/hooks.js";
@@ -50,6 +51,7 @@ async function sync(inlineConfig, options) {
     await dbPackage?.typegen?.(astroConfig);
     const exitCode = await syncContentCollections(settings, { ...options, logger });
     if (exitCode !== 0) return exitCode;
+    syncAstroEnv(settings, options?.fs);
     logger.info(null, `Types generated ${dim(getTimeStat(timerStart, performance.now()))}`);
     return 0;
   } catch (err) {
@@ -70,7 +72,7 @@ async function syncContentCollections(settings, { logger, fs }) {
         ssr: { external: [] },
         logLevel: "silent"
       },
-      { settings, logger, mode: "build", command: "build", fs }
+      { settings, logger, mode: "build", command: "build", fs, sync: true }
     )
   );
   const hotSend = tempViteServer.hot.send;

package/dist/env/sync.d.ts

@@ -0,0 +1,3 @@
+import fsMod from 'node:fs';
+import type { AstroSettings } from '../@types/astro.js';
+export declare function syncAstroEnv(settings: AstroSettings, fs?: typeof fsMod): void;

package/dist/env/sync.js

@@ -0,0 +1,27 @@
+import fsMod from "node:fs";
+import { ENV_TYPES_FILE, TYPES_TEMPLATE_URL } from "./constants.js";
+import { getEnvFieldType } from "./validators.js";
+function syncAstroEnv(settings, fs = fsMod) {
+  if (!settings.config.experimental.env) {
+    return;
+  }
+  const schema = settings.config.experimental.env.schema ?? {};
+  let client = "";
+  let server = "";
+  for (const [key, options] of Object.entries(schema)) {
+    const str = `export const ${key}: ${getEnvFieldType(options)};	
+`;
+    if (options.context === "client") {
+      client += str;
+    } else {
+      server += str;
+    }
+  }
+  const template = fs.readFileSync(TYPES_TEMPLATE_URL, "utf-8");
+  const dts = template.replace("// @@CLIENT@@", client).replace("// @@SERVER@@", server);
+  fs.mkdirSync(settings.dotAstroDir, { recursive: true });
+  fs.writeFileSync(new URL(ENV_TYPES_FILE, settings.dotAstroDir), dts, "utf-8");
+}
+export {
+  syncAstroEnv
+};

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

@@ -5,6 +5,7 @@ interface AstroEnvVirtualModPluginParams {
     settings: AstroSettings;
     mode: 'dev' | 'build' | string;
     fs: typeof fsMod;
+    sync: boolean;
 }
-export declare function astroEnv({ settings, mode, fs, }: AstroEnvVirtualModPluginParams): Plugin | undefined;
+export declare function astroEnv({ settings, mode, fs, sync, }: AstroEnvVirtualModPluginParams): Plugin | undefined;
 export {};

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

@@ -2,19 +2,18 @@ import { fileURLToPath } from "node:url";
 import { loadEnv } from "vite";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import {
-  ENV_TYPES_FILE,
   MODULE_TEMPLATE_URL,
-  TYPES_TEMPLATE_URL,
   VIRTUAL_MODULES_IDS,
   VIRTUAL_MODULES_IDS_VALUES
 } from "./constants.js";
-import { getEnvFieldType, validateEnvVariable } from "./validators.js";
+import { validateEnvVariable } from "./validators.js";
 function astroEnv({
   settings,
   mode,
-  fs
+  fs,
+  sync
 }) {
-  if (!settings.config.experimental.env) {
+  if (!settings.config.experimental.env || sync) {
     return;
   }
   const schema = settings.config.experimental.env.schema ?? {};
@@ -34,22 +33,10 @@ function astroEnv({
         }
       }
       const validatedVariables = validatePublicVariables({ schema, loadedEnv });
-      const clientTemplates = getClientTemplates({ validatedVariables });
-      const serverTemplates = getServerTemplates({ validatedVariables, schema, fs });
       templates = {
-        client: clientTemplates.module,
-        server: serverTemplates.module,
+        ...getTemplates(schema, fs, validatedVariables),
         internal: `export const schema = ${JSON.stringify(schema)};`
       };
-      generateDts({
-        settings,
-        fs,
-        content: getDts({
-          fs,
-          client: clientTemplates.types,
-          server: serverTemplates.types
-        })
-      });
     },
     buildEnd() {
       templates = null;
@@ -81,14 +68,6 @@ function astroEnv({
 function resolveVirtualModuleId(id) {
   return `\0${id}`;
 }
-function generateDts({
-  content,
-  settings,
-  fs
-}) {
-  fs.mkdirSync(settings.dotAstroDir, { recursive: true });
-  fs.writeFileSync(new URL(ENV_TYPES_FILE, settings.dotAstroDir), content, "utf-8");
-}
 function validatePublicVariables({
   schema,
   loadedEnv
@@ -117,57 +96,31 @@ function validatePublicVariables({
   }
   return valid;
 }
-function getDts({
-  client,
-  server,
-  fs
-}) {
-  const template = fs.readFileSync(TYPES_TEMPLATE_URL, "utf-8");
-  return template.replace("// @@CLIENT@@", client).replace("// @@SERVER@@", server);
-}
-function getClientTemplates({
-  validatedVariables
-}) {
-  let module = "";
-  let types = "";
-  for (const { key, type, value } of validatedVariables.filter((e) => e.context === "client")) {
-    module += `export const ${key} = ${JSON.stringify(value)};`;
-    types += `export const ${key}: ${type};	
-`;
-  }
-  return {
-    module,
-    types
-  };
-}
-function getServerTemplates({
-  validatedVariables,
-  schema,
-  fs
-}) {
-  let module = fs.readFileSync(MODULE_TEMPLATE_URL, "utf-8");
-  let types = "";
+function getTemplates(schema, fs, validatedVariables) {
+  let client = "";
+  let server = fs.readFileSync(MODULE_TEMPLATE_URL, "utf-8");
   let onSetGetEnv = "";
-  for (const { key, type, value } of validatedVariables.filter((e) => e.context === "server")) {
-    module += `export const ${key} = ${JSON.stringify(value)};`;
-    types += `export const ${key}: ${type};	
-`;
+  for (const { key, value, context } of validatedVariables) {
+    const str = `export const ${key} = ${JSON.stringify(value)};`;
+    if (context === "client") {
+      client += str;
+    } else {
+      server += str;
+    }
   }
   for (const [key, options] of Object.entries(schema)) {
     if (!(options.context === "server" && options.access === "secret")) {
       continue;
     }
-    types += `export const ${key}: ${getEnvFieldType(options)};		
-`;
-    module += `export let ${key} = _internalGetSecret(${JSON.stringify(key)});
+    server += `export let ${key} = _internalGetSecret(${JSON.stringify(key)});
 `;
     onSetGetEnv += `${key} = reset ? undefined : _internalGetSecret(${JSON.stringify(key)});
 `;
   }
-  module = module.replace("// @@ON_SET_GET_ENV@@", onSetGetEnv);
+  server = server.replace("// @@ON_SET_GET_ENV@@", onSetGetEnv);
   return {
-    module,
-    types
+    client,
+    server
   };
 }
 export {

package/dist/runtime/client/dev-toolbar/ui-library/tooltip.js

@@ -33,7 +33,7 @@ class DevToolbarTooltip extends HTMLElement {
 
 			svg {
 				vertical-align: bottom;
-				margin-right: 4px;
+				margin-inline-end: 4px;
 			}
 
 			hr {

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

@@ -9,9 +9,6 @@ function recordServerError(loader, config, { logger }, _err) {
   } catch {
   }
   const errorWithMetadata = collectErrorMetadata(err, config.root);
-  if (errorWithMetadata.name !== AstroErrorData.UnhandledRejection.name) {
-    telemetry.record(eventError({ cmd: "dev", err: errorWithMetadata, isFatal: false }));
-  }
   logger.error(null, formatErrorMessage(errorWithMetadata, logger.level() === "debug"));
   return {
     error: err,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.11.1",
+  "version": "4.11.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -155,7 +155,6 @@
     "preferred-pm": "^3.1.3",
     "prompts": "^2.4.2",
     "rehype": "^13.0.1",
-    "resolve": "^1.22.8",
     "semver": "^7.6.2",
     "shiki": "^1.9.0",
     "string-width": "^7.1.0",
@@ -195,7 +194,6 @@
     "@types/js-yaml": "^4.0.9",
     "@types/probe-image-size": "^7.2.4",
     "@types/prompts": "^2.4.9",
-    "@types/resolve": "^1.20.6",
     "@types/semver": "^7.5.8",
     "@types/send": "^0.17.4",
     "@types/unist": "^3.0.2",