chore: Remove unnecssary 'Omit' types

wxt-dev · Mar 31, 2024 · db57c8e · db57c8e
1 parent 7e37e11
commit db57c8e
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 24 deletions.
diff --git a/src/core/builders/vite/plugins/bundleAnalysis.ts b/src/core/builders/vite/plugins/bundleAnalysis.ts
@@ -5,9 +5,7 @@ import path from 'node:path';
 
 let increment = 0;
 
-export function bundleAnalysis(
-  config: Omit<ResolvedConfig, 'builder'>,
-): vite.Plugin {
+export function bundleAnalysis(config: ResolvedConfig): vite.Plugin {
   return visualizer({
     template: 'raw-data',
     filename: path.resolve(

diff --git a/src/core/builders/vite/plugins/cssEntrypoints.ts b/src/core/builders/vite/plugins/cssEntrypoints.ts
@@ -14,7 +14,7 @@ import { getEntrypointBundlePath } from '~/core/utils/entrypoints';
  */
 export function cssEntrypoints(
   entrypoint: Entrypoint,
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: ResolvedConfig,
 ): vite.Plugin {
   return {
     name: 'wxt:css-entrypoint',

diff --git a/src/core/builders/vite/plugins/devHtmlPrerender.ts b/src/core/builders/vite/plugins/devHtmlPrerender.ts
@@ -12,7 +12,7 @@ let reactRefreshPreamble = '';
  * Pre-renders the HTML entrypoints when building the extension to connect to the dev server.
  */
 export function devHtmlPrerender(
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: ResolvedConfig,
   server: WxtDevServer | undefined,
 ): vite.PluginOption {
   const htmlReloadId = '@wxt/reload-html';
@@ -133,7 +133,7 @@ export function devHtmlPrerender(
 }
 
 export function pointToDevServer(
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: ResolvedConfig,
   server: WxtDevServer,
   id: string,
   document: Document,

diff --git a/src/core/builders/vite/plugins/devServerGlobals.ts b/src/core/builders/vite/plugins/devServerGlobals.ts
@@ -5,7 +5,7 @@ import { ResolvedConfig, WxtDevServer } from '~/types';
  * Defines global constants about the dev server. Helps scripts connect to the server's web socket.
  */
 export function devServerGlobals(
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: ResolvedConfig,
   server: WxtDevServer | undefined,
 ): Plugin {
   return {

diff --git a/src/core/builders/vite/plugins/download.ts b/src/core/builders/vite/plugins/download.ts
@@ -9,7 +9,7 @@ import { fetchCached } from '~/core/utils/network';
  * @example
  * import "url:https://google-tagmanager.com/gtag?id=XYZ";
  */
-export function download(config: Omit<ResolvedConfig, 'builder'>): Plugin {
+export function download(config: ResolvedConfig): Plugin {
   return {
     name: 'wxt:download',
     resolveId(id) {

diff --git a/src/core/builders/vite/plugins/excludeBrowserPolyfill.ts b/src/core/builders/vite/plugins/excludeBrowserPolyfill.ts
@@ -6,9 +6,7 @@ import type * as vite from 'vite';
  * `webextension-polyfill` module to a virtual module and exporting the `chrome` global from the
  * virtual module.
  */
-export function excludeBrowserPolyfill(
-  config: Omit<ResolvedConfig, 'builder'>,
-): vite.Plugin {
+export function excludeBrowserPolyfill(config: ResolvedConfig): vite.Plugin {
   const virtualId = 'virtual:wxt-webextension-polyfill-disabled';
 
   return {

diff --git a/src/core/builders/vite/plugins/globals.ts b/src/core/builders/vite/plugins/globals.ts
@@ -2,9 +2,7 @@ import type * as vite from 'vite';
 import { ResolvedConfig } from '~/types';
 import { getGlobals } from '~/core/utils/globals';
 
-export function globals(
-  config: Omit<ResolvedConfig, 'builder'>,
-): vite.PluginOption {
+export function globals(config: ResolvedConfig): vite.PluginOption {
   return {
     name: 'wxt:globals',
     config() {

diff --git a/src/core/builders/vite/plugins/multipageMove.ts b/src/core/builders/vite/plugins/multipageMove.ts
@@ -20,7 +20,7 @@ import { normalizePath } from '~/core/utils/paths';
  */
 export function multipageMove(
   entrypoints: Entrypoint[],
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: ResolvedConfig,
 ): vite.Plugin {
   return {
     name: 'wxt:multipage-move',

diff --git a/src/core/builders/vite/plugins/tsconfigPaths.ts b/src/core/builders/vite/plugins/tsconfigPaths.ts
@@ -1,9 +1,7 @@
 import { ResolvedConfig } from '~/types';
 import type * as vite from 'vite';
 
-export function tsconfigPaths(
-  config: Omit<ResolvedConfig, 'builder'>,
-): vite.Plugin {
+export function tsconfigPaths(config: ResolvedConfig): vite.Plugin {
   return {
     name: 'wxt:aliases',
     async config() {

diff --git a/src/core/builders/vite/plugins/unimport.ts b/src/core/builders/vite/plugins/unimport.ts
@@ -15,9 +15,7 @@ const ENABLED_EXTENSIONS = new Set([
 /**
  * Inject any global imports defined by unimport
  */
-export function unimport(
-  config: Omit<ResolvedConfig, 'builder'>,
-): vite.PluginOption {
+export function unimport(config: ResolvedConfig): vite.PluginOption {
   const options = config.imports;
   if (options === false) return [];
 

diff --git a/src/core/builders/vite/plugins/webextensionPolyfillMock.ts b/src/core/builders/vite/plugins/webextensionPolyfillMock.ts
@@ -16,7 +16,7 @@ import { ResolvedConfig } from '~/types';
  * `npm list` and inline them automatically.
  */
 export function webextensionPolyfillMock(
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: ResolvedConfig,
 ): vite.PluginOption {
   return {
     name: 'wxt:testing-inline-deps',

diff --git a/src/core/utils/globals.ts b/src/core/utils/globals.ts
@@ -1,7 +1,7 @@
 import { ResolvedConfig } from '~/types';
 
 export function getGlobals(
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: ResolvedConfig,
 ): Array<{ name: string; value: any; type: string }> {
   return [
     {

diff --git a/src/core/utils/network.ts b/src/core/utils/network.ts
@@ -26,7 +26,7 @@ export async function isOnline(): Promise<boolean> {
  */
 export async function fetchCached(
   url: string,
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: ResolvedConfig,
 ): Promise<string> {
   let content: string = '';