astro 4.11.2 → 4.11.3

package/dist/cli/install-package.js

@@ -7,9 +7,10 @@ import ora from "ora";
 import preferredPM from "preferred-pm";
 import prompts from "prompts";
 import whichPm from "which-pm";
+const require2 = createRequire(import.meta.url);
 async function getPackage(packageName, logger, options, otherDeps = []) {
   try {
-    createRequire(options.cwd ?? process.cwd()).resolve(packageName);
+    require2.resolve(packageName, { paths: [options.cwd ?? process.cwd()] });
     const packageImport = await import(packageName);
     return packageImport;
   } catch (e) {

package/dist/container/index.js

@@ -1,6 +1,6 @@
 import { posix } from "node:path";
-import { validateConfig } from "../core/config/config.js";
 import { ASTRO_CONFIG_DEFAULTS } from "../core/config/schema.js";
+import { validateConfig } from "../core/config/validate.js";
 import { Logger } from "../core/logger/core.js";
 import { nodeLogDestination } from "../core/logger/node.js";
 import { removeLeadingForwardSlash } from "../core/path.js";
@@ -73,7 +73,7 @@ class experimental_AstroContainer {
   async #containerResolve(specifier, astroConfig) {
     const found = this.#pipeline.manifest.entryModules[specifier];
     if (found) {
-      return new URL(found, astroConfig.build.client).toString();
+      return new URL(found, astroConfig?.build.client).toString();
     }
     return found;
   }

package/dist/container/pipeline.js

@@ -1,11 +1,8 @@
 import { Pipeline } from "../core/base-pipeline.js";
-import { RouteNotFound } from "../core/errors/errors-data.js";
-import { AstroError } from "../core/errors/index.js";
 import {
   createModuleScriptElement,
   createStylesheetElementSet
 } from "../core/render/ssr-element.js";
-import { DEFAULT_404_ROUTE } from "../core/routing/astro-designed-error-pages.js";
 import { findRouteToRewrite } from "../core/routing/rewrite.js";
 class ContainerPipeline extends Pipeline {
   /**

package/dist/content/vite-plugin-content-virtual-mod.d.ts

@@ -1,5 +1,5 @@
 import nodeFs from 'node:fs';
-import { type Plugin } from 'vite';
+import type { Plugin } from 'vite';
 import type { AstroSettings } from '../@types/astro.js';
 import { type ContentLookupMap } from './utils.js';
 interface AstroContentVirtualModPluginParams {

package/dist/content/vite-plugin-content-virtual-mod.js

@@ -3,11 +3,11 @@ import { extname } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import glob from "fast-glob";
 import pLimit from "p-limit";
-import {} from "vite";
 import { encodeName } from "../core/build/util.js";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { appendForwardSlash, removeFileExtension } from "../core/path.js";
-import { isServerLikeOutput, rootRelativePath } from "../core/util.js";
+import { isServerLikeOutput } from "../core/util.js";
+import { rootRelativePath } from "../core/viteUtils.js";
 import {
   CONTENT_FLAG,
   CONTENT_RENDER_FLAG,

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

@@ -1,6 +1,5 @@
 import { fileURLToPath } from "node:url";
 import glob from "fast-glob";
-import {} from "vite";
 import { getAssetsPrefix } from "../../../assets/utils/getAssetsPrefix.js";
 import { normalizeTheLocale } from "../../../i18n/index.js";
 import { toRoutingStrategy } from "../../../i18n/utils.js";

package/dist/core/compile/compile.js

@@ -3,7 +3,7 @@ import { transform } from "@astrojs/compiler";
 import { normalizePath } from "vite";
 import { AggregateError, CompilerError } from "../errors/errors.js";
 import { AstroErrorData } from "../errors/index.js";
-import { resolvePath } from "../util.js";
+import { resolvePath } from "../viteUtils.js";
 import { createStylePreprocessor } from "./style.js";
 async function compile({
   astroConfig,

package/dist/core/config/config.d.ts

@@ -1,8 +1,6 @@
+import fs from 'node:fs';
 import type { Arguments as Flags } from 'yargs-parser';
 import type { AstroConfig, AstroInlineConfig, AstroUserConfig, CLIFlags } from '../../@types/astro.js';
-import fs from 'node:fs';
-/** Turn raw config values into normalized values */
-export declare function validateConfig(userConfig: any, root: string, cmd: string): Promise<AstroConfig>;
 /** Convert the generic "yargs" flag object into our own, custom TypeScript object. */
 export declare function resolveFlags(flags: Partial<Flags>): CLIFlags;
 export declare function resolveRoot(cwd?: string | URL): string;

package/dist/core/config/config.js

@@ -8,23 +8,8 @@ import { trackAstroConfigZodError } from "../errors/errors.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { formatConfigErrorMessage } from "../messages.js";
 import { mergeConfig } from "./merge.js";
-import { createRelativeSchema } from "./schema.js";
+import { validateConfig } from "./validate.js";
 import { loadConfigWithVite } from "./vite-load.js";
-async function validateConfig(userConfig, root, cmd) {
-  const AstroConfigRelativeSchema = createRelativeSchema(cmd, root);
-  let result;
-  try {
-    result = await AstroConfigRelativeSchema.parseAsync(userConfig);
-  } catch (e) {
-    if (e instanceof ZodError) {
-      trackAstroConfigZodError(e);
-      console.error(formatConfigErrorMessage(e) + "\n");
-      telemetry.record(eventConfigError({ cmd, err: e, isFatal: true }));
-    }
-    throw e;
-  }
-  return result;
-}
 function resolveFlags(flags) {
   return {
     root: typeof flags.root === "string" ? flags.root : void 0,
@@ -113,7 +98,17 @@ async function resolveConfig(inlineConfig, command, fsMod = fs) {
   }
   const userConfig = await loadConfig(root, inlineOnlyConfig.configFile, fsMod);
   const mergedConfig = mergeConfig(userConfig, inlineUserConfig);
-  const astroConfig = await validateConfig(mergedConfig, root, command);
+  let astroConfig;
+  try {
+    astroConfig = await validateConfig(mergedConfig, root, command);
+  } catch (e) {
+    if (e instanceof ZodError) {
+      trackAstroConfigZodError(e);
+      console.error(formatConfigErrorMessage(e) + "\n");
+      telemetry.record(eventConfigError({ cmd: command, err: e, isFatal: true }));
+    }
+    throw e;
+  }
   return { userConfig: mergedConfig, astroConfig };
 }
 export {
@@ -121,6 +116,5 @@ export {
   resolveConfig,
   resolveConfigPath,
   resolveFlags,
-  resolveRoot,
-  validateConfig
+  resolveRoot
 };

package/dist/core/config/validate.d.ts

@@ -0,0 +1,3 @@
+import type { AstroConfig } from '../../@types/astro.js';
+/** Turn raw config values into normalized values */
+export declare function validateConfig(userConfig: any, root: string, cmd: string): Promise<AstroConfig>;

package/dist/core/config/validate.js

@@ -0,0 +1,8 @@
+import { createRelativeSchema } from "./schema.js";
+async function validateConfig(userConfig, root, cmd) {
+  const AstroConfigRelativeSchema = createRelativeSchema(cmd, root);
+  return await AstroConfigRelativeSchema.parseAsync(userConfig);
+}
+export {
+  validateConfig
+};

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.11.2";
+const ASTRO_VERSION = "4.11.3";
 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/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.2";
+  const currentVersion = "4.11.3";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.11.2";
+  const version = "4.11.3";
   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.2"}`
+        `v${"4.11.3"}`
       )} ${headline}`
     );
   }

package/dist/core/util.d.ts

@@ -1,5 +1,4 @@
 import type { AstroConfig, AstroSettings, RouteType } from '../@types/astro.js';
-import type { ModuleLoader } from './module-loader/index.js';
 /** 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 */
@@ -40,18 +39,8 @@ export declare function isServerLikeOutput(config: AstroConfig): boolean;
 export declare function isModeServerWithNoAdapter(settings: AstroSettings): boolean;
 export declare function isContentCollectionsCacheEnabled(config: AstroConfig): boolean;
 export declare function relativeToSrcDir(config: AstroConfig, idOrUrl: URL | string): string;
-export declare function rootRelativePath(root: URL, idOrUrl: URL | string, shouldPrependForwardSlash?: boolean): string;
 export declare function emoji(char: string, fallback: string): string;
-/**
- * Simulate Vite's resolve and import analysis so we can import the id as an URL
- * through a script tag or a dynamic import as-is.
- */
-export declare function resolveIdToUrl(loader: ModuleLoader, id: string, root?: URL): Promise<string>;
 export declare function resolveJsToTs(filePath: string): string;
-/**
- * Resolve the hydration paths so that it can be imported in the client
- */
-export declare function resolvePath(specifier: string, importer: string): string;
 /**
  * Set a default NODE_ENV so Vite doesn't set an incorrect default when loading the Astro config
  */

package/dist/core/util.js

@@ -1,9 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { normalizePath } from "vite";
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "./constants.js";
-import { prependForwardSlash, removeTrailingForwardSlash, slash } from "./path.js";
+import { removeTrailingForwardSlash, slash } from "./path.js";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }
@@ -123,40 +122,9 @@ function relativeToSrcDir(config, idOrUrl) {
   }
   return id.slice(slash(fileURLToPath(config.srcDir)).length);
 }
-function rootRelativePath(root, idOrUrl, shouldPrependForwardSlash = true) {
-  let id;
-  if (typeof idOrUrl !== "string") {
-    id = unwrapId(viteID(idOrUrl));
-  } else {
-    id = idOrUrl;
-  }
-  const normalizedRoot = normalizePath(fileURLToPath(root));
-  if (id.startsWith(normalizedRoot)) {
-    id = id.slice(normalizedRoot.length);
-  }
-  return shouldPrependForwardSlash ? prependForwardSlash(id) : id;
-}
 function emoji(char, fallback) {
   return process.platform !== "win32" ? char : fallback;
 }
-async function resolveIdToUrl(loader, id, root) {
-  let resultId = await loader.resolveId(id, void 0);
-  if (!resultId && id.endsWith(".jsx")) {
-    resultId = await loader.resolveId(id.slice(0, -4), void 0);
-  }
-  if (!resultId) {
-    return VALID_ID_PREFIX + id;
-  }
-  if (path.isAbsolute(resultId)) {
-    const normalizedRoot = root && normalizePath(fileURLToPath(root));
-    if (normalizedRoot && resultId.startsWith(normalizedRoot)) {
-      return resultId.slice(normalizedRoot.length - 1);
-    } else {
-      return "/@fs" + prependForwardSlash(resultId);
-    }
-  }
-  return VALID_ID_PREFIX + resultId;
-}
 function resolveJsToTs(filePath) {
   if (filePath.endsWith(".jsx") && !fs.existsSync(filePath)) {
     const tryPath = filePath.slice(0, -4) + ".tsx";
@@ -166,14 +134,6 @@ function resolveJsToTs(filePath) {
   }
   return filePath;
 }
-function resolvePath(specifier, importer) {
-  if (specifier.startsWith(".")) {
-    const absoluteSpecifier = path.resolve(path.dirname(importer), specifier);
-    return resolveJsToTs(normalizePath(absoluteSpecifier));
-  } else {
-    return specifier;
-  }
-}
 function ensureProcessNodeEnv(defaultNodeEnv) {
   if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = defaultNodeEnv;
@@ -197,11 +157,8 @@ export {
   padMultilineString,
   parseNpmName,
   relativeToSrcDir,
-  resolveIdToUrl,
   resolveJsToTs,
   resolvePages,
-  resolvePath,
-  rootRelativePath,
   unwrapId,
   viteID
 };

package/dist/core/viteUtils.d.ts

@@ -0,0 +1,11 @@
+import type { ModuleLoader } from './module-loader/index.js';
+/**
+ * Resolve the hydration paths so that it can be imported in the client
+ */
+export declare function resolvePath(specifier: string, importer: string): string;
+export declare function rootRelativePath(root: URL, idOrUrl: URL | string, shouldPrependForwardSlash?: boolean): string;
+/**
+ * Simulate Vite's resolve and import analysis so we can import the id as an URL
+ * through a script tag or a dynamic import as-is.
+ */
+export declare function resolveIdToUrl(loader: ModuleLoader, id: string, root?: URL): Promise<string>;

package/dist/core/viteUtils.js

@@ -0,0 +1,49 @@
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { normalizePath } from "vite";
+import { prependForwardSlash } from "../core/path.js";
+import { VALID_ID_PREFIX, resolveJsToTs, unwrapId, viteID } from "./util.js";
+function resolvePath(specifier, importer) {
+  if (specifier.startsWith(".")) {
+    const absoluteSpecifier = path.resolve(path.dirname(importer), specifier);
+    return resolveJsToTs(normalizePath(absoluteSpecifier));
+  } else {
+    return specifier;
+  }
+}
+function rootRelativePath(root, idOrUrl, shouldPrependForwardSlash = true) {
+  let id;
+  if (typeof idOrUrl !== "string") {
+    id = unwrapId(viteID(idOrUrl));
+  } else {
+    id = idOrUrl;
+  }
+  const normalizedRoot = normalizePath(fileURLToPath(root));
+  if (id.startsWith(normalizedRoot)) {
+    id = id.slice(normalizedRoot.length);
+  }
+  return shouldPrependForwardSlash ? prependForwardSlash(id) : id;
+}
+async function resolveIdToUrl(loader, id, root) {
+  let resultId = await loader.resolveId(id, void 0);
+  if (!resultId && id.endsWith(".jsx")) {
+    resultId = await loader.resolveId(id.slice(0, -4), void 0);
+  }
+  if (!resultId) {
+    return VALID_ID_PREFIX + id;
+  }
+  if (path.isAbsolute(resultId)) {
+    const normalizedRoot = root && normalizePath(fileURLToPath(root));
+    if (normalizedRoot && resultId.startsWith(normalizedRoot)) {
+      return resultId.slice(normalizedRoot.length - 1);
+    } else {
+      return "/@fs" + prependForwardSlash(resultId);
+    }
+  }
+  return VALID_ID_PREFIX + resultId;
+}
+export {
+  resolveIdToUrl,
+  resolvePath,
+  rootRelativePath
+};

package/dist/jsx/babel.js

@@ -1,7 +1,7 @@
 import * as t from "@babel/types";
 import { AstroError } from "../core/errors/errors.js";
 import { AstroErrorData } from "../core/errors/index.js";
-import { resolvePath } from "../core/util.js";
+import { resolvePath } from "../core/viteUtils.js";
 const ClientOnlyPlaceholder = "astro-client-only";
 function isComponent(tagName) {
   return tagName[0] && tagName[0].toLowerCase() !== tagName[0] || tagName.includes(".") || /[^a-zA-Z]/.test(tagName[0]);

package/dist/jsx/rehype.js

@@ -1,7 +1,7 @@
 import { visit } from "unist-util-visit";
 import { AstroError } from "../core/errors/errors.js";
 import { AstroErrorData } from "../core/errors/index.js";
-import { resolvePath } from "../core/util.js";
+import { resolvePath } from "../core/viteUtils.js";
 const ClientOnlyPlaceholder = "astro-client-only";
 const rehypeAnalyzeAstroMetadata = () => {
   return (tree, file) => {

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

@@ -1,16 +1,14 @@
 import { fileURLToPath } from "node:url";
 import { getInfoOutput } from "../cli/info/index.js";
 import {} from "../core/base-pipeline.js";
-import { shouldAppendForwardSlash } from "../core/build/util.js";
 import { ASTRO_VERSION, DEFAULT_404_COMPONENT } from "../core/constants.js";
 import { enhanceViteSSRError } from "../core/errors/dev/index.js";
-import { RewriteEncounteredAnError } from "../core/errors/errors-data.js";
-import { AggregateError, AstroError, CSSError, MarkdownError } from "../core/errors/index.js";
-import { prependForwardSlash, removeTrailingForwardSlash } from "../core/path.js";
+import { AggregateError, CSSError, MarkdownError } from "../core/errors/index.js";
 import { Pipeline, loadRenderer } from "../core/render/index.js";
-import { DEFAULT_404_ROUTE, default404Page } from "../core/routing/astro-designed-error-pages.js";
+import { default404Page } from "../core/routing/astro-designed-error-pages.js";
 import { findRouteToRewrite } from "../core/routing/rewrite.js";
-import { isPage, isServerLikeOutput, resolveIdToUrl, viteID } from "../core/util.js";
+import { isPage, isServerLikeOutput, viteID } from "../core/util.js";
+import { resolveIdToUrl } from "../core/viteUtils.js";
 import { PAGE_SCRIPT_ID } from "../vite-plugin-scripts/index.js";
 import { getStylesForURL } from "./css.js";
 import { getComponentMetadata } from "./metadata.js";

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

@@ -1,4 +1,4 @@
-import { resolveIdToUrl } from "../core/util.js";
+import { resolveIdToUrl } from "../core/viteUtils.js";
 function createResolve(loader, root) {
   return async function(s) {
     return await resolveIdToUrl(loader, s, root);

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

@@ -1,5 +1,6 @@
 import { createModuleScriptElementWithSrc } from "../core/render/ssr-element.js";
-import { rootRelativePath, viteID } from "../core/util.js";
+import { viteID } from "../core/util.js";
+import { rootRelativePath } from "../core/viteUtils.js";
 import { crawlGraph } from "./vite.js";
 async function getScriptsForURL(filePath, root, loader) {
   const elements = /* @__PURE__ */ new Set();

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

@@ -2,7 +2,8 @@ import { extname } from "node:path";
 import { bold } from "kleur/colors";
 import { normalizePath } from "vite";
 import {} from "../core/logger/core.js";
-import { isEndpoint, isPage, isServerLikeOutput, rootRelativePath } from "../core/util.js";
+import { isEndpoint, isPage, isServerLikeOutput } from "../core/util.js";
+import { rootRelativePath } from "../core/viteUtils.js";
 import { getPrerenderDefault } from "../prerender/utils.js";
 import { scan } from "./scan.js";
 const KNOWN_FILE_EXTENSIONS = [".astro", ".js", ".ts"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.11.2",
+  "version": "4.11.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",