summaryrefslogtreecommitdiff
path: root/packages/markdown/remark/src
diff options
context:
space:
mode:
Diffstat (limited to 'packages/markdown/remark/src')
-rw-r--r--packages/markdown/remark/src/load-plugins.ts15
-rw-r--r--packages/markdown/remark/src/types.ts3
2 files changed, 9 insertions, 9 deletions
diff --git a/packages/markdown/remark/src/load-plugins.ts b/packages/markdown/remark/src/load-plugins.ts
index b1e72ae36..139eeaf19 100644
--- a/packages/markdown/remark/src/load-plugins.ts
+++ b/packages/markdown/remark/src/load-plugins.ts
@@ -1,26 +1,27 @@
import * as unified from 'unified';
-import type { Plugin, UnifiedPluginImport } from './types';
+import type { Plugin } from './types';
-async function importPlugin(p: string | UnifiedPluginImport): UnifiedPluginImport {
+async function importPlugin(p: string | unified.Plugin): Promise<unified.Plugin> {
if (typeof p === 'string') {
- return await import(p);
+ const importResult = await import(p);
+ return importResult.default;
}
- return await p;
+ return p;
}
-export function loadPlugins(items: Plugin[]): Promise<[unified.Plugin] | [unified.Plugin, any]>[] {
+export function loadPlugins(items: Plugin[]): Promise<[unified.Plugin, any?]>[] {
return items.map((p) => {
return new Promise((resolve, reject) => {
if (Array.isArray(p)) {
const [plugin, opts] = p;
return importPlugin(plugin)
- .then((m) => resolve([m.default, opts]))
+ .then((m) => resolve([m, opts]))
.catch((e) => reject(e));
}
return importPlugin(p)
- .then((m) => resolve([m.default]))
+ .then((m) => resolve([m]))
.catch((e) => reject(e));
});
});
diff --git a/packages/markdown/remark/src/types.ts b/packages/markdown/remark/src/types.ts
index 043594c9c..94c3e78a3 100644
--- a/packages/markdown/remark/src/types.ts
+++ b/packages/markdown/remark/src/types.ts
@@ -1,8 +1,7 @@
import type * as unified from 'unified';
import type * as shiki from 'shiki';
-export type UnifiedPluginImport = Promise<{ default: unified.Plugin }>;
-export type Plugin = string | [string, any] | UnifiedPluginImport | [UnifiedPluginImport, any];
+export type Plugin = string | [string, any] | unified.Plugin | [unified.Plugin, any];
export interface AstroMarkdownOptions {
mode?: 'md' | 'mdx';