astro 4.5.2 → 4.5.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/@types/astro.d.ts +1 -1
- package/dist/cli/add/babel.d.ts +1 -1
- package/dist/core/build/static-build.js +2 -0
- package/dist/core/config/schema.d.ts +103 -96
- package/dist/core/config/schema.js +2 -4
- package/dist/core/constants.js +1 -1
- package/dist/core/dev/dev.js +1 -1
- package/dist/core/messages.js +2 -2
- package/dist/core/redirects/render.js +1 -1
- package/dist/runtime/server/render/util.js +11 -0
- package/package.json +3 -5
package/dist/@types/astro.d.ts
CHANGED
package/dist/cli/add/babel.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ export declare const visit: {
|
|
|
11
11
|
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;
|
|
12
12
|
clearNode: (node: traverse.Node, opts?: traverse.RemovePropertiesOptions | undefined) => void;
|
|
13
13
|
removeProperties: (tree: traverse.Node, opts?: traverse.RemovePropertiesOptions | undefined) => traverse.Node;
|
|
14
|
-
hasType: (tree: traverse.Node, type: "
|
|
14
|
+
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" | "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" | "JSXAttribute" | "JSXClosingElement" | "JSXClosingFragment" | "JSXElement" | "JSXEmptyExpression" | "JSXExpressionContainer" | "JSXFragment" | "JSXIdentifier" | "JSXMemberExpression" | "JSXNamespacedName" | "JSXOpeningElement" | "JSXOpeningFragment" | "JSXSpreadAttribute" | "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;
|
|
15
15
|
cache: typeof traverse.cache;
|
|
16
16
|
};
|
|
17
17
|
export { t };
|
|
@@ -1,12 +1,19 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
/// <reference types="node" resolution-mode="require"/>
|
|
3
|
-
import type { RehypePlugin, RemarkPlugin, ShikiConfig } from '@astrojs/markdown-remark';
|
|
3
|
+
import type { RehypePlugin as _RehypePlugin, RemarkPlugin as _RemarkPlugin, RemarkRehype as _RemarkRehype, ShikiConfig } from '@astrojs/markdown-remark';
|
|
4
4
|
import type { ViteUserConfig } from '../../@types/astro.js';
|
|
5
5
|
import type { OutgoingHttpHeaders } from 'node:http';
|
|
6
6
|
import { z } from 'zod';
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
type
|
|
7
|
+
interface ComplexifyUnionObj {
|
|
8
|
+
}
|
|
9
|
+
type ComplexifyWithUnion<T> = T & ComplexifyUnionObj;
|
|
10
|
+
type ComplexifyWithOmit<T> = Omit<T, '__nonExistent'>;
|
|
11
|
+
type ShikiLang = ComplexifyWithUnion<NonNullable<ShikiConfig['langs']>[number]>;
|
|
12
|
+
type ShikiTheme = ComplexifyWithUnion<NonNullable<ShikiConfig['theme']>>;
|
|
13
|
+
type ShikiTransformer = ComplexifyWithUnion<NonNullable<ShikiConfig['transformers']>[number]>;
|
|
14
|
+
type RehypePlugin = ComplexifyWithUnion<_RehypePlugin>;
|
|
15
|
+
type RemarkPlugin = ComplexifyWithUnion<_RemarkPlugin>;
|
|
16
|
+
type RemarkRehype = ComplexifyWithOmit<_RemarkRehype>;
|
|
10
17
|
export declare const AstroConfigSchema: z.ZodObject<{
|
|
11
18
|
root: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
|
|
12
19
|
srcDir: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
|
|
@@ -197,55 +204,55 @@ export declare const AstroConfigSchema: z.ZodObject<{
|
|
|
197
204
|
markdown: z.ZodDefault<z.ZodObject<{
|
|
198
205
|
syntaxHighlight: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"shiki">, z.ZodLiteral<"prism">, z.ZodLiteral<false>]>>;
|
|
199
206
|
shikiConfig: z.ZodDefault<z.ZodObject<{
|
|
200
|
-
langs: z.ZodDefault<z.ZodEffects<z.ZodArray<z.ZodType<
|
|
207
|
+
langs: z.ZodDefault<z.ZodEffects<z.ZodArray<z.ZodType<ShikiLang, z.ZodTypeDef, ShikiLang>, "many">, ShikiLang[], ShikiLang[]>>;
|
|
201
208
|
theme: z.ZodDefault<z.ZodUnion<[z.ZodEnum<[import("shiki/themes").BundledTheme, ...import("shiki/themes").BundledTheme[]]>, z.ZodType<ShikiTheme, z.ZodTypeDef, ShikiTheme>]>>;
|
|
202
209
|
themes: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodEnum<[import("shiki/themes").BundledTheme, ...import("shiki/themes").BundledTheme[]]>, z.ZodType<ShikiTheme, z.ZodTypeDef, ShikiTheme>]>>>;
|
|
203
210
|
wrap: z.ZodDefault<z.ZodUnion<[z.ZodBoolean, z.ZodNull]>>;
|
|
204
|
-
transformers: z.ZodDefault<z.ZodEffects<z.ZodArray<z.ZodType<
|
|
211
|
+
transformers: z.ZodDefault<z.ZodEffects<z.ZodArray<z.ZodType<ShikiTransformer, z.ZodTypeDef, ShikiTransformer>, "many">, ShikiTransformer[], ShikiTransformer[]>>;
|
|
205
212
|
}, "strip", z.ZodTypeAny, {
|
|
206
|
-
langs:
|
|
207
|
-
theme: (
|
|
208
|
-
themes: Record<string,
|
|
213
|
+
langs: ShikiLang[];
|
|
214
|
+
theme: (import("shiki/themes").BundledTheme | ShikiTheme) & (import("shiki/themes").BundledTheme | ShikiTheme | undefined);
|
|
215
|
+
themes: Record<string, import("shiki/themes").BundledTheme | ShikiTheme>;
|
|
209
216
|
wrap: boolean | null;
|
|
210
|
-
transformers:
|
|
217
|
+
transformers: ShikiTransformer[];
|
|
211
218
|
}, {
|
|
212
|
-
langs?:
|
|
213
|
-
theme?:
|
|
214
|
-
themes?: Record<string,
|
|
219
|
+
langs?: ShikiLang[] | undefined;
|
|
220
|
+
theme?: import("shiki/themes").BundledTheme | ShikiTheme | undefined;
|
|
221
|
+
themes?: Record<string, import("shiki/themes").BundledTheme | ShikiTheme> | undefined;
|
|
215
222
|
wrap?: boolean | null | undefined;
|
|
216
|
-
transformers?:
|
|
223
|
+
transformers?: ShikiTransformer[] | undefined;
|
|
217
224
|
}>>;
|
|
218
225
|
remarkPlugins: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodTuple<[z.ZodString, z.ZodAny], null>, z.ZodType<RemarkPlugin, z.ZodTypeDef, RemarkPlugin>, z.ZodTuple<[z.ZodType<RemarkPlugin, z.ZodTypeDef, RemarkPlugin>, z.ZodAny], null>]>, "many">>;
|
|
219
226
|
rehypePlugins: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodTuple<[z.ZodString, z.ZodAny], null>, z.ZodType<RehypePlugin, z.ZodTypeDef, RehypePlugin>, z.ZodTuple<[z.ZodType<RehypePlugin, z.ZodTypeDef, RehypePlugin>, z.ZodAny], null>]>, "many">>;
|
|
220
|
-
remarkRehype: z.ZodDefault<z.
|
|
227
|
+
remarkRehype: z.ZodDefault<z.ZodType<RemarkRehype, z.ZodTypeDef, RemarkRehype>>;
|
|
221
228
|
gfm: z.ZodDefault<z.ZodBoolean>;
|
|
222
229
|
smartypants: z.ZodDefault<z.ZodBoolean>;
|
|
223
230
|
}, "strip", z.ZodTypeAny, {
|
|
224
231
|
syntaxHighlight: false | "shiki" | "prism";
|
|
225
232
|
shikiConfig: {
|
|
226
|
-
langs:
|
|
227
|
-
theme: (
|
|
228
|
-
themes: Record<string,
|
|
233
|
+
langs: ShikiLang[];
|
|
234
|
+
theme: (import("shiki/themes").BundledTheme | ShikiTheme) & (import("shiki/themes").BundledTheme | ShikiTheme | undefined);
|
|
235
|
+
themes: Record<string, import("shiki/themes").BundledTheme | ShikiTheme>;
|
|
229
236
|
wrap: boolean | null;
|
|
230
|
-
transformers:
|
|
237
|
+
transformers: ShikiTransformer[];
|
|
231
238
|
};
|
|
232
239
|
remarkPlugins: (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[];
|
|
233
240
|
rehypePlugins: (string | [string, any] | RehypePlugin | [RehypePlugin, any])[];
|
|
234
|
-
remarkRehype:
|
|
241
|
+
remarkRehype: RemarkRehype;
|
|
235
242
|
gfm: boolean;
|
|
236
243
|
smartypants: boolean;
|
|
237
244
|
}, {
|
|
238
245
|
syntaxHighlight?: false | "shiki" | "prism" | undefined;
|
|
239
246
|
shikiConfig?: {
|
|
240
|
-
langs?:
|
|
241
|
-
theme?:
|
|
242
|
-
themes?: Record<string,
|
|
247
|
+
langs?: ShikiLang[] | undefined;
|
|
248
|
+
theme?: import("shiki/themes").BundledTheme | ShikiTheme | undefined;
|
|
249
|
+
themes?: Record<string, import("shiki/themes").BundledTheme | ShikiTheme> | undefined;
|
|
243
250
|
wrap?: boolean | null | undefined;
|
|
244
|
-
transformers?:
|
|
251
|
+
transformers?: ShikiTransformer[] | undefined;
|
|
245
252
|
} | undefined;
|
|
246
253
|
remarkPlugins?: (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[] | undefined;
|
|
247
254
|
rehypePlugins?: (string | [string, any] | RehypePlugin | [RehypePlugin, any])[] | undefined;
|
|
248
|
-
remarkRehype?:
|
|
255
|
+
remarkRehype?: RemarkRehype | undefined;
|
|
249
256
|
gfm?: boolean | undefined;
|
|
250
257
|
smartypants?: boolean | undefined;
|
|
251
258
|
}>>;
|
|
@@ -420,15 +427,15 @@ export declare const AstroConfigSchema: z.ZodObject<{
|
|
|
420
427
|
markdown: {
|
|
421
428
|
syntaxHighlight: false | "shiki" | "prism";
|
|
422
429
|
shikiConfig: {
|
|
423
|
-
langs:
|
|
424
|
-
theme: (
|
|
425
|
-
themes: Record<string,
|
|
430
|
+
langs: ShikiLang[];
|
|
431
|
+
theme: (import("shiki/themes").BundledTheme | ShikiTheme) & (import("shiki/themes").BundledTheme | ShikiTheme | undefined);
|
|
432
|
+
themes: Record<string, import("shiki/themes").BundledTheme | ShikiTheme>;
|
|
426
433
|
wrap: boolean | null;
|
|
427
|
-
transformers:
|
|
434
|
+
transformers: ShikiTransformer[];
|
|
428
435
|
};
|
|
429
436
|
remarkPlugins: (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[];
|
|
430
437
|
rehypePlugins: (string | [string, any] | RehypePlugin | [RehypePlugin, any])[];
|
|
431
|
-
remarkRehype:
|
|
438
|
+
remarkRehype: RemarkRehype;
|
|
432
439
|
gfm: boolean;
|
|
433
440
|
smartypants: boolean;
|
|
434
441
|
};
|
|
@@ -525,15 +532,15 @@ export declare const AstroConfigSchema: z.ZodObject<{
|
|
|
525
532
|
markdown?: {
|
|
526
533
|
syntaxHighlight?: false | "shiki" | "prism" | undefined;
|
|
527
534
|
shikiConfig?: {
|
|
528
|
-
langs?:
|
|
529
|
-
theme?:
|
|
530
|
-
themes?: Record<string,
|
|
535
|
+
langs?: ShikiLang[] | undefined;
|
|
536
|
+
theme?: import("shiki/themes").BundledTheme | ShikiTheme | undefined;
|
|
537
|
+
themes?: Record<string, import("shiki/themes").BundledTheme | ShikiTheme> | undefined;
|
|
531
538
|
wrap?: boolean | null | undefined;
|
|
532
|
-
transformers?:
|
|
539
|
+
transformers?: ShikiTransformer[] | undefined;
|
|
533
540
|
} | undefined;
|
|
534
541
|
remarkPlugins?: (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[] | undefined;
|
|
535
542
|
rehypePlugins?: (string | [string, any] | RehypePlugin | [RehypePlugin, any])[] | undefined;
|
|
536
|
-
remarkRehype?:
|
|
543
|
+
remarkRehype?: RemarkRehype | undefined;
|
|
537
544
|
gfm?: boolean | undefined;
|
|
538
545
|
smartypants?: boolean | undefined;
|
|
539
546
|
} | undefined;
|
|
@@ -684,55 +691,55 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
|
|
|
684
691
|
markdown: z.ZodDefault<z.ZodObject<{
|
|
685
692
|
syntaxHighlight: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"shiki">, z.ZodLiteral<"prism">, z.ZodLiteral<false>]>>;
|
|
686
693
|
shikiConfig: z.ZodDefault<z.ZodObject<{
|
|
687
|
-
langs: z.ZodDefault<z.ZodEffects<z.ZodArray<z.ZodType<
|
|
694
|
+
langs: z.ZodDefault<z.ZodEffects<z.ZodArray<z.ZodType<ShikiLang, z.ZodTypeDef, ShikiLang>, "many">, ShikiLang[], ShikiLang[]>>;
|
|
688
695
|
theme: z.ZodDefault<z.ZodUnion<[z.ZodEnum<[import("shiki/themes").BundledTheme, ...import("shiki/themes").BundledTheme[]]>, z.ZodType<ShikiTheme, z.ZodTypeDef, ShikiTheme>]>>;
|
|
689
696
|
themes: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodEnum<[import("shiki/themes").BundledTheme, ...import("shiki/themes").BundledTheme[]]>, z.ZodType<ShikiTheme, z.ZodTypeDef, ShikiTheme>]>>>;
|
|
690
697
|
wrap: z.ZodDefault<z.ZodUnion<[z.ZodBoolean, z.ZodNull]>>;
|
|
691
|
-
transformers: z.ZodDefault<z.ZodEffects<z.ZodArray<z.ZodType<
|
|
698
|
+
transformers: z.ZodDefault<z.ZodEffects<z.ZodArray<z.ZodType<ShikiTransformer, z.ZodTypeDef, ShikiTransformer>, "many">, ShikiTransformer[], ShikiTransformer[]>>;
|
|
692
699
|
}, "strip", z.ZodTypeAny, {
|
|
693
|
-
langs:
|
|
694
|
-
theme: (
|
|
695
|
-
themes: Record<string,
|
|
700
|
+
langs: ShikiLang[];
|
|
701
|
+
theme: (import("shiki/themes").BundledTheme | ShikiTheme) & (import("shiki/themes").BundledTheme | ShikiTheme | undefined);
|
|
702
|
+
themes: Record<string, import("shiki/themes").BundledTheme | ShikiTheme>;
|
|
696
703
|
wrap: boolean | null;
|
|
697
|
-
transformers:
|
|
704
|
+
transformers: ShikiTransformer[];
|
|
698
705
|
}, {
|
|
699
|
-
langs?:
|
|
700
|
-
theme?:
|
|
701
|
-
themes?: Record<string,
|
|
706
|
+
langs?: ShikiLang[] | undefined;
|
|
707
|
+
theme?: import("shiki/themes").BundledTheme | ShikiTheme | undefined;
|
|
708
|
+
themes?: Record<string, import("shiki/themes").BundledTheme | ShikiTheme> | undefined;
|
|
702
709
|
wrap?: boolean | null | undefined;
|
|
703
|
-
transformers?:
|
|
710
|
+
transformers?: ShikiTransformer[] | undefined;
|
|
704
711
|
}>>;
|
|
705
712
|
remarkPlugins: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodTuple<[z.ZodString, z.ZodAny], null>, z.ZodType<RemarkPlugin, z.ZodTypeDef, RemarkPlugin>, z.ZodTuple<[z.ZodType<RemarkPlugin, z.ZodTypeDef, RemarkPlugin>, z.ZodAny], null>]>, "many">>;
|
|
706
713
|
rehypePlugins: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodTuple<[z.ZodString, z.ZodAny], null>, z.ZodType<RehypePlugin, z.ZodTypeDef, RehypePlugin>, z.ZodTuple<[z.ZodType<RehypePlugin, z.ZodTypeDef, RehypePlugin>, z.ZodAny], null>]>, "many">>;
|
|
707
|
-
remarkRehype: z.ZodDefault<z.
|
|
714
|
+
remarkRehype: z.ZodDefault<z.ZodType<RemarkRehype, z.ZodTypeDef, RemarkRehype>>;
|
|
708
715
|
gfm: z.ZodDefault<z.ZodBoolean>;
|
|
709
716
|
smartypants: z.ZodDefault<z.ZodBoolean>;
|
|
710
717
|
}, "strip", z.ZodTypeAny, {
|
|
711
718
|
syntaxHighlight: false | "shiki" | "prism";
|
|
712
719
|
shikiConfig: {
|
|
713
|
-
langs:
|
|
714
|
-
theme: (
|
|
715
|
-
themes: Record<string,
|
|
720
|
+
langs: ShikiLang[];
|
|
721
|
+
theme: (import("shiki/themes").BundledTheme | ShikiTheme) & (import("shiki/themes").BundledTheme | ShikiTheme | undefined);
|
|
722
|
+
themes: Record<string, import("shiki/themes").BundledTheme | ShikiTheme>;
|
|
716
723
|
wrap: boolean | null;
|
|
717
|
-
transformers:
|
|
724
|
+
transformers: ShikiTransformer[];
|
|
718
725
|
};
|
|
719
726
|
remarkPlugins: (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[];
|
|
720
727
|
rehypePlugins: (string | [string, any] | RehypePlugin | [RehypePlugin, any])[];
|
|
721
|
-
remarkRehype:
|
|
728
|
+
remarkRehype: RemarkRehype;
|
|
722
729
|
gfm: boolean;
|
|
723
730
|
smartypants: boolean;
|
|
724
731
|
}, {
|
|
725
732
|
syntaxHighlight?: false | "shiki" | "prism" | undefined;
|
|
726
733
|
shikiConfig?: {
|
|
727
|
-
langs?:
|
|
728
|
-
theme?:
|
|
729
|
-
themes?: Record<string,
|
|
734
|
+
langs?: ShikiLang[] | undefined;
|
|
735
|
+
theme?: import("shiki/themes").BundledTheme | ShikiTheme | undefined;
|
|
736
|
+
themes?: Record<string, import("shiki/themes").BundledTheme | ShikiTheme> | undefined;
|
|
730
737
|
wrap?: boolean | null | undefined;
|
|
731
|
-
transformers?:
|
|
738
|
+
transformers?: ShikiTransformer[] | undefined;
|
|
732
739
|
} | undefined;
|
|
733
740
|
remarkPlugins?: (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[] | undefined;
|
|
734
741
|
rehypePlugins?: (string | [string, any] | RehypePlugin | [RehypePlugin, any])[] | undefined;
|
|
735
|
-
remarkRehype?:
|
|
742
|
+
remarkRehype?: RemarkRehype | undefined;
|
|
736
743
|
gfm?: boolean | undefined;
|
|
737
744
|
smartypants?: boolean | undefined;
|
|
738
745
|
}>>;
|
|
@@ -981,15 +988,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
|
|
|
981
988
|
markdown: {
|
|
982
989
|
syntaxHighlight: false | "shiki" | "prism";
|
|
983
990
|
shikiConfig: {
|
|
984
|
-
langs:
|
|
985
|
-
theme: (
|
|
986
|
-
themes: Record<string,
|
|
991
|
+
langs: ShikiLang[];
|
|
992
|
+
theme: (import("shiki/themes").BundledTheme | ShikiTheme) & (import("shiki/themes").BundledTheme | ShikiTheme | undefined);
|
|
993
|
+
themes: Record<string, import("shiki/themes").BundledTheme | ShikiTheme>;
|
|
987
994
|
wrap: boolean | null;
|
|
988
|
-
transformers:
|
|
995
|
+
transformers: ShikiTransformer[];
|
|
989
996
|
};
|
|
990
997
|
remarkPlugins: (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[];
|
|
991
998
|
rehypePlugins: (string | [string, any] | RehypePlugin | [RehypePlugin, any])[];
|
|
992
|
-
remarkRehype:
|
|
999
|
+
remarkRehype: RemarkRehype;
|
|
993
1000
|
gfm: boolean;
|
|
994
1001
|
smartypants: boolean;
|
|
995
1002
|
};
|
|
@@ -1067,15 +1074,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
|
|
|
1067
1074
|
markdown?: {
|
|
1068
1075
|
syntaxHighlight?: false | "shiki" | "prism" | undefined;
|
|
1069
1076
|
shikiConfig?: {
|
|
1070
|
-
langs?:
|
|
1071
|
-
theme?:
|
|
1072
|
-
themes?: Record<string,
|
|
1077
|
+
langs?: ShikiLang[] | undefined;
|
|
1078
|
+
theme?: import("shiki/themes").BundledTheme | ShikiTheme | undefined;
|
|
1079
|
+
themes?: Record<string, import("shiki/themes").BundledTheme | ShikiTheme> | undefined;
|
|
1073
1080
|
wrap?: boolean | null | undefined;
|
|
1074
|
-
transformers?:
|
|
1081
|
+
transformers?: ShikiTransformer[] | undefined;
|
|
1075
1082
|
} | undefined;
|
|
1076
1083
|
remarkPlugins?: (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[] | undefined;
|
|
1077
1084
|
rehypePlugins?: (string | [string, any] | RehypePlugin | [RehypePlugin, any])[] | undefined;
|
|
1078
|
-
remarkRehype?:
|
|
1085
|
+
remarkRehype?: RemarkRehype | undefined;
|
|
1079
1086
|
gfm?: boolean | undefined;
|
|
1080
1087
|
smartypants?: boolean | undefined;
|
|
1081
1088
|
} | undefined;
|
|
@@ -1182,15 +1189,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
|
|
|
1182
1189
|
markdown: {
|
|
1183
1190
|
syntaxHighlight: false | "shiki" | "prism";
|
|
1184
1191
|
shikiConfig: {
|
|
1185
|
-
langs:
|
|
1186
|
-
theme: (
|
|
1187
|
-
themes: Record<string,
|
|
1192
|
+
langs: ShikiLang[];
|
|
1193
|
+
theme: (import("shiki/themes").BundledTheme | ShikiTheme) & (import("shiki/themes").BundledTheme | ShikiTheme | undefined);
|
|
1194
|
+
themes: Record<string, import("shiki/themes").BundledTheme | ShikiTheme>;
|
|
1188
1195
|
wrap: boolean | null;
|
|
1189
|
-
transformers:
|
|
1196
|
+
transformers: ShikiTransformer[];
|
|
1190
1197
|
};
|
|
1191
1198
|
remarkPlugins: (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[];
|
|
1192
1199
|
rehypePlugins: (string | [string, any] | RehypePlugin | [RehypePlugin, any])[];
|
|
1193
|
-
remarkRehype:
|
|
1200
|
+
remarkRehype: RemarkRehype;
|
|
1194
1201
|
gfm: boolean;
|
|
1195
1202
|
smartypants: boolean;
|
|
1196
1203
|
};
|
|
@@ -1268,15 +1275,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
|
|
|
1268
1275
|
markdown?: {
|
|
1269
1276
|
syntaxHighlight?: false | "shiki" | "prism" | undefined;
|
|
1270
1277
|
shikiConfig?: {
|
|
1271
|
-
langs?:
|
|
1272
|
-
theme?:
|
|
1273
|
-
themes?: Record<string,
|
|
1278
|
+
langs?: ShikiLang[] | undefined;
|
|
1279
|
+
theme?: import("shiki/themes").BundledTheme | ShikiTheme | undefined;
|
|
1280
|
+
themes?: Record<string, import("shiki/themes").BundledTheme | ShikiTheme> | undefined;
|
|
1274
1281
|
wrap?: boolean | null | undefined;
|
|
1275
|
-
transformers?:
|
|
1282
|
+
transformers?: ShikiTransformer[] | undefined;
|
|
1276
1283
|
} | undefined;
|
|
1277
1284
|
remarkPlugins?: (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[] | undefined;
|
|
1278
1285
|
rehypePlugins?: (string | [string, any] | RehypePlugin | [RehypePlugin, any])[] | undefined;
|
|
1279
|
-
remarkRehype?:
|
|
1286
|
+
remarkRehype?: RemarkRehype | undefined;
|
|
1280
1287
|
gfm?: boolean | undefined;
|
|
1281
1288
|
smartypants?: boolean | undefined;
|
|
1282
1289
|
} | undefined;
|
|
@@ -1383,15 +1390,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
|
|
|
1383
1390
|
markdown: {
|
|
1384
1391
|
syntaxHighlight: false | "shiki" | "prism";
|
|
1385
1392
|
shikiConfig: {
|
|
1386
|
-
langs:
|
|
1387
|
-
theme: (
|
|
1388
|
-
themes: Record<string,
|
|
1393
|
+
langs: ShikiLang[];
|
|
1394
|
+
theme: (import("shiki/themes").BundledTheme | ShikiTheme) & (import("shiki/themes").BundledTheme | ShikiTheme | undefined);
|
|
1395
|
+
themes: Record<string, import("shiki/themes").BundledTheme | ShikiTheme>;
|
|
1389
1396
|
wrap: boolean | null;
|
|
1390
|
-
transformers:
|
|
1397
|
+
transformers: ShikiTransformer[];
|
|
1391
1398
|
};
|
|
1392
1399
|
remarkPlugins: (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[];
|
|
1393
1400
|
rehypePlugins: (string | [string, any] | RehypePlugin | [RehypePlugin, any])[];
|
|
1394
|
-
remarkRehype:
|
|
1401
|
+
remarkRehype: RemarkRehype;
|
|
1395
1402
|
gfm: boolean;
|
|
1396
1403
|
smartypants: boolean;
|
|
1397
1404
|
};
|
|
@@ -1469,15 +1476,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
|
|
|
1469
1476
|
markdown?: {
|
|
1470
1477
|
syntaxHighlight?: false | "shiki" | "prism" | undefined;
|
|
1471
1478
|
shikiConfig?: {
|
|
1472
|
-
langs?:
|
|
1473
|
-
theme?:
|
|
1474
|
-
themes?: Record<string,
|
|
1479
|
+
langs?: ShikiLang[] | undefined;
|
|
1480
|
+
theme?: import("shiki/themes").BundledTheme | ShikiTheme | undefined;
|
|
1481
|
+
themes?: Record<string, import("shiki/themes").BundledTheme | ShikiTheme> | undefined;
|
|
1475
1482
|
wrap?: boolean | null | undefined;
|
|
1476
|
-
transformers?:
|
|
1483
|
+
transformers?: ShikiTransformer[] | undefined;
|
|
1477
1484
|
} | undefined;
|
|
1478
1485
|
remarkPlugins?: (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[] | undefined;
|
|
1479
1486
|
rehypePlugins?: (string | [string, any] | RehypePlugin | [RehypePlugin, any])[] | undefined;
|
|
1480
|
-
remarkRehype?:
|
|
1487
|
+
remarkRehype?: RemarkRehype | undefined;
|
|
1481
1488
|
gfm?: boolean | undefined;
|
|
1482
1489
|
smartypants?: boolean | undefined;
|
|
1483
1490
|
} | undefined;
|
|
@@ -1584,15 +1591,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
|
|
|
1584
1591
|
markdown: {
|
|
1585
1592
|
syntaxHighlight: false | "shiki" | "prism";
|
|
1586
1593
|
shikiConfig: {
|
|
1587
|
-
langs:
|
|
1588
|
-
theme: (
|
|
1589
|
-
themes: Record<string,
|
|
1594
|
+
langs: ShikiLang[];
|
|
1595
|
+
theme: (import("shiki/themes").BundledTheme | ShikiTheme) & (import("shiki/themes").BundledTheme | ShikiTheme | undefined);
|
|
1596
|
+
themes: Record<string, import("shiki/themes").BundledTheme | ShikiTheme>;
|
|
1590
1597
|
wrap: boolean | null;
|
|
1591
|
-
transformers:
|
|
1598
|
+
transformers: ShikiTransformer[];
|
|
1592
1599
|
};
|
|
1593
1600
|
remarkPlugins: (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[];
|
|
1594
1601
|
rehypePlugins: (string | [string, any] | RehypePlugin | [RehypePlugin, any])[];
|
|
1595
|
-
remarkRehype:
|
|
1602
|
+
remarkRehype: RemarkRehype;
|
|
1596
1603
|
gfm: boolean;
|
|
1597
1604
|
smartypants: boolean;
|
|
1598
1605
|
};
|
|
@@ -1670,15 +1677,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
|
|
|
1670
1677
|
markdown?: {
|
|
1671
1678
|
syntaxHighlight?: false | "shiki" | "prism" | undefined;
|
|
1672
1679
|
shikiConfig?: {
|
|
1673
|
-
langs?:
|
|
1674
|
-
theme?:
|
|
1675
|
-
themes?: Record<string,
|
|
1680
|
+
langs?: ShikiLang[] | undefined;
|
|
1681
|
+
theme?: import("shiki/themes").BundledTheme | ShikiTheme | undefined;
|
|
1682
|
+
themes?: Record<string, import("shiki/themes").BundledTheme | ShikiTheme> | undefined;
|
|
1676
1683
|
wrap?: boolean | null | undefined;
|
|
1677
|
-
transformers?:
|
|
1684
|
+
transformers?: ShikiTransformer[] | undefined;
|
|
1678
1685
|
} | undefined;
|
|
1679
1686
|
remarkPlugins?: (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[] | undefined;
|
|
1680
1687
|
rehypePlugins?: (string | [string, any] | RehypePlugin | [RehypePlugin, any])[] | undefined;
|
|
1681
|
-
remarkRehype?:
|
|
1688
|
+
remarkRehype?: RemarkRehype | undefined;
|
|
1682
1689
|
gfm?: boolean | undefined;
|
|
1683
1690
|
smartypants?: boolean | undefined;
|
|
1684
1691
|
} | undefined;
|
|
@@ -4,8 +4,6 @@ import path from "node:path";
|
|
|
4
4
|
import { pathToFileURL } from "node:url";
|
|
5
5
|
import { z } from "zod";
|
|
6
6
|
import { appendForwardSlash, prependForwardSlash, removeTrailingForwardSlash } from "../path.js";
|
|
7
|
-
import "@shikijs/core";
|
|
8
|
-
import "mdast-util-to-hast";
|
|
9
7
|
const ASTRO_CONFIG_DEFAULTS = {
|
|
10
8
|
root: ".",
|
|
11
9
|
srcDir: "./src",
|
|
@@ -200,7 +198,7 @@ const AstroConfigSchema = z.object({
|
|
|
200
198
|
z.custom((data) => typeof data === "function"),
|
|
201
199
|
z.tuple([z.custom((data) => typeof data === "function"), z.any()])
|
|
202
200
|
]).array().default(ASTRO_CONFIG_DEFAULTS.markdown.rehypePlugins),
|
|
203
|
-
remarkRehype: z.custom((data) => data instanceof Object && !Array.isArray(data)).
|
|
201
|
+
remarkRehype: z.custom((data) => data instanceof Object && !Array.isArray(data)).default(ASTRO_CONFIG_DEFAULTS.markdown.remarkRehype),
|
|
204
202
|
gfm: z.boolean().default(ASTRO_CONFIG_DEFAULTS.markdown.gfm),
|
|
205
203
|
smartypants: z.boolean().default(ASTRO_CONFIG_DEFAULTS.markdown.smartypants)
|
|
206
204
|
}).default({}),
|
|
@@ -238,7 +236,7 @@ const AstroConfigSchema = z.object({
|
|
|
238
236
|
)
|
|
239
237
|
}).optional().superRefine((i18n, ctx) => {
|
|
240
238
|
if (i18n) {
|
|
241
|
-
const { defaultLocale, locales: _locales, fallback, domains
|
|
239
|
+
const { defaultLocale, locales: _locales, fallback, domains } = i18n;
|
|
242
240
|
const locales = _locales.map((locale) => {
|
|
243
241
|
if (typeof locale === "string") {
|
|
244
242
|
return locale;
|
package/dist/core/constants.js
CHANGED
package/dist/core/dev/dev.js
CHANGED
|
@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
|
|
|
23
23
|
base: restart.container.settings.config.base
|
|
24
24
|
})
|
|
25
25
|
);
|
|
26
|
-
const currentVersion = "4.5.
|
|
26
|
+
const currentVersion = "4.5.3";
|
|
27
27
|
if (currentVersion.includes("-")) {
|
|
28
28
|
logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
|
|
29
29
|
}
|
package/dist/core/messages.js
CHANGED
|
@@ -36,7 +36,7 @@ function serverStart({
|
|
|
36
36
|
host,
|
|
37
37
|
base
|
|
38
38
|
}) {
|
|
39
|
-
const version = "4.5.
|
|
39
|
+
const version = "4.5.3";
|
|
40
40
|
const localPrefix = `${dim("\u2503")} Local `;
|
|
41
41
|
const networkPrefix = `${dim("\u2503")} Network `;
|
|
42
42
|
const emptyPrefix = " ".repeat(11);
|
|
@@ -261,7 +261,7 @@ function printHelp({
|
|
|
261
261
|
message.push(
|
|
262
262
|
linebreak(),
|
|
263
263
|
` ${bgGreen(black(` ${commandName} `))} ${green(
|
|
264
|
-
`v${"4.5.
|
|
264
|
+
`v${"4.5.3"}`
|
|
265
265
|
)} ${headline}`
|
|
266
266
|
);
|
|
267
267
|
}
|
|
@@ -5,7 +5,7 @@ async function renderRedirect(renderContext) {
|
|
|
5
5
|
} = renderContext;
|
|
6
6
|
const { redirect, redirectRoute } = routeData;
|
|
7
7
|
const status = redirectRoute && typeof redirect === "object" ? redirect.status : method === "GET" ? 301 : 308;
|
|
8
|
-
const headers = { location: redirectRouteGenerate(renderContext) };
|
|
8
|
+
const headers = { location: encodeURI(redirectRouteGenerate(renderContext)) };
|
|
9
9
|
return new Response(null, { status, headers });
|
|
10
10
|
}
|
|
11
11
|
function redirectRouteGenerate(renderContext) {
|
|
@@ -70,6 +70,9 @@ Make sure to use the static attribute syntax (\`${key}={value}\`) instead of the
|
|
|
70
70
|
if (key === "className") {
|
|
71
71
|
return markHTMLString(` class="${toAttributeString(value, shouldEscape)}"`);
|
|
72
72
|
}
|
|
73
|
+
if (typeof value === "string" && value.includes("&") && urlCanParse(value)) {
|
|
74
|
+
return markHTMLString(` ${key}="${toAttributeString(value, false)}"`);
|
|
75
|
+
}
|
|
73
76
|
if (value === true && (key.startsWith("data-") || htmlBooleanAttributes.test(key))) {
|
|
74
77
|
return markHTMLString(` ${key}`);
|
|
75
78
|
} else {
|
|
@@ -131,6 +134,14 @@ function promiseWithResolvers() {
|
|
|
131
134
|
reject
|
|
132
135
|
};
|
|
133
136
|
}
|
|
137
|
+
function urlCanParse(url) {
|
|
138
|
+
try {
|
|
139
|
+
new URL(url);
|
|
140
|
+
return true;
|
|
141
|
+
} catch {
|
|
142
|
+
return false;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
134
145
|
export {
|
|
135
146
|
addAttribute,
|
|
136
147
|
defineScriptVars,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "astro",
|
|
3
|
-
"version": "4.5.
|
|
3
|
+
"version": "4.5.3",
|
|
4
4
|
"description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"author": "withastro",
|
|
@@ -109,7 +109,6 @@
|
|
|
109
109
|
"@babel/plugin-transform-react-jsx": "^7.22.5",
|
|
110
110
|
"@babel/traverse": "^7.23.3",
|
|
111
111
|
"@babel/types": "^7.23.3",
|
|
112
|
-
"@shikijs/core": "^1.1.2",
|
|
113
112
|
"@types/babel__core": "^7.20.4",
|
|
114
113
|
"acorn": "^8.11.2",
|
|
115
114
|
"aria-query": "^5.3.0",
|
|
@@ -140,7 +139,6 @@
|
|
|
140
139
|
"js-yaml": "^4.1.0",
|
|
141
140
|
"kleur": "^4.1.4",
|
|
142
141
|
"magic-string": "^0.30.3",
|
|
143
|
-
"mdast-util-to-hast": "13.0.2",
|
|
144
142
|
"mime": "^3.0.0",
|
|
145
143
|
"ora": "^7.0.1",
|
|
146
144
|
"p-limit": "^5.0.0",
|
|
@@ -163,15 +161,15 @@
|
|
|
163
161
|
"yargs-parser": "^21.1.1",
|
|
164
162
|
"zod": "^3.22.4",
|
|
165
163
|
"zod-to-json-schema": "^3.22.4",
|
|
166
|
-
"@astrojs/markdown-remark": "4.3.0",
|
|
167
164
|
"@astrojs/internal-helpers": "0.3.0",
|
|
165
|
+
"@astrojs/markdown-remark": "4.3.0",
|
|
168
166
|
"@astrojs/telemetry": "3.0.4"
|
|
169
167
|
},
|
|
170
168
|
"optionalDependencies": {
|
|
171
169
|
"sharp": "^0.32.6"
|
|
172
170
|
},
|
|
173
171
|
"devDependencies": {
|
|
174
|
-
"@astrojs/check": "^0.
|
|
172
|
+
"@astrojs/check": "^0.5.8",
|
|
175
173
|
"@playwright/test": "1.40.0",
|
|
176
174
|
"@types/aria-query": "^5.0.4",
|
|
177
175
|
"@types/babel__generator": "^7.6.7",
|