Skip to content

Commit 8b85840

Browse files
yell0wsuityell0wsuit
authored
Fix footer column, fix Windows ARM64 build, update packages (#43)
* Update workflow, fix ARM64 builds not building * Update packages * Fix footer column * Fix badge contrast (due to new daisyui version) * Update version * Add URL check to prevent cache update in testing URLs
1 parent ff480e9 commit 8b85840

7 files changed

Lines changed: 1087 additions & 817 deletions

File tree

‎.github/workflows/electron.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
run: |
134134
source venv/bin/activate
135135
for arch in ${{ join(matrix.arch, ' ') }}; do
136-
npm run makecli -- --arch=$arch
136+
npx electron-forge make --arch=$arch
137137
mkdir -p out/make-mac-$arch
138138
mv out/make/* out/make-mac-$arch/
139139
done
@@ -143,7 +143,7 @@ jobs:
143143
run: |
144144
$architectures = @("x64", "arm64")
145145
foreach ($arch in $architectures) {
146-
npm run makecli -- --arch=$arch
146+
npx electron-forge make --arch=$arch
147147
New-Item -ItemType Directory -Force -Path "out/make-win-$arch"
148148
Move-Item -Path "out/make/*" -Destination "out/make-win-$arch/"
149149
}
@@ -153,7 +153,7 @@ jobs:
153153
- name: Build Electron app (Linux)
154154
if: matrix.os == 'ubuntu-latest'
155155
run: |
156-
npm run makecli
156+
npx electron-forge make
157157
mkdir -p out/make-linux
158158
mv out/make/* out/make-linux/
159159
env:

‎package-lock.json‎

Lines changed: 1031 additions & 772 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"author": "yell0wsuit",
44
"description": "An English-learning interactive tool written in React, designed to help learners practice speaking and listening",
55
"private": true,
6-
"version": "3.2.9",
6+
"version": "3.2.10",
77
"type": "module",
88
"main": "main.cjs",
99
"license": "Apache-2.0",
@@ -23,69 +23,69 @@
2323
"dependencies": {
2424
"@dnd-kit/core": "^6.3.1",
2525
"@dnd-kit/sortable": "^10.0.0",
26-
"@tailwindcss/postcss": "^4.0.8",
27-
"@tailwindcss/vite": "^4.0.8",
26+
"@tailwindcss/postcss": "^4.1.3",
27+
"@tailwindcss/vite": "^4.1.3",
2828
"@vidstack/react": "^1.12.13",
29-
"@wavesurfer/react": "^1.0.9",
29+
"@wavesurfer/react": "^1.0.10",
3030
"cors": "^2.8.5",
3131
"dexie": "^4.0.11",
32-
"electron-log": "^5.3.0",
32+
"electron-log": "^5.3.3",
3333
"electron-squirrel-startup": "^1.0.1",
34-
"express": "^4.21.2",
34+
"express": "^5.1.0",
3535
"express-rate-limit": "^7.5.0",
3636
"he": "^1.2.0",
37-
"i18next": "^24.2.2",
37+
"i18next": "^24.2.3",
3838
"i18next-browser-languagedetector": "^8.0.4",
3939
"i18next-http-backend": "^3.0.2",
4040
"lodash": "^4.17.21",
4141
"masonry-layout": "^4.2.2",
42-
"mime": "^4.0.6",
42+
"mime": "^4.0.7",
4343
"nprogress": "^0.2.0",
44-
"react": "^19.0.0",
45-
"react-dom": "^19.0.0",
44+
"react": "^19.1.0",
45+
"react-dom": "^19.1.0",
4646
"react-flip-toolkit": "^7.2.4",
4747
"react-i18next": "^15.4.1",
4848
"react-icons": "^5.5.0",
4949
"react-loading-skeleton": "^3.5.0",
50-
"react-router-dom": "^7.2.0",
51-
"sonner": "^2.0.1",
50+
"react-router-dom": "^7.5.0",
51+
"sonner": "^2.0.3",
5252
"vidstack": "^1.12.12",
53-
"wavesurfer.js": "^7.9.1"
53+
"wavesurfer.js": "^7.9.4"
5454
},
5555
"devDependencies": {
56-
"@electron-forge/cli": "^7.7.0",
57-
"@electron-forge/maker-deb": "^7.7.0",
58-
"@electron-forge/maker-dmg": "^7.7.0",
59-
"@electron-forge/maker-rpm": "^7.7.0",
60-
"@electron-forge/maker-squirrel": "^7.7.0",
61-
"@electron-forge/maker-zip": "^7.7.0",
62-
"@electron-forge/plugin-auto-unpack-natives": "^7.7.0",
63-
"@electron-forge/plugin-fuses": "^7.7.0",
56+
"@electron-forge/cli": "^7.8.0",
57+
"@electron-forge/maker-deb": "^7.8.0",
58+
"@electron-forge/maker-dmg": "^7.8.0",
59+
"@electron-forge/maker-rpm": "^7.8.0",
60+
"@electron-forge/maker-squirrel": "^7.8.0",
61+
"@electron-forge/maker-zip": "^7.8.0",
62+
"@electron-forge/plugin-auto-unpack-natives": "^7.8.0",
63+
"@electron-forge/plugin-fuses": "^7.8.0",
6464
"@electron/fuses": "^1.8.0",
65-
"@eslint/js": "^9.21.0",
65+
"@eslint/js": "^9.24.0",
6666
"@tailwindcss/typography": "^0.5.16",
67-
"@types/react": "^19.0.10",
68-
"@types/react-dom": "^19.0.4",
67+
"@types/react": "^19.1.0",
68+
"@types/react-dom": "^19.1.1",
6969
"@vitejs/plugin-react": "^4.3.4",
70-
"@vitejs/plugin-react-swc": "^3.8.0",
71-
"autoprefixer": "^10.4.20",
70+
"@vitejs/plugin-react-swc": "^3.8.1",
71+
"autoprefixer": "^10.4.21",
7272
"concurrently": "^9.1.2",
7373
"cross-env": "^7.0.3",
74-
"daisyui": "^5.0.0-beta.8",
75-
"electron": "^34.2.0",
76-
"eslint": "^9.21.0",
77-
"eslint-plugin-react": "^7.37.4",
78-
"eslint-plugin-react-hooks": "^5.1.0",
74+
"daisyui": "^5.0.12",
75+
"electron": "^35.1.4",
76+
"eslint": "^9.24.0",
77+
"eslint-plugin-react": "^7.37.5",
78+
"eslint-plugin-react-hooks": "^5.2.0",
7979
"eslint-plugin-react-refresh": "^0.4.19",
8080
"globals": "^16.0.0",
8181
"postcss": "^8.5.3",
82-
"prettier": "^3.5.2",
82+
"prettier": "^3.5.3",
8383
"prettier-plugin-tailwindcss": "^0.6.11",
8484
"rollup-plugin-visualizer": "^5.14.0",
85-
"tailwindcss": "^4.0.8",
86-
"vite": "^6.2.0",
87-
"vite-plugin-pwa": "^0.21.1",
88-
"wait-on": "^8.0.2"
85+
"tailwindcss": "^4.1.3",
86+
"vite": "^6.2.5",
87+
"vite-plugin-pwa": "^1.0.0",
88+
"wait-on": "^8.0.3"
8989
},
9090
"optionalDependencies": {
9191
"appdmg": "latest"

‎src/App.jsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,12 @@ const RATE_LIMIT_KEY = "github_ratelimit_timestamp";
3838
const RATE_LIMIT_THRESHOLD = 50;
3939

4040
const clearCacheForNewVersion = async () => {
41+
// Normalize URL
42+
const baseUrl = import.meta.env.BASE_URL.replace(/\/+$/, ""); // Remove trailing slash
43+
const currentUrl = window.location.href;
44+
4145
// Prevent running in either development mode or Electron version
42-
if (process.env.NODE_ENV === "development" || isElectron()) {
46+
if (process.env.NODE_ENV === "development" || isElectron() || !currentUrl.startsWith(baseUrl)) {
4347
console.warn("Dev mode or Electron version detected, skipping version check.");
4448
return;
4549
}

‎src/components/general/Footer.jsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ const openExternal = (url) => {
1515

1616
const Footer = () => {
1717
return (
18-
<footer lang="en" className="footer bg-base-200 p-6 pb-20 text-base-content md:p-10">
18+
<footer
19+
lang="en"
20+
className="footer sm:footer-horizontal bg-base-200 text-base-content p-6 pb-20 md:p-10"
21+
>
1922
<aside>
2023
<LogoLightOrDark width="100" height="100" />
2124
<p>

‎src/components/word_page/WordDetails.jsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,11 @@ const WordDetails = ({ word, handleBack, t, accent, onReviewUpdate, scrollRef })
161161
</h1>
162162

163163
{word.level.map((wordLevel, id) => (
164-
<span key={id} className="badge badge-outline font-semibold" lang="en">
164+
<span
165+
key={id}
166+
className="badge badge-neutral font-semibold"
167+
lang="en"
168+
>
165169
{wordLevel.toUpperCase()}
166170
</span>
167171
))}

‎src/components/word_page/WordList.jsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ const PronunciationPractice = () => {
143143
<a
144144
role="tab"
145145
onClick={() => setActiveTab("oxford3000")}
146-
className={`md:text-base tab ${
146+
className={`tab md:text-base ${
147147
activeTab === "oxford3000"
148148
? "tab-active font-semibold"
149149
: ""
@@ -159,7 +159,7 @@ const PronunciationPractice = () => {
159159
</a>
160160
<a
161161
role="tab"
162-
className={`md:text-base tab ${
162+
className={`tab md:text-base ${
163163
activeTab === "oxford5000"
164164
? "tab-active font-semibold"
165165
: ""
@@ -252,7 +252,7 @@ const PronunciationPractice = () => {
252252
{word.level.map((wordLevel, id) => (
253253
<span
254254
key={id}
255-
className="badge badge-outline font-semibold"
255+
className="badge badge-neutral font-semibold"
256256
lang="en"
257257
>
258258
{wordLevel.toUpperCase()}

0 commit comments

Comments
 (0)