Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions packages/wxt/src/builtin-modules/unimport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import type {
WxtModule,
WxtResolvedUnimportOptions,
} from '../types';
import { type Unimport, createUnimport, toExports } from 'unimport';
import { createUnimport, toExports, type Unimport } from 'unimport';
import UnimportPlugin from 'unimport/unplugin';
import { extname } from 'node:path';

export default defineWxtModule({
name: 'wxt:built-in:unimport',
Expand Down Expand Up @@ -51,14 +52,13 @@ export default defineWxtModule({

if (!wxt.config.imports.eslintrc.enabled) return;

// Only generate ESLint config if that feature is enabled
entries.push(
await getEslintConfigEntry(
unimport,
wxt.config.imports.eslintrc.enabled,
wxt.config.imports,
),
const eslintConfigEntries = await getEslintConfigEntry(
unimport,
wxt.config.imports.eslintrc.enabled,
wxt.config.imports,
);

entries.push(...eslintConfigEntries);
});

// Add vite plugin
Expand Down Expand Up @@ -105,7 +105,7 @@ async function getEslintConfigEntry(
unimport: Unimport,
version: 8 | 9,
options: WxtResolvedUnimportOptions,
): Promise<WxtDirFileEntry> {
): Promise<WxtDirFileEntry[]> {
const globals = (await unimport.getImports())
.map((i) => i.as ?? i.name)
.filter(Boolean)
Expand All @@ -115,7 +115,7 @@ async function getEslintConfigEntry(
return globals;
}, {});

if (version <= 8) return getEslint8ConfigEntry(options, globals);
if (version <= 8) return [getEslint8ConfigEntry(options, globals)];
else return getEslint9ConfigEntry(options, globals);
}

Expand All @@ -132,8 +132,8 @@ export function getEslint8ConfigEntry(
export function getEslint9ConfigEntry(
options: WxtResolvedUnimportOptions,
globals: Record<string, EslintGlobalsPropValue>,
): WxtDirFileEntry {
return {
): WxtDirFileEntry[] {
const javaScriptFileEntry: WxtDirFileEntry = {
path: options.eslintrc.filePath,
text: `const globals = ${JSON.stringify(globals, null, 2)}

Expand All @@ -147,4 +147,18 @@ export default {
};
`,
};

const typeScriptFilePath =
options.eslintrc.filePath.slice(0, -extname(options.eslintrc.filePath)) +
'.d.ts';

const typeScriptFileEntry: WxtDirFileEntry = {
path: typeScriptFilePath,
text: `import type { ConfigObject } from "@eslint/core";
declare const config: ConfigObject;
export default config;
`,
};

return [javaScriptFileEntry, typeScriptFileEntry];
}
Loading