astro 4.7.1 → 4.8.0

package/dist/assets/utils/vendor/image-size/types/cur.js

@@ -5,8 +5,7 @@ const CUR = {
   validate(input) {
     const reserved = readUInt16LE(input, 0);
     const imageCount = readUInt16LE(input, 4);
-    if (reserved !== 0 || imageCount === 0)
-      return false;
+    if (reserved !== 0 || imageCount === 0) return false;
     const imageType = readUInt16LE(input, 2);
     return imageType === TYPE_CURSOR;
   },

package/dist/assets/utils/vendor/image-size/types/icns.js

@@ -64,8 +64,7 @@ const ICNS = {
     let imageHeader = readImageHeader(input, imageOffset);
     let imageSize = getImageSize(imageHeader[0]);
     imageOffset += imageHeader[1];
-    if (imageOffset === fileLength)
-      return imageSize;
+    if (imageOffset === fileLength) return imageSize;
     const result = {
       height: imageSize.height,
       images: [imageSize],

package/dist/assets/utils/vendor/image-size/types/ico.js

@@ -17,16 +17,14 @@ const ICO = {
   validate(input) {
     const reserved = readUInt16LE(input, 0);
     const imageCount = readUInt16LE(input, 4);
-    if (reserved !== 0 || imageCount === 0)
-      return false;
+    if (reserved !== 0 || imageCount === 0) return false;
     const imageType = readUInt16LE(input, 2);
     return imageType === TYPE_ICON;
   },
   calculate(input) {
     const nbImages = readUInt16LE(input, 4);
     const imageSize = getImageSize(input, 0);
-    if (nbImages === 1)
-      return imageSize;
+    if (nbImages === 1) return imageSize;
     const imgs = [imageSize];
     for (let imageIndex = 1; imageIndex < nbImages; imageIndex += 1) {
       imgs.push(getImageSize(input, imageIndex));

package/dist/assets/utils/vendor/image-size/types/jp2.js

@@ -1,11 +1,9 @@
 import { readUInt32BE, findBox } from "./utils.js";
 const JP2 = {
   validate(input) {
-    if (readUInt32BE(input, 4) !== 1783636e3 || readUInt32BE(input, 0) < 1)
-      return false;
+    if (readUInt32BE(input, 4) !== 1783636e3 || readUInt32BE(input, 0) < 1) return false;
     const ftypBox = findBox(input, "ftyp", 0);
-    if (!ftypBox)
-      return false;
+    if (!ftypBox) return false;
     return readUInt32BE(input, ftypBox.offset + 4) === 1718909296;
   },
   calculate(input) {

package/dist/assets/utils/vendor/image-size/types/utils.js

@@ -24,11 +24,9 @@ function readUInt(input, bits, offset, isBigEndian) {
   return methods[methodName](input, offset);
 }
 function readBox(buffer, offset) {
-  if (buffer.length - offset < 4)
-    return;
+  if (buffer.length - offset < 4) return;
   const boxSize = readUInt32BE(buffer, offset);
-  if (buffer.length - offset < boxSize)
-    return;
+  if (buffer.length - offset < boxSize) return;
   return {
     name: toUTF8String(buffer, 4 + offset, 8 + offset),
     offset,
@@ -38,10 +36,8 @@ function readBox(buffer, offset) {
 function findBox(buffer, boxName, offset) {
   while (offset < buffer.length) {
     const box = readBox(buffer, offset);
-    if (!box)
-      break;
-    if (box.name === boxName)
-      return box;
+    if (!box) break;
+    if (box.name === boxName) return box;
     offset += box.size;
   }
 }

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

@@ -10,7 +10,7 @@ import {
   removeBase,
   removeQueryString
 } from "../core/path.js";
-import { isServerLikeOutput } from "../prerender/utils.js";
+import { isServerLikeOutput } from "../core/util.js";
 import { VALID_INPUT_FORMATS, VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from "./consts.js";
 import { emitESMImage } from "./utils/emitAsset.js";
 import { getAssetsPrefix } from "./utils/getAssetsPrefix.js";

package/dist/cli/add/babel.d.ts

@@ -11,7 +11,7 @@ export declare const visit: {
     node: (node: traverse.Node, opts: traverse.TraverseOptions<traverse.Node>, scope?: traverse.Scope | undefined, state?: any, path?: traverse.NodePath<traverse.Node> | undefined, skipKeys?: Record<string, boolean> | undefined) => void;
     clearNode: (node: traverse.Node, opts?: traverse.RemovePropertiesOptions | undefined) => void;
     removeProperties: (tree: traverse.Node, opts?: traverse.RemovePropertiesOptions | undefined) => traverse.Node;
-    hasType: (tree: traverse.Node, type: "CatchClause" | "ClassBody" | "Identifier" | "Program" | "SpreadElement" | "Super" | "SwitchCase" | "TemplateElement" | "VariableDeclarator" | "ArrayExpression" | "ArrowFunctionExpression" | "AssignmentExpression" | "AwaitExpression" | "BinaryExpression" | "CallExpression" | "ClassExpression" | "ConditionalExpression" | "FunctionExpression" | "ImportExpression" | "LogicalExpression" | "MemberExpression" | "MetaProperty" | "NewExpression" | "ObjectExpression" | "SequenceExpression" | "TaggedTemplateExpression" | "TemplateLiteral" | "ThisExpression" | "UnaryExpression" | "UpdateExpression" | "YieldExpression" | "ClassDeclaration" | "FunctionDeclaration" | "ImportDeclaration" | "ExportNamedDeclaration" | "ExportDefaultDeclaration" | "ExportAllDeclaration" | "ImportSpecifier" | "ImportDefaultSpecifier" | "ImportNamespaceSpecifier" | "ExportSpecifier" | "ObjectPattern" | "ArrayPattern" | "RestElement" | "AssignmentPattern" | "ExpressionStatement" | "BlockStatement" | "StaticBlock" | "EmptyStatement" | "DebuggerStatement" | "WithStatement" | "ReturnStatement" | "LabeledStatement" | "BreakStatement" | "ContinueStatement" | "IfStatement" | "SwitchStatement" | "ThrowStatement" | "TryStatement" | "WhileStatement" | "DoWhileStatement" | "ForStatement" | "ForInStatement" | "ForOfStatement" | "VariableDeclaration" | "File" | "JSXAttribute" | "JSXSpreadAttribute" | "JSXIdentifier" | "JSXNamespacedName" | "JSXElement" | "JSXOpeningElement" | "JSXMemberExpression" | "AnyTypeAnnotation" | "ArgumentPlaceholder" | "ArrayTypeAnnotation" | "BigIntLiteral" | "BindExpression" | "BooleanLiteral" | "BooleanLiteralTypeAnnotation" | "BooleanTypeAnnotation" | "ClassAccessorProperty" | "ClassImplements" | "ClassMethod" | "ClassPrivateMethod" | "ClassPrivateProperty" | "ClassProperty" | "DecimalLiteral" | "DeclareClass" | "DeclareExportAllDeclaration" | "DeclareExportDeclaration" | "DeclareFunction" | "DeclareInterface" | "DeclareModule" | "DeclareModuleExports" | "DeclareOpaqueType" | "DeclareTypeAlias" | "DeclareVariable" | "DeclaredPredicate" | "Decorator" | "Directive" | "DirectiveLiteral" | "DoExpression" | "EmptyTypeAnnotation" | "EnumBooleanBody" | "EnumBooleanMember" | "EnumDeclaration" | "EnumDefaultedMember" | "EnumNumberBody" | "EnumNumberMember" | "EnumStringBody" | "EnumStringMember" | "EnumSymbolBody" | "ExistsTypeAnnotation" | "ExportDefaultSpecifier" | "ExportNamespaceSpecifier" | "FunctionTypeAnnotation" | "FunctionTypeParam" | "GenericTypeAnnotation" | "Import" | "ImportAttribute" | "IndexedAccessType" | "InferredPredicate" | "InterfaceDeclaration" | "InterfaceExtends" | "InterfaceTypeAnnotation" | "InterpreterDirective" | "IntersectionTypeAnnotation" | "JSXClosingElement" | "JSXClosingFragment" | "JSXEmptyExpression" | "JSXExpressionContainer" | "JSXFragment" | "JSXOpeningFragment" | "JSXSpreadChild" | "JSXText" | "MixedTypeAnnotation" | "ModuleExpression" | "Noop" | "NullLiteral" | "NullLiteralTypeAnnotation" | "NullableTypeAnnotation" | "NumberLiteral" | "NumberLiteralTypeAnnotation" | "NumberTypeAnnotation" | "NumericLiteral" | "ObjectMethod" | "ObjectProperty" | "ObjectTypeAnnotation" | "ObjectTypeCallProperty" | "ObjectTypeIndexer" | "ObjectTypeInternalSlot" | "ObjectTypeProperty" | "ObjectTypeSpreadProperty" | "OpaqueType" | "OptionalCallExpression" | "OptionalIndexedAccessType" | "OptionalMemberExpression" | "ParenthesizedExpression" | "PipelineBareFunction" | "PipelinePrimaryTopicReference" | "PipelineTopicExpression" | "Placeholder" | "PrivateName" | "QualifiedTypeIdentifier" | "RecordExpression" | "RegExpLiteral" | "RegexLiteral" | "RestProperty" | "SpreadProperty" | "StringLiteral" | "StringLiteralTypeAnnotation" | "StringTypeAnnotation" | "SymbolTypeAnnotation" | "TSAnyKeyword" | "TSArrayType" | "TSAsExpression" | "TSBigIntKeyword" | "TSBooleanKeyword" | "TSCallSignatureDeclaration" | "TSConditionalType" | "TSConstructSignatureDeclaration" | "TSConstructorType" | "TSDeclareFunction" | "TSDeclareMethod" | "TSEnumDeclaration" | "TSEnumMember" | "TSExportAssignment" | "TSExpressionWithTypeArguments" | "TSExternalModuleReference" | "TSFunctionType" | "TSImportEqualsDeclaration" | "TSImportType" | "TSIndexSignature" | "TSIndexedAccessType" | "TSInferType" | "TSInstantiationExpression" | "TSInterfaceBody" | "TSInterfaceDeclaration" | "TSIntersectionType" | "TSIntrinsicKeyword" | "TSLiteralType" | "TSMappedType" | "TSMethodSignature" | "TSModuleBlock" | "TSModuleDeclaration" | "TSNamedTupleMember" | "TSNamespaceExportDeclaration" | "TSNeverKeyword" | "TSNonNullExpression" | "TSNullKeyword" | "TSNumberKeyword" | "TSObjectKeyword" | "TSOptionalType" | "TSParameterProperty" | "TSParenthesizedType" | "TSPropertySignature" | "TSQualifiedName" | "TSRestType" | "TSSatisfiesExpression" | "TSStringKeyword" | "TSSymbolKeyword" | "TSThisType" | "TSTupleType" | "TSTypeAliasDeclaration" | "TSTypeAnnotation" | "TSTypeAssertion" | "TSTypeLiteral" | "TSTypeOperator" | "TSTypeParameter" | "TSTypeParameterDeclaration" | "TSTypeParameterInstantiation" | "TSTypePredicate" | "TSTypeQuery" | "TSTypeReference" | "TSUndefinedKeyword" | "TSUnionType" | "TSUnknownKeyword" | "TSVoidKeyword" | "ThisTypeAnnotation" | "TopicReference" | "TupleExpression" | "TupleTypeAnnotation" | "TypeAlias" | "TypeAnnotation" | "TypeCastExpression" | "TypeParameter" | "TypeParameterDeclaration" | "TypeParameterInstantiation" | "TypeofTypeAnnotation" | "UnionTypeAnnotation" | "V8IntrinsicIdentifier" | "Variance" | "VoidTypeAnnotation", denylistTypes?: string[] | undefined) => boolean;
+    hasType: (tree: traverse.Node, type: "CatchClause" | "ClassBody" | "Identifier" | "Program" | "SpreadElement" | "Super" | "SwitchCase" | "TemplateElement" | "VariableDeclarator" | "JSXIdentifier" | "JSXNamespacedName" | "JSXMemberExpression" | "JSXEmptyExpression" | "JSXExpressionContainer" | "JSXSpreadAttribute" | "JSXAttribute" | "JSXOpeningElement" | "JSXOpeningFragment" | "JSXClosingElement" | "JSXClosingFragment" | "JSXElement" | "JSXFragment" | "JSXText" | "ArrayExpression" | "ArrowFunctionExpression" | "AssignmentExpression" | "AwaitExpression" | "BinaryExpression" | "CallExpression" | "ClassExpression" | "ConditionalExpression" | "FunctionExpression" | "ImportExpression" | "LogicalExpression" | "MemberExpression" | "MetaProperty" | "NewExpression" | "ObjectExpression" | "SequenceExpression" | "TaggedTemplateExpression" | "TemplateLiteral" | "ThisExpression" | "UnaryExpression" | "UpdateExpression" | "YieldExpression" | "ClassDeclaration" | "FunctionDeclaration" | "ImportDeclaration" | "ExportNamedDeclaration" | "ExportDefaultDeclaration" | "ExportAllDeclaration" | "ImportSpecifier" | "ImportDefaultSpecifier" | "ImportNamespaceSpecifier" | "ExportSpecifier" | "ObjectPattern" | "ArrayPattern" | "RestElement" | "AssignmentPattern" | "ExpressionStatement" | "BlockStatement" | "StaticBlock" | "EmptyStatement" | "DebuggerStatement" | "WithStatement" | "ReturnStatement" | "LabeledStatement" | "BreakStatement" | "ContinueStatement" | "IfStatement" | "SwitchStatement" | "ThrowStatement" | "TryStatement" | "WhileStatement" | "DoWhileStatement" | "ForStatement" | "ForInStatement" | "ForOfStatement" | "VariableDeclaration" | "File" | "AnyTypeAnnotation" | "ArgumentPlaceholder" | "ArrayTypeAnnotation" | "BigIntLiteral" | "BindExpression" | "BooleanLiteral" | "BooleanLiteralTypeAnnotation" | "BooleanTypeAnnotation" | "ClassAccessorProperty" | "ClassImplements" | "ClassMethod" | "ClassPrivateMethod" | "ClassPrivateProperty" | "ClassProperty" | "DecimalLiteral" | "DeclareClass" | "DeclareExportAllDeclaration" | "DeclareExportDeclaration" | "DeclareFunction" | "DeclareInterface" | "DeclareModule" | "DeclareModuleExports" | "DeclareOpaqueType" | "DeclareTypeAlias" | "DeclareVariable" | "DeclaredPredicate" | "Decorator" | "Directive" | "DirectiveLiteral" | "DoExpression" | "EmptyTypeAnnotation" | "EnumBooleanBody" | "EnumBooleanMember" | "EnumDeclaration" | "EnumDefaultedMember" | "EnumNumberBody" | "EnumNumberMember" | "EnumStringBody" | "EnumStringMember" | "EnumSymbolBody" | "ExistsTypeAnnotation" | "ExportDefaultSpecifier" | "ExportNamespaceSpecifier" | "FunctionTypeAnnotation" | "FunctionTypeParam" | "GenericTypeAnnotation" | "Import" | "ImportAttribute" | "IndexedAccessType" | "InferredPredicate" | "InterfaceDeclaration" | "InterfaceExtends" | "InterfaceTypeAnnotation" | "InterpreterDirective" | "IntersectionTypeAnnotation" | "JSXSpreadChild" | "MixedTypeAnnotation" | "ModuleExpression" | "Noop" | "NullLiteral" | "NullLiteralTypeAnnotation" | "NullableTypeAnnotation" | "NumberLiteral" | "NumberLiteralTypeAnnotation" | "NumberTypeAnnotation" | "NumericLiteral" | "ObjectMethod" | "ObjectProperty" | "ObjectTypeAnnotation" | "ObjectTypeCallProperty" | "ObjectTypeIndexer" | "ObjectTypeInternalSlot" | "ObjectTypeProperty" | "ObjectTypeSpreadProperty" | "OpaqueType" | "OptionalCallExpression" | "OptionalIndexedAccessType" | "OptionalMemberExpression" | "ParenthesizedExpression" | "PipelineBareFunction" | "PipelinePrimaryTopicReference" | "PipelineTopicExpression" | "Placeholder" | "PrivateName" | "QualifiedTypeIdentifier" | "RecordExpression" | "RegExpLiteral" | "RegexLiteral" | "RestProperty" | "SpreadProperty" | "StringLiteral" | "StringLiteralTypeAnnotation" | "StringTypeAnnotation" | "SymbolTypeAnnotation" | "TSAnyKeyword" | "TSArrayType" | "TSAsExpression" | "TSBigIntKeyword" | "TSBooleanKeyword" | "TSCallSignatureDeclaration" | "TSConditionalType" | "TSConstructSignatureDeclaration" | "TSConstructorType" | "TSDeclareFunction" | "TSDeclareMethod" | "TSEnumDeclaration" | "TSEnumMember" | "TSExportAssignment" | "TSExpressionWithTypeArguments" | "TSExternalModuleReference" | "TSFunctionType" | "TSImportEqualsDeclaration" | "TSImportType" | "TSIndexSignature" | "TSIndexedAccessType" | "TSInferType" | "TSInstantiationExpression" | "TSInterfaceBody" | "TSInterfaceDeclaration" | "TSIntersectionType" | "TSIntrinsicKeyword" | "TSLiteralType" | "TSMappedType" | "TSMethodSignature" | "TSModuleBlock" | "TSModuleDeclaration" | "TSNamedTupleMember" | "TSNamespaceExportDeclaration" | "TSNeverKeyword" | "TSNonNullExpression" | "TSNullKeyword" | "TSNumberKeyword" | "TSObjectKeyword" | "TSOptionalType" | "TSParameterProperty" | "TSParenthesizedType" | "TSPropertySignature" | "TSQualifiedName" | "TSRestType" | "TSSatisfiesExpression" | "TSStringKeyword" | "TSSymbolKeyword" | "TSThisType" | "TSTupleType" | "TSTypeAliasDeclaration" | "TSTypeAnnotation" | "TSTypeAssertion" | "TSTypeLiteral" | "TSTypeOperator" | "TSTypeParameter" | "TSTypeParameterDeclaration" | "TSTypeParameterInstantiation" | "TSTypePredicate" | "TSTypeQuery" | "TSTypeReference" | "TSUndefinedKeyword" | "TSUnionType" | "TSUnknownKeyword" | "TSVoidKeyword" | "ThisTypeAnnotation" | "TopicReference" | "TupleExpression" | "TupleTypeAnnotation" | "TypeAlias" | "TypeAnnotation" | "TypeCastExpression" | "TypeParameter" | "TypeParameterDeclaration" | "TypeParameterInstantiation" | "TypeofTypeAnnotation" | "UnionTypeAnnotation" | "V8IntrinsicIdentifier" | "Variance" | "VoidTypeAnnotation", denylistTypes?: string[] | undefined) => boolean;
     cache: typeof traverse.cache;
 };
 export { t };

package/dist/cli/add/imports.js

@@ -6,8 +6,7 @@ function ensureImport(root, importDeclaration) {
       if (path.node.source.value === importDeclaration.source.value) {
         path.node.specifiers.forEach(
           (specifier) => specifiersToFind.forEach((specifierToFind, i) => {
-            if (specifier.type !== specifierToFind.type)
-              return;
+            if (specifier.type !== specifierToFind.type) return;
             if (specifier.local.name === specifierToFind.local.name) {
               specifiersToFind.splice(i, 1);
             }
@@ -16,16 +15,13 @@ function ensureImport(root, importDeclaration) {
       }
     }
   });
-  if (specifiersToFind.length === 0)
-    return;
+  if (specifiersToFind.length === 0) return;
   visit(root, {
     Program(path) {
       const declaration = t.importDeclaration(specifiersToFind, importDeclaration.source);
       const latestImport = path.get("body").filter((statement) => statement.isImportDeclaration()).pop();
-      if (latestImport)
-        latestImport.insertAfter(declaration);
-      else
-        path.unshiftContainer("body", declaration);
+      if (latestImport) latestImport.insertAfter(declaration);
+      else path.unshiftContainer("body", declaration);
     }
   });
 }

package/dist/cli/add/index.js

@@ -349,8 +349,7 @@ function isAdapter(integration) {
 async function parseAstroConfig(configURL) {
   const source = await fs.readFile(fileURLToPath(configURL), { encoding: "utf-8" });
   const result = parse(source);
-  if (!result)
-    throw new Error("Unknown error parsing astro config");
+  if (!result) throw new Error("Unknown error parsing astro config");
   if (result.errors.length > 0)
     throw new Error("Error parsing astro config: " + JSON.stringify(result.errors));
   return result;
@@ -379,21 +378,16 @@ async function addIntegration(ast, integration) {
   visit(ast, {
     // eslint-disable-next-line @typescript-eslint/no-shadow
     ExportDefaultDeclaration(path2) {
-      if (!t.isCallExpression(path2.node.declaration))
-        return;
+      if (!t.isCallExpression(path2.node.declaration)) return;
       const configObject = path2.node.declaration.arguments[0];
-      if (!t.isObjectExpression(configObject))
-        return;
+      if (!t.isObjectExpression(configObject)) return;
       let integrationsProp = configObject.properties.find((prop) => {
-        if (prop.type !== "ObjectProperty")
-          return false;
+        if (prop.type !== "ObjectProperty") return false;
         if (prop.key.type === "Identifier") {
-          if (prop.key.name === "integrations")
-            return true;
+          if (prop.key.name === "integrations") return true;
         }
         if (prop.key.type === "StringLiteral") {
-          if (prop.key.value === "integrations")
-            return true;
+          if (prop.key.value === "integrations") return true;
         }
         return false;
       });
@@ -409,8 +403,7 @@ async function addIntegration(ast, integration) {
       const existingIntegrationCall = integrationsProp.value.elements.find(
         (expr) => t.isCallExpression(expr) && t.isIdentifier(expr.callee) && expr.callee.name === integrationId.name
       );
-      if (existingIntegrationCall)
-        return;
+      if (existingIntegrationCall) return;
       integrationsProp.value.elements.push(integrationCall);
     }
   });
@@ -424,21 +417,16 @@ async function setAdapter(ast, adapter, exportName) {
   visit(ast, {
     // eslint-disable-next-line @typescript-eslint/no-shadow
     ExportDefaultDeclaration(path2) {
-      if (!t.isCallExpression(path2.node.declaration))
-        return;
+      if (!t.isCallExpression(path2.node.declaration)) return;
       const configObject = path2.node.declaration.arguments[0];
-      if (!t.isObjectExpression(configObject))
-        return;
+      if (!t.isObjectExpression(configObject)) return;
       let outputProp = configObject.properties.find((prop) => {
-        if (prop.type !== "ObjectProperty")
-          return false;
+        if (prop.type !== "ObjectProperty") return false;
         if (prop.key.type === "Identifier") {
-          if (prop.key.name === "output")
-            return true;
+          if (prop.key.name === "output") return true;
         }
         if (prop.key.type === "StringLiteral") {
-          if (prop.key.value === "output")
-            return true;
+          if (prop.key.value === "output") return true;
         }
         return false;
       });
@@ -448,15 +436,12 @@ async function setAdapter(ast, adapter, exportName) {
         );
       }
       let adapterProp = configObject.properties.find((prop) => {
-        if (prop.type !== "ObjectProperty")
-          return false;
+        if (prop.type !== "ObjectProperty") return false;
         if (prop.key.type === "Identifier") {
-          if (prop.key.name === "adapter")
-            return true;
+          if (prop.key.name === "adapter") return true;
         }
         if (prop.key.type === "StringLiteral") {
-          if (prop.key.value === "adapter")
-            return true;
+          if (prop.key.value === "adapter") return true;
         }
         return false;
       });
@@ -553,8 +538,7 @@ async function getInstallIntegrationsCommand({
 }) {
   const pm = await preferredPM(cwd);
   logger.debug("add", `package manager: ${JSON.stringify(pm)}`);
-  if (!pm)
-    return null;
+  if (!pm) return null;
   const dependencies = await convertIntegrationsToInstallSpecifiers(integrations);
   switch (pm.name) {
     case "npm":
@@ -583,8 +567,7 @@ async function convertIntegrationsToInstallSpecifiers(integrations) {
 }
 async function resolveRangeToInstallSpecifier(name, range) {
   const versions = await fetchPackageVersions(name);
-  if (versions instanceof Error)
-    return name;
+  if (versions instanceof Error) return name;
   const stableVersions = versions.filter((v) => !v.includes("-"));
   const maxStable = maxSatisfying(stableVersions, range);
   return `${name}@^${maxStable}`;
@@ -606,11 +589,9 @@ async function tryToInstallIntegrations({
 }) {
   const installCommand = await getInstallIntegrationsCommand({ integrations, cwd, logger });
   const inheritedFlags = Object.entries(flags).map(([flag]) => {
-    if (flag == "_")
-      return;
+    if (flag == "_") return;
     if (INHERITED_FLAGS.has(flag)) {
-      if (flag.length === 1)
-        return `-${flag}`;
+      if (flag.length === 1) return `-${flag}`;
       return `--${flag}`;
     }
   }).filter(Boolean).flat();
@@ -840,8 +821,7 @@ ${message}`
 }
 function parseIntegrationName(spec) {
   const result = parseNpmName(spec);
-  if (!result)
-    return;
+  if (!result) return;
   let { scope, name } = result;
   let tag = "latest";
   if (scope) {
@@ -855,8 +835,7 @@ function parseIntegrationName(spec) {
   return { scope, name, tag };
 }
 async function askToContinue({ flags }) {
-  if (flags.yes || flags.y)
-    return true;
+  if (flags.yes || flags.y) return true;
   const response = await prompts({
     type: "confirm",
     name: "askToContinue",
@@ -869,11 +848,9 @@ function getDiffContent(input, output) {
   let changes = [];
   for (const change of diffWords(input, output)) {
     let lines = change.value.trim().split("\n").slice(0, change.count);
-    if (lines.length === 0)
-      continue;
+    if (lines.length === 0) continue;
     if (change.added) {
-      if (!change.value.trim())
-        continue;
+      if (!change.value.trim()) continue;
       changes.push(change.value);
     }
   }

package/dist/cli/add/wrapper.js

@@ -2,8 +2,7 @@ import { t, visit } from "./babel.js";
 function wrapDefaultExport(ast, functionIdentifier) {
   visit(ast, {
     ExportDefaultDeclaration(path) {
-      if (!t.isExpression(path.node.declaration))
-        return;
+      if (!t.isExpression(path.node.declaration)) return;
       if (t.isCallExpression(path.node.declaration) && t.isIdentifier(path.node.declaration.callee) && path.node.declaration.callee.name === functionIdentifier.name)
         return;
       path.node.declaration = t.callExpression(functionIdentifier, [path.node.declaration]);

package/dist/cli/index.js

@@ -45,8 +45,7 @@ function printVersion() {
 }
 function resolveCommand(flags) {
   const cmd = flags._[2];
-  if (flags.version)
-    return "version";
+  if (flags.version) return "version";
   const supportedCommands = /* @__PURE__ */ new Set([
     "add",
     "sync",

package/dist/cli/info/index.js

@@ -60,8 +60,7 @@ async function copyToClipboard(text) {
     message: "Copy to clipboard?",
     initial: true
   });
-  if (!shouldCopy)
-    return;
+  if (!shouldCopy) return;
   try {
     execSync(command, {
       input: text.trim(),

package/dist/cli/install-package.js

@@ -25,8 +25,7 @@ async function getPackage(packageName, logger, options, otherDeps = []) {
     const packageImport = await import(packageName);
     return packageImport;
   } catch (e) {
-    if (options.optional)
-      return void 0;
+    if (options.optional) return void 0;
     let message = `To continue, Astro requires the following dependency to be installed: ${bold(
       packageName
     )}.`;
@@ -178,15 +177,13 @@ async function fetchPackageVersions(packageName) {
 }
 let _registry;
 async function getRegistry() {
-  if (_registry)
-    return _registry;
+  if (_registry) return _registry;
   const fallback = "https://registry.npmjs.org";
   const packageManager = (await preferredPM(process.cwd()))?.name || "npm";
   try {
     const { stdout } = await execa(packageManager, ["config", "get", "registry"]);
     _registry = stdout?.trim()?.replace(/\/$/, "") || fallback;
-    if (!new URL(_registry).host)
-      _registry = fallback;
+    if (!new URL(_registry).host) _registry = fallback;
   } catch (e) {
     _registry = fallback;
   }

package/dist/cli/throw-and-exit.js

@@ -5,8 +5,7 @@ import { debug } from "../core/logger/core.js";
 import { formatErrorMessage } from "../core/messages.js";
 import { eventError, telemetry } from "../events/index.js";
 async function throwAndExit(cmd, err) {
-  if (isAstroConfigZodError(err))
-    return;
+  if (isAstroConfigZodError(err)) return;
   let telemetryPromise;
   let errorMessage;
   function exitWithErrorMessage() {

package/dist/config/index.d.ts

@@ -1,7 +1,7 @@
 import type { UserConfig } from 'vite';
-import type { AstroUserConfig } from '../@types/astro.js';
+import type { AstroInlineConfig, AstroUserConfig } from '../@types/astro.js';
 export declare function defineConfig(config: AstroUserConfig): AstroUserConfig;
-export declare function getViteConfig(inlineConfig: UserConfig): ({ mode, command }: {
+export declare function getViteConfig(inlineConfig: UserConfig, inlineAstroConfig?: AstroInlineConfig): ({ mode, command }: {
     mode: string;
     command: 'serve' | 'build';
 }) => Promise<Record<string, any>>;

package/dist/config/index.js

@@ -2,7 +2,7 @@ import { Logger } from "../core/logger/core.js";
 function defineConfig(config) {
   return config;
 }
-function getViteConfig(inlineConfig) {
+function getViteConfig(inlineConfig, inlineAstroConfig = {}) {
   return async ({ mode, command }) => {
     const cmd = command === "serve" ? "dev" : command;
     const [
@@ -26,7 +26,7 @@ function getViteConfig(inlineConfig) {
       dest: nodeLogDestination,
       level: "info"
     });
-    const { astroConfig: config } = await resolveConfig({}, cmd);
+    const { astroConfig: config } = await resolveConfig(inlineAstroConfig, cmd);
     let settings = await createSettings(config, inlineConfig.root);
     settings = await runHookConfigSetup({ settings, command: cmd, logger });
     const viteConfig = await createVite(

package/dist/content/index.d.ts

@@ -1,7 +1,7 @@
 export { CONTENT_FLAG, PROPAGATED_ASSET_FLAG } from './consts.js';
 export { attachContentServerListeners } from './server-listeners.js';
 export { createContentTypesGenerator } from './types-generator.js';
-export { contentObservable, getContentPaths, getDotAstroTypeReference, hasAssetPropagationFlag, } from './utils.js';
+export { contentObservable, getContentPaths, hasAssetPropagationFlag } from './utils.js';
 export { astroContentAssetPropagationPlugin } from './vite-plugin-content-assets.js';
 export { astroContentImportPlugin } from './vite-plugin-content-imports.js';
 export { astroContentVirtualModPlugin } from './vite-plugin-content-virtual-mod.js';

package/dist/content/index.js

@@ -1,12 +1,7 @@
 import { CONTENT_FLAG, PROPAGATED_ASSET_FLAG } from "./consts.js";
 import { attachContentServerListeners } from "./server-listeners.js";
 import { createContentTypesGenerator } from "./types-generator.js";
-import {
-  contentObservable,
-  getContentPaths,
-  getDotAstroTypeReference,
-  hasAssetPropagationFlag
-} from "./utils.js";
+import { contentObservable, getContentPaths, hasAssetPropagationFlag } from "./utils.js";
 import { astroContentAssetPropagationPlugin } from "./vite-plugin-content-assets.js";
 import { astroContentImportPlugin } from "./vite-plugin-content-imports.js";
 import { astroContentVirtualModPlugin } from "./vite-plugin-content-virtual-mod.js";
@@ -20,6 +15,5 @@ export {
   contentObservable,
   createContentTypesGenerator,
   getContentPaths,
-  getDotAstroTypeReference,
   hasAssetPropagationFlag
 };

package/dist/content/runtime.d.ts

@@ -10,10 +10,11 @@ export declare function createCollectionToGlobResultMap({ globResult, contentDir
     globResult: GlobResult;
     contentDir: string;
 }): CollectionToEntryMap;
-export declare function createGetCollection({ contentCollectionToEntryMap, dataCollectionToEntryMap, getRenderEntryImport, }: {
+export declare function createGetCollection({ contentCollectionToEntryMap, dataCollectionToEntryMap, getRenderEntryImport, cacheEntriesByCollection, }: {
     contentCollectionToEntryMap: CollectionToEntryMap;
     dataCollectionToEntryMap: CollectionToEntryMap;
     getRenderEntryImport: GetEntryImport;
+    cacheEntriesByCollection: Map<string, any[]>;
 }): (collection: string, filter?: (entry: any) => unknown) => Promise<any[]>;
 export declare function createGetEntryBySlug({ getEntryImport, getRenderEntryImport, }: {
     getEntryImport: GetEntryImport;

package/dist/content/runtime.js

@@ -12,8 +12,7 @@ import {
   unescapeHTML
 } from "../runtime/server/index.js";
 function defineCollection(config) {
-  if (!config.type)
-    config.type = "content";
+  if (!config.type) config.type = "content";
   return config;
 }
 function createCollectionToGlobResultMap({
@@ -24,19 +23,18 @@ function createCollectionToGlobResultMap({
   for (const key in globResult) {
     const keyRelativeToContentDir = key.replace(new RegExp(`^${contentDir}`), "");
     const segments = keyRelativeToContentDir.split("/");
-    if (segments.length <= 1)
-      continue;
+    if (segments.length <= 1) continue;
     const collection = segments[0];
     collectionToGlobResultMap[collection] ??= {};
     collectionToGlobResultMap[collection][key] = globResult[key];
   }
   return collectionToGlobResultMap;
 }
-const cacheEntriesByCollection = /* @__PURE__ */ new Map();
 function createGetCollection({
   contentCollectionToEntryMap,
   dataCollectionToEntryMap,
-  getRenderEntryImport
+  getRenderEntryImport,
+  cacheEntriesByCollection
 }) {
   return async function getCollection(collection, filter) {
     let type;
@@ -100,8 +98,7 @@ function createGetEntryBySlug({
 }) {
   return async function getEntryBySlug(collection, slug) {
     const entryImport = await getEntryImport(collection, slug);
-    if (typeof entryImport !== "function")
-      return void 0;
+    if (typeof entryImport !== "function") return void 0;
     const entry = await entryImport();
     return {
       id: entry.id,
@@ -122,8 +119,7 @@ function createGetEntryBySlug({
 function createGetDataEntryById({ getEntryImport }) {
   return async function getDataEntryById(collection, id) {
     const lazyImport = await getEntryImport(collection, id);
-    if (!lazyImport)
-      throw new Error(`Entry ${collection} \u2192 ${id} was not found.`);
+    if (!lazyImport) throw new Error(`Entry ${collection} \u2192 ${id} was not found.`);
     const entry = await lazyImport();
     return {
       id: entry.id,
@@ -151,8 +147,7 @@ function createGetEntry({
       lookupId = "id" in collectionOrLookupObject ? collectionOrLookupObject.id : collectionOrLookupObject.slug;
     }
     const entryImport = await getEntryImport(collection, lookupId);
-    if (typeof entryImport !== "function")
-      return void 0;
+    if (typeof entryImport !== "function") return void 0;
     const entry = await entryImport();
     if (entry._internal.type === "content") {
       return {
@@ -193,19 +188,15 @@ async function render({
     ...AstroErrorData.UnknownContentCollectionError,
     message: `Unexpected error while rendering ${String(collection)} \u2192 ${String(id)}.`
   });
-  if (typeof renderEntryImport !== "function")
-    throw UnexpectedRenderError;
+  if (typeof renderEntryImport !== "function") throw UnexpectedRenderError;
   const baseMod = await renderEntryImport();
-  if (baseMod == null || typeof baseMod !== "object")
-    throw UnexpectedRenderError;
+  if (baseMod == null || typeof baseMod !== "object") throw UnexpectedRenderError;
   const { default: defaultMod } = baseMod;
   if (isPropagatedAssetsModule(defaultMod)) {
     const { collectedStyles, collectedLinks, collectedScripts, getMod } = defaultMod;
-    if (typeof getMod !== "function")
-      throw UnexpectedRenderError;
+    if (typeof getMod !== "function") throw UnexpectedRenderError;
     const propagationMod = await getMod();
-    if (propagationMod == null || typeof propagationMod !== "object")
-      throw UnexpectedRenderError;
+    if (propagationMod == null || typeof propagationMod !== "object") throw UnexpectedRenderError;
     const Content = createComponent({
       factory(result, baseProps, slots) {
         let styles = "", links = "", scripts = "";

package/dist/content/server-listeners.js

@@ -20,8 +20,7 @@ async function attachContentServerListeners({
       )} for changes`
     );
     const maybeTsConfigStats = await getTSConfigStatsWhenAllowJsFalse({ contentPaths, settings });
-    if (maybeTsConfigStats)
-      warnAllowJsIsFalse({ ...maybeTsConfigStats, logger });
+    if (maybeTsConfigStats) warnAllowJsIsFalse({ ...maybeTsConfigStats, logger });
     await attachListeners();
   } else {
     viteServer.watcher.on("addDir", contentDirListener);
@@ -86,18 +85,14 @@ async function getTSConfigStatsWhenAllowJsFalse({
   const isContentConfigJsFile = [".js", ".mjs"].some(
     (ext) => contentPaths.config.url.pathname.endsWith(ext)
   );
-  if (!isContentConfigJsFile)
-    return;
+  if (!isContentConfigJsFile) return;
   const inputConfig = await loadTSConfig(fileURLToPath(settings.config.root));
-  if (typeof inputConfig === "string")
-    return;
+  if (typeof inputConfig === "string") return;
   const tsConfigFileName = inputConfig.tsconfigFile.split(path.sep).pop();
-  if (!tsConfigFileName)
-    return;
+  if (!tsConfigFileName) return;
   const contentConfigFileName = contentPaths.config.url.pathname.split(path.sep).pop();
   const allowJSOption = inputConfig.tsconfig.compilerOptions?.allowJs;
-  if (allowJSOption)
-    return;
+  if (allowJSOption) return;
   return { tsConfigFileName, contentConfigFileName };
 }
 export {

package/dist/content/types-generator.js

@@ -52,8 +52,7 @@ async function createContentTypesGenerator({
     for (const entry of globResult) {
       const fullPath = path.join(fileURLToPath(contentPaths.contentDir), entry.path);
       const entryURL = pathToFileURL(fullPath);
-      if (entryURL.href.startsWith(contentPaths.config.url.href))
-        continue;
+      if (entryURL.href.startsWith(contentPaths.config.url.href)) continue;
       if (entry.dirent.isFile()) {
         events.push({ name: "add", entry: entryURL });
       } else if (entry.dirent.isDirectory()) {
@@ -70,8 +69,7 @@ async function createContentTypesGenerator({
       );
       const collectionKey2 = JSON.stringify(collection2);
       const isCollectionEvent = collection2.split("/").length === 1;
-      if (!isCollectionEvent)
-        return { shouldGenerateTypes: false };
+      if (!isCollectionEvent) return { shouldGenerateTypes: false };
       switch (event.name) {
         case "addDir":
           collectionEntryMap[JSON.stringify(collection2)] = {
@@ -153,8 +151,7 @@ async function createContentTypesGenerator({
       }
     }
     const contentEntryType = contentEntryConfigByExt.get(path.extname(event.entry.pathname));
-    if (!contentEntryType)
-      return { shouldGenerateTypes: false };
+    if (!contentEntryType) return { shouldGenerateTypes: false };
     const { id, slug: generatedSlug } = getContentEntryIdAndSlug({
       entry,
       contentDir,
@@ -224,8 +221,7 @@ async function createContentTypesGenerator({
       entry: pathToFileURL(rawEvent.entry),
       name: rawEvent.name
     };
-    if (!event.entry.pathname.startsWith(contentPaths.contentDir.pathname))
-      return;
+    if (!event.entry.pathname.startsWith(contentPaths.contentDir.pathname)) return;
     events.push(event);
     debounceTimeout && clearTimeout(debounceTimeout);
     const runEventsSafe = async () => {
@@ -267,8 +263,7 @@ async function createContentTypesGenerator({
 }
 function invalidateVirtualMod(viteServer) {
   const virtualMod = viteServer.moduleGraph.getModuleById("\0" + VIRTUAL_MODULE_ID);
-  if (!virtualMod)
-    return;
+  if (!virtualMod) return;
   viteServer.moduleGraph.invalidateModule(virtualMod);
 }
 function normalizeConfigPath(from, to) {