Skip to content

Commit

Permalink
Merge pull request #33 from CodeDead/release/v2.2.0
Browse files Browse the repository at this point in the history
Release/v2.2.0
  • Loading branch information
CodeDead authored Dec 15, 2022
2 parents 69ebbd8 + 3fc2b22 commit 7f56275
Show file tree
Hide file tree
Showing 29 changed files with 1,440 additions and 1,373 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
if: matrix.platform == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
- name: Install app dependencies and build web
run: yarn && yarn build

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: matrix.platform == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
- name: Install app dependencies and build it
run: yarn && yarn build
- uses: tauri-apps/tauri-action@v0
Expand Down
554 changes: 280 additions & 274 deletions .yarn/releases/yarn-3.2.4.cjs → .yarn/releases/yarn-3.3.0.cjs

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
yarnPath: .yarn/releases/yarn-3.2.4.cjs

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.3.0.cjs
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ The application icon was provided by [RemixIcon](https://remixicon.com/).

### Translations

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

## About
Expand Down
21 changes: 10 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
{
"name": "advanced-passgen",
"version": "2.1.0",
"version": "2.2.0",
"private": true,
"dependencies": {
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@fontsource/roboto": "^4.5.8",
"@mui/icons-material": "^5.10.9",
"@mui/material": "^5.10.12",
"@mui/icons-material": "^5.11.0",
"@mui/material": "^5.11.0",
"@shopify/react-web-worker": "^5.0.6",
"@tauri-apps/api": "^1.1.0",
"@tauri-apps/api": "^1.2.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^14.4.3",
"clsx": "^1.2.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.4.3",
"react-router-dom": "^6.4.5",
"react-scripts": "^5.0.1",
"react-virtualized": "^9.22.3",
"web-vitals": "^3.0.4"
"web-vitals": "^3.1.0"
},
"scripts": {
"start": "react-scripts start",
Expand All @@ -46,15 +45,15 @@
"last 1 safari version"
]
},
"packageManager": "yarn@3.2.4",
"packageManager": "yarn@3.3.0",
"devDependencies": {
"@tauri-apps/cli": "^1.1.1",
"@tauri-apps/cli": "^1.2.2",
"cross-env": "^7.0.3",
"eslint": "^8.26.0",
"eslint": "^8.29.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-react": "^7.31.10",
"eslint-plugin-react": "^7.31.11",
"eslint-plugin-react-hooks": "^4.6.0"
}
}
1 change: 1 addition & 0 deletions src-tauri/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Generated by Cargo
# will have compiled files and executables
/target/
.idea/*
Loading

0 comments on commit 7f56275

Please sign in to comment.