Skip to content

Commit ea11b14

Browse files
committed
chore: cleanup esm
As far as I could tell, the original reasons are no longer reproducible.
1 parent 944e2c5 commit ea11b14

File tree

6 files changed

+488
-27
lines changed

6 files changed

+488
-27
lines changed

packages/wxt/package.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,14 @@
6363
"web-ext-run": "^0.2.4"
6464
},
6565
"peerDependencies": {
66+
"eslint": "^8.57.0 || ^9.0.0",
6667
"vite": "^5.4.19 || ^6.3.4 || ^7.0.0"
6768
},
69+
"peerDependenciesMeta": {
70+
"eslint": {
71+
"optional": true
72+
}
73+
},
6874
"devDependencies": {
6975
"@aklinker1/check": "^2.1.0",
7076
"@faker-js/faker": "^10.0.0",
@@ -73,6 +79,7 @@
7379
"@types/node": "^20.17.6",
7480
"@types/normalize-path": "^3.0.2",
7581
"@types/prompts": "^2.4.9",
82+
"eslint": "^9.38.0",
7683
"extract-zip": "^2.0.1",
7784
"happy-dom": "^18.0.1",
7885
"lodash.merge": "^4.6.2",
@@ -83,7 +90,6 @@
8390
"vitest": "^3.2.4",
8491
"vitest-plugin-random-seed": "^1.1.1"
8592
},
86-
"peerDependenciesMeta": {},
8793
"repository": {
8894
"type": "git",
8995
"url": "git+https://github.com/wxt-dev/wxt.git"

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -536,17 +536,10 @@ async function getUnimportEslintOptions(
536536
* Returns the path to `node_modules/wxt`.
537537
*/
538538
function resolveWxtModuleDir() {
539-
// TODO: Drop the __filename expression once we're fully running in ESM
540-
// (see https://github.com/wxt-dev/wxt/issues/277)
541-
const importer =
542-
typeof __filename === 'string'
543-
? pathToFileURL(__filename).href
544-
: import.meta.url;
545-
546539
// TODO: Switch to import.meta.resolve() once the parent argument is unflagged
547540
// (e.g. --experimental-import-meta-resolve) and all Node.js versions we support
548541
// have it.
549-
const url = esmResolve('wxt', importer);
542+
const url = esmResolve('wxt', import.meta.url);
550543

551544
// esmResolve() returns the "wxt/dist/index.mjs" file, not the package's root
552545
// directory, which we want to return from this function.

packages/wxt/src/core/runners/index.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import { ExtensionRunner } from '../../types';
2-
import { createWslRunner } from './wsl';
3-
import { createWebExtRunner } from './web-ext';
4-
import { createSafariRunner } from './safari';
5-
import { createManualRunner } from './manual';
6-
import { isWsl } from '../utils/wsl';
1+
import isWsl from 'is-wsl';
2+
import type { ExtensionRunner } from '../../types';
73
import { wxt } from '../wxt';
4+
import { createManualRunner } from './manual';
5+
import { createSafariRunner } from './safari';
6+
import { createWebExtRunner } from './web-ext';
7+
import { createWslRunner } from './wsl';
88

99
export async function createExtensionRunner(): Promise<ExtensionRunner> {
1010
if (wxt.config.browser === 'safari') return createSafariRunner();
1111

12-
if (await isWsl()) return createWslRunner();
12+
if (isWsl) return createWslRunner();
1313
if (wxt.config.runnerConfig.config?.disabled) return createManualRunner();
1414

1515
return createWebExtRunner();

packages/wxt/src/core/utils/eslint.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
export async function getEslintVersion(): Promise<string[]> {
22
try {
3-
const require = (await import('node:module')).default.createRequire(
4-
import.meta.url,
5-
);
6-
const { ESLint } = require('eslint');
3+
const { ESLint } = await import('eslint');
74
return ESLint.version?.split('.') ?? [];
85
} catch {
96
// Return an empty version when there's an error importing ESLint

packages/wxt/src/core/utils/wsl.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)