chore: 修改构建配置

aooiuu · May 23, 2024 · 526232c · 526232c
1 parent 3d5fdea
commit 526232c
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 40 deletions.
diff --git a/.github/workflows/electron.yml b/.github/workflows/electron.yml
@@ -1,4 +1,4 @@
-name: electron
+name: Electron
 
 on:
   push:

diff --git a/packages/epub/package.json b/packages/epub/package.json
@@ -23,6 +23,6 @@
     "epub.d.ts"
   ],
   "keywords": [],
-  "author": "aooiuu",
+  "author": "julien-c",
   "license": "ISC"
 }
diff --git a/packages/web/electron-builder.json5 b/packages/web/electron-builder.json5
@@ -1,37 +1,41 @@
 /**
  * @see https://www.electron.build/configuration/configuration
  */
- {
-  "appId": "any-reader",
-  "productName": "AnyReader",
-  "artifactName": "AnyReader_${version}.${ext}",
-  "asar": false,
-  "directories": {
-    "output": "dist/electron"
+{
+  appId: 'io.github.any-reader',
+  productName: 'AnyReader',
+  artifactName: 'AnyReader_${version}.${ext}',
+  asar: true,
+  directories: {
+    output: 'dist/electron'
   },
-  "files": [
-    "dist"
+  files: [
+    'dist/electron-js',
+    'dist/electron-template',
+    '!**/node_modules/**/*.map',
+    '!**/node_modules/**/*.md',
+    '!**/node_modules/**/*.ts',
+    '!**/node_modules/**/*.scss',
+    '!**/node_modules/.bin',
+    '!**/node_modules/*/{test,__tests__,tests,powered-test,example,examples}'
   ],
-  "mac": {
-    "target": [
-      "dmg"
-    ]
+  mac: {
+    target: ['dmg']
   },
-  "win": {
+  win: {
+    artifactName: '${productName}-win32-${arch}-${version}.${ext}',
     // "icon": "public/icon.png",
-    "target": [
+    target: [
       {
-        "target": "nsis",
-        "arch": [
-          "x64"
-        ]
+        target: 'nsis',
+        arch: ['x64', 'ia32']
       }
     ]
   },
-  "nsis": {
-    "oneClick": false,
-    "perMachine": false,
-    "allowToChangeInstallationDirectory": true,
-    "deleteAppDataOnUninstall": false
+  nsis: {
+    oneClick: false,
+    perMachine: false,
+    allowToChangeInstallationDirectory: true,
+    deleteAppDataOnUninstall: false
   }
-}
+}
diff --git a/packages/web/src/constants.ts b/packages/web/src/constants.ts
@@ -9,14 +9,14 @@ export enum CONTENT_TYPE {
 }
 
 export const CONTENT_TYPES = [
-  { value: 0, label: 'MANGA' },
-  { value: 1, label: 'NOVEL' },
-  { value: 2, label: 'VIDEO' },
+  { value: 0, label: '漫画' },
+  { value: 1, label: '小说' },
+  { value: 2, label: '视频' },
   // { value: 3, label: 'AUDIO' },
   // { value: 4, label: 'RSS' },
   // { value: 5, label: 'NOVELMORE' },
 
-  { value: 101, label: 'GAME' }
+  { value: 101, label: '游戏' }
 ];
 
 export const PLATFORM: 'browser' | 'vscode' | 'electron' = import.meta.env.VITE_APP_PLATFORM;

diff --git a/packages/web/src/pages/pc/search/index.vue b/packages/web/src/pages/pc/search/index.vue
@@ -4,7 +4,7 @@
       <div class="flex-1 flex items-center gap-10">
         <a-input-search v-model="searchText" placeholder="输入关键词，回车键搜索" class="!w-80" :disabled="loading" @keyup.enter="onSearch" />
         <a-checkbox-group v-model="contentTypes" :disabled="loading">
-          <a-checkbox v-for="item in CONTENT_TYPES" :key="item.value" :value="item.value">
+          <a-checkbox v-for="item in CONTENT_TYPES.filter((e) => e.value !== CONTENT_TYPE.GAME)" :key="item.value" :value="item.value">
             {{ item.label }}
           </a-checkbox>
         </a-checkbox-group>
@@ -62,7 +62,7 @@
 <script setup lang="tsx">
 import { v4 as uuidV4 } from 'uuid';
 import pLimit from 'p-limit';
-import { CONTENT_TYPES } from '@/constants';
+import { CONTENT_TYPES, CONTENT_TYPE } from '@/constants';
 import { searchByRuleId } from '@/api';
 import { useFavoritesStore } from '@/stores/favorites';
 import { useRulesStore } from '@/stores/rules';

diff --git a/packages/web/src/pages/vscode/search/index.vsc.vue b/packages/web/src/pages/vscode/search/index.vsc.vue
@@ -19,7 +19,7 @@
         <template v-if="expand">
           <!-- 规则类型 -->
           <vscode-dropdown class="w-full" :value="'' + contentType" @input="(event:any) => (contentType = +event.target.value)">
-            <vscode-option v-for="item in CONTENT_TYPES" :key="item.value" :value="item.value">
+            <vscode-option v-for="item in CONTENT_TYPES.filter((e) => e.value !== CONTENT_TYPE.GAME)" :key="item.value" :value="item.value">
               {{ item.label }}
             </vscode-option>
           </vscode-dropdown>

diff --git a/packages/web/src/pages/vscode/search/index.vue b/packages/web/src/pages/vscode/search/index.vue
@@ -4,7 +4,7 @@
       <div class="flex-1 flex items-center gap-10">
         <a-input-search v-model="searchText" placeholder="输入关键词，回车键搜索" class="!w-80" :disabled="loading" @keyup.enter="onSearch" />
         <a-checkbox-group v-model="contentTypes" :disabled="loading">
-          <a-checkbox v-for="item in CONTENT_TYPES" :key="item.value" :value="item.value">
+          <a-checkbox v-for="item in CONTENT_TYPES.filter((e) => e.value !== CONTENT_TYPE.GAME)" :key="item.value" :value="item.value">
             {{ item.label }}
           </a-checkbox>
         </a-checkbox-group>
@@ -54,7 +54,7 @@
 <script setup lang="tsx">
 import { v4 as uuidV4 } from 'uuid';
 import pLimit from 'p-limit';
-import { CONTENT_TYPES } from '@/constants';
+import { CONTENT_TYPES, CONTENT_TYPE } from '@/constants';
 import { searchByRuleId } from '@/api';
 import { getChapter } from '@/api/vsc';
 import { useFavoritesStore } from '@/stores/favorites';

diff --git a/packages/web/src/utils/request.ts b/packages/web/src/utils/request.ts
@@ -10,10 +10,7 @@ export async function request(config: any) {
   } else if (PLATFORM === 'electron') {
     const { pm } = await import(`./postMessage.electron`);
     const method = config.method ?? 'get';
-    !NProgress.isStarted() && NProgress.start();
-    const res = await pm.send(`${method}@${config.url}`, config.params || config.data);
-    NProgress.done();
-    return res;
+    return pm.send(`${method}@${config.url}`, config.params || config.data);
   } else {
     const { pm } = await import(`./postMessage`);
     const method = config.method ?? 'get';