Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions e2e/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -29,7 +24,7 @@ export default typescriptEslint.config([

parserOptions: {
project: 'tsconfig.json',
tsconfigRootDir: __dirname,
tsconfigRootDir: import.meta.dirname,
},
},

Expand Down
7 changes: 1 addition & 6 deletions packages/cli/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -29,7 +24,7 @@ export default typescriptEslint.config([

parserOptions: {
project: 'tsconfig.json',
tsconfigRootDir: __dirname,
tsconfigRootDir: import.meta.dirname,
},
},

Expand Down
7 changes: 1 addition & 6 deletions server/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -29,7 +24,7 @@ export default typescriptEslint.config([

parserOptions: {
project: 'tsconfig.json',
tsconfigRootDir: __dirname,
tsconfigRootDir: import.meta.dirname,
},
},

Expand Down
10 changes: 3 additions & 7 deletions web/eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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('#')),
Expand All @@ -40,7 +36,7 @@ export default typescriptEslint.config(
parser,
parserOptions: {
project: ['./tsconfig.json'],
tsconfigRootDir: __dirname,
tsconfigRootDir: import.meta.dirname,
},
},
// ignores: ['**/service-worker/**'],
Expand Down Expand Up @@ -96,7 +92,7 @@ export default typescriptEslint.config(

parserOptions: {
extraFileExtensions: ['.svelte'],
tsconfigRootDir: __dirname,
tsconfigRootDir: import.meta.dirname,
project: ['./tsconfig.json'],
},
},
Expand Down
4 changes: 2 additions & 2 deletions web/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
Loading