Skip to content

Commit

Permalink
Merge branch 'th-ch:master' into music-query-widget
Browse files Browse the repository at this point in the history
  • Loading branch information
iryis authored Sep 22, 2024
2 parents 23c201c + 31d472e commit 3473963
Show file tree
Hide file tree
Showing 22 changed files with 1,344 additions and 524 deletions.
1 change: 0 additions & 1 deletion .eslintignore

This file was deleted.

80 changes: 0 additions & 80 deletions .eslintrc.js

This file was deleted.

9 changes: 9 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,17 @@

All notable changes to this project will be documented in this file. Dates are displayed in UTC.

#### [v3.5.3](https://github.com/th-ch/youtube-music/compare/v3.5.2...v3.5.3)

- fix: fix `trustedHTML` issue [`#2339`](https://github.com/th-ch/youtube-music/issues/2339)
- chore(deps): update dependency rollup to v4.21.3 [`6edc84a`](https://github.com/th-ch/youtube-music/commit/6edc84a8bd6c7e009041117ba0d2004783eb3a47)
- chore(deps): update typescript-eslint monorepo to v8.6.0 [`d4c8a43`](https://github.com/th-ch/youtube-music/commit/d4c8a4320d733f7bddc4dcd1de93644790e71d66)
- chore(deps): update dependency eslint to v8.57.1 [`02b7a39`](https://github.com/th-ch/youtube-music/commit/02b7a39753528cfd8c0d107d6d2ec6ef78c5afe7)

#### [v3.5.2](https://github.com/th-ch/youtube-music/compare/v3.5.1...v3.5.2)

> 7 September 2024
- chore(deps): update typescript-eslint monorepo to v8.4.0 [`#2401`](https://github.com/th-ch/youtube-music/pull/2401)
- chore(deps): update dependency @total-typescript/ts-reset to v0.6.1 [`#2396`](https://github.com/th-ch/youtube-music/pull/2396)
- chore(deps): update dependency electron to v31.5.0 [`#2397`](https://github.com/th-ch/youtube-music/pull/2397)
Expand Down
76 changes: 76 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
//@ts-check

import eslint from '@eslint/js';
import tseslint from 'typescript-eslint';
import stylistic from "@stylistic/eslint-plugin-js"
import * as importPlugin from "eslint-plugin-import"

export default tseslint.config(
eslint.configs.recommended,
tseslint.configs.eslintRecommended,
...tseslint.configs.recommendedTypeChecked,
{ ignores: ["dist", "node_modules", "*.config.*js"] },
{
plugins: {
stylistic,
importPlugin
},
languageOptions: {
parser: tseslint.parser,
parserOptions: {
project: true,
sourceType: "module",
ecmaVersion: "latest"
}
},
rules: {
"stylistic/arrow-parens": ["error", "always"],
"stylistic/object-curly-spacing": ["error", "always"],
"@typescript-eslint/no-floating-promises": "off",
"@typescript-eslint/no-misused-promises": ["off", { checksVoidReturn: false }],
'@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
"@typescript-eslint/no-non-null-assertion": "off",
"importPlugin/first": "error",
"importPlugin/newline-after-import": "off",
"importPlugin/no-default-export": "off",
"importPlugin/no-duplicates": "error",
"importPlugin/no-unresolved": ["error", { ignore: ['^virtual:', '\\?inline$', '\\?raw$', '\\?asset&asarUnpack'] }],
"importPlugin/order": ["error", {
'groups': ['builtin', 'external', ['internal', 'index', 'sibling'], 'parent', 'type'],
'newlines-between': 'always-and-inside-groups',
'alphabetize': { order: 'ignore', caseInsensitive: false }
}],
"importPlugin/prefer-default-export": "off",
"camelcase": ["error", { properties: "never" }],
"class-methods-use-this": "off",
"stylistic/lines-around-comment": ["error", {
beforeBlockComment: false,
afterBlockComment: false,
beforeLineComment: false,
afterLineComment: false,
}],
"stylistic/max-len": "off",
"stylistic/no-mixed-operators": "error",
"stylistic/no-multi-spaces": ["error", { ignoreEOLComments: true }],
"stylistic/no-tabs": "error",
"no-void": "error",
"no-empty": "off",
"prefer-promise-reject-errors": "off",
"stylistic/quotes": ["error", "single", {
avoidEscape: true,
allowTemplateLiterals: false,
}],
"stylistic/quote-props": ["error", "consistent"],
"stylistic/semi": ["error", "always"],
},
settings: {
'import/parsers': {
'@typescript-eslint/parser': ['.ts']
},
'import/resolver': {
typescript: {},
exports: {},
},
},
},
);
30 changes: 16 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "youtube-music",
"productName": "YouTube Music",
"version": "3.5.2",
"version": "3.5.3",
"description": "YouTube Music Desktop App - including custom plugins",
"main": "./dist/main/index.js",
"license": "MIT",
Expand Down Expand Up @@ -163,7 +163,7 @@
"@electron/remote": "2.1.2",
"@ffmpeg.wasm/core-mt": "0.12.0",
"@ffmpeg.wasm/main": "0.12.0",
"@floating-ui/dom": "1.6.10",
"@floating-ui/dom": "1.6.11",
"@foobar404/wave": "2.0.5",
"@jellybrick/electron-better-web-request": "1.0.4",
"@jellybrick/mpris-service": "2.1.4",
Expand All @@ -188,7 +188,7 @@
"filenamify": "6.0.0",
"howler": "2.2.4",
"html-to-text": "9.0.5",
"i18next": "23.14.0",
"i18next": "23.15.1",
"keyboardevent-from-electron-accelerator": "2.0.0",
"keyboardevents-areequal": "0.2.2",
"node-html-parser": "6.1.13",
Expand All @@ -204,40 +204,42 @@
"ts-morph": "23.0.0",
"vudio": "2.1.1",
"x11": "2.3.0",
"youtubei.js": "10.4.0"
"youtubei.js": "10.5.0"
},
"devDependencies": {
"@playwright/test": "1.47.0",
"@eslint/js": "^9.10.0",
"@playwright/test": "1.47.2",
"@stylistic/eslint-plugin-js": "^2.8.0",
"@total-typescript/ts-reset": "0.6.1",
"@types/color": "3.0.6",
"@types/electron-localshortcut": "3.1.3",
"@types/eslint__js": "^8.42.3",
"@types/howler": "2.2.11",
"@types/html-to-text": "9.0.4",
"@types/semver": "7.5.8",
"@typescript-eslint/eslint-plugin": "8.4.0",
"@typescript-eslint/parser": "8.4.0",
"@types/trusted-types": "2.0.7",
"bufferutil": "4.0.8",
"builtin-modules": "4.0.0",
"cross-env": "7.0.3",
"del-cli": "5.1.0",
"discord-api-types": "0.37.100",
"electron": "32.0.2",
"electron": "32.1.2",
"electron-builder": "24.13.3",
"electron-devtools-installer": "3.2.0",
"electron-vite": "2.3.0",
"esbuild": "0.23.1",
"eslint": "8.57.0",
"eslint": "9.11.0",
"eslint-import-resolver-exports": "1.0.0-beta.5",
"eslint-import-resolver-typescript": "3.6.3",
"eslint-plugin-import": "2.30.0",
"eslint-plugin-prettier": "5.2.1",
"glob": "11.0.0",
"node-gyp": "10.2.0",
"playwright": "1.47.0",
"rollup": "4.21.2",
"typescript": "5.5.4",
"playwright": "1.47.2",
"rollup": "4.22.4",
"typescript": "5.6.2",
"typescript-eslint": "^8.6.0",
"utf-8-validate": "6.0.4",
"vite": "5.4.3",
"vite": "5.4.7",
"vite-plugin-inspect": "0.8.7",
"vite-plugin-resolve": "2.5.2",
"vite-plugin-solid": "2.10.2",
Expand Down
Loading

0 comments on commit 3473963

Please sign in to comment.