To vite vue (#82)

nekobato · Jan 6, 2024 · 4868a81 · 4868a81
1 parent 46b4d7c
commit 4868a81
Show file tree

Hide file tree

Showing 92 changed files with 7,844 additions and 36,695 deletions.
diff --git a/.npmrc b/.npmrc
diff --git a/composables/hazyRoute.ts b/composables/hazyRoute.ts
diff --git a/electron-builder.config.js → electron-builder.json5 b/electron-builder.config.js → electron-builder.json5
@@ -1,15 +1,15 @@
-const package = require("./package.json");
-
-module.exports = {
+{
+  $schema: "https://raw.githubusercontent.com/electron-userland/electron-builder/master/packages/app-builder-lib/scheme.json",
   appId: "net.nekobato.hazy",
   asar: true,
+  productName: "hazy",
   directories: {
     output: "release/${version}",
   },
-  files: [".output/**/*", "dist-electron"],
+  files: ["dist", "dist-electron"],
   mac: {
     category: "public.app-category.social-networking",
-    icon: ".output/public/icons/mac/icon.icns",
+    icon: "dist/icons/mac/icon.icns",
     artifactName: "${productName}_${version}.${ext}",
     target: ["dmg"],
     publish: [
@@ -35,5 +35,4 @@ module.exports = {
     allowToChangeInstallationDirectory: true,
     deleteAppDataOnUninstall: false,
   },
-  buildVersion: package.version,
-};
+}
diff --git a/electron/tsconfig.json b/electron/tsconfig.json
diff --git a/index.html b/index.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="ja">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>hazy</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/electron/api/index.ts → main/api/index.ts b/electron/api/index.ts → main/api/index.ts
diff --git a/electron/api/misskey.ts → main/api/misskey.ts b/electron/api/misskey.ts → main/api/misskey.ts
diff --git a/electron/api/request.ts → main/api/request.ts b/electron/api/request.ts → main/api/request.ts
diff --git a/electron/autoupdate.ts → main/autoupdate.ts b/electron/autoupdate.ts → main/autoupdate.ts
diff --git a/electron/db.ts → main/db.ts b/electron/db.ts → main/db.ts
@@ -1,8 +1,7 @@
 import { safeStorage } from "electron";
 import Store from "electron-store";
 import { nanoid } from "nanoid/non-secure";
-import type { Instance, Timeline, User, Settings } from "@/types/store";
-import { storeDefaults } from "../utils/statics";
+import type { Instance, Timeline, User, Settings, InstanceStore } from "../shared/types/store";
 
 export type StoreSchema = {
   timelines: Timeline[];
@@ -11,6 +10,27 @@ export type StoreSchema = {
   settings: Settings;
 };
 
+export const storeDefaults = {
+  users: [] as User[],
+  instances: [] as InstanceStore[],
+  timelines: [] as Timeline[],
+  settings: {
+    opacity: 50,
+    hazyMode: "show",
+    windowSize: {
+      width: 475,
+      height: 600,
+    },
+    maxPostCount: 1000,
+    postStyle: "all",
+    shortcuts: {},
+    shouldAppUpdate: true,
+    misskey: {
+      hideCw: false,
+    },
+  } as Settings,
+};
+
 const schema: Store.Schema<StoreSchema> = {
   timelines: {
     type: "array",

diff --git a/main/electron-env.d.ts b/main/electron-env.d.ts
@@ -0,0 +1,17 @@
+/// <reference types="vite-plugin-electron/electron-env" />
+
+declare namespace NodeJS {
+  interface ProcessEnv {
+    DIST: string;
+    VITE_PUBLIC: string;
+  }
+}
+
+interface Window {
+  ipc: {
+    send: (event: string, payload?: any) => void;
+    invoke: (event: string, payload?: any) => Promise<any>;
+    on: (event: string, callback: (event: Electron.IpcRendererEvent, ...args: any[]) => void) => void;
+  };
+  openUrl: (e: Event, url: string) => void;
+}
diff --git a/electron/env.ts → main/env.ts b/electron/env.ts → main/env.ts
diff --git a/electron/index.ts → main/index.ts b/electron/index.ts → main/index.ts
@@ -8,7 +8,7 @@ import menuTemplate from "./menu";
 import * as db from "./db";
 import { apiRequest } from "./api";
 import { checkUpdate } from "./autoupdate";
-import type { Settings } from "@/types/store";
+import type { Settings } from "../shared/types/store";
 
 process.on("uncaughtException", function (error) {
   dialog.showErrorBox("Error", error.message);
@@ -238,4 +238,9 @@ if (DEBUG) {
   }
 }
 
-app.whenReady().then(start);
+app
+  .whenReady()
+  .then(start)
+  .catch((error) => {
+    dialog.showErrorBox("Error", error.message);
+  });
diff --git a/electron/menu.ts → main/menu.ts b/electron/menu.ts → main/menu.ts
@@ -1,4 +1,4 @@
-import electron from "electron";
+import electron, { app, dialog } from "electron";
 
 type MenuTemplate = (electron.MenuItemConstructorOptions | electron.MenuItem)[];
 
@@ -8,9 +8,19 @@ const menuTemplate = ({ mainWindow }: { mainWindow: electron.BrowserWindow | nul
     label: "hazy",
     submenu: [
       {
-        id: "quit",
-        label: "Quit hazy",
-        role: "quit",
+        label: "About Hazy",
+        click: () => {
+          dialog.showMessageBox({
+            type: "info",
+            icon: `${__dirname}/../public/icons/png/128x128.png`,
+            title: "Hazy",
+            message: `Hazy`,
+            detail: `Version: ${app.getVersion()}\n\nhttps://github.com/nekobato/hazy/`,
+          });
+        },
+      },
+      {
+        type: "separator",
       },
       {
         id: "reload",
@@ -19,19 +29,19 @@ const menuTemplate = ({ mainWindow }: { mainWindow: electron.BrowserWindow | nul
           mainWindow?.webContents.reload();
         },
       },
+      {
+        type: "separator",
+      },
+      {
+        id: "quit",
+        label: "Quit Hazy",
+        role: "quit",
+      },
     ],
   },
   {
     label: "Edit",
-    submenu: [
-      { label: "Undo", role: "undo" },
-      { label: "Redo", role: "redo" },
-      { type: "separator" },
-      { label: "Cut", role: "cut" },
-      { label: "Copy", role: "copy" },
-      { label: "Paste", role: "paste" },
-      { label: "Select All", role: "selectAll" },
-    ],
+    role: "editMenu",
   },
   // @ts-ignore: viewMenu is not defined in d.ts
   {

diff --git a/electron/preload.ts → main/preload.ts b/electron/preload.ts → main/preload.ts
diff --git a/electron/static.ts → main/static.ts b/electron/static.ts → main/static.ts
@@ -4,7 +4,7 @@ process.env.ROOT = path.join(__dirname, "..");
 process.env.DIST = path.join(process.env.ROOT, "dist-electron");
 process.env.VITE_PUBLIC = process.env.VITE_DEV_SERVER_URL
   ? path.join(process.env.ROOT, "public")
-  : path.join(process.env.ROOT, ".output/public");
+  : path.join(process.env.ROOT, "dist");
 process.env["ELECTRON_DISABLE_SECURITY_WARNINGS"] = "true";
 
 export const preload = path.join(process.env.DIST, "preload.js");

diff --git a/electron/windows/mainWindow.ts → main/windows/mainWindow.ts b/electron/windows/mainWindow.ts → main/windows/mainWindow.ts
diff --git a/electron/windows/mediaViewerWindow.ts → main/windows/mediaViewerWindow.ts b/electron/windows/mediaViewerWindow.ts → main/windows/mediaViewerWindow.ts
diff --git a/electron/windows/postWindow.ts → main/windows/postWindow.ts b/electron/windows/postWindow.ts → main/windows/postWindow.ts
diff --git a/nuxt.config.ts b/nuxt.config.ts