diff --git a/package.json b/package.json index 120343a..c57f3ba 100644 --- a/package.json +++ b/package.json @@ -15,17 +15,17 @@ "dev:renderer": "vite dev", "build:main": "node scripts/build.main.mjs", "build:renderer": "vite build", - "build": "npm run typecheck && cross-env-shell IS_ELECTRON=true npm run build:renderer && npm run build:main", + "build": "cross-env-shell IS_ELECTRON=true npm run build:renderer && npm run build:main", "build:app": "npm run build && electron-builder --config .electron-builder.config.js", "build:app-dir": "npm run build && electron-builder --config .electron-builder.config.js --dir", "build:app-win": "npm run build && electron-builder --config .electron-builder.config.js --win", "build:app-mac": "npm run build && electron-builder --config .electron-builder.config.js --mac", "build:app-linux": "npm run build && electron-builder --config .electron-builder.config.js --linux", - "typecheck": "tsc --noEmit --project src/renderer/tsconfig.json", "debug": "cross-env-shell NODE_ENV=debug \"npm run typecheck && node scripts/build.mjs && vite ./src/renderer\"", "test": "vitest", "test:ui": "vitest --ui", "test:coverage": "vitest run --coverage", + "test:types": "tsc --noEmit --project src/renderer/tsconfig.json", "eslint": "eslint --ext .ts,.js ./", "prettier": "prettier --write './**/*.{ts,js,tsx,jsx}'" }, @@ -55,11 +55,11 @@ "@types/lodash-es": "^4.17.6", "@types/md5": "^2.3.2", "@types/qrcode": "^1.4.2", - "@types/react": "^18.0.1", + "@types/react": "^18.0.5", "@types/react-dom": "^18.0.0", "@typescript-eslint/eslint-plugin": "^5.19.0", "@typescript-eslint/parser": "^5.19.0", - "@vitejs/plugin-react": "^1.3.0", + "@vitejs/plugin-react": "^1.3.1", "@vitest/ui": "^0.9.3", "autoprefixer": "^10.4.4", "axios": "^0.26.1", @@ -76,13 +76,13 @@ "electron-builder": "^23.0.3", "electron-devtools-installer": "^3.2.0", "electron-rebuild": "^3.2.7", - "electron-releases": "^3.984.0", - "esbuild": "^0.14.34", + "electron-releases": "^3.985.0", + "esbuild": "^0.14.36", "eslint": "^8.13.0", "eslint-plugin-react": "^7.29.4", "eslint-plugin-react-hooks": "^4.4.0", "express-fileupload": "^1.3.1", - "framer-motion": "^6.2.9", + "framer-motion": "^6.3.0", "howler": "^2.2.3", "js-cookie": "^3.0.1", "jsdom": "^19.0.0", @@ -105,12 +105,12 @@ "rollup": "^2.70.1", "rollup-plugin-visualizer": "^5.6.0", "sass": "^1.50.0", - "tailwindcss": "^3.0.23", + "tailwindcss": "^3.0.24", "typescript": "^4.6.3", - "unplugin-auto-import": "^0.7.0", + "unplugin-auto-import": "^0.7.1", "valtio": "^1.5.2", "valtio-persist": "^1.0.2", - "vite": "^2.9.1", + "vite": "^2.9.5", "vite-plugin-svg-icons": "^2.0.1", "vitest": "^0.9.3", "wait-on": "^6.0.1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 114d261..580c37b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,11 +13,11 @@ specifiers: '@types/lodash-es': ^4.17.6 '@types/md5': ^2.3.2 '@types/qrcode': ^1.4.2 - '@types/react': ^18.0.1 + '@types/react': ^18.0.5 '@types/react-dom': ^18.0.0 '@typescript-eslint/eslint-plugin': ^5.19.0 '@typescript-eslint/parser': ^5.19.0 - '@vitejs/plugin-react': ^1.3.0 + '@vitejs/plugin-react': ^1.3.1 '@vitest/ui': ^0.9.3 NeteaseCloudMusicApi: ^4.5.11 autoprefixer: ^10.4.4 @@ -39,16 +39,16 @@ specifiers: electron-devtools-installer: ^3.2.0 electron-log: ^4.4.6 electron-rebuild: ^3.2.7 - electron-releases: ^3.984.0 + electron-releases: ^3.985.0 electron-store: ^8.0.1 - esbuild: ^0.14.34 + esbuild: ^0.14.36 eslint: ^8.13.0 eslint-plugin-react: ^7.29.4 eslint-plugin-react-hooks: ^4.4.0 express: ^4.17.3 express-fileupload: ^1.3.1 fast-folder-size: ^1.6.1 - framer-motion: ^6.2.9 + framer-motion: ^6.3.0 howler: ^2.2.3 js-cookie: ^3.0.1 jsdom: ^19.0.0 @@ -71,12 +71,12 @@ specifiers: rollup: ^2.70.1 rollup-plugin-visualizer: ^5.6.0 sass: ^1.50.0 - tailwindcss: ^3.0.23 + tailwindcss: ^3.0.24 typescript: ^4.6.3 - unplugin-auto-import: ^0.7.0 + unplugin-auto-import: ^0.7.1 valtio: ^1.5.2 valtio-persist: ^1.0.2 - vite: ^2.9.1 + vite: ^2.9.5 vite-plugin-svg-icons: ^2.0.1 vitest: ^0.9.3 wait-on: ^6.0.1 @@ -104,11 +104,11 @@ devDependencies: '@types/lodash-es': 4.17.6 '@types/md5': 2.3.2 '@types/qrcode': 1.4.2 - '@types/react': 18.0.1 + '@types/react': 18.0.5 '@types/react-dom': 18.0.0 '@typescript-eslint/eslint-plugin': 5.19.0_f34adc8488d2e4f014fe61432d70cbf2 '@typescript-eslint/parser': 5.19.0_eslint@8.13.0+typescript@4.6.3 - '@vitejs/plugin-react': 1.3.0 + '@vitejs/plugin-react': 1.3.1 '@vitest/ui': 0.9.3 autoprefixer: 10.4.4_postcss@8.4.12 axios: 0.26.1 @@ -125,13 +125,13 @@ devDependencies: electron-builder: 23.0.3 electron-devtools-installer: 3.2.0 electron-rebuild: 3.2.7 - electron-releases: 3.984.0 - esbuild: 0.14.34 + electron-releases: 3.985.0 + esbuild: 0.14.36 eslint: 8.13.0 eslint-plugin-react: 7.29.4_eslint@8.13.0 eslint-plugin-react-hooks: 4.4.0_eslint@8.13.0 express-fileupload: 1.3.1 - framer-motion: 6.2.9_react-dom@18.0.0+react@18.0.0 + framer-motion: 6.3.0_react-dom@18.0.0+react@18.0.0 howler: 2.2.3 js-cookie: 3.0.1 jsdom: 19.0.0 @@ -154,13 +154,13 @@ devDependencies: rollup: 2.70.1 rollup-plugin-visualizer: 5.6.0_rollup@2.70.1 sass: 1.50.0 - tailwindcss: 3.0.23_autoprefixer@10.4.4 + tailwindcss: 3.0.24 typescript: 4.6.3 - unplugin-auto-import: 0.7.0_870970c68398995560daff87db538fc7 - valtio: 1.5.2_react@18.0.0+vite@2.9.1 + unplugin-auto-import: 0.7.1_05062056c3506028f60dc849695a4e6b + valtio: 1.5.2_react@18.0.0+vite@2.9.5 valtio-persist: 1.0.2_valtio@1.5.2 - vite: 2.9.1_sass@1.50.0 - vite-plugin-svg-icons: 2.0.1_vite@2.9.1 + vite: 2.9.5_sass@1.50.0 + vite-plugin-svg-icons: 2.0.1_vite@2.9.5 vitest: 0.9.3_ac1eaec0e6cd6e44c577f894fa1b602e wait-on: 6.0.1 @@ -177,15 +177,15 @@ packages: '@jridgewell/trace-mapping': 0.3.4 dev: true - /@antfu/utils/0.5.0: - resolution: {integrity: sha512-MrAQ/MrPSxbh1bBrmwJjORfJymw4IqSHFBXqvxaga3ZdDM+/zokYF8DjyJpSjY2QmpmgQrajDUBJOWrYeARfzA==} + /@antfu/utils/0.5.1: + resolution: {integrity: sha512-8Afo0+xvYe1K8Wm4xHTymfTkpzy36aaqDvhXIayUwl+mecMG9Xzl3XjXa6swG6Bk8FBeQ646RyvmsYt6+2Be9g==} dev: true /@babel/code-frame/7.16.7: resolution: {integrity: sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/highlight': 7.16.10 + '@babel/highlight': 7.17.9 dev: true /@babel/compat-data/7.17.7: @@ -193,19 +193,19 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/core/7.17.8: - resolution: {integrity: sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ==} + /@babel/core/7.17.9: + resolution: {integrity: sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==} engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.1.2 '@babel/code-frame': 7.16.7 - '@babel/generator': 7.17.7 - '@babel/helper-compilation-targets': 7.17.7_@babel+core@7.17.8 + '@babel/generator': 7.17.9 + '@babel/helper-compilation-targets': 7.17.7_@babel+core@7.17.9 '@babel/helper-module-transforms': 7.17.7 - '@babel/helpers': 7.17.8 - '@babel/parser': 7.17.8 + '@babel/helpers': 7.17.9 + '@babel/parser': 7.17.9 '@babel/template': 7.16.7 - '@babel/traverse': 7.17.3 + '@babel/traverse': 7.17.9 '@babel/types': 7.17.0 convert-source-map: 1.8.0 debug: 4.3.4 @@ -216,8 +216,8 @@ packages: - supports-color dev: true - /@babel/generator/7.17.7: - resolution: {integrity: sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==} + /@babel/generator/7.17.9: + resolution: {integrity: sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.17.0 @@ -232,14 +232,14 @@ packages: '@babel/types': 7.17.0 dev: true - /@babel/helper-compilation-targets/7.17.7_@babel+core@7.17.8: + /@babel/helper-compilation-targets/7.17.7_@babel+core@7.17.9: resolution: {integrity: sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: '@babel/compat-data': 7.17.7 - '@babel/core': 7.17.8 + '@babel/core': 7.17.9 '@babel/helper-validator-option': 7.16.7 browserslist: 4.20.2 semver: 6.3.0 @@ -252,22 +252,14 @@ packages: '@babel/types': 7.17.0 dev: true - /@babel/helper-function-name/7.16.7: - resolution: {integrity: sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==} + /@babel/helper-function-name/7.17.9: + resolution: {integrity: sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-get-function-arity': 7.16.7 '@babel/template': 7.16.7 '@babel/types': 7.17.0 dev: true - /@babel/helper-get-function-arity/7.16.7: - resolution: {integrity: sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.17.0 - dev: true - /@babel/helper-hoist-variables/7.16.7: resolution: {integrity: sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==} engines: {node: '>=6.9.0'} @@ -292,7 +284,7 @@ packages: '@babel/helper-split-export-declaration': 7.16.7 '@babel/helper-validator-identifier': 7.16.7 '@babel/template': 7.16.7 - '@babel/traverse': 7.17.3 + '@babel/traverse': 7.17.9 '@babel/types': 7.17.0 transitivePeerDependencies: - supports-color @@ -327,19 +319,19 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/helpers/7.17.8: - resolution: {integrity: sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw==} + /@babel/helpers/7.17.9: + resolution: {integrity: sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==} engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.16.7 - '@babel/traverse': 7.17.3 + '@babel/traverse': 7.17.9 '@babel/types': 7.17.0 transitivePeerDependencies: - supports-color dev: true - /@babel/highlight/7.16.10: - resolution: {integrity: sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==} + /@babel/highlight/7.17.9: + resolution: {integrity: sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-validator-identifier': 7.16.7 @@ -347,63 +339,63 @@ packages: js-tokens: 4.0.0 dev: true - /@babel/parser/7.17.8: - resolution: {integrity: sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ==} + /@babel/parser/7.17.9: + resolution: {integrity: sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==} engines: {node: '>=6.0.0'} hasBin: true dev: true - /@babel/plugin-syntax-jsx/7.16.7_@babel+core@7.17.8: + /@babel/plugin-syntax-jsx/7.16.7_@babel+core@7.17.9: resolution: {integrity: sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.17.8 + '@babel/core': 7.17.9 '@babel/helper-plugin-utils': 7.16.7 dev: true - /@babel/plugin-transform-react-jsx-development/7.16.7_@babel+core@7.17.8: + /@babel/plugin-transform-react-jsx-development/7.16.7_@babel+core@7.17.9: resolution: {integrity: sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.17.8 - '@babel/plugin-transform-react-jsx': 7.17.3_@babel+core@7.17.8 + '@babel/core': 7.17.9 + '@babel/plugin-transform-react-jsx': 7.17.3_@babel+core@7.17.9 dev: true - /@babel/plugin-transform-react-jsx-self/7.16.7_@babel+core@7.17.8: + /@babel/plugin-transform-react-jsx-self/7.16.7_@babel+core@7.17.9: resolution: {integrity: sha512-oe5VuWs7J9ilH3BCCApGoYjHoSO48vkjX2CbA5bFVhIuO2HKxA3vyF7rleA4o6/4rTDbk6r8hBW7Ul8E+UZrpA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.17.8 + '@babel/core': 7.17.9 '@babel/helper-plugin-utils': 7.16.7 dev: true - /@babel/plugin-transform-react-jsx-source/7.16.7_@babel+core@7.17.8: + /@babel/plugin-transform-react-jsx-source/7.16.7_@babel+core@7.17.9: resolution: {integrity: sha512-rONFiQz9vgbsnaMtQlZCjIRwhJvlrPET8TabIUK2hzlXw9B9s2Ieaxte1SCOOXMbWRHodbKixNf3BLcWVOQ8Bw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.17.8 + '@babel/core': 7.17.9 '@babel/helper-plugin-utils': 7.16.7 dev: true - /@babel/plugin-transform-react-jsx/7.17.3_@babel+core@7.17.8: + /@babel/plugin-transform-react-jsx/7.17.3_@babel+core@7.17.9: resolution: {integrity: sha512-9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.17.8 + '@babel/core': 7.17.9 '@babel/helper-annotate-as-pure': 7.16.7 '@babel/helper-module-imports': 7.16.7 '@babel/helper-plugin-utils': 7.16.7 - '@babel/plugin-syntax-jsx': 7.16.7_@babel+core@7.17.8 + '@babel/plugin-syntax-jsx': 7.16.7_@babel+core@7.17.9 '@babel/types': 7.17.0 dev: true @@ -419,21 +411,21 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.16.7 - '@babel/parser': 7.17.8 + '@babel/parser': 7.17.9 '@babel/types': 7.17.0 dev: true - /@babel/traverse/7.17.3: - resolution: {integrity: sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==} + /@babel/traverse/7.17.9: + resolution: {integrity: sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==} engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.16.7 - '@babel/generator': 7.17.7 + '@babel/generator': 7.17.9 '@babel/helper-environment-visitor': 7.16.7 - '@babel/helper-function-name': 7.16.7 + '@babel/helper-function-name': 7.17.9 '@babel/helper-hoist-variables': 7.16.7 '@babel/helper-split-export-declaration': 7.16.7 - '@babel/parser': 7.17.8 + '@babel/parser': 7.17.9 '@babel/types': 7.17.0 debug: 4.3.4 globals: 11.12.0 @@ -640,8 +632,8 @@ packages: resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} dev: true - /@rollup/pluginutils/4.2.0: - resolution: {integrity: sha512-2WUyJNRkyH5p487pGnn4tWAsxhEFKN/pT8CMgHshd5H+IXkOnKvKZwsz5ZWz+YCXkleZRAU5kwbfgF8CPfDRqA==} + /@rollup/pluginutils/4.2.1: + resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==} engines: {node: '>= 8.0.0'} dependencies: estree-walker: 2.0.2 @@ -952,10 +944,6 @@ packages: resolution: {integrity: sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==} dev: true - /@types/parse-json/4.0.0: - resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} - dev: true - /@types/plist/3.0.2: resolution: {integrity: sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw==} dependencies: @@ -985,11 +973,11 @@ packages: /@types/react-dom/18.0.0: resolution: {integrity: sha512-49897Y0UiCGmxZqpC8Blrf6meL8QUla6eb+BBhn69dTXlmuOlzkfr7HHY/O8J25e1lTUMs+YYxSlVDAaGHCOLg==} dependencies: - '@types/react': 18.0.1 + '@types/react': 18.0.5 dev: true - /@types/react/18.0.1: - resolution: {integrity: sha512-VnWlrVgG0dYt+NqlfMI0yUYb8Rdl4XUROyH+c6gq/iFCiZ805Vi//26UW38DHnxQkbDhnrIWTBiy6oKZqL11cw==} + /@types/react/18.0.5: + resolution: {integrity: sha512-UPxNGInDCIKlfqBrm8LDXYWNfLHwIdisWcsH5GpMyGjhEDLFgTtlRBaoWuCua9HcyuE0rMkmAeZ3FXV1pYLIYQ==} dependencies: '@types/prop-types': 15.7.5 '@types/scheduler': 0.16.2 @@ -1160,17 +1148,17 @@ packages: eslint-visitor-keys: 3.3.0 dev: true - /@vitejs/plugin-react/1.3.0: - resolution: {integrity: sha512-H+yIupjUE4a+E4oeWUv4xUJIMR0DWBIMUG/DYgvj0J9Vu1rdHAlJ5JdbI+N1KDUD7Ee2fZ1DMPZ/NBg6mXtoCw==} + /@vitejs/plugin-react/1.3.1: + resolution: {integrity: sha512-qQS8Y2fZCjo5YmDUplEXl3yn+aueiwxB7BaoQ4nWYJYR+Ai8NXPVLlkLobVMs5+DeyFyg9Lrz6zCzdX1opcvyw==} engines: {node: '>=12.0.0'} dependencies: - '@babel/core': 7.17.8 - '@babel/plugin-transform-react-jsx': 7.17.3_@babel+core@7.17.8 - '@babel/plugin-transform-react-jsx-development': 7.16.7_@babel+core@7.17.8 - '@babel/plugin-transform-react-jsx-self': 7.16.7_@babel+core@7.17.8 - '@babel/plugin-transform-react-jsx-source': 7.16.7_@babel+core@7.17.8 - '@rollup/pluginutils': 4.2.0 - react-refresh: 0.11.0 + '@babel/core': 7.17.9 + '@babel/plugin-transform-react-jsx': 7.17.3_@babel+core@7.17.9 + '@babel/plugin-transform-react-jsx-development': 7.16.7_@babel+core@7.17.9 + '@babel/plugin-transform-react-jsx-self': 7.16.7_@babel+core@7.17.9 + '@babel/plugin-transform-react-jsx-source': 7.16.7_@babel+core@7.17.9 + '@rollup/pluginutils': 4.2.1 + react-refresh: 0.12.0 resolve: 1.22.0 transitivePeerDependencies: - supports-color @@ -2422,17 +2410,6 @@ packages: vary: 1.1.2 dev: true - /cosmiconfig/7.0.1: - resolution: {integrity: sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==} - engines: {node: '>=10'} - dependencies: - '@types/parse-json': 4.0.0 - import-fresh: 3.3.0 - parse-json: 5.2.0 - path-type: 4.0.0 - yaml: 1.10.2 - dev: true - /crc/3.8.0: resolution: {integrity: sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==} dependencies: @@ -3003,8 +2980,8 @@ packages: - supports-color dev: true - /electron-releases/3.984.0: - resolution: {integrity: sha512-h7WeahdmniYyZ1HITeTnk7yA9+9j4vHCPqi6Ss414sm45fN3yBQS1O60+CoGUTAc2HJiwy/dX8s2T8lcw85vFA==} + /electron-releases/3.985.0: + resolution: {integrity: sha512-1HJzI4m6kS0aV45NWqs99eR7ekSAN7JIKsklsV+1eGfcRwwyP6O8c3458rL4vdvlhZ9+QnUM3B0S03+XV5M0Tg==} dev: true /electron-store/8.0.1: @@ -3075,12 +3052,6 @@ packages: resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==} dev: true - /error-ex/1.3.2: - resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} - dependencies: - is-arrayish: 0.2.1 - dev: true - /error-stack-parser/2.0.7: resolution: {integrity: sha512-chLOW0ZGRf4s8raLrDxa5sdkvPec5YdvwbFnqJme4rk0rFajP8mPtrDL1+I+CwrQDCjswDA5sREX7jYQDQs9vA==} dependencies: @@ -3127,8 +3098,8 @@ packages: dev: true optional: true - /esbuild-android-64/0.14.34: - resolution: {integrity: sha512-XfxcfJqmMYsT/LXqrptzFxmaR3GWzXHDLdFNIhm6S00zPaQF1TBBWm+9t0RZ6LRR7iwH57DPjaOeW20vMqI4Yw==} + /esbuild-android-64/0.14.36: + resolution: {integrity: sha512-jwpBhF1jmo0tVCYC/ORzVN+hyVcNZUWuozGcLHfod0RJCedTDTvR4nwlTXdx1gtncDqjk33itjO+27OZHbiavw==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -3136,8 +3107,8 @@ packages: dev: true optional: true - /esbuild-android-arm64/0.14.34: - resolution: {integrity: sha512-T02+NXTmSRL1Mc6puz+R9CB54rSPICkXKq6+tw8B6vxZFnCPzbJxgwIX4kcluz9p8nYBjF3+lSilTGWb7+Xgew==} + /esbuild-android-arm64/0.14.36: + resolution: {integrity: sha512-/hYkyFe7x7Yapmfv4X/tBmyKnggUmdQmlvZ8ZlBnV4+PjisrEhAvC3yWpURuD9XoB8Wa1d5dGkTsF53pIvpjsg==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -3145,8 +3116,8 @@ packages: dev: true optional: true - /esbuild-darwin-64/0.14.34: - resolution: {integrity: sha512-pLRip2Bh4Ng7Bf6AMgCrSp3pPe/qZyf11h5Qo2mOfJqLWzSVjxrXW+CFRJfrOVP7TCnh/gmZSM2AFdCPB72vtw==} + /esbuild-darwin-64/0.14.36: + resolution: {integrity: sha512-kkl6qmV0dTpyIMKagluzYqlc1vO0ecgpviK/7jwPbRDEv5fejRTaBBEE2KxEQbTHcLhiiDbhG7d5UybZWo/1zQ==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -3154,8 +3125,8 @@ packages: dev: true optional: true - /esbuild-darwin-arm64/0.14.34: - resolution: {integrity: sha512-vpidSJEBxx6lf1NWgXC+DCmGqesJuZ5Y8aQVVsaoO4i8tRXbXb0whChRvop/zd3nfNM4dIl5EXAky0knRX5I6w==} + /esbuild-darwin-arm64/0.14.36: + resolution: {integrity: sha512-q8fY4r2Sx6P0Pr3VUm//eFYKVk07C5MHcEinU1BjyFnuYz4IxR/03uBbDwluR6ILIHnZTE7AkTUWIdidRi1Jjw==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -3163,8 +3134,8 @@ packages: dev: true optional: true - /esbuild-freebsd-64/0.14.34: - resolution: {integrity: sha512-m0HBjePhe0hAQJgtMRMNV9kMgIyV4/qSnzPx42kRMQBcPhgjAq1JRu4Il26czC+9FgpMbFkUktb07f/Lwnc6CA==} + /esbuild-freebsd-64/0.14.36: + resolution: {integrity: sha512-Hn8AYuxXXRptybPqoMkga4HRFE7/XmhtlQjXFHoAIhKUPPMeJH35GYEUWGbjteai9FLFvBAjEAlwEtSGxnqWww==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -3172,8 +3143,8 @@ packages: dev: true optional: true - /esbuild-freebsd-arm64/0.14.34: - resolution: {integrity: sha512-cpRc2B94L1KvMPPYB4D6G39jLqpKlD3noAMY4/e86iXXXkhUYJJEtTuyNFTa9JRpWM0xCAp4mxjHjoIiLuoCLA==} + /esbuild-freebsd-arm64/0.14.36: + resolution: {integrity: sha512-S3C0attylLLRiCcHiJd036eDEMOY32+h8P+jJ3kTcfhJANNjP0TNBNL30TZmEdOSx/820HJFgRrqpNAvTbjnDA==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -3181,8 +3152,8 @@ packages: dev: true optional: true - /esbuild-linux-32/0.14.34: - resolution: {integrity: sha512-8nQaEaoW7MH/K/RlozJa+lE1ejHIr8fuPIHhc513UebRav7HtXgQvxHQ6VZRUkWtep23M6dd7UqhwO1tMOfzQQ==} + /esbuild-linux-32/0.14.36: + resolution: {integrity: sha512-Eh9OkyTrEZn9WGO4xkI3OPPpUX7p/3QYvdG0lL4rfr73Ap2HAr6D9lP59VMF64Ex01LhHSXwIsFG/8AQjh6eNw==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -3190,8 +3161,8 @@ packages: dev: true optional: true - /esbuild-linux-64/0.14.34: - resolution: {integrity: sha512-Y3of4qQoLLlAgf042MlrY1P+7PnN9zWj8nVtw9XQG5hcLOZLz7IKpU35oeu7n4wvyaZHwvQqDJ93gRLqdJekcQ==} + /esbuild-linux-64/0.14.36: + resolution: {integrity: sha512-vFVFS5ve7PuwlfgoWNyRccGDi2QTNkQo/2k5U5ttVD0jRFaMlc8UQee708fOZA6zTCDy5RWsT5MJw3sl2X6KDg==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -3199,8 +3170,8 @@ packages: dev: true optional: true - /esbuild-linux-arm/0.14.34: - resolution: {integrity: sha512-9lpq1NcJqssAF7alCO6zL3gvBVVt/lKw4oetUM7OgNnRX0OWpB+ZIO9FwCrSj/dMdmgDhPLf+119zB8QxSMmAg==} + /esbuild-linux-arm/0.14.36: + resolution: {integrity: sha512-NhgU4n+NCsYgt7Hy61PCquEz5aevI6VjQvxwBxtxrooXsxt5b2xtOUXYZe04JxqQo+XZk3d1gcr7pbV9MAQ/Lg==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -3208,8 +3179,8 @@ packages: dev: true optional: true - /esbuild-linux-arm64/0.14.34: - resolution: {integrity: sha512-IlWaGtj9ir7+Nrume1DGcyzBDlK8GcnJq0ANKwcI9pVw8tqr+6GD0eqyF9SF1mR8UmAp+odrx1H5NdR2cHdFHA==} + /esbuild-linux-arm64/0.14.36: + resolution: {integrity: sha512-24Vq1M7FdpSmaTYuu1w0Hdhiqkbto1I5Pjyi+4Cdw5fJKGlwQuw+hWynTcRI/cOZxBcBpP21gND7W27gHAiftw==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -3217,8 +3188,8 @@ packages: dev: true optional: true - /esbuild-linux-mips64le/0.14.34: - resolution: {integrity: sha512-k3or+01Rska1AjUyNjA4buEwB51eyN/xPQAoOx1CjzAQC3l8rpjUDw55kXyL63O/1MUi4ISvtNtl8gLwdyEcxw==} + /esbuild-linux-mips64le/0.14.36: + resolution: {integrity: sha512-hZUeTXvppJN+5rEz2EjsOFM9F1bZt7/d2FUM1lmQo//rXh1RTFYzhC0txn7WV0/jCC7SvrGRaRz0NMsRPf8SIA==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -3226,8 +3197,8 @@ packages: dev: true optional: true - /esbuild-linux-ppc64le/0.14.34: - resolution: {integrity: sha512-+qxb8M9FfM2CJaVU7GgYpJOHM1ngQOx+/VrtBjb4C8oVqaPcESCeg2anjl+HRZy8VpYc71q/iBYausPPbJ+Keg==} + /esbuild-linux-ppc64le/0.14.36: + resolution: {integrity: sha512-1Bg3QgzZjO+QtPhP9VeIBhAduHEc2kzU43MzBnMwpLSZ890azr4/A9Dganun8nsqD/1TBcqhId0z4mFDO8FAvg==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -3235,8 +3206,8 @@ packages: dev: true optional: true - /esbuild-linux-riscv64/0.14.34: - resolution: {integrity: sha512-Y717ltBdQ5j5sZIHdy1DV9kieo0wMip0dCmVSTceowCPYSn1Cg33Kd6981+F/3b9FDMzNWldZFOBRILViENZSA==} + /esbuild-linux-riscv64/0.14.36: + resolution: {integrity: sha512-dOE5pt3cOdqEhaufDRzNCHf5BSwxgygVak9UR7PH7KPVHwSTDAZHDoEjblxLqjJYpc5XaU9+gKJ9F8mp9r5I4A==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -3244,8 +3215,8 @@ packages: dev: true optional: true - /esbuild-linux-s390x/0.14.34: - resolution: {integrity: sha512-bDDgYO4LhL4+zPs+WcBkXph+AQoPcQRTv18FzZS0WhjfH8TZx2QqlVPGhmhZ6WidrY+jKthUqO6UhGyIb4MpmA==} + /esbuild-linux-s390x/0.14.36: + resolution: {integrity: sha512-g4FMdh//BBGTfVHjF6MO7Cz8gqRoDPzXWxRvWkJoGroKA18G9m0wddvPbEqcQf5Tbt2vSc1CIgag7cXwTmoTXg==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -3253,8 +3224,8 @@ packages: dev: true optional: true - /esbuild-netbsd-64/0.14.34: - resolution: {integrity: sha512-cfaFGXdRt0+vHsjNPyF0POM4BVSHPSbhLPe8mppDc7GDDxjIl08mV1Zou14oDWMp/XZMjYN1kWYRSfftiD0vvQ==} + /esbuild-netbsd-64/0.14.36: + resolution: {integrity: sha512-UB2bVImxkWk4vjnP62ehFNZ73lQY1xcnL5ZNYF3x0AG+j8HgdkNF05v67YJdCIuUJpBuTyCK8LORCYo9onSW+A==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -3262,8 +3233,8 @@ packages: dev: true optional: true - /esbuild-openbsd-64/0.14.34: - resolution: {integrity: sha512-vmy9DxXVnRiI14s8GKuYBtess+EVcDALkbpTqd5jw4XITutIzyB7n4x0Tj5utAkKsgZJB22lLWGekr0ABnSLow==} + /esbuild-openbsd-64/0.14.36: + resolution: {integrity: sha512-NvGB2Chf8GxuleXRGk8e9zD3aSdRO5kLt9coTQbCg7WMGXeX471sBgh4kSg8pjx0yTXRt0MlrUDnjVYnetyivg==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -3271,8 +3242,8 @@ packages: dev: true optional: true - /esbuild-sunos-64/0.14.34: - resolution: {integrity: sha512-eNPVatNET1F7tRMhii7goL/eptfxc0ALRjrj9SPFNqp0zmxrehBFD6BaP3R4LjMn6DbMO0jOAnTLFKr8NqcJAA==} + /esbuild-sunos-64/0.14.36: + resolution: {integrity: sha512-VkUZS5ftTSjhRjuRLp+v78auMO3PZBXu6xl4ajomGenEm2/rGuWlhFSjB7YbBNErOchj51Jb2OK8lKAo8qdmsQ==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -3280,8 +3251,8 @@ packages: dev: true optional: true - /esbuild-windows-32/0.14.34: - resolution: {integrity: sha512-EFhpXyHEcnqWYe2rAHFd8dRw8wkrd9U+9oqcyoEL84GbanAYjiiIjBZsnR8kl0sCQ5w6bLpk7vCEIA2VS32Vcg==} + /esbuild-windows-32/0.14.36: + resolution: {integrity: sha512-bIar+A6hdytJjZrDxfMBUSEHHLfx3ynoEZXx/39nxy86pX/w249WZm8Bm0dtOAByAf4Z6qV0LsnTIJHiIqbw0w==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -3289,8 +3260,8 @@ packages: dev: true optional: true - /esbuild-windows-64/0.14.34: - resolution: {integrity: sha512-a8fbl8Ky7PxNEjf1aJmtxdDZj32/hC7S1OcA2ckEpCJRTjiKslI9vAdPpSjrKIWhws4Galpaawy0nB7fjHYf5Q==} + /esbuild-windows-64/0.14.36: + resolution: {integrity: sha512-+p4MuRZekVChAeueT1Y9LGkxrT5x7YYJxYE8ZOTcEfeUUN43vktSn6hUNsvxzzATrSgq5QqRdllkVBxWZg7KqQ==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -3298,8 +3269,8 @@ packages: dev: true optional: true - /esbuild-windows-arm64/0.14.34: - resolution: {integrity: sha512-EYvmKbSa2B3sPnpC28UEu9jBK5atGV4BaVRE7CYGUci2Hlz4AvtV/LML+TcDMT6gBgibnN2gcltWclab3UutMg==} + /esbuild-windows-arm64/0.14.36: + resolution: {integrity: sha512-fBB4WlDqV1m18EF/aheGYQkQZHfPHiHJSBYzXIo8yKehek+0BtBwo/4PNwKGJ5T0YK0oc8pBKjgwPbzSrPLb+Q==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -3307,32 +3278,32 @@ packages: dev: true optional: true - /esbuild/0.14.34: - resolution: {integrity: sha512-QIWdPT/gFF6hCaf4m7kP0cJ+JIuFkdHibI7vVFvu3eJS1HpVmYHWDulyN5WXwbRA0SX/7ZDaJ/1DH8SdY9xOJg==} + /esbuild/0.14.36: + resolution: {integrity: sha512-HhFHPiRXGYOCRlrhpiVDYKcFJRdO0sBElZ668M4lh2ER0YgnkLxECuFe7uWCf23FrcLc59Pqr7dHkTqmRPDHmw==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - esbuild-android-64: 0.14.34 - esbuild-android-arm64: 0.14.34 - esbuild-darwin-64: 0.14.34 - esbuild-darwin-arm64: 0.14.34 - esbuild-freebsd-64: 0.14.34 - esbuild-freebsd-arm64: 0.14.34 - esbuild-linux-32: 0.14.34 - esbuild-linux-64: 0.14.34 - esbuild-linux-arm: 0.14.34 - esbuild-linux-arm64: 0.14.34 - esbuild-linux-mips64le: 0.14.34 - esbuild-linux-ppc64le: 0.14.34 - esbuild-linux-riscv64: 0.14.34 - esbuild-linux-s390x: 0.14.34 - esbuild-netbsd-64: 0.14.34 - esbuild-openbsd-64: 0.14.34 - esbuild-sunos-64: 0.14.34 - esbuild-windows-32: 0.14.34 - esbuild-windows-64: 0.14.34 - esbuild-windows-arm64: 0.14.34 + esbuild-android-64: 0.14.36 + esbuild-android-arm64: 0.14.36 + esbuild-darwin-64: 0.14.36 + esbuild-darwin-arm64: 0.14.36 + esbuild-freebsd-64: 0.14.36 + esbuild-freebsd-arm64: 0.14.36 + esbuild-linux-32: 0.14.36 + esbuild-linux-64: 0.14.36 + esbuild-linux-arm: 0.14.36 + esbuild-linux-arm64: 0.14.36 + esbuild-linux-mips64le: 0.14.36 + esbuild-linux-ppc64le: 0.14.36 + esbuild-linux-riscv64: 0.14.36 + esbuild-linux-s390x: 0.14.36 + esbuild-netbsd-64: 0.14.36 + esbuild-openbsd-64: 0.14.36 + esbuild-sunos-64: 0.14.36 + esbuild-windows-32: 0.14.36 + esbuild-windows-64: 0.14.36 + esbuild-windows-arm64: 0.14.36 dev: true /escalade/3.1.1: @@ -3840,8 +3811,8 @@ packages: map-cache: 0.2.2 dev: true - /framer-motion/6.2.9_react-dom@18.0.0+react@18.0.0: - resolution: {integrity: sha512-XMP4Z5j9KlGw8aeo7n8BXTJFbt1Vv5XRzHVOKiAna1yBG4SPwTdk/8bJRfztYb0Jmw90hzBTC/3Q2dhfdtXisQ==} + /framer-motion/6.3.0_react-dom@18.0.0+react@18.0.0: + resolution: {integrity: sha512-Nm6l2cemuFeSC1fmq9R32sCQs1eplOuZ3r14/PxRDewpE3NUr+ul5ulGRRzk8K0Aa5p76Tedi3sfCUaTPa5fRg==} peerDependencies: react: '>=16.8 || ^17.0.0 || ^18.0.0' react-dom: '>=16.8 || ^17.0.0 || ^18.0.0' @@ -4523,10 +4494,6 @@ packages: kind-of: 6.0.3 dev: true - /is-arrayish/0.2.1: - resolution: {integrity: sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=} - dev: true - /is-bigint/1.0.4: resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==} dependencies: @@ -4956,10 +4923,6 @@ packages: resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} dev: true - /json-parse-even-better-errors/2.3.1: - resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} - dev: true - /json-schema-traverse/0.4.1: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} dev: true @@ -5004,7 +4967,7 @@ packages: dependencies: universalify: 2.0.0 optionalDependencies: - graceful-fs: 4.2.10 + graceful-fs: 4.2.9 dev: true /jsx-ast-utils/3.2.2: @@ -5097,10 +5060,6 @@ packages: engines: {node: '>=10'} dev: true - /lines-and-columns/1.2.4: - resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} - dev: true - /listenercount/1.0.1: resolution: {integrity: sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=} dev: false @@ -5724,8 +5683,8 @@ packages: kind-of: 3.2.2 dev: true - /object-hash/2.2.0: - resolution: {integrity: sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==} + /object-hash/3.0.0: + resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==} engines: {node: '>= 6'} dev: true @@ -5988,16 +5947,6 @@ packages: callsites: 3.1.0 dev: true - /parse-json/5.2.0: - resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} - engines: {node: '>=8'} - dependencies: - '@babel/code-frame': 7.16.7 - error-ex: 1.3.2 - json-parse-even-better-errors: 2.3.1 - lines-and-columns: 1.2.4 - dev: true - /parse5/6.0.1: resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==} dev: true @@ -6460,8 +6409,8 @@ packages: react-dom: 18.0.0_react@18.0.0 dev: true - /react-refresh/0.11.0: - resolution: {integrity: sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==} + /react-refresh/0.12.0: + resolution: {integrity: sha512-suLIhrU2IHKL5JEKR/fAwJv7bbeq4kJ+pJopf77jHwuR+HmJS/HbrPIGsTBUVfw7tXPOmYv7UJ7PCaN49e8x4A==} engines: {node: '>=0.10.0'} dev: true @@ -7411,27 +7360,24 @@ packages: resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} dev: true - /tailwindcss/3.0.23_autoprefixer@10.4.4: - resolution: {integrity: sha512-+OZOV9ubyQ6oI2BXEhzw4HrqvgcARY38xv3zKcjnWtMIZstEsXdI9xftd1iB7+RbOnj2HOEzkA0OyB5BaSxPQA==} + /tailwindcss/3.0.24: + resolution: {integrity: sha512-H3uMmZNWzG6aqmg9q07ZIRNIawoiEcNFKDfL+YzOPuPsXuDXxJxB9icqzLgdzKNwjG3SAro2h9SYav8ewXNgig==} engines: {node: '>=12.13.0'} hasBin: true - peerDependencies: - autoprefixer: ^10.0.2 dependencies: arg: 5.0.1 - autoprefixer: 10.4.4_postcss@8.4.12 - chalk: 4.1.2 chokidar: 3.5.3 color-name: 1.1.4 - cosmiconfig: 7.0.1 detective: 5.2.0 didyoumean: 1.2.2 dlv: 1.1.3 fast-glob: 3.2.11 glob-parent: 6.0.2 is-glob: 4.0.3 + lilconfig: 2.0.5 normalize-path: 3.0.0 - object-hash: 2.2.0 + object-hash: 3.0.0 + picocolors: 1.0.0 postcss: 8.4.12 postcss-js: 4.0.0_postcss@8.4.12 postcss-load-config: 3.1.4_postcss@8.4.12 @@ -7769,8 +7715,8 @@ packages: engines: {node: '>= 0.8'} dev: false - /unplugin-auto-import/0.7.0_870970c68398995560daff87db538fc7: - resolution: {integrity: sha512-40oC7bxzSyyvJI4mXmk8gDD7gKjR10gYkeWBu/UigK8TusXwUsJOjwvIr+REgzOMBGH/5pUiVMoBYEZrLejk3w==} + /unplugin-auto-import/0.7.1_05062056c3506028f60dc849695a4e6b: + resolution: {integrity: sha512-9865OV9eP99PNxHR2mtTDExeN01m4M9boT5U2BtIwsU1wDRsaFIYWLwcCBEjvXzXfTTC2NNMskhHGVAMfL2WgA==} engines: {node: '>=14'} peerDependencies: '@vueuse/core': '*' @@ -7778,12 +7724,12 @@ packages: '@vueuse/core': optional: true dependencies: - '@antfu/utils': 0.5.0 - '@rollup/pluginutils': 4.2.0 + '@antfu/utils': 0.5.1 + '@rollup/pluginutils': 4.2.1 local-pkg: 0.4.1 magic-string: 0.26.1 resolve: 1.22.0 - unplugin: 0.6.1_870970c68398995560daff87db538fc7 + unplugin: 0.6.2_05062056c3506028f60dc849695a4e6b transitivePeerDependencies: - esbuild - rollup @@ -7791,8 +7737,8 @@ packages: - webpack dev: true - /unplugin/0.6.1_870970c68398995560daff87db538fc7: - resolution: {integrity: sha512-cQqRCgQ2v/Q4fPIWNVZ6sNIDdl5v8JXOnlsUOsGzT4fblTONoPWaytiYSpu5qJ9lvSDZYAQN6BRVo3XQoZMfUQ==} + /unplugin/0.6.2_05062056c3506028f60dc849695a4e6b: + resolution: {integrity: sha512-+QONc2uBFQbeo4x5mlJHjTKjR6pmuchMpGVrWhwdGFFMb4ttFZ4E9KqhOOrNcm3Q8NNyB1vJ4s5e36IZC7UWYw==} peerDependencies: esbuild: '>=0.13' rollup: ^2.50.0 @@ -7809,9 +7755,9 @@ packages: optional: true dependencies: chokidar: 3.5.3 - esbuild: 0.14.34 + esbuild: 0.14.36 rollup: 2.70.1 - vite: 2.9.1_sass@1.50.0 + vite: 2.9.5_sass@1.50.0 webpack-sources: 3.2.3 webpack-virtual-modules: 0.4.3 dev: true @@ -7940,10 +7886,10 @@ packages: valtio: ^1.2.5 dependencies: lodash: 4.17.21 - valtio: 1.5.2_react@18.0.0+vite@2.9.1 + valtio: 1.5.2_react@18.0.0+vite@2.9.5 dev: true - /valtio/1.5.2_react@18.0.0+vite@2.9.1: + /valtio/1.5.2_react@18.0.0+vite@2.9.5: resolution: {integrity: sha512-4oqGO+7xSKZJJgLsfwRdzQxxy4hiOjiE0IZv0xoNNLtJQ+Y6mtWoEl0Y0JyUCrU/HBmY+0W/yL3lwjrpTBCJ/w==} engines: {node: '>=12.7.0'} peerDependencies: @@ -7970,7 +7916,7 @@ packages: proxy-compare: 2.1.0 react: 18.0.0 use-sync-external-store: 1.0.0_react@18.0.0 - vite: 2.9.1_sass@1.50.0 + vite: 2.9.5_sass@1.50.0 dev: true /vary/1.1.2: @@ -7987,7 +7933,7 @@ packages: dev: true optional: true - /vite-plugin-svg-icons/2.0.1_vite@2.9.1: + /vite-plugin-svg-icons/2.0.1_vite@2.9.5: resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==} peerDependencies: vite: '>=2.0.0' @@ -8000,13 +7946,13 @@ packages: pathe: 0.2.0 svg-baker: 1.7.0 svgo: 2.8.0 - vite: 2.9.1_sass@1.50.0 + vite: 2.9.5_sass@1.50.0 transitivePeerDependencies: - supports-color dev: true - /vite/2.9.1_sass@1.50.0: - resolution: {integrity: sha512-vSlsSdOYGcYEJfkQ/NeLXgnRv5zZfpAsdztkIrs7AZHV8RCMZQkwjo4DS5BnrYTqoWqLoUe1Cah4aVO4oNNqCQ==} + /vite/2.9.5_sass@1.50.0: + resolution: {integrity: sha512-dvMN64X2YEQgSXF1lYabKXw3BbN6e+BL67+P3Vy4MacnY+UzT1AfkHiioFSi9+uiDUiaDy7Ax/LQqivk6orilg==} engines: {node: '>=12.2.0'} hasBin: true peerDependencies: @@ -8021,7 +7967,7 @@ packages: stylus: optional: true dependencies: - esbuild: 0.14.34 + esbuild: 0.14.36 postcss: 8.4.12 resolve: 1.22.0 rollup: 2.70.1 @@ -8058,7 +8004,7 @@ packages: local-pkg: 0.4.1 tinypool: 0.1.2 tinyspy: 0.3.2 - vite: 2.9.1_sass@1.50.0 + vite: 2.9.5_sass@1.50.0 transitivePeerDependencies: - less - sass diff --git a/src/renderer/utils/common.ts b/src/renderer/utils/common.ts index 871aa85..2a08bfd 100644 --- a/src/renderer/utils/common.ts +++ b/src/renderer/utils/common.ts @@ -79,7 +79,7 @@ export function formatDuration( return hours !== '0' ? `${hours}:${mins.padStart(2, '0')}:${seconds}` : `${mins}:${seconds}` - } else if (format === 'hh[hr] mm[min]') { + } else { const units = { en: { hours: 'hr', diff --git a/src/renderer/utils/lyric.ts b/src/renderer/utils/lyric.ts index 467a4ec..b29dc33 100644 --- a/src/renderer/utils/lyric.ts +++ b/src/renderer/utils/lyric.ts @@ -48,6 +48,11 @@ function parseLyric(lrc: string): ParsedLyric[] { return low } + function trimContent(content: string): string { + const t = content.trim() + return t.length < 1 ? content : t + } + for (const line of lrc.trim().matchAll(extractLrcRegex)) { const { lyricTimestamps, content } = line.groups as { lyricTimestamps: string @@ -81,8 +86,3 @@ function parseLyric(lrc: string): ParsedLyric[] { return parsedLyrics } - -function trimContent(content: string): string { - const t = content.trim() - return t.length < 1 ? content : t -}