fix: convert __dirname to dirname(fileURLToPath(import.meta.url))

mizdra · Dec 28, 2021 · 6db3b65 · 6db3b65
1 parent 69595d7
commit 6db3b65
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,5 @@
-import { join } from 'path';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
 import { Worker } from 'worker_threads';
 import { wrap } from 'comlink';
 // eslint-disable-next-line @typescript-eslint/no-require-imports
@@ -33,7 +34,7 @@ export async function run(options: Options) {
 
   // Directly executing the Core API will hog the main thread and halt the spinner.
   // So we wrap it with comlink and run it on the Worker.
-  const worker = new Worker(join(__dirname, 'core-worker.js'));
+  const worker = new Worker(join(dirname(fileURLToPath(import.meta.url)), 'core-worker.js'));
   const ProxiedCore = wrap<typeof SerializableCore>(nodeEndpoint.default(worker));
   const core = await new ProxiedCore(config);
 

diff --git a/src/util/filter-script.ts b/src/util/filter-script.ts
@@ -2,6 +2,7 @@ import { exec as execOriginal } from 'child_process';
 import { mkdir, appendFile, readFile, access } from 'fs/promises';
 import { tmpdir } from 'os';
 import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
 import { promisify } from 'util';
 
 const exec = promisify(execOriginal);
@@ -36,9 +37,9 @@ export function generateFixableMakerScriptFilePath(ruleIds: string[]): string {
 }
 
 export function generateExampleFilterScriptFilePath(): string {
-  return join(__dirname, '..', '..', 'static', 'example-filter-script.js');
+  return join(dirname(fileURLToPath(import.meta.url)), '..', '..', 'static', 'example-filter-script.js');
 }
 
 export function generateExampleFixableMakerScriptFilePath(): string {
-  return join(__dirname, '..', '..', 'static', 'example-fixable-maker-script.js');
+  return join(dirname(fileURLToPath(import.meta.url)), '..', '..', 'static', 'example-fixable-maker-script.js');
 }
diff --git a/test/core.test.ts b/test/core.test.ts
@@ -1,19 +1,21 @@
 import { exec } from 'child_process';
-import { join } from 'path';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
 import { promisify } from 'util';
 import { ESLint } from 'eslint';
 import { mockConsoleLog } from 'jest-mock-process';
 import { Core } from '../src/core.js';
 
 const execPromise = promisify(exec);
+const cwd = join(dirname(fileURLToPath(import.meta.url)), '..');
 
 /**
  * Returns a string containing the stitched together contents of the file modified by transform.
  * To make the snapshot easier to read, the name of the file is inserted at the beginning of the contents of each file.
  */
 async function getSnapshotOfChangedFiles(): Promise<string> {
   const { stdout } = await execPromise(`diff -qr fixtures fixtures-tmp | cut -d " " -f 4 | xargs tail -n +1`, {
-    cwd: join(__dirname, '..'),
+    cwd,
   });
   return stdout.toString();
 }
@@ -32,11 +34,11 @@ function normalize(results: ESLint.LintResult[]): ESLint.LintResult[] {
 }
 
 beforeEach(async () => {
-  await execPromise(`rm -rf fixtures-tmp && cp -r fixtures fixtures-tmp`, { cwd: join(__dirname, '..') });
+  await execPromise(`rm -rf fixtures-tmp && cp -r fixtures fixtures-tmp`, { cwd });
 });
 
 afterEach(async () => {
-  await execPromise(`rm -rf fixtures-tmp`, { cwd: join(__dirname, '..') });
+  await execPromise(`rm -rf fixtures-tmp`, { cwd });
 });
 
 describe('Core', () => {
@@ -45,7 +47,7 @@ describe('Core', () => {
     rulePaths: ['fixtures-tmp/rules'],
     extensions: ['.js', '.jsx', '.mjs'],
     formatterName: 'codeframe',
-    cwd: join(__dirname, '..'),
+    cwd,
   });
   test('lint', async () => {
     const results = await core.lint();