refactor: Clean code and make a couple small adjusts

packages/analytics/modules/analytics/client.ts

@@ -224,6 +224,7 @@ function createBackgroundAnalytics(
 function createFrontendAnalytics(): Analytics {
   const port = browser.runtime.connect({ name: ANALYTICS_PORT });
   const sessionId = Date.now();
+
   const getFrontendMetadata = (): AnalyticsEventMetadata => ({
     sessionId,
     timestamp: Date.now(),

packages/analytics/modules/analytics/index.ts

@@ -61,6 +61,7 @@ export const analytics = createAnalytics(useAppConfig().analytics);
       const hasBackground = entrypoints.find(
         (entry) => entry.type === 'background',
       );
+
       if (!hasBackground) {
         entrypoints.push({
           type: 'background',

packages/analytics/modules/analytics/providers/google-analytics-4.ts

@@ -21,8 +21,10 @@ export const googleAnalytics4 =
           config?.debug ? '/debug/mp/collect' : '/mp/collect',
           options.apiUrl ?? 'https://www.google-analytics.com',
         );
+
         if (options.apiSecret)
           url.searchParams.set('api_secret', options.apiSecret);
+
         if (options.measurementId)
           url.searchParams.set('measurement_id', options.measurementId);
 

packages/analytics/modules/analytics/providers/umami.ts

@@ -12,6 +12,7 @@ export const umami = defineAnalyticsProvider<UmamiProviderOptions>(
       if (config.debug) {
         console.debug('[@wxt-dev/analytics] Sending event to Umami:', payload);
       }
+
       return fetch(`${options.apiUrl}/send`, {
         method: 'POST',
         headers: {

packages/i18n/src/__tests__/build.test.ts

@@ -56,6 +56,7 @@ describe('Built Tools', () => {
     const messages = await parseMessagesFile(`file.yml`);
     await generateChromeMessagesFile('output.json', messages);
     await generateTypeFile('output.d.ts', messages);
+
     const actualChromeMessagesFile = mockWriteFile.mock.calls[0][1];
     const actualDtsFile = mockWriteFile.mock.calls[1][1];
 

packages/i18n/src/__tests__/index.test.ts

@@ -53,13 +53,13 @@ describe('createI18n', () => {
     (rawMessage, count, expected) => {
       const i18n = createI18n();
       getMessageMock.mockReturnValue(rawMessage);
-      const key = 'items';
+      const KEY = 'items';
 
-      const actual = i18n.t(key, count);
+      const actual = i18n.t(KEY, count);
 
       expect(actual).toBe(expected);
       expect(getMessageMock).toBeCalledTimes(1);
-      expect(getMessageMock).toBeCalledWith(key, [String(count)]);
+      expect(getMessageMock).toBeCalledWith(KEY, [String(count)]);
     },
   );
 

packages/i18n/src/__tests__/types.test.ts

@@ -4,6 +4,7 @@ import { browser } from '@wxt-dev/browser';
 
 vi.mock('@wxt-dev/browser', async () => {
   const { vi } = await import('vitest');
+
   return {
     browser: {
       i18n: {
@@ -14,7 +15,7 @@ vi.mock('@wxt-dev/browser', async () => {
 });
 const getMessageMock = vi.mocked(browser.i18n.getMessage);
 
-const n: number = 1;
+const N = 1;
 
 describe('I18n Types', () => {
   beforeEach(() => {
@@ -29,7 +30,7 @@ describe('I18n Types', () => {
         i18n.t('any');
         i18n.t('any', ['one']);
         i18n.t('any', ['one', 'two']);
-        i18n.t('any', n, ['one', 'two']);
+        i18n.t('any', N, ['one', 'two']);
       });
     });
   });
@@ -52,7 +53,7 @@ describe('I18n Types', () => {
         // @ts-expect-error
         i18n.t('simple', ['one']);
         // @ts-expect-error
-        i18n.t('simple', n);
+        i18n.t('simple', N);
 
         i18n.t('simpleSub1', ['one']);
         // @ts-expect-error
@@ -62,7 +63,7 @@ describe('I18n Types', () => {
         // @ts-expect-error
         i18n.t('simpleSub1', ['one', 'two']);
         // @ts-expect-error
-        i18n.t('simpleSub1', n);
+        i18n.t('simpleSub1', N);
 
         i18n.t('simpleSub2', ['one', 'two']);
         // @ts-expect-error
@@ -72,41 +73,42 @@ describe('I18n Types', () => {
         // @ts-expect-error
         i18n.t('simpleSub2', ['one', 'two', 'three']);
         // @ts-expect-error
-        i18n.t('simpleSub2', n);
+        i18n.t('simpleSub2', N);
 
-        i18n.t('plural', n);
+        i18n.t('plural', N);
         // @ts-expect-error
         i18n.t('plural');
         // @ts-expect-error
         i18n.t('plural', []);
         // @ts-expect-error
         i18n.t('plural', ['one']);
         // @ts-expect-error
-        i18n.t('plural', n, ['sub']);
+        i18n.t('plural', N, ['sub']);
+
+        i18n.t('pluralSub1', N);
+        i18n.t('pluralSub1', N, undefined);
+        i18n.t('pluralSub1', N, ['one']);
 
-        i18n.t('pluralSub1', n);
-        i18n.t('pluralSub1', n, undefined);
-        i18n.t('pluralSub1', n, ['one']);
         // @ts-expect-error
         i18n.t('pluralSub1');
         // @ts-expect-error
         i18n.t('pluralSub1', ['one']);
         // @ts-expect-error
-        i18n.t('pluralSub1', n, []);
+        i18n.t('pluralSub1', N, []);
         // @ts-expect-error
-        i18n.t('pluralSub1', n, ['one', 'two']);
+        i18n.t('pluralSub1', N, ['one', 'two']);
 
-        i18n.t('pluralSub2', n, ['one', 'two']);
+        i18n.t('pluralSub2', N, ['one', 'two']);
         // @ts-expect-error
         i18n.t('pluralSub2');
         // @ts-expect-error
         i18n.t('pluralSub2', ['one', 'two']);
         // @ts-expect-error
-        i18n.t('pluralSub2', n, ['one']);
+        i18n.t('pluralSub2', N, ['one']);
         // @ts-expect-error
-        i18n.t('pluralSub2', n, ['one', 'two', 'three']);
+        i18n.t('pluralSub2', N, ['one', 'two', 'three']);
         // @ts-expect-error
-        i18n.t('pluralSub2', n);
+        i18n.t('pluralSub2', N);
       });
     });
   });

packages/i18n/src/__tests__/utils.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { ChromeMessage } from '../build';
 import {
   applyChromeMessagePlaceholders,

packages/i18n/src/build.ts

@@ -6,7 +6,7 @@
  */
 
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
-import { parseYAML, parseJSON5, parseTOML } from 'confbox';
+import { parseJSON5, parseTOML, parseYAML } from 'confbox';
 import { dirname, extname } from 'node:path';
 import { applyChromeMessagePlaceholders, getSubstitutionCount } from './utils';
 
@@ -191,6 +191,7 @@ function _parseMessagesObject(
       if (isPluralMessage(object)) {
         const message = Object.values(object).join('|');
         const substitutions = getSubstitutionCount(message);
+
         return [
           {
             type: 'plural',
@@ -204,6 +205,7 @@ function _parseMessagesObject(
       if (depth === 1 && isChromeMessage(object)) {
         const message = applyChromeMessagePlaceholders(object);
         const substitutions = getSubstitutionCount(message);
+
         return [
           {
             type: 'chrome',

packages/i18n/src/index.ts

@@ -1,8 +1,8 @@
 /** @module @wxt-dev/i18n */
 import {
-  I18nStructure,
   DefaultI18nStructure,
   I18n,
+  I18nStructure,
   Substitution,
 } from './types';
 import { browser } from '@wxt-dev/browser';
@@ -14,6 +14,7 @@ export function createI18n<
     // Resolve args
     let sub: Substitution[] | undefined;
     let count: number | undefined;
+
     args.forEach((arg, i) => {
       if (arg == null) {
         // ignore nullish args
@@ -35,16 +36,19 @@ export function createI18n<
 
     // Load the localization
     let message: string;
+
     if (sub?.length) {
       // Convert all substitutions to strings
       const stringSubs = sub?.map((sub) => String(sub));
       message = browser.i18n.getMessage(key.replaceAll('.', '_'), stringSubs);
     } else {
       message = browser.i18n.getMessage(key.replaceAll('.', '_'));
     }
+
     if (!message) {
       console.warn(`[i18n] Message not found: "${key}"`);
     }
+
     if (count == null) return message;
 
     // Apply pluralization

packages/i18n/src/module.ts

@@ -14,8 +14,8 @@ import 'wxt';
 import { addAlias, defineWxtModule } from 'wxt/modules';
 import {
   generateChromeMessagesText,
-  parseMessagesFile,
   generateTypeText,
+  parseMessagesFile,
   SUPPORTED_LOCALES,
 } from './build';
 import { glob } from 'tinyglobby';
@@ -36,6 +36,7 @@ export default defineWxtModule<I18nOptions>({
       );
       return;
     }
+
     wxt.logger.info(
       '`[i18n]` Default locale: ' + wxt.config.manifest.default_locale,
     );
@@ -55,7 +56,9 @@ export default defineWxtModule<I18nOptions>({
       const res = files.map((file) => {
         const rawLocale = basename(file).replace(extname(file), '');
         const locale = standardizeLocale(rawLocale);
+
         if (!SUPPORTED_LOCALES.has(locale)) unsupportedLocales.push(locale);
+
         return { file, locale };
       });
 
@@ -71,6 +74,7 @@ export default defineWxtModule<I18nOptions>({
       GeneratedPublicFile[]
     > => {
       const files = await getLocalizationFiles();
+
       return await Promise.all(
         files.map(async ({ file, locale }) => {
           const messages = await parseMessagesFile(file);
@@ -87,13 +91,15 @@ export default defineWxtModule<I18nOptions>({
       const defaultLocaleFile = files.find(
         ({ locale }) => locale === wxt.config.manifest.default_locale,
       )!;
+
       if (defaultLocaleFile == null) {
         throw Error(
           `\`[i18n]\` Required localization file does not exist: \`<localesDir>/${wxt.config.manifest.default_locale}.{json|json5|jsonc|yml|yaml|toml}\``,
         );
       }
 
       const messages = await parseMessagesFile(defaultLocaleFile.file);
+
       return {
         path: typesPath,
         text: generateTypeText(messages),
@@ -153,7 +159,7 @@ export { type GeneratedI18nStructure }
 
     addAlias(wxt, '#i18n', sourcePath);
 
-    // Generate separate declaration file containing types - this prevents
+    // Generate a separate declaration file containing types - this prevents
     // firing the dev server's default file watcher when updating the types,
     // which would cause a full rebuild and reload of the extension.
 

packages/i18n/src/utils.ts

@@ -28,6 +28,7 @@ export function standardizeLocale(locale: string): string {
 
   const [is_match, prefix, suffix] =
     locale.match(/^([a-z]{2})[-_]([a-z]{2,3})$/i) ?? [];
+
   if (is_match) {
     return `${prefix.toLowerCase()}_${suffix.toUpperCase()}`;
   }

packages/module-react/components/App.tsx

@@ -1,5 +1,7 @@
 export default function () {
   const [count, setCount] = useState(0);
+
   const increment = () => setCount((count) => count + 1);
+
   return <button onClick={increment}>Count: {count}</button>;
 }

packages/module-react/entrypoints/content/index.tsx

@@ -22,6 +22,7 @@ function createUi(ctx: ContentScriptContext) {
     append: 'first',
     onMount(container) {
       const root = ReactDOM.createRoot(container);
+
       root.render(
         <React.StrictMode>
           <App />

packages/module-solid/components/App.tsx

@@ -2,6 +2,8 @@ import { Component } from 'solid-js';
 
 export const App: Component = () => {
   const [count, setCount] = createSignal(0);
+
   const increment = () => setCount((count) => count + 1);
+
   return <button onClick={increment}>Count: {count()}</button>;
 };

packages/runner/package.json

@@ -20,6 +20,9 @@
   },
   "license": "MIT",
   "funding": "https://github.com/sponsors/wxt-dev",
+  "dependencies": {
+    "fs-extra": "^11.2.0"
+  },
   "scripts": {
     "check": "bun run build && check",
     "test": "buildc --deps-only -- vitest",