refactor: expose HookParameters type

withastro · Jun 29, 2022 · efdd022 · efdd022
1 parent 489d1b2
commit efdd022
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
@@ -923,6 +923,10 @@ export interface SSRLoadedRenderer extends AstroRenderer {
 	};
 }
 
+export type HookParameters<Hook extends keyof AstroIntegration['hooks'], Fn = AstroIntegration['hooks'][Hook]> = Fn extends (...args: any) => any
+		? Parameters<Fn>[0]
+		: never;
+
 export interface AstroIntegration {
 	/** The name of the integration. */
 	name: string;

diff --git a/packages/astro/src/integrations/index.ts b/packages/astro/src/integrations/index.ts
@@ -2,7 +2,7 @@ import type { AddressInfo } from 'net';
 import type { ViteDevServer } from 'vite';
 import {
 	AstroConfig,
-	AstroIntegration,
+	HookParameters,
 	AstroRenderer,
 	BuildConfig,
 	RouteData,
@@ -14,11 +14,6 @@ import { mergeConfig } from '../core/config.js';
 import type { ViteConfigWithSSR } from '../core/create-vite.js';
 import { isBuildingToSSR } from '../core/util.js';
 
-type Hooks<
-	Hook extends keyof AstroIntegration['hooks'],
-	Fn = AstroIntegration['hooks'][Hook]
-> = Fn extends (...args: any) => any ? Parameters<Fn>[0] : never;
-
 export async function runHookConfigSetup({
 	config: _config,
 	command,
@@ -45,7 +40,7 @@ export async function runHookConfigSetup({
 		 * ```
 		 */
 		if (integration?.hooks?.['astro:config:setup']) {
-			const hooks: Hooks<'astro:config:setup'> = {
+			const hooks: HookParameters<'astro:config:setup'> = {
 				config: updatedConfig,
 				command,
 				addRenderer(renderer: AstroRenderer) {

diff --git a/packages/integrations/mdx/src/index.ts b/packages/integrations/mdx/src/index.ts
@@ -1,23 +1,21 @@
 import type { AstroIntegration } from 'astro';
-import mdx from '@mdx-js/rollup';
+import mdxPlugin from '@mdx-js/rollup';
 
-export default function (): AstroIntegration {
+export default function mdx(): AstroIntegration {
 	return {
 			name: '@astrojs/mdx',
 			hooks: {
-				'astro:config:setup': ({ updateConfig, addPageExtension }) => {
-					const mdxPlugin = mdx({
-						jsx: true,
-						jsxImportSource: 'astro'
-					})
-
+				'astro:config:setup': ({ updateConfig, addPageExtension }: any) => {
 					addPageExtension('.mdx');
 					updateConfig({
 						vite: {
 							plugins: [
 								{ 	
 									enforce: 'pre',
-									...mdxPlugin
+									...mdxPlugin({
+										jsx: true,
+										jsxImportSource: 'astro'
+									})
 								},
 								{
 									name: '@astrojs/mdx',