Skip to content

High performance self-hosted photo and video management solution.

chore: use import.meta.dirname instead of __dirname (#30738)

Mees Frensel2a1691868e71
diff --git a/e2e/eslint.config.mjs b/e2e/eslint.config.mjs
index d5da8f8445..3d69d1f503 100644
--- a/e2e/eslint.config.mjs
+++ b/e2e/eslint.config.mjs
@@ -2,13 +2,8 @@ import js from '@eslint/js';
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
import eslintPluginUnicorn from 'eslint-plugin-unicorn';
import globals from 'globals';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
import typescriptEslint from 'typescript-eslint';
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
export default typescriptEslint.config([
eslintPluginUnicorn.configs.recommended,
eslintPluginPrettierRecommended,
@@ -29,7 +24,7 @@ export default typescriptEslint.config([
parserOptions: {
project: 'tsconfig.json',
- tsconfigRootDir: __dirname,
+ tsconfigRootDir: import.meta.dirname,
},
},
diff --git a/packages/cli/eslint.config.mjs b/packages/cli/eslint.config.mjs
index bcc74c654d..cd32bf6023 100644
--- a/packages/cli/eslint.config.mjs
+++ b/packages/cli/eslint.config.mjs
@@ -2,13 +2,8 @@ import js from '@eslint/js';
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
import eslintPluginUnicorn from 'eslint-plugin-unicorn';
import globals from 'globals';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
import typescriptEslint from 'typescript-eslint';
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
export default typescriptEslint.config([
eslintPluginUnicorn.configs.recommended,
eslintPluginPrettierRecommended,
@@ -29,7 +24,7 @@ export default typescriptEslint.config([
parserOptions: {
project: 'tsconfig.json',
- tsconfigRootDir: __dirname,
+ tsconfigRootDir: import.meta.dirname,
},
},
diff --git a/server/eslint.config.mjs b/server/eslint.config.mjs
index 2c11b7d3cb..949acaf139 100644
--- a/server/eslint.config.mjs
+++ b/server/eslint.config.mjs
@@ -2,13 +2,8 @@ import js from '@eslint/js';
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
import eslintPluginUnicorn from 'eslint-plugin-unicorn';
import globals from 'globals';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
import typescriptEslint from 'typescript-eslint';
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
export default typescriptEslint.config([
eslintPluginUnicorn.configs.recommended,
eslintPluginPrettierRecommended,
@@ -29,7 +24,7 @@ export default typescriptEslint.config([
parserOptions: {
project: 'tsconfig.json',
- tsconfigRootDir: __dirname,
+ tsconfigRootDir: import.meta.dirname,
},
},
diff --git a/web/eslint.config.js b/web/eslint.config.js
index 5974eaf68f..fc69385c93 100644
--- a/web/eslint.config.js
+++ b/web/eslint.config.js
@@ -10,10 +10,6 @@ import parser from 'svelte-eslint-parser';
import typescriptEslint from 'typescript-eslint';
import fs from 'node:fs';
import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
export default typescriptEslint.config(
...eslintPluginSvelte.configs.recommended,
@@ -29,7 +25,7 @@ export default typescriptEslint.config(
'error',
{
browserslist: fs
- .readFileSync(path.join(__dirname, '.browserslistrc'), 'utf8')
+ .readFileSync(path.join(import.meta.dirname, '.browserslistrc'), 'utf8')
.split('\n')
.map((line) => line.trim())
.filter((line) => line && !line.startsWith('#')),
@@ -40,7 +36,7 @@ export default typescriptEslint.config(
parser,
parserOptions: {
project: ['./tsconfig.json'],
- tsconfigRootDir: __dirname,
+ tsconfigRootDir: import.meta.dirname,
},
},
// ignores: ['**/service-worker/**'],
@@ -96,7 +92,7 @@ export default typescriptEslint.config(
parserOptions: {
extraFileExtensions: ['.svelte'],
- tsconfigRootDir: __dirname,
+ tsconfigRootDir: import.meta.dirname,
project: ['./tsconfig.json'],
},
},
diff --git a/web/vite.config.ts b/web/vite.config.ts
index c2b2b5bf25..07e7efaf2a 100644
--- a/web/vite.config.ts
+++ b/web/vite.config.ts
@@ -28,8 +28,8 @@ export default defineConfig({
alias: {
'xmlhttprequest-ssl': './node_modules/engine.io-client/lib/xmlhttprequest.js',
// eslint-disable-next-line unicorn/prefer-module
- '@test-data': path.resolve(__dirname, './src/test-data'),
- // '@immich/ui': path.resolve(__dirname, '../../ui/packages/ui'),
+ '@test-data': path.resolve(import.meta.dirname, './src/test-data'),
+ // '@immich/ui': path.resolve(import.meta.dirname, '../../ui/packages/ui'),
},
},
server: {