From 9ff4d7900267269f01b9b568fc81df869c373566 Mon Sep 17 00:00:00 2001 From: Vladimir Sheremet Date: Thu, 15 Aug 2024 18:36:37 +0200 Subject: [PATCH] chore: cleanup --- packages/browser/src/node/rpc.ts | 10 ---------- packages/browser/src/node/types.ts | 3 +-- packages/mocker/src/node/esmWalker.ts | 2 +- packages/mocker/src/node/hoistMocksPlugin.ts | 9 +-------- 4 files changed, 3 insertions(+), 21 deletions(-) diff --git a/packages/browser/src/node/rpc.ts b/packages/browser/src/node/rpc.ts index 6de683a24f97..219b9bd22f43 100644 --- a/packages/browser/src/node/rpc.ts +++ b/packages/browser/src/node/rpc.ts @@ -61,16 +61,6 @@ export function setupBrowserRpc(server: BrowserServer) { } } - function invalidateModuleById(id: string) { - const moduleGraph = server.vite.moduleGraph - const module = moduleGraph.getModuleById(id) - if (module) { - moduleGraph.invalidateModule(module, new Set(), Date.now(), true) - return true - } - return false - } - function setupClient(sessionId: string, ws: WebSocket) { const mockResolver = new ServerMockResolver(server.vite, { moduleDirectories: project.config.server?.deps?.moduleDirectories, diff --git a/packages/browser/src/node/types.ts b/packages/browser/src/node/types.ts index 0bd615bbf0d9..91ed6c8c605d 100644 --- a/packages/browser/src/node/types.ts +++ b/packages/browser/src/node/types.ts @@ -1,7 +1,6 @@ import type { ServerIdResolution, ServerMockResolution } from '@vitest/mocker/node' import type { BirpcReturn } from 'birpc' -import type { AfterSuiteRunMeta, CancelReason, RunnerTestFile, SnapshotResult, TaskResultPack, UserConsoleLog } from 'vitest' -import type { Reporter } from 'vitest/reporters' +import type { AfterSuiteRunMeta, CancelReason, Reporter, RunnerTestFile, SnapshotResult, TaskResultPack, UserConsoleLog } from 'vitest' export interface WebSocketBrowserHandlers { resolveSnapshotPath: (testPath: string) => string diff --git a/packages/mocker/src/node/esmWalker.ts b/packages/mocker/src/node/esmWalker.ts index 5db0faee4e00..7a5e4d29d1b6 100644 --- a/packages/mocker/src/node/esmWalker.ts +++ b/packages/mocker/src/node/esmWalker.ts @@ -116,7 +116,7 @@ export function esmWalker( } } - eswalk(root, { + eswalk(root as Node, { enter(node, parent) { if (node.type === 'ImportDeclaration') { return this.skip() diff --git a/packages/mocker/src/node/hoistMocksPlugin.ts b/packages/mocker/src/node/hoistMocksPlugin.ts index 6d401d8b58fc..bdf2ace2f22d 100644 --- a/packages/mocker/src/node/hoistMocksPlugin.ts +++ b/packages/mocker/src/node/hoistMocksPlugin.ts @@ -10,11 +10,11 @@ import type { ImportDeclaration, ImportExpression, VariableDeclaration, - Node as _Node, } from 'estree' import { findNodeAround } from 'acorn-walk' import type { Plugin, Rollup } from 'vite' import { createFilter } from 'vite' +import type { Node, Positioned } from './esmWalker' import { esmWalker } from './esmWalker' export interface HoistMocksPluginOptions { @@ -64,13 +64,6 @@ export function hoistMocksPlugin(options: HoistMocksPluginOptions = {}): Plugin } } -type Positioned = T & { - start: number - end: number -} - -type Node = Positioned<_Node> - const API_NOT_FOUND_ERROR = `There are some problems in resolving the mocks API. You may encounter this issue when importing the mocks API from another module other than 'vitest'. To fix this issue you can either: