dep update + HP content fixes

.astro/types.d.ts

@@ -1,7 +1,64 @@
+declare module 'astro:content' {
+	interface Render {
+		'.mdx': Promise<{
+			Content: import('astro').MarkdownInstance<{}>['Content'];
+			headings: import('astro').MarkdownHeading[];
+			remarkPluginFrontmatter: Record<string, any>;
+		}>;
+	}
+}
+
+declare module 'astro:content' {
+	interface Render {
+		'.md': Promise<{
+			Content: import('astro').MarkdownInstance<{}>['Content'];
+			headings: import('astro').MarkdownHeading[];
+			remarkPluginFrontmatter: Record<string, any>;
+		}>;
+	}
+}
+
 declare module 'astro:content' {
 	export { z } from 'astro/zod';
 	export type CollectionEntry<C extends keyof typeof entryMap> =
-		(typeof entryMap)[C][keyof (typeof entryMap)[C]] & Render;
+		(typeof entryMap)[C][keyof (typeof entryMap)[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;
+		width: import('astro/zod').ZodNumber;
+		height: import('astro/zod').ZodNumber;
+		format: import('astro/zod').ZodUnion<
+			[
+				import('astro/zod').ZodLiteral<'png'>,
+				import('astro/zod').ZodLiteral<'jpg'>,
+				import('astro/zod').ZodLiteral<'jpeg'>,
+				import('astro/zod').ZodLiteral<'tiff'>,
+				import('astro/zod').ZodLiteral<'webp'>,
+				import('astro/zod').ZodLiteral<'gif'>,
+				import('astro/zod').ZodLiteral<'svg'>
+			]
+		>;
+	}>;
 
 	type BaseSchemaWithoutEffects =
 		| import('astro/zod').AnyZodObject
@@ -16,15 +73,10 @@ declare module 'astro:content' {
 		| BaseSchemaWithoutEffects
 		| import('astro/zod').ZodEffects<BaseSchemaWithoutEffects>;
 
+	export type SchemaContext = { image: ImageFunction };
+
 	type BaseCollectionConfig<S extends BaseSchema> = {
-		schema?: S;
+		schema?: S | ((context: SchemaContext) => S);
-		slug?: (entry: {
-			id: CollectionEntry<keyof typeof entryMap>['id'];
-			defaultSlug: string;
-			collection: string;
-			body: string;
-			data: import('astro/zod').infer<S>;
-		}) => string | Promise<string>;
 	};
 	export function defineCollection<S extends BaseSchema>(
 		input: BaseCollectionConfig<S>
@@ -53,18 +105,11 @@ declare module 'astro:content' {
 		filter?: (entry: CollectionEntry<C>) => unknown
 	): Promise<CollectionEntry<C>[]>;
 
+	type ReturnTypeOrOriginal<T> = T extends (...args: any[]) => infer R ? R : T;
 	type InferEntrySchema<C extends keyof typeof entryMap> = import('astro/zod').infer<
-		Required<ContentConfig['collections'][C]>['schema']
+		ReturnTypeOrOriginal<Required<ContentConfig['collections'][C]>['schema']>
 	>;
 
-	type Render = {
-		render(): Promise<{
-			Content: import('astro').MarkdownInstance<{}>['Content'];
-			headings: import('astro').MarkdownHeading[];
-			remarkPluginFrontmatter: Record<string, any>;
-		}>;
-	};
-
 	const entryMap: {
 		"articles": {
 "en/2022.md": {
@@ -73,112 +118,112 @@ declare module 'astro:content' {
   body: string,
   collection: "articles",
   data: InferEntrySchema<"articles">
-},
+} & { render(): Render[".md"] },
 "en/2023.md": {
   id: "en/2023.md",
   slug: "2023",
   body: string,
   collection: "articles",
   data: InferEntrySchema<"articles">
-},
+} & { render(): Render[".md"] },
 "en/after-effects-expressions.mdx": {
   id: "en/after-effects-expressions.mdx",
   slug: "after-effects-expressions",
   body: string,
   collection: "articles",
   data: InferEntrySchema<"articles">
-},
+} & { render(): Render[".mdx"] },
 "en/faq.md": {
   id: "en/faq.md",
   slug: "faq",
   body: string,
   collection: "articles",
   data: InferEntrySchema<"articles">
-},
+} & { render(): Render[".md"] },
 "en/gratuiste.md": {
   id: "en/gratuiste.md",
   slug: "gratuiste",
   body: string,
   collection: "articles",
   data: InferEntrySchema<"articles">
-},
+} & { render(): Render[".md"] },
 "en/sci-hub-blocage.mdx": {
   id: "en/sci-hub-blocage.mdx",
   slug: "sci-hub-unblock",
   body: string,
   collection: "articles",
   data: InferEntrySchema<"articles">
-},
+} & { render(): Render[".mdx"] },
 "en/the-day-I-jamd.mdx": {
   id: "en/the-day-I-jamd.mdx",
   slug: "the-day-I-jamd",
   body: string,
   collection: "articles",
   data: InferEntrySchema<"articles">
-},
+} & { render(): Render[".mdx"] },
 "en/video-compression.mdx": {
   id: "en/video-compression.mdx",
   slug: "video-compression",
   body: string,
   collection: "articles",
   data: InferEntrySchema<"articles">
-},
+} & { render(): Render[".mdx"] },
 "fr/2022.md": {
   id: "fr/2022.md",
   slug: "2022",
   body: string,
   collection: "articles",
   data: InferEntrySchema<"articles">
-},
+} & { render(): Render[".md"] },
 "fr/2023.md": {
   id: "fr/2023.md",
   slug: "2023",
   body: string,
   collection: "articles",
   data: InferEntrySchema<"articles">
-},
+} & { render(): Render[".md"] },
 "fr/after-effects-expressions.md": {
   id: "fr/after-effects-expressions.md",
   slug: "after-effects-expressions",
   body: string,
   collection: "articles",
   data: InferEntrySchema<"articles">
-},
+} & { render(): Render[".md"] },
 "fr/faq.md": {
   id: "fr/faq.md",
   slug: "faq",
   body: string,
   collection: "articles",
   data: InferEntrySchema<"articles">
-},
+} & { render(): Render[".md"] },
 "fr/gratuiste.md": {
   id: "fr/gratuiste.md",
   slug: "gratuiste",
   body: string,
   collection: "articles",
   data: InferEntrySchema<"articles">
-},
+} & { render(): Render[".md"] },
 "fr/sci-hub-blocage.mdx": {
   id: "fr/sci-hub-blocage.mdx",
   slug: "sci-hub-blocage",
   body: string,
   collection: "articles",
   data: InferEntrySchema<"articles">
-},
+} & { render(): Render[".mdx"] },
 "fr/the-day-I-jamd.mdx": {
   id: "fr/the-day-I-jamd.mdx",
   slug: "the-day-I-jamd",
   body: string,
   collection: "articles",
   data: InferEntrySchema<"articles">
-},
+} & { render(): Render[".mdx"] },
 "fr/video-compression.md": {
   id: "fr/video-compression.md",
   slug: "video-compression",
   body: string,
   collection: "articles",
   data: InferEntrySchema<"articles">
-},
+} & { render(): Render[".md"] },
 },
 "fragments": {
 "en/acme-sh-tls-cert.md": {
@@ -187,98 +232,98 @@ declare module 'astro:content' {
   body: string,
   collection: "fragments",
   data: InferEntrySchema<"fragments">
-},
+} & { render(): Render[".md"] },
 "en/array-vs-array.md": {
   id: "en/array-vs-array.md",
   slug: "array-vs-array",
   body: string,
   collection: "fragments",
   data: InferEntrySchema<"fragments">
-},
+} & { render(): Render[".md"] },
 "en/buttons.md": {
   id: "en/buttons.md",
   slug: "buttons",
   body: string,
   collection: "fragments",
   data: InferEntrySchema<"fragments">
-},
+} & { render(): Render[".md"] },
 "en/image-full.mdx": {
   id: "en/image-full.mdx",
   slug: "image-full",
   body: string,
   collection: "fragments",
   data: InferEntrySchema<"fragments">
-},
+} & { render(): Render[".mdx"] },
 "en/nuxt-graphql-static.md": {
   id: "en/nuxt-graphql-static.md",
   slug: "nuxt-graphql-static",
   body: string,
   collection: "fragments",
   data: InferEntrySchema<"fragments">
-},
+} & { render(): Render[".md"] },
 "en/super-cookies.md": {
   id: "en/super-cookies.md",
   slug: "super-cookies",
   body: string,
   collection: "fragments",
   data: InferEntrySchema<"fragments">
-},
+} & { render(): Render[".md"] },
 "en/toulouse-fun.md": {
   id: "en/toulouse-fun.md",
   slug: "toulouse-fun",
   body: string,
   collection: "fragments",
   data: InferEntrySchema<"fragments">
-},
+} & { render(): Render[".md"] },
 "fr/acme-sh-tls-cert.md": {
   id: "fr/acme-sh-tls-cert.md",
   slug: "acme-sh-tls-cert",
   body: string,
   collection: "fragments",
   data: InferEntrySchema<"fragments">
-},
+} & { render(): Render[".md"] },
 "fr/array-vs-array.md": {
   id: "fr/array-vs-array.md",
   slug: "array-vs-array",
   body: string,
   collection: "fragments",
   data: InferEntrySchema<"fragments">
-},
+} & { render(): Render[".md"] },
 "fr/buttons.mdx": {
   id: "fr/buttons.mdx",
   slug: "buttons",
   body: string,
   collection: "fragments",
   data: InferEntrySchema<"fragments">
-},
+} & { render(): Render[".mdx"] },
 "fr/image-full.mdx": {
   id: "fr/image-full.mdx",
   slug: "image-full",
   body: string,
   collection: "fragments",
   data: InferEntrySchema<"fragments">
-},
+} & { render(): Render[".mdx"] },
 "fr/nuxt-graphql-static.md": {
   id: "fr/nuxt-graphql-static.md",
   slug: "nuxt-graphql-static",
   body: string,
   collection: "fragments",
   data: InferEntrySchema<"fragments">
-},
+} & { render(): Render[".md"] },
 "fr/super-cookies.mdx": {
   id: "fr/super-cookies.mdx",
   slug: "super-cookies",
   body: string,
   collection: "fragments",
   data: InferEntrySchema<"fragments">
-},
+} & { render(): Render[".mdx"] },
 "fr/toulouse-fun.md": {
   id: "fr/toulouse-fun.md",
   slug: "toulouse-fun",
   body: string,
   collection: "fragments",
   data: InferEntrySchema<"fragments">
-},
+} & { render(): Render[".md"] },
 },
 
 	};

package.json

@@ -13,11 +13,11 @@
 		"i18n:sync": "astro-i18n sync"
 	},
 	"dependencies": {
-		"@astrojs/image": "^0.14.0",
+		"@astrojs/image": "^0.16.6",
-		"@astrojs/mdx": "^0.16.0",
+		"@astrojs/mdx": "^0.19.0",
-		"@astrojs/sitemap": "^1.0.1",
+		"@astrojs/sitemap": "^1.2.2",
-		"astro": "2.0.6",
+		"astro": "2.3.0",
-		"astro-i18n": "^1.6.4"
+		"astro-i18n": "^1.6.9"
 	},
 	"devDependencies": {
 		"autoprefixer": "^10.4.13",

src/data/HP/en/01-offre.md

@@ -16,15 +16,14 @@ quickImage: /assets/images/home/icon-desktop.svg
 
 Whether it's a creation or a redesign, I can handle everything:
 
-- graphic design,
+- custom development;
-- custom development,
+- configuration of a content management system (if needed);
-- configuration of a content management system (if needed),
+- hosting and deploying;
-- hosting and deploying
+- maintenance.
-- maintenance
 
 ### Bigger websites, e-commerce.
 
 When the project is larger, I call on talented partners who share the same values:
 
-- [Rose Primaire](https://roseprimaire.com/) for the monitoring and management of the project,
+- [Rose Primaire](https://roseprimaire.com/) for the monitoring and management of the project;
-- [Sylvain Plantier](https://jedessinebien.com/) and/or [Benoît Etchevery](http://ben-etche.com/) for illustration and art direction
+- [Sylvain Plantier](https://jedessinebien.com/) and/or [Benoît Etchevery](http://ben-etche.com/) for illustration and art direction.

src/data/HP/en/02-methodo.md

@@ -23,9 +23,9 @@ It means that the website is designed to only include the necessary functionalit
 
 This methodology has **many advantages:**
 
-- great performances
+- great performances;
-- enhanced security
+- enhanced security;
-- reduced costs
+- reduced costs;
-- easier maintenance
+- easier maintenance.
 
 When the project requires it, I set up a content management system (CMS) decoupled from the interface. This ensures that **the website stays online** even if the CMS stops working.

src/data/HP/en/03-about.md

@@ -12,12 +12,16 @@ quickImage: /assets/images/home/icon-heart.svg
 
 ## About.
 
-### Trainings and certifications.
+### Trainings myself.
 
 In order to strengthen my skills, I have completed the following training and certifications:
 
-- [Opquast](https://directory.opquast.com/en/certificat/CTQSKP/) - Mastering Web Quality Assurance
+- [Opquast](https://directory.opquast.com/en/certificat/CTQSKP/) - Mastering Web Quality Assurance;
-- [Access42](https://certification.access42.pro/) - Developing and coding accessible websites (cert number: 696fa2e0-cc67-11ec-88d2-9dabf3f992d4)
+- Access42 - Developing and coding accessible websites (cert number: 696fa2e0-cc67-11ec-88d2-9dabf3f992d4).
+
+### Trainings others.
+
+For several years, I have been teaching web development courses on various campuses.
 
 ### Free time.
 

src/data/HP/fr/01-offre.md

@@ -16,15 +16,14 @@ quickImage: /assets/images/home/icon-desktop.svg
 
 Qu'il s'agisse d'une création ou d'une refonte, je m'occupe de tout :
 
-- propositions graphiques,
+- développement sur-mesure ;
-- développement sur-mesure,
+- configuration d'un outil de gestion des contenus (si pertinent) ;
-- configuration d'un outil de gestion des contenus (si pertinent),
+- hébergement et mise en ligne ;
-- hébergement et mise en ligne
+- maintenance.
-- maintenance
 
 ### Plus gros site, e-commerce.
 
 Lorsque le projet est plus volumineux, je fais appel à des partenaires talentueux partageant les mêmes valeurs :
 
-- [Rose Primaire](https://roseprimaire.com/) pour le conseil et l'accompagnement du projet,
+- [Rose Primaire](https://roseprimaire.com/) pour le conseil et l'accompagnement du projet ;
-- [Sylvain Plantier](https://jedessinebien.com/) et/ou [Benoît Etchevery](http://ben-etche.com/) pour l'illustration et la direction artistique
+- [Sylvain Plantier](https://jedessinebien.com/) et/ou [Benoît Etchevery](http://ben-etche.com/) pour l'illustration et la direction artistique.

src/data/HP/fr/02-methodo.md

@@ -23,9 +23,9 @@ C'est-à-dire que le site est pensé pour n'embarquer que les fonctionnalités n
 
 Cette approche présente de **nombreux avantages :**
 
-- chargement rapide des pages
+- chargement rapide des pages ;
-- sécurité renforcée
+- sécurité renforcée ;
-- coûts serveur réduits
+- coûts serveur réduits ;
-- maintenance facilitée
+- maintenance facilitée.
 
 Lorsque le projet le demande, je mets en place un outil de gestion des contenus (CMS) découplé de l'interface. Cela permet de garantir que **le site reste en ligne** même si le CMS venait à ne plus fonctionner.

src/data/HP/fr/03-about.md

@@ -12,12 +12,16 @@ quickImage: /assets/images/home/icon-heart.svg
 
 ## À propos.
 
-### Formations et certifications.
+### Formations personnelles.
 
 Afin de solidifier mes compétences, j'ai suivi les formations et passé les certifications suivantes :
 
-- [Opquast](https://directory.opquast.com/fr/certificat/CTQSKP/) - Maîtrise de la qualité en projet web
+- [Opquast](https://directory.opquast.com/fr/certificat/CTQSKP/) - Maîtrise de la qualité en projet web ;
-- [Access42](https://certification.access42.pro/) - Développer et coder des sites accessibles (certificat numéro : 696fa2e0-cc67-11ec-88d2-9dabf3f992d4)
+- Access42 - Développer et coder des sites accessibles (certificat numéro : 696fa2e0-cc67-11ec-88d2-9dabf3f992d4).
+
+### Formations des autres.
+
+Depuis plusieurs années, j'interviens dans différents campus afin de dispenser des cours de développement web.
 
 ### Temps libre.