Skip to content

Commit 7f56275

Browse files
authored
Merge pull request #33 from CodeDead/release/v2.2.0
Release/v2.2.0
2 parents 69ebbd8 + 3fc2b22 commit 7f56275

File tree

29 files changed

+1440
-1373
lines changed

29 files changed

+1440
-1373
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
if: matrix.platform == 'ubuntu-latest'
3232
run: |
3333
sudo apt-get update
34-
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
34+
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
3535
- name: Install app dependencies and build web
3636
run: yarn && yarn build
3737

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: matrix.platform == 'ubuntu-latest'
3838
run: |
3939
sudo apt-get update
40-
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
40+
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
4141
- name: Install app dependencies and build it
4242
run: yarn && yarn build
4343
- uses: tauri-apps/tauri-action@v0

.yarn/releases/yarn-3.2.4.cjs renamed to .yarn/releases/yarn-3.3.0.cjs

Lines changed: 280 additions & 274 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
yarnPath: .yarn/releases/yarn-3.2.4.cjs
2-
31
nodeLinker: node-modules
2+
3+
yarnPath: .yarn/releases/yarn-3.3.0.cjs

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ The application icon was provided by [RemixIcon](https://remixicon.com/).
8787

8888
### Translations
8989

90+
* Chinese (Simplified) - [大眼仔~](https://github.com/wcxu21)
9091
* German: [uDEV2019](https://github.com/uDEV2019)
9192

9293
## About

package.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
{
22
"name": "advanced-passgen",
3-
"version": "2.1.0",
3+
"version": "2.2.0",
44
"private": true,
55
"dependencies": {
66
"@emotion/react": "^11.10.5",
77
"@emotion/styled": "^11.10.5",
88
"@fontsource/roboto": "^4.5.8",
9-
"@mui/icons-material": "^5.10.9",
10-
"@mui/material": "^5.10.12",
9+
"@mui/icons-material": "^5.11.0",
10+
"@mui/material": "^5.11.0",
1111
"@shopify/react-web-worker": "^5.0.6",
12-
"@tauri-apps/api": "^1.1.0",
12+
"@tauri-apps/api": "^1.2.0",
1313
"@testing-library/jest-dom": "^5.16.5",
1414
"@testing-library/react": "^13.4.0",
1515
"@testing-library/user-event": "^14.4.3",
16-
"clsx": "^1.2.1",
1716
"react": "^18.2.0",
1817
"react-dom": "^18.2.0",
19-
"react-router-dom": "^6.4.3",
18+
"react-router-dom": "^6.4.5",
2019
"react-scripts": "^5.0.1",
2120
"react-virtualized": "^9.22.3",
22-
"web-vitals": "^3.0.4"
21+
"web-vitals": "^3.1.0"
2322
},
2423
"scripts": {
2524
"start": "react-scripts start",
@@ -46,15 +45,15 @@
4645
"last 1 safari version"
4746
]
4847
},
49-
"packageManager": "yarn@3.2.4",
48+
"packageManager": "yarn@3.3.0",
5049
"devDependencies": {
51-
"@tauri-apps/cli": "^1.1.1",
50+
"@tauri-apps/cli": "^1.2.2",
5251
"cross-env": "^7.0.3",
53-
"eslint": "^8.26.0",
52+
"eslint": "^8.29.0",
5453
"eslint-config-airbnb": "^19.0.4",
5554
"eslint-plugin-import": "^2.26.0",
5655
"eslint-plugin-jsx-a11y": "^6.6.1",
57-
"eslint-plugin-react": "^7.31.10",
56+
"eslint-plugin-react": "^7.31.11",
5857
"eslint-plugin-react-hooks": "^4.6.0"
5958
}
6059
}

src-tauri/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# Generated by Cargo
22
# will have compiled files and executables
33
/target/
4+
.idea/*

0 commit comments

Comments
 (0)