From 69a89314fe81038fafc919dfdc03f6d0b4559506 Mon Sep 17 00:00:00 2001 From: Shinigami Date: Fri, 4 Jul 2025 16:41:26 +0200 Subject: infra: use import.meta.dirname (#3542) --- eslint.config.ts | 7 ++----- scripts/apidocs/utils/paths.ts | 5 ++--- scripts/generate-locales.ts | 5 ++--- test/scripts/apidocs/verify-jsdoc-tags.spec.ts | 5 ++--- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/eslint.config.ts b/eslint.config.ts index 26eec55a..3bbb8de5 100644 --- a/eslint.config.ts +++ b/eslint.config.ts @@ -6,13 +6,10 @@ import eslintPluginFileProgress from 'eslint-plugin-file-progress'; import eslintPluginJsdoc from 'eslint-plugin-jsdoc'; import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'; import eslintPluginUnicorn from 'eslint-plugin-unicorn'; -import { dirname, resolve } from 'node:path'; -import { fileURLToPath } from 'node:url'; +import { resolve } from 'node:path'; import tseslint from 'typescript-eslint'; -const __filename = fileURLToPath(import.meta.url); -const __dirname = dirname(__filename); -const gitignorePath = resolve(__dirname, '.gitignore'); +const gitignorePath = resolve(import.meta.dirname, '.gitignore'); const config: ReturnType = tseslint.config( //#region global diff --git a/scripts/apidocs/utils/paths.ts b/scripts/apidocs/utils/paths.ts index 8abca1ea..defa10fe 100644 --- a/scripts/apidocs/utils/paths.ts +++ b/scripts/apidocs/utils/paths.ts @@ -1,7 +1,6 @@ -import { dirname, resolve } from 'node:path'; -import { fileURLToPath } from 'node:url'; +import { resolve } from 'node:path'; -const FILE_PATH_THIS = dirname(fileURLToPath(import.meta.url)); +const FILE_PATH_THIS = import.meta.dirname; /** * The path to the project directory. */ diff --git a/scripts/generate-locales.ts b/scripts/generate-locales.ts index 212f0513..d6008794 100644 --- a/scripts/generate-locales.ts +++ b/scripts/generate-locales.ts @@ -16,15 +16,14 @@ */ import { constants } from 'node:fs'; import { access, readFile, readdir, stat, writeFile } from 'node:fs/promises'; -import { dirname, resolve } from 'node:path'; -import { fileURLToPath } from 'node:url'; +import { resolve } from 'node:path'; import type { LocaleDefinition, MetadataDefinition } from '../src/definitions'; import { keys } from '../src/internal/keys'; import { formatMarkdown, formatTypescript } from './apidocs/utils/format'; // Constants -const pathRoot = resolve(dirname(fileURLToPath(import.meta.url)), '..'); +const pathRoot = resolve(import.meta.dirname, '..'); const pathLocale = resolve(pathRoot, 'src', 'locale'); const pathLocales = resolve(pathRoot, 'src', 'locales'); const pathLocaleIndex = resolve(pathLocale, 'index.ts'); diff --git a/test/scripts/apidocs/verify-jsdoc-tags.spec.ts b/test/scripts/apidocs/verify-jsdoc-tags.spec.ts index 244741c6..0ffac8e0 100644 --- a/test/scripts/apidocs/verify-jsdoc-tags.spec.ts +++ b/test/scripts/apidocs/verify-jsdoc-tags.spec.ts @@ -1,6 +1,5 @@ import { existsSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'; -import { dirname, resolve } from 'node:path'; -import { fileURLToPath } from 'node:url'; +import { resolve } from 'node:path'; import { isSemVer, isURL } from 'validator'; import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'; import { processComponents } from '../../../scripts/apidocs/generate'; @@ -14,7 +13,7 @@ import { getProject } from '../../../scripts/apidocs/project'; // - has valid @see tags // - has proper links in the description -const tempDir = resolve(dirname(fileURLToPath(import.meta.url)), 'temp'); +const tempDir = resolve(import.meta.dirname, 'temp'); const relativeImportPath = `${'../'.repeat(5)}src`; afterAll(() => { -- cgit v1.2.3