refactor: Use import.meta.dirname

ffflorian · ffflorian · commit dde95f4bcbf1 · 2025-09-17T10:50:39.000+02:00
diff --git a/packages/auto-approver/src/AutoApprover.ts b/packages/auto-approver/src/AutoApprover.ts
@@ -1,6 +1,5 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import {fileURLToPath} from 'node:url';
 import axios, {AxiosError, AxiosInstance} from 'axios';
 import logdown from 'logdown';
 
@@ -9,8 +8,7 @@ interface PackageJson {
   version: string;
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = import.meta.dirname;
 const packageJsonPath = path.join(__dirname, '../package.json');
 
 const {bin, version: toolVersion}: PackageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
diff --git a/packages/auto-approver/src/cli.ts b/packages/auto-approver/src/cli.ts
@@ -3,7 +3,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import readline from 'node:readline';
-import {fileURLToPath} from 'node:url';
 import {program as commander} from 'commander';
 import {cosmiconfigSync} from 'cosmiconfig';
 import logdown from 'logdown';
@@ -24,8 +23,7 @@ interface PackageJson {
   version: string;
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = import.meta.dirname;
 const packageJsonPath = path.join(__dirname, '../package.json');
 
 const {bin, description, version}: PackageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
diff --git a/packages/crates-updater/src/cli.ts b/packages/crates-updater/src/cli.ts
@@ -2,7 +2,6 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
-import {fileURLToPath} from 'node:url';
 import {program as commander} from 'commander';
 
 import * as CratesUpdater from './CratesUpdater.js';
@@ -12,8 +11,8 @@ interface PackageJson {
   description: string;
   version: string;
 }
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+
+const __dirname = import.meta.dirname;
 const packageJsonPath = path.join(__dirname, '../package.json');
 
 const {bin, description, version}: PackageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
diff --git a/packages/electron-icon-generator/src/cli.ts b/packages/electron-icon-generator/src/cli.ts
@@ -2,7 +2,6 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
-import {fileURLToPath} from 'node:url';
 import {program as commander} from 'commander';
 
 import {IconGenerator} from './index.js';
@@ -13,8 +12,7 @@ interface PackageJson {
   version: string;
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = import.meta.dirname;
 const packageJsonPath = path.join(__dirname, '../package.json');
 
 const {bin, description, version}: PackageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
diff --git a/packages/electron-info/src/ElectronInfo.test.ts b/packages/electron-info/src/ElectronInfo.test.ts
@@ -1,5 +1,4 @@
 import path from 'node:path';
-import {fileURLToPath} from 'node:url';
 import {randomUUID} from 'node:crypto';
 import {expect, describe, test, beforeEach, beforeAll, afterAll, afterEach} from 'vitest';
 import {StatusCodes as HTTP_STATUS} from 'http-status-codes';
@@ -8,8 +7,7 @@ import fs from 'fs-extra';
 
 import {ElectronInfo, RawReleaseInfo} from './ElectronInfo.js';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = import.meta.dirname;
 const tempDir = path.resolve(__dirname, '.temp');
 const tempDirDownload = path.resolve(__dirname, '.temp/download');
 const mockUrl = 'http://example.com';
diff --git a/packages/electron-info/src/cli.ts b/packages/electron-info/src/cli.ts
@@ -2,7 +2,6 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
-import {fileURLToPath} from 'node:url';
 import {program as commander} from 'commander';
 
 import {ElectronInfo, RawDeps, SupportedDependencies} from './ElectronInfo.js';
@@ -13,8 +12,7 @@ interface PackageJson {
   version: string;
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = import.meta.dirname;
 const packageJsonPath = path.join(__dirname, '../package.json');
 
 const {description, name, version}: PackageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
diff --git a/packages/gh-open/src/cli.ts b/packages/gh-open/src/cli.ts
@@ -2,7 +2,6 @@
 
 import path from 'node:path';
 import fs from 'node:fs';
-import {fileURLToPath} from 'node:url';
 import {program as commander} from 'commander';
 import {findUp} from 'find-up';
 import open from 'open';
@@ -15,8 +14,7 @@ interface PackageJson {
   version: string;
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = import.meta.dirname;
 const packageJsonPath = path.join(__dirname, '../package.json');
 const {description, name, version}: PackageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
 
diff --git a/packages/https-proxy/src/cli.ts b/packages/https-proxy/src/cli.ts
@@ -2,7 +2,6 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
-import {fileURLToPath} from 'node:url';
 import {program as commander} from 'commander';
 
 import {HttpsProxy} from './HttpsProxy.js';
@@ -13,8 +12,7 @@ interface PackageJson {
   version: string;
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = import.meta.dirname;
 const packageJsonPath = path.join(__dirname, '../package.json');
 
 const {description, name, version}: PackageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
diff --git a/packages/jszip-cli/src/cli.ts b/packages/jszip-cli/src/cli.ts
@@ -1,14 +1,12 @@
 #!/usr/bin/env node
 
 import path from 'node:path';
-import {fileURLToPath} from 'node:url';
 import {program as commander} from 'commander';
 import fs from 'fs-extra';
 
 import {JSZipCLI} from './JSZipCLI.js';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = import.meta.dirname;
 const packageJsonPath = path.join(__dirname, '../package.json');
 
 const {description, name, version}: {description: string; name: string; version: string} =
diff --git a/packages/mastodon-bot-yearprogress/src/cli.ts b/packages/mastodon-bot-yearprogress/src/cli.ts
@@ -2,7 +2,6 @@
 
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import {fileURLToPath} from 'node:url';
 import {program as commander} from 'commander';
 
 import {YearProgressClient} from './YearProgressClient.js';
@@ -15,8 +14,7 @@ interface CommanderOptions {
   token?: string;
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = import.meta.dirname;
 const packageJsonPath = path.join(__dirname, '../package.json');
 
 const packageJson = fs.readFileSync(packageJsonPath, 'utf-8');
diff --git a/packages/mastodon-bot-yearprogress/tsconfig.json b/packages/mastodon-bot-yearprogress/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
     "esModuleInterop": true,
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
diff --git a/packages/my-timezone/src/cli.ts b/packages/my-timezone/src/cli.ts
@@ -2,7 +2,6 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
-import {fileURLToPath} from 'node:url';
 import {program as commander} from 'commander';
 
 import {MyTimezone} from './MyTimezone.js';
@@ -13,8 +12,7 @@ interface PackageJson {
   version: string;
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = import.meta.dirname;
 const packageJsonPath = path.join(__dirname, '../package.json');
 
 const {bin, description, version}: PackageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
diff --git a/packages/ntpclient/src/cli.ts b/packages/ntpclient/src/cli.ts
@@ -2,7 +2,6 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
-import {fileURLToPath} from 'node:url';
 import {program as commander} from 'commander';
 
 import {NTPClient} from './index.js';
@@ -13,8 +12,7 @@ interface PackageJson {
   version: string;
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = import.meta.dirname;
 const packageJsonPath = path.join(__dirname, '../package.json');
 
 const {bin, description, version}: PackageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
diff --git a/packages/publish-flat/src/cli-copy.ts b/packages/publish-flat/src/cli-copy.ts
@@ -2,7 +2,6 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
-import {fileURLToPath} from 'node:url';
 import {program as commander} from 'commander';
 
 import {copyJson} from './copyJson.js';
@@ -12,8 +11,7 @@ interface PackageJson {
   version: string;
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = import.meta.dirname;
 const packageJsonPath = path.join(__dirname, '../package.json');
 
 const {bin, version}: PackageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
diff --git a/packages/publish-flat/src/cli.ts b/packages/publish-flat/src/cli.ts
@@ -2,7 +2,6 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
-import {fileURLToPath} from 'node:url';
 import {program as commander} from 'commander';
 
 import {PublishFlat} from './PublishFlat.js';
@@ -13,8 +12,7 @@ interface PackageJson {
   version: string;
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = import.meta.dirname;
 const packageJsonPath = path.join(__dirname, '../package.json');
 const {bin, description, version}: PackageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
 
diff --git a/packages/scrabble-cheater/src/cli.ts b/packages/scrabble-cheater/src/cli.ts
@@ -2,7 +2,6 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
-import {fileURLToPath} from 'node:url';
 import {program as commander} from 'commander';
 
 import {Options, ScrabbleCheater} from './index.js';
@@ -13,8 +12,7 @@ interface PackageJson {
   version: string;
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = import.meta.dirname;
 const packageJsonPath = path.join(__dirname, '../package.json');
 
 const {bin, description, version}: PackageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
diff --git a/packages/scrabble-cheater/src/index.test.ts b/packages/scrabble-cheater/src/index.test.ts
@@ -1,11 +1,9 @@
 import path from 'node:path';
-import {fileURLToPath} from 'node:url';
 import {assert, expect, describe, test} from 'vitest';
 
 import {ScrabbleCheater} from './index.js';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = import.meta.dirname;
 
 const wordList = path.resolve(__dirname, '../fixtures/wordlist.txt');
 const emptyList = path.resolve(__dirname, '../fixtures/empty.txt');
diff --git a/packages/which-os/src/cli.ts b/packages/which-os/src/cli.ts
@@ -3,7 +3,6 @@
 import {inspect} from 'node:util';
 import fs from 'node:fs';
 import path from 'node:path';
-import {fileURLToPath} from 'node:url';
 import {program as commander} from 'commander';
 
 import * as whichOS from './which-os.js';
@@ -14,8 +13,7 @@ interface PackageJson {
   version: string;
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = import.meta.dirname;
 const packageJsonPath = path.join(__dirname, '../package.json');
 
 const {description, name, version}: PackageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
