Merge branch 'main' into api-common_release_pipeline

lokalise · Mar 21, 2024 · c316873 · c316873
2 parents 2dae95d + 60f8823
commit c316873
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/packages/app/websockets-common/src/rooms.ts b/packages/app/websockets-common/src/rooms.ts
@@ -36,7 +36,7 @@ export type Room<Rn extends RoomName> = Rooms[Rn]
  */
 export type RoomId = `${RoomName}|${string}`
 
-const SEPARATOR = '|' as const
+const SEPARATOR = '|'
 
 export const getRoomId = <Rn extends RoomName>(
 	roomName: Rn,

diff --git a/packages/dev/eslint-config/configs/frontend.cjs b/packages/dev/eslint-config/configs/frontend.cjs
@@ -13,11 +13,6 @@ module.exports = {
 		browser: true,
 		node: true,
 	},
-	settings: {
-		jest: {
-			version: '>= 27',
-		},
-	},
 	rules: {
 		'import/no-extraneous-dependencies': ['error', { packageDir: './' }],
 	},

diff --git a/packages/dev/eslint-config/configs/shared-package.cjs b/packages/dev/eslint-config/configs/shared-package.cjs
@@ -1,17 +1,15 @@
 module.exports = {
 	ignorePatterns: ['node_modules', 'dist'],
-	plugins: ['@typescript-eslint', 'prettier', 'vitest', 'import'],
+	plugins: ['@typescript-eslint', 'vitest', 'import'],
 	extends: [
 		'eslint:recommended',
-		'plugin:prettier/recommended',
 		'plugin:import/recommended',
 		'plugin:import/typescript',
 		'plugin:vitest/recommended',
 		'./typescript.cjs',
 		'./tests.cjs',
 	],
 	rules: {
-		'prettier/prettier': 'error',
 		// Disabling since rule has a bug where it has false positive when named export matches module name
 		'import/no-named-as-default': 'off',
 		'import/no-named-as-default-member': 'off',

diff --git a/packages/dev/eslint-config/package.json b/packages/dev/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@lokalise/eslint-config",
-	"version": "1.0.0",
+	"version": "1.0.1",
 	"type": "module",
 	"files": [
 		"configs/*"
@@ -20,9 +20,9 @@
 		"lint:fix": "prettier --write ."
 	},
 	"dependencies": {
-		"@lokalise/eslint-config-frontend": "^4.1.0",
-		"@tanstack/eslint-plugin-query": "^5.6.0",
-		"@typescript-eslint/parser": "^6.13.1"
+		"@lokalise/eslint-config-frontend": "^4.4.0",
+		"@tanstack/eslint-plugin-query": "^5.28.6",
+		"@typescript-eslint/parser": "^7.3.1"
 	},
 	"devDependencies": {
 		"@lokalise/prettier-config": "*",