Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 0 additions & 72 deletions .github/workflows/build.yaml

This file was deleted.

22 changes: 18 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
tags:
- 'v*'

permissions:
contents: write

jobs:
create-release:
name: Create Release
Expand Down Expand Up @@ -59,13 +62,21 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build-and-upload:
name: Build and Upload ${{ matrix.os }}
name: ${{ matrix.display_name }} Build
needs: create-release
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
include:
- os: ubuntu-latest
display_name: Linux
- os: windows-latest
display_name: Windows
- os: macos-latest
display_name: macOS

steps:
- name: Checkout code
Expand All @@ -90,6 +101,11 @@ jobs:
- name: Install dependencies
run: npm ci

- name: Install Snapcraft (Linux only)
if: matrix.os == 'ubuntu-latest'
run: |
sudo snap install snapcraft --classic

- name: Build for Windows
if: matrix.os == 'windows-latest'
run: npm run build:win
Expand All @@ -115,11 +131,9 @@ jobs:
files: |
dist/*.exe
dist/*.dmg
dist/*.zip
dist/*.AppImage
dist/*.snap
dist/*.deb
dist/*.yml
dist/*.yaml
dist/latest*.yml
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# DexReader

[![CI](https://github.com/remichan97/DexReader/actions/workflows/ci.yaml/badge.svg)](https://github.com/remichan97/DexReader/actions/workflows/ci.yaml)
[![Release](https://github.com/remichan97/DexReader/actions/workflows/release.yaml/badge.svg)](https://github.com/remichan97/DexReader/actions/workflows/release.yaml)
[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)

A modern, cross-platform manga reader for MangaDex built with Electron, React, and TypeScript.
Expand Down
21 changes: 15 additions & 6 deletions electron-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,44 @@ files:
- '!{.eslintcache,eslint.config.mjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
- '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
- '!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}'
asar: true
asarUnpack:
- resources/**
- out/main/database/migrations/**
compression: maximum
win:
executableName: dexreader
target:
- nsis
nsis:
artifactName: ${name}-${version}-setup.${ext}
shortcutName: ${productName}
uninstallDisplayName: ${productName}
createDesktopShortcut: always
mac:
target:
- target: dmg
arch: [x64, arm64]
entitlementsInherit: build/entitlements.mac.plist
extendInfo:
- NSCameraUsageDescription: Application requests access to the device's camera.
- NSMicrophoneUsageDescription: Application requests access to the device's microphone.
- NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder.
- NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
notarize: false
dmg:
artifactName: ${name}-${version}.${ext}
artifactName: ${name}-${version}-${arch}.${ext}
linux:
target:
- AppImage
- snap
- deb
maintainer: electronjs.org
category: Utility
maintainer: remichan97
category: Entertainment
appImage:
artifactName: ${name}-${version}.${ext}
artifactName: ${name}-${version}-${arch}.${ext}
snap:
artifactName: ${name}-${version}-${arch}.${ext}
deb:
artifactName: ${name}-${version}-${arch}.${ext}
npmRebuild: false
publish:
provider: github
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@
"main": "./out/main/index.js",
"author": "remichan97",
"homepage": "https://electron-vite.org",
"build": {
"publish": {
"provider": "github",
"owner": "remichan97",
"repo": "DexReader"
}
},
"scripts": {
"format": "prettier --write .",
"lint": "eslint --cache .",
Expand Down
6 changes: 3 additions & 3 deletions src/renderer/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BrowserRouter, useLocation } from 'react-router-dom'
import { HashRouter, useLocation } from 'react-router-dom'
import { useEffect, useState } from 'react'
import { AppShell } from './layouts/AppShell'
import { AppRoutes } from './router'
Expand Down Expand Up @@ -146,12 +146,12 @@ function App(): React.JSX.Element {
console.error('[App Error]', error, errorInfo)
}}
>
<BrowserRouter>
<HashRouter>
<UnsavedChangesProvider>
<AppContent />
</UnsavedChangesProvider>
<ToastContainer toasts={toasts} onDismiss={dismissToast} position="bottom-right" />
</BrowserRouter>
</HashRouter>
</ErrorBoundary>
)
}
Expand Down
Loading