Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
aklinker1 committed Feb 15, 2024
1 parent 074db50 commit c3c79de
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions src/core/utils/building/generate-wxt-dir.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Unimport, UnimportOptions, createUnimport } from 'unimport';
import { Unimport, createUnimport } from 'unimport';
import {
EslintGlobalsPropValue,
Entrypoint,
Expand All @@ -13,7 +13,6 @@ import path from 'node:path';
import { Message, parseI18nMessages } from '~/core/utils/i18n';
import { writeFileIfDifferent, getPublicFiles } from '~/core/utils/fs';
import { wxt } from '../../wxt';
import { isModuleInstalled } from '../package';

/**
* Generate and write all the files inside the `InternalConfig.typesDir` directory.
Expand All @@ -26,10 +25,10 @@ export async function generateTypesDir(
const references: string[] = [];

if (wxt.config.imports !== false) {
const res = await writeImportsDeclarationFile(wxt.config.imports);
references.push(res.filePath);
const unimport = createUnimport(wxt.config.imports);
references.push(await writeImportsDeclarationFile(unimport));
if (wxt.config.imports.eslintrc.enabled) {
await writeImportsEslintFile(res.unimport, wxt.config.imports);
await writeImportsEslintFile(unimport, wxt.config.imports);
}
}

Expand All @@ -41,11 +40,8 @@ export async function generateTypesDir(
await writeTsConfigFile(mainReference);
}

async function writeImportsDeclarationFile(
unimportOptions: Partial<UnimportOptions>,
): Promise<{ filePath: string; unimport: Unimport }> {
async function writeImportsDeclarationFile(unimport: Unimport) {
const filePath = resolve(wxt.config.typesDir, 'imports.d.ts');
const unimport = createUnimport(unimportOptions);

// Load project imports into unimport memory so they are output via generateTypeDeclarations
await unimport.scanImportsFromDir(undefined, { cwd: wxt.config.srcDir });
Expand All @@ -57,7 +53,7 @@ async function writeImportsDeclarationFile(
) + '\n',
);

return { filePath, unimport };
return filePath;
}

async function writeImportsEslintFile(
Expand Down

0 comments on commit c3c79de

Please sign in to comment.