Merge branches 'master' and 'master' of https://github.com/Ripwords/transparentReader

Author: Ripwords

.github/workflows/publish.yml

@@ -6,6 +6,7 @@ on:
 
 env:
   TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+  TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
 
 jobs:
   publish-tauri:
@@ -20,7 +21,7 @@ jobs:
     - name: setup node
       uses: actions/setup-node@v1
       with:
-        node-version: 14
+        node-version: 16
     - name: install Rust stable
       uses: actions-rs/toolchain@v1
       with:
@@ -32,7 +33,7 @@ jobs:
         sudo apt-get install -y webkit2gtk-4.0
     - name: install app dependencies and build it
       run: yarn && yarn build
-    - uses: tauri-apps/tauri-action@v0
+    - uses: jdukewich/tauri-action@fix-windows-bundling
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

.gitignore

@@ -4,3 +4,4 @@ dist
 dist-ssr
 *.local
 ~
+.env

components.d.ts

@@ -0,0 +1,23 @@
+// generated by unplugin-vue-components
+// We suggest you to commit this file into source control
+// Read more: https://github.com/vuejs/vue-next/pull/3399
+
+declare module 'vue' {
+  export interface GlobalComponents {
+    Content: typeof import('./src/components/Content.vue')['default']
+    'IGrommetIcons:documentWord': typeof import('~icons/grommet-icons/document-word')['default']
+    'IMdi:arrowTopLeftThinCircleOutline': typeof import('~icons/mdi/arrow-top-left-thin-circle-outline')['default']
+    'IMdi:filePdf': typeof import('~icons/mdi/file-pdf')['default']
+    'IMdi:fileWord': typeof import('~icons/mdi/file-word')['default']
+    'IMdi:themeLightDark': typeof import('~icons/mdi/theme-light-dark')['default']
+    'IRi:settings3Line': typeof import('~icons/ri/settings3-line')['default']
+    NH2: typeof import('naive-ui')['NH2']
+    NInput: typeof import('naive-ui')['NInput']
+    NMessageProvider: typeof import('naive-ui')['NMessageProvider']
+    NModal: typeof import('naive-ui')['NModal']
+    NSlider: typeof import('naive-ui')['NSlider']
+    NTooltip: typeof import('naive-ui')['NTooltip']
+  }
+}
+
+export { }

package.json

@@ -1,34 +1,33 @@
 {
   "name": "window-reader",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "scripts": {
-    "dev": "concurrently -k \"vite\" \"tauri dev\"",
-    "build": "vue-tsc --noEmit && vite build"
+    "dev": "tauri dev",
+    "build": "tauri build"
   },
   "dependencies": {
     "@tauri-apps/api": "^1.0.0-rc.1",
-    "@vueup/vue-quill": "^1.0.0-beta.7",
-    "@vueuse/core": "^6.9.1",
+    "@tauri-apps/cli": "^1.0.0-rc.5",
+    "@vueup/vue-quill": "1.0.0-beta.8",
+    "@vueuse/core": "7.6.2",
     "file-saver": "^2.0.5",
-    "pinia": "^2.0.9",
+    "pinia": "2.0.11",
     "quill-to-pdf": "^1.0.7",
     "quill-to-word": "^1.3.0",
-    "vue": "^3.2.16"
+    "vue": "3.2.31"
   },
   "devDependencies": {
-    "@iconify/json": "^1.1.428",
-    "@tauri-apps/cli": "^1.0.0-rc.5",
+    "@iconify/json": "2.1.3",
     "@types/file-saver": "^2.0.5",
-    "@vitejs/plugin-vue": "^1.9.3",
-    "concurrently": "^6.3.0",
-    "naive-ui": "^2.24.6",
-    "typescript": "^4.4.3",
-    "unplugin-auto-import": "^0.4.14",
-    "unplugin-icons": "^0.12.18",
-    "unplugin-vue-components": "^0.17.2",
-    "vite": "^2.6.4",
-    "vite-plugin-windicss": "^1.5.1",
+    "@vitejs/plugin-vue": "2.2.2",
+    "naive-ui": "2.25.2",
+    "typescript": "4.5.5",
+    "unplugin-auto-import": "0.6.0",
+    "unplugin-icons": "0.13.2",
+    "unplugin-vue-components": "0.17.18",
+    "vite": "2.8.4",
+    "vite-plugin-windicss": "1.7.1",
     "vue-tsc": "^0.3.0",
-    "windicss": "^3.2.1"
+    "windicss": "^3.4.3"
   }
 }