Merge pull request #93 from lovegaoshi/dev

chore: dep upgrade

package.json

@@ -8,30 +8,30 @@
   "scripts": {
     "start": "webpack serve --env dev",
     "watch": "webpack --env devBuild --watch",
-    "dev": "python ./scripts/moveFFMpeg.py && webpack --env devBuild && python ./scripts/moveFFMpeg.py --build",
-    "build": "webpack --env prod && python ./scripts/moveFFMpeg.py --prod",
+    "dev": "python3 ./scripts/moveFFMpeg.py && webpack --env devBuild && python3 ./scripts/moveFFMpeg.py --build",
+    "build": "webpack --env prod && python3 ./scripts/moveFFMpeg.py --prod",
     "dep": "git submodule update --remote --merge --recursive && yarn upgrade-interactive",
     "ci:lint": "eslint src --max-warnings=0",
     "ci:format": "prettier --check src",
     "prettify": "prettier --write ./src",
     "compile": "tsc"
   },
   "devDependencies": {
-    "@babel/core": "^7.24.7",
-    "@babel/preset-env": "^7.24.7",
+    "@babel/core": "^7.25.2",
+    "@babel/preset-env": "^7.25.2",
     "@babel/preset-react": "^7.24.7",
     "@babel/preset-typescript": "^7.24.7",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
     "@types/base-64": "^1.0.2",
-    "@types/chrome": "^0.0.268",
+    "@types/chrome": "^0.0.269",
     "@types/he": "^1.2.3",
     "@types/js-base64": "^3.3.1",
     "@types/md5": "^2.3.5",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "@types/uuid": "^9.0.8",
-    "@typescript-eslint/eslint-plugin": "^7.13.1",
-    "@typescript-eslint/parser": "^7.13.1",
+    "@types/uuid": "^10.0.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
     "@welldone-software/why-did-you-render": "^8.0.3",
     "babel-loader": "^9.1.3",
     "clean-webpack-plugin": "^4.0.0",
@@ -44,23 +44,23 @@
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-import-resolver-webpack": "^0.13.8",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsx-a11y": "^6.8.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-react": "^7.34.2",
+    "eslint-plugin-jsx-a11y": "^6.9.0",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-react": "^7.35.0",
     "eslint-plugin-react-hooks": "^4.6.2",
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^5.6.0",
     "lodash": "^4.17.21",
     "mini-css-extract-plugin": "^2.9.0",
     "node-sass": "^9.0.0",
-    "prettier": "^3.3.2",
+    "prettier": "^3.3.3",
     "progress-bar-webpack-plugin": "^2.1.0",
     "react-refresh": "^0.14.2",
-    "sass-loader": "^14.2.1",
+    "sass-loader": "^16.0.0",
     "style-loader": "^4.0.0",
     "tsconfig-paths-webpack-plugin": "^4.1.0",
-    "typescript": "^5.4.5",
-    "webpack": "^5.92.0",
+    "typescript": "^5.5.4",
+    "webpack": "^5.93.0",
     "webpack-cli": "^5.1.4",
     "webpack-config-utils": "^2.3.1",
     "webpack-dev-server": "^5.0.4"
@@ -70,19 +70,19 @@
     "not dead"
   ],
   "dependencies": {
-    "@emotion/react": "^11.11.4",
-    "@emotion/styled": "^11.11.5",
+    "@emotion/react": "^11.13.0",
+    "@emotion/styled": "^11.13.0",
     "@ffmpeg/core": "^0.12.6",
     "@ffmpeg/ffmpeg": "^0.12.10",
     "@ffmpeg/util": "^0.12.1",
     "@fontsource/roboto": "^5.0.13",
-    "@fortawesome/fontawesome-free": "^6.5.2",
-    "@fortawesome/free-brands-svg-icons": "^6.5.2",
+    "@fortawesome/fontawesome-free": "^6.6.0",
+    "@fortawesome/free-brands-svg-icons": "^6.6.0",
     "@hello-pangea/dnd": "^16.6.0",
-    "@mui/icons-material": "^5.15.20",
-    "@mui/lab": "^5.0.0-alpha.170",
-    "@mui/material": "^5.15.20",
-    "@mui/styles": "^5.15.20",
+    "@mui/icons-material": "^5.16.5",
+    "@mui/lab": "^5.0.0-alpha.173",
+    "@mui/material": "^5.16.5",
+    "@mui/styles": "^5.16.5",
     "axios": "^1.7.2",
     "base-64": "^1.0.0",
     "base64-js": "^1.5.1",
@@ -93,15 +93,15 @@
     "cross-fetch": "^4.0.0",
     "crypto-browserify": "^3.12.0",
     "crypto-js": "^4.2.0",
-    "dayjs": "^1.11.11",
+    "dayjs": "^1.11.12",
     "dotenv-webpack": "^8.1.0",
     "downloadjs": "^1.4.7",
     "dropbox": "^10.34.0",
     "fflate": "^0.8.2",
     "file-saver": "^2.0.5",
     "fs": "^0.0.1-security",
     "he": "^1.2.0",
-    "i18next": "^23.11.5",
+    "i18next": "^23.12.2",
     "libmuse": "https://github.com/lovegaoshi/muse.git#commit=cbb249107f71a2f57336a5d08fac389138d8c924",
     "material-ui-confirm": "^3.0.16",
     "md5": "^2.3.0",
@@ -115,16 +115,16 @@
     "react-contexify": "^6.0.0",
     "react-dom": "^18.3.1",
     "react-hotkeys-hook": "^4.5.0",
-    "react-i18next": "^14.1.2",
+    "react-i18next": "^15.0.0",
     "react-jinke-music-player": "git+https://[email protected]/lovegaoshi/react-music-player.git",
     "react-lrc": "^3.2.1",
     "react-swipeable": "^7.0.1",
     "react-window": "^1.8.10",
     "stream-browserify": "^3.0.0",
     "util": "^0.12.5",
     "uuid": "^10.0.0",
-    "youtubei.js": "^10.0.0",
-    "zustand": "^4.5.2"
+    "youtubei.js": "^10.2.0",
+    "zustand": "^4.5.4"
   },
   "packageManager": "[email protected]"
 }

src/components/Playlists/PlaylistsHeader/Search.tsx

@@ -9,6 +9,7 @@ import Tooltip from '@mui/material/Tooltip';
 
 import { searchBiliURLs } from '@APM/utils/BiliSearch';
 import { useNoxSetting } from '@APM/stores/useApp';
+import { StorageKeys } from '@enums/Storage';
 
 interface Props {
   setSearchInputVal: (input: string) => void;
@@ -35,6 +36,7 @@ export default function Search({ setSearchInputVal }: Props) {
     setProgressVal(100);
     const searchedList = {
       ...searchPlaylist,
+      id: StorageKeys.SEARCH_PLAYLIST_KEY,
       ...(await searchBiliURLs({
         input,
         progressEmitter: setProgressVal,

src/objects/Storage.ts

@@ -1,10 +1,6 @@
 import { SyncOptions } from '@APM/enums/Storage';
 import { DefaultSetting as _DefaultSetting } from '@APM/objects/Storage';
 
-export { SyncOptions } from '@APM/enums/Storage';
-
-export const INITIAL_PLAYLIST = ['5053504', '2664851'];
-
 export const DefaultSetting: NoxStorage.PlayerSettingDict = {
   ..._DefaultSetting,
 

src/popup/App.tsx

@@ -39,9 +39,7 @@ export default function App() {
     playerStyle.playerBackground().then(setBackgroundSrc);
   }, [playerStyle.playerBackground]);
 
-  if (!currentSongList) {
-    return <h1>Loading...</h1>;
-  }
+  if (!currentSongList) return <h1>Loading...</h1>;
   return (
     // Outmost layer of the page
     <React.Suspense fallback={<h1>Loading...</h1>}>

src/utils/ChromeStorageAPI.ts

@@ -82,8 +82,10 @@ export const getPlaylistSongList = (
   playlist?: NoxMedia.Playlist,
 ): Promise<NoxMedia.Song[]> => getItem(`${playlist?.id}${SongListSuffix}`, []);
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export const getMapping = (key: string, _: any = undefined) => getItem(key, {});
+export const getMapping = async (
+  key: string,
+  transform: (v: any) => any = (v) => v,
+) => transform(await getItem(key, {}));
 
 export const importPlayerContentRaw = (
   // eslint-disable-next-line @typescript-eslint/no-unused-vars