Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pulling refs/heads/patch-audiocraft-2023 into Dev #790

Merged
merged 2 commits into from
Sep 4, 2023
Merged

Pulling refs/heads/patch-audiocraft-2023 into Dev #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b241fe4
Major Updates
h0lybyte Aug 30, 2023
dd66728
Minor Updates
h0lybyte Sep 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 48 additions & 25 deletions .astro/types.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,6 @@ declare module 'astro:content' {
type Flatten<T> = T extends { [K: string]: infer U } ? U : never;
export type CollectionEntry<C extends keyof AnyEntryMap> = Flatten<AnyEntryMap[C]>;

// TODO: Remove this when having this fallback is no longer relevant. 2.3? 3.0? - erika, 2023-04-04
/**
* @deprecated
* `astro:content` no longer provide `image()`.
*
* Please use it through `schema`, like such:
* ```ts
* import { defineCollection, z } from "astro:content";
*
* defineCollection({
* schema: ({ image }) =>
* z.object({
* image: image(),
* }),
* });
* ```
*/
export const image: never;

// This needs to be in sync with ImageMetadata
export type ImageFunction = () => import('astro/zod').ZodObject<{
src: import('astro/zod').ZodString;
Expand All @@ -56,7 +37,7 @@ declare module 'astro:content' {
import('astro/zod').ZodLiteral<'tiff'>,
import('astro/zod').ZodLiteral<'webp'>,
import('astro/zod').ZodLiteral<'gif'>,
import('astro/zod').ZodLiteral<'svg'>
import('astro/zod').ZodLiteral<'svg'>,
]
>;
}>;
Expand Down Expand Up @@ -96,7 +77,7 @@ declare module 'astro:content' {

export function getEntryBySlug<
C extends keyof ContentEntryMap,
E extends ValidContentEntrySlug<C> | (string & {})
E extends ValidContentEntrySlug<C> | (string & {}),
>(
collection: C,
// Note that this has to accept a regular string too, for SSR
Expand All @@ -121,7 +102,7 @@ declare module 'astro:content' {

export function getEntry<
C extends keyof ContentEntryMap,
E extends ValidContentEntrySlug<C> | (string & {})
E extends ValidContentEntrySlug<C> | (string & {}),
>(entry: {
collection: C;
slug: E;
Expand All @@ -130,7 +111,7 @@ declare module 'astro:content' {
: Promise<CollectionEntry<C> | undefined>;
export function getEntry<
C extends keyof DataEntryMap,
E extends keyof DataEntryMap[C] | (string & {})
E extends keyof DataEntryMap[C] | (string & {}),
>(entry: {
collection: C;
id: E;
Expand All @@ -139,7 +120,7 @@ declare module 'astro:content' {
: Promise<CollectionEntry<C> | undefined>;
export function getEntry<
C extends keyof ContentEntryMap,
E extends ValidContentEntrySlug<C> | (string & {})
E extends ValidContentEntrySlug<C> | (string & {}),
>(
collection: C,
slug: E
Expand All @@ -148,7 +129,7 @@ declare module 'astro:content' {
: Promise<CollectionEntry<C> | undefined>;
export function getEntry<
C extends keyof DataEntryMap,
E extends keyof DataEntryMap[C] | (string & {})
E extends keyof DataEntryMap[C] | (string & {}),
>(
collection: C,
id: E
Expand Down Expand Up @@ -1535,6 +1516,41 @@ declare module 'astro:content' {
collection: "journal";
data: InferEntrySchema<"journal">
} & { render(): Render[".md"] };
"08-29.md": {
id: "08-29.md";
slug: "08-29";
body: string;
collection: "journal";
data: InferEntrySchema<"journal">
} & { render(): Render[".md"] };
"08-30.md": {
id: "08-30.md";
slug: "08-30";
body: string;
collection: "journal";
data: InferEntrySchema<"journal">
} & { render(): Render[".md"] };
"08-31.md": {
id: "08-31.md";
slug: "08-31";
body: string;
collection: "journal";
data: InferEntrySchema<"journal">
} & { render(): Render[".md"] };
"09-01.md": {
id: "09-01.md";
slug: "09-01";
body: string;
collection: "journal";
data: InferEntrySchema<"journal">
} & { render(): Render[".md"] };
"09-02.md": {
id: "09-02.md";
slug: "09-02";
body: string;
collection: "journal";
data: InferEntrySchema<"journal">
} & { render(): Render[".md"] };
"asset.mdx": {
id: "asset.mdx";
slug: "asset";
Expand Down Expand Up @@ -1817,6 +1833,13 @@ declare module 'astro:content' {
collection: "project";
data: any
} & { render(): Render[".mdx"] };
"lofifocus.mdx": {
id: "lofifocus.mdx";
slug: "lofifocus";
body: string;
collection: "project";
data: any
} & { render(): Render[".mdx"] };
"rareicon.mdx": {
id: "rareicon.mdx";
slug: "rareicon";
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/auto_pull_dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: Release

on:
workflow_dispatch:
# Branches
push:
branches: ["dev*"]

jobs:
pull-request:
Expand Down
Loading