refactor: use static imports now that wxt is esm-only

Since #848, there's no need to do all this async work.
At least, as far as I could tell...

Author: lishaduck

packages/wxt/src/@types/modules.d.ts

@@ -23,11 +23,11 @@ declare module 'web-ext-run' {
     exit(): Promise<void>;
   }
 
-  const webExt: {
-    cmd: {
-      run(config: any, executeOptions: any): Promise<WebExtRunInstance>;
-    };
+  export declare const cmd: {
+    run(config: any, executeOptions: any): Promise<WebExtRunInstance>;
   };
+
+  declare const webExt: { cmd: typeof cmd };
   export default webExt;
 }
 

packages/wxt/src/core/builders/vite/index.ts

@@ -1,4 +1,4 @@
-import type * as vite from 'vite';
+import * as vite from 'vite';
 import {
   BuildStepOutput,
   Entrypoint,
@@ -29,13 +29,11 @@ import { dirname, extname, join, relative } from 'node:path';
 import fs from 'fs-extra';
 import { normalizePath } from '../../utils/paths';
 
-export async function createViteBuilder(
+export function createViteBuilder(
   wxtConfig: ResolvedConfig,
   hooks: Hookable<WxtHooks>,
   getWxtDevServer?: () => WxtDevServer | undefined,
-): Promise<WxtBuilder> {
-  const vite = await import('vite');
-
+): WxtBuilder {
   /**
    * Returns the base vite config shared by all builds based on the inline and user config.
    */

packages/wxt/src/core/builders/vite/plugins/devServerGlobals.ts

@@ -1,4 +1,4 @@
-import { Plugin } from 'vite';
+import type { Plugin } from 'vite';
 import { ResolvedConfig, WxtDevServer } from '../../../../types';
 
 /**

packages/wxt/src/core/builders/vite/plugins/download.ts

@@ -1,4 +1,4 @@
-import { Plugin } from 'vite';
+import type { Plugin } from 'vite';
 import { ResolvedConfig } from '../../../../types';
 import { fetchCached } from '../../../utils/network';
 

packages/wxt/src/core/builders/vite/plugins/noopBackground.ts

@@ -1,4 +1,4 @@
-import { Plugin } from 'vite';
+import type { Plugin } from 'vite';
 import { VIRTUAL_NOOP_BACKGROUND_MODULE_ID } from '../../../utils/constants';
 
 /**

packages/wxt/src/core/builders/vite/plugins/removeEntrypointMainFunction.ts

@@ -1,5 +1,5 @@
 import { ResolvedConfig } from '../../../../types';
-import * as vite from 'vite';
+import type * as vite from 'vite';
 import { normalizePath } from '../../../utils/paths';
 import { removeMainFunctionCode } from '../../../utils/transform';
 import { resolve } from 'node:path';

packages/wxt/src/core/builders/vite/plugins/resolveVirtualModules.ts

@@ -1,5 +1,5 @@
-import { Plugin } from 'vite';
-import { ResolvedConfig } from '../../../../types';
+import type { Plugin } from 'vite';
+import type { ResolvedConfig } from '../../../../types';
 import { normalizePath } from '../../../utils/paths';
 import {
   VirtualModuleId,

packages/wxt/src/core/initialize.ts

@@ -5,6 +5,7 @@ import fs from 'fs-extra';
 import path from 'node:path';
 import pc from 'picocolors';
 import { Formatter } from 'picocolors/types';
+import ora from 'ora';
 
 export async function initialize(options: {
   directory: string;
@@ -161,7 +162,6 @@ async function cloneProject({
   directory: string;
   template: Template;
 }) {
-  const { default: ora } = await import('ora');
   const spinner = ora('Downloading template').start();
   try {
     // 1. Clone repo

packages/wxt/src/core/resolve-config.ts

@@ -29,6 +29,7 @@ import { safeStringToNumber } from './utils/number';
 import { loadEnv } from './utils/env';
 import { getPort } from 'get-port-please';
 import { fileURLToPath, pathToFileURL } from 'node:url';
+import * as vite from 'vite';
 
 /**
  * Given an inline config, discover the config file if necessary, merge the results, resolve any
@@ -61,7 +62,7 @@ export async function resolveConfig(
 
   // Merge it into the inline config
 
-  const mergedConfig = await mergeInlineConfig(inlineConfig, userConfig);
+  const mergedConfig = mergeInlineConfig(inlineConfig, userConfig);
 
   // Apply defaults to make internal config.
 
@@ -255,10 +256,10 @@ async function resolveManifestConfig(
 /**
  * Merge the inline config and user config. Inline config is given priority. Defaults are not applied here.
  */
-async function mergeInlineConfig(
+function mergeInlineConfig(
   inlineConfig: InlineConfig,
   userConfig: UserConfig,
-): Promise<InlineConfig> {
+): InlineConfig {
   // Merge imports option
   const imports: InlineConfig['imports'] =
     inlineConfig.imports === false || userConfig.imports === false
@@ -277,11 +278,7 @@ async function mergeInlineConfig(
   const merged = defu(inlineConfig, userConfig);
 
   // Builders
-  const builderConfig = await mergeBuilderConfig(
-    merged.logger ?? consola,
-    inlineConfig,
-    userConfig,
-  );
+  const builderConfig = mergeBuilderConfig(inlineConfig, userConfig);
 
   return {
     ...merged,
@@ -566,25 +563,17 @@ const COMMAND_MODES: Record<WxtCommand, string> = {
   serve: 'development',
 };
 
-export async function mergeBuilderConfig(
-  logger: Logger,
+function mergeBuilderConfig(
   inlineConfig: InlineConfig,
   userConfig: UserConfig,
-): Promise<Pick<InlineConfig, 'vite'>> {
-  const vite = await import('vite').catch((err) => {
-    logger.debug('Failed to import vite:', err);
-  });
-  if (vite) {
-    return {
-      vite: async (env) => {
-        const resolvedInlineConfig = (await inlineConfig.vite?.(env)) ?? {};
-        const resolvedUserConfig = (await userConfig.vite?.(env)) ?? {};
-        return vite.mergeConfig(resolvedUserConfig, resolvedInlineConfig);
-      },
-    };
-  }
-
-  throw Error('Builder not found. Make sure vite is installed.');
+): Pick<InlineConfig, 'vite'> {
+  return {
+    vite: async (env) => {
+      const resolvedInlineConfig = (await inlineConfig.vite?.(env)) ?? {};
+      const resolvedUserConfig = (await userConfig.vite?.(env)) ?? {};
+      return vite.mergeConfig(resolvedUserConfig, resolvedInlineConfig);
+    },
+  };
 }
 
 export async function resolveWxtUserModules(

packages/wxt/src/core/runners/web-ext.ts

@@ -1,4 +1,6 @@
-import type { WebExtRunInstance } from 'web-ext-run';
+import webExt, { type WebExtRunInstance } from 'web-ext-run';
+import * as webExtLogger from 'web-ext-run/util/logger';
+
 import { ExtensionRunner } from '../../types';
 import { formatDuration } from '../utils/time';
 import defu from 'defu';
@@ -27,7 +29,6 @@ export function createWebExtRunner(): ExtensionRunner {
       }
 
       // Use WXT's logger instead of web-ext's built-in one.
-      const webExtLogger = await import('web-ext-run/util/logger');
       webExtLogger.consoleStream.write = ({ level, msg, name }) => {
         if (level >= ERROR_LOG_LEVEL) wxt.logger.error(name, msg);
         if (level >= WARN_LOG_LEVEL) wxt.logger.warn(msg);
@@ -80,8 +81,7 @@ export function createWebExtRunner(): ExtensionRunner {
       wxt.logger.debug('web-ext config:', finalConfig);
       wxt.logger.debug('web-ext options:', options);
 
-      const webExt = await import('web-ext-run');
-      runner = await webExt.default.cmd.run(finalConfig, options);
+      runner = await webExt.cmd.run(finalConfig, options);
 
       const duration = Date.now() - startTime;
       wxt.logger.success(`Opened browser in ${formatDuration(duration)}`);