feat: extract resolve options to plugin definition

modernweb-dev · Jan 18, 2023 · 33d16fc · 33d16fc
1 parent c66aa3f
commit 33d16fc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/packages/dev-server-core/src/index.ts b/packages/dev-server-core/src/index.ts
@@ -6,7 +6,7 @@ import WebSocket from 'ws';
 export { WebSocket };
 
 export { DevServer } from './server/DevServer';
-export { Plugin, ServerStartParams } from './plugins/Plugin';
+export { Plugin, ServerStartParams, ResolveOptions } from './plugins/Plugin';
 export { DevServerCoreConfig, MimeTypeMappings } from './server/DevServerCoreConfig';
 export { WebSocketsManager, WebSocketData } from './web-sockets/WebSocketsManager';
 export {

diff --git a/packages/dev-server-core/src/plugins/Plugin.ts b/packages/dev-server-core/src/plugins/Plugin.ts
@@ -26,6 +26,12 @@ export interface ServerStartParams {
   webSockets?: WebSocketsManager;
 }
 
+export interface ResolveOptions {
+  isEntry?: boolean;
+  skipSelf?: boolean;
+  [key: string]: unknown;
+}
+
 export interface Plugin {
   name: string;
   injectWebSocket?: boolean;
@@ -40,11 +46,7 @@ export interface Plugin {
     code?: string;
     column?: number;
     line?: number;
-    resolveOptions?: {
-      custom?: Record<string, unknown>;
-      isEntry?: boolean;
-      skipSelf?: boolean;
-    };
+    resolveOptions?: ResolveOptions;
   }): ResolveResult | Promise<ResolveResult>;
   resolveImportSkip?(context: Context, source: string, importer: string): void;
   transformImport?(args: {

diff --git a/packages/dev-server-rollup/src/createRollupPluginContextAdapter.ts b/packages/dev-server-rollup/src/createRollupPluginContextAdapter.ts
@@ -1,5 +1,11 @@
 import path from 'path';
-import { DevServerCoreConfig, FSWatcher, Plugin as WdsPlugin, Context } from '@web/dev-server-core';
+import {
+  DevServerCoreConfig,
+  FSWatcher,
+  Plugin as WdsPlugin,
+  Context,
+  ResolveOptions,
+} from '@web/dev-server-core';
 import {
   PluginContext,
   MinimalPluginContext,
@@ -8,11 +14,6 @@ import {
   ModuleInfo,
 } from 'rollup';
 
-interface ResolveOptions {
-  skipSelf?: boolean;
-  [key: string]: unknown;
-}
-
 export function createRollupPluginContextAdapter<
   T extends PluginContext | MinimalPluginContext | TransformPluginContext,
 >(