Merge pull request #142 from AsakuraMizu/main

v4.6.1

.env.development

@@ -0,0 +1,4 @@
+# username & password for auto login when developing locally
+# copy this file to .env.development.local
+VITE_USERNAME=
+VITE_PASSWORD=

.gitignore

@@ -5,4 +5,6 @@ legacy
 yarn-error.log
 dist
 dist-zip
-stats.html
+stats.html
+.swc
+*.local

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 4.6.1
+
+- Change i18n backend to [Lingui](https://lingui.dev/) and support language switching ([#134](https://github.com/Harry-Chen/Learn-Helper/issues/134))
+- FIX csrf injection ([#135](https://github.com/Harry-Chen/Learn-Helper/issues/135))
+- Try to FIX PKU course compatibility ([#139](https://github.com/Harry-Chen/Learn-Helper/issues/139))
+- FIX open in new window ([#140](https://github.com/Harry-Chen/Learn-Helper/issues/140))
+- FIX card list scroll height reset after open item ([AsakuraMizu/Learn-Helper#2](https://github.com/AsakuraMizu/Learn-Helper/issues/2))
+- FIX card filter not reset after switching semester ([AsakuraMizu/Learn-Helper#3](https://github.com/AsakuraMizu/Learn-Helper/issues/3))
+- Remove fontawesome and use [unplugin-icons](https://github.com/unplugin/unplugin-icons) to render icons, reduce package size
+
 ## v4.6.0
 
 (Contributed by @AsakuraMizu as part of OSPP'2023 project)

CHANGELOG_ZH.md

@@ -1,5 +1,15 @@
 # 更新记录
 
+## 4.6.1
+
+- [FIX] 更换 i18n 后端，支持切换语言 ([#134](https://github.com/Harry-Chen/Learn-Helper/issues/134))
+- [FIX] csrf 注入失败导致无法提交作业等问题 ([#135](https://github.com/Harry-Chen/Learn-Helper/issues/135))
+- [FIX] 尝试修复北大课程兼容 ([#139](https://github.com/Harry-Chen/Learn-Helper/issues/139))
+- [FIX] 无法正确在新窗口打开 ([#140](https://github.com/Harry-Chen/Learn-Helper/issues/140))
+- [FIX] 打开项目后滚动重置 ([AsakuraMizu/Learn-Helper#2](https://github.com/AsakuraMizu/Learn-Helper/issues/2))
+- [FIX] 切换学期后过滤未重置 ([AsakuraMizu/Learn-Helper#3](https://github.com/AsakuraMizu/Learn-Helper/issues/3))
+- [FIX] 移除 fontawesome，使用 [unplugin-icons](https://github.com/unplugin/unplugin-icons) 渲染图标，减小包体积
+
 ## 4.6.0
 
 （由 @AsakuraMizu 作为 2023 年 OSPP 项目贡献）

README.md

@@ -79,6 +79,10 @@ yarn serve:chrome
 
 Due to technical restrictions, dev mode works only for chrome.
 
+### Auto login
+
+Copy `.env.development` to `.env.development.local` and fill in your username & password to login automatically on start. (development mode only)
+
 ## Revision History
 
 See [CHANGELOG.md](https://github.com/Harry-Chen/Learn-Helper/blob/master/CHANGELOG.md).

lingui.config.ts

@@ -0,0 +1,15 @@
+import type { LinguiConfig } from '@lingui/conf';
+
+const config: LinguiConfig = {
+  locales: ['en', 'zh'],
+  sourceLocale: 'zh',
+  orderBy: 'origin',
+  catalogs: [
+    {
+      path: '<rootDir>/src/locales/{locale}',
+      include: ['src'],
+    },
+  ],
+};
+
+export default config;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "learn-helper",
-  "version": "4.6.0",
+  "version": "4.6.1",
   "author": "Harry Chen",
   "license": "MIT",
   "private": true,
@@ -17,45 +17,52 @@
     "serve:chrome": "web-ext run -t chromium --start-url \"https://example.com\" --source-dir ./dist/",
     "serve:firefox": "web-ext run --start-url \"about:debugging#/runtime/this-firefox\"  --source-dir ./dist/",
     "lint": "eslint .",
-    "format": "prettier --write \"src/**/*.ts\" \"src/**/*.tsx\" \"src/**/*.js\" \"./*.js\""
+    "format": "prettier --write \"src/**/*.ts\" \"src/**/*.tsx\"",
+    "lingui:extract": "lingui extract"
   },
   "devDependencies": {
+    "@lingui/cli": "^4.5.0",
+    "@lingui/swc-plugin": "^4.0.4",
+    "@lingui/vite-plugin": "^4.5.0",
     "@mdx-js/rollup": "^2.3.0",
     "@samrum/vite-plugin-web-extension": "^5.0.0",
-    "@types/lodash": "^4.14.195",
+    "@svgr/core": "^8.1.0",
+    "@svgr/plugin-jsx": "^8.1.0",
     "@types/node": "^18.11.11",
     "@types/randomstring": "^1.1.8",
-    "@types/react": "^18.2.15",
+    "@types/react": "^18.2.23",
     "@types/react-dom": "^18.2.7",
     "@types/redux-logger": "^3.0.9",
-    "@types/webextension-polyfill": "^0.10.1",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
-    "@vitejs/plugin-react": "^4.0.3",
-    "eslint": "^8.45.0",
+    "@types/webextension-polyfill": "^0.10.4",
+    "@typescript-eslint/eslint-plugin": "^6.7.3",
+    "@typescript-eslint/parser": "^6.7.3",
+    "@vitejs/plugin-react-swc": "^3.4.0",
+    "eslint": "^8.50.0",
     "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-react": "^7.32.2",
-    "prettier": "^2.8.0",
+    "eslint-plugin-react": "^7.33.2",
+    "prettier": "^3.0.3",
     "randomstring": "^1.3.0",
     "remark-mdx-images": "^2.0.0",
-    "remark-unwrap-images": "^3.0.1",
+    "remark-unwrap-images": "^4.0.0",
     "rollup-plugin-visualizer": "^5.9.2",
-    "terser": "^5.19.4",
-    "typescript": "^5.1.6",
-    "vite": "^4.4.4",
+    "terser": "^5.20.0",
+    "typescript": "^5.2.2",
+    "unplugin-icons": "^0.17.0",
+    "vite": "^4.4.9",
     "vite-plugin-zip-pack": "^1.0.6",
-    "web-ext": "^7.6.2"
+    "web-ext": "^7.7.0"
   },
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@fortawesome/fontawesome-svg-core": "^6.4.0",
-    "@fortawesome/free-solid-svg-icons": "^6.4.0",
-    "@fortawesome/react-fontawesome": "^0.2.0",
-    "@mui/material": "^5.14.0",
-    "@reduxjs/toolkit": "^1.9.5",
+    "@iconify-json/fa6-solid": "^1.1.15",
+    "@lingui/core": "^4.5.0",
+    "@lingui/macro": "^4.5.0",
+    "@lingui/react": "^4.5.0",
+    "@mui/material": "^5.14.11",
+    "@reduxjs/toolkit": "^1.9.6",
     "classnames": "^2.3.2",
-    "compare-versions": "^6.0.0",
+    "compare-versions": "^6.1.0",
     "fake-parse5": "^0.0.1",
     "material-ui-popup-state": "^5.0.9",
     "notistack": "^3.0.1",
@@ -66,7 +73,7 @@
     "react-iframe": "^1.8.5",
     "react-redux": "^8.1.2",
     "redux-logger": "^3.0.6",
-    "thu-learn-lib": "^3.1.0",
+    "thu-learn-lib": "^3.1.2",
     "webextension-polyfill": "^0.10.0"
   },
   "resolutions": {}