Merge branch 'main' into main

This commit is contained in:
Michal Vaniš 2023-12-02 20:35:00 +01:00 committed by GitHub
commit fec4695919
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 299 additions and 324 deletions

View file

@ -12,17 +12,32 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [macos-latest, ubuntu-latest, windows-latest] os: [macos-latest, ubuntu-latest, windows-latest]
include:
- os: macos-latest
platform: mac
- os: ubuntu-latest
platform: linux
- os: windows-latest
platform: windows
steps: steps:
- name: Check out Git repository - uses: actions/checkout@v3
uses: actions/checkout@v3 - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
- uses: actions/setup-node@v3 - name: Use Node.js 18
uses: actions/setup-node@v3
with: with:
node-version: 18 node-version: 18
cache: "pnpm"
- name: Install dependencies
run: pnpm install --frozen-lockfile
- name: Build
run: pnpm build
- name: Run Electron Builder - name: Run Electron Builder
uses: samuelmeuli/action-electron-builder@e4b12cd06ddf023422f1ac4e39632bd76f6e6928 run: |
with: pnpm electron-builder --${{ matrix.platform }} --publish always
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} env:
RELEASE: true GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View file

@ -7,7 +7,9 @@ Vesktop is a cross platform desktop app aiming to give you a snappier Discord ex
Bug reports, feature requests & contributions are highly appreciated!! Bug reports, feature requests & contributions are highly appreciated!!
![image](https://user-images.githubusercontent.com/45497981/235024615-94565eaf-f412-4384-a3f5-d8cde7458f6d.png) ![](https://github.com/Vencord/Vesktop/assets/45497981/8608a899-96a9-4027-9725-2cb02ba189fd)
![grafik](https://github.com/Vencord/Vesktop/assets/45497981/8701e5de-52c4-4346-a990-719cb971642e)
## Installing ## Installing

View file

@ -1,6 +1,6 @@
{ {
"name": "VencordDesktop", "name": "VencordDesktop",
"version": "0.4.3", "version": "0.4.4",
"private": true, "private": true,
"description": "", "description": "",
"keywords": [], "keywords": [],
@ -23,23 +23,23 @@
"watch": "pnpm build --watch" "watch": "pnpm build --watch"
}, },
"dependencies": { "dependencies": {
"arrpc": "github:OpenAsar/arrpc#89f4da610ccfac93f461826a446a17cd3b23953d" "arrpc": "github:OpenAsar/arrpc#3e22fd776273afaa4a80c51deb86077ffdd4d2ae"
}, },
"optionalDependencies": { "optionalDependencies": {
"@vencord/venmic": "^2.1.2" "@vencord/venmic": "^2.1.3"
}, },
"devDependencies": { "devDependencies": {
"@fal-works/esbuild-plugin-global-externals": "^2.1.2", "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
"@types/node": "^20.8.4", "@types/node": "^20.10.0",
"@types/react": "^18.2.28", "@types/react": "^18.2.39",
"@typescript-eslint/eslint-plugin": "^6.7.5", "@typescript-eslint/eslint-plugin": "^6.13.1",
"@typescript-eslint/parser": "^6.7.5", "@typescript-eslint/parser": "^6.13.1",
"@vencord/types": "^0.1.2", "@vencord/types": "^0.1.2",
"dotenv": "^16.3.1", "dotenv": "^16.3.1",
"electron": "^27.0.0", "electron": "^27.1.2",
"electron-builder": "^24.6.4", "electron-builder": "^24.9.1",
"esbuild": "^0.19.4", "esbuild": "^0.19.8",
"eslint": "^8.51.0", "eslint": "^8.54.0",
"eslint-config-prettier": "^9.0.0", "eslint-config-prettier": "^9.0.0",
"eslint-import-resolver-alias": "^1.1.2", "eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-license-header": "^0.6.0", "eslint-plugin-license-header": "^0.6.0",
@ -47,13 +47,13 @@
"eslint-plugin-prettier": "^5.0.1", "eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-simple-import-sort": "^10.0.0", "eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-unused-imports": "^3.0.0", "eslint-plugin-unused-imports": "^3.0.0",
"prettier": "^3.0.3", "prettier": "^3.1.0",
"source-map-support": "^0.5.21", "source-map-support": "^0.5.21",
"tsx": "^3.13.0", "tsx": "^4.6.0",
"type-fest": "^4.4.0", "type-fest": "^4.8.2",
"typescript": "^5.2.2" "typescript": "^5.3.2"
}, },
"packageManager": "pnpm@8.6.11", "packageManager": "pnpm@8.11.0",
"engines": { "engines": {
"node": ">=18", "node": ">=18",
"pnpm": ">=8" "pnpm": ">=8"
@ -109,7 +109,6 @@
"Type": "Application", "Type": "Application",
"Categories": "Network;InstantMessaging;Chat;", "Categories": "Network;InstantMessaging;Chat;",
"Keywords": "discord;vencord;electron;chat;", "Keywords": "discord;vencord;electron;chat;",
"WMClass": "VencordDesktop",
"StartupWMClass": "VencordDesktop" "StartupWMClass": "VencordDesktop"
} }
}, },

File diff suppressed because it is too large Load diff

View file

@ -78,8 +78,6 @@ await Promise.all([
inject: ["./scripts/build/injectReact.mjs"], inject: ["./scripts/build/injectReact.mjs"],
jsxFactory: "VencordCreateElement", jsxFactory: "VencordCreateElement",
jsxFragment: "VencordFragment", jsxFragment: "VencordFragment",
// Work around https://github.com/evanw/esbuild/issues/2460
tsconfig: "./scripts/build/tsconfig.esbuild.json",
external: ["@vencord/types/*"], external: ["@vencord/types/*"],
plugins: [vencordDep], plugins: [vencordDep],
footer: { js: "//# sourceURL=VCDRenderer" } footer: { js: "//# sourceURL=VCDRenderer" }

View file

@ -1,7 +0,0 @@
// Work around https://github.com/evanw/esbuild/issues/2460
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"jsx": "react"
}
}

View file

@ -24,6 +24,7 @@
img { img {
width: 6em; width: 6em;
height: 6em; height: 6em;
image-rendering: pixelated;
} }
</style> </style>
</head> </head>