sharedにパス通したいな

nekobato · Aug 23, 2023 · babd0d2 · babd0d2
1 parent f2ca544
commit babd0d2
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 95 deletions.
diff --git a/packages/main/db.ts b/packages/main/db.ts
@@ -1,14 +1,10 @@
 import { safeStorage } from "electron";
 import Store from "electron-store";
 import { v4 as uuid } from "uuid";
+import { Timeline } from "../shared/types/Store";
 
 export type StoreSchema = {
-  timeline: {
-    id: string; // uuid
-    userId: string;
-    channel: string;
-    options: string;
-  }[];
+  timeline: Timeline[];
   instance: {
     id: string; // uuid
     type: "misskey" | "mastodon";

diff --git a/packages/main/tsconfig.json b/packages/main/tsconfig.json
@@ -1,3 +1,9 @@
 {
-  "extends": "../../tsconfig.json"
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "paths": {
+      "@/shared/*": ["../shared/*"]
+    }
+  },
+  "include": ["**/*.ts"]
 }
diff --git a/packages/main/vite.config.ts b/packages/main/vite.config.ts
@@ -15,7 +15,7 @@ export default defineConfig({
     sourcemap: true,
     emptyOutDir: true,
     rollupOptions: {
-      external: ["electron", "sqlite3", ...builtinModules, ...Object.keys(pkg.dependencies || {})],
+      external: ["electron", ...builtinModules, ...Object.keys(pkg.dependencies || {})],
     },
     commonjsOptions: {
       ignoreGlobal: false,

diff --git a/packages/mutation-types.ts b/packages/mutation-types.ts
diff --git a/packages/renderer/src/components/Post.vue b/packages/renderer/src/components/Post.vue
@@ -39,6 +39,7 @@ const postAtttachments = computed(() => {
 });
 
 const openPost = () => {
+  console.log(new URL(`/notes/${props.post.id}`, timelineStore.currentInstance?.url).toString());
   ipcSend("open-url", { url: new URL(`/notes/${props.post.id}`, timelineStore.currentInstance?.url).toString() });
 };
 
@@ -84,14 +85,6 @@ const isMyReaction = (reaction: string, myReaction?: string) => {
       <div class="post-data">
         <div class="hazy-post-info">
           <span class="username" v-html="props.post.user.name" />
-          <div class="hazy-post-actions">
-            <button class="hazy-post-action" @click="openPost">
-              <Icon class="nn-icon size-xsmall" icon="mingcute:add-fill" />
-            </button>
-            <button class="hazy-post-action" @click="openPost">
-              <Icon class="nn-icon size-xsmall" icon="mingcute:external-link-line" />
-            </button>
-          </div>
         </div>
         <div class="hazy-post-contents">
           <img class="hazy-avatar" :src="props.post.user.avatarUrl" alt="" />
@@ -123,6 +116,14 @@ const isMyReaction = (reaction: string, myReaction?: string) => {
         <span class="count">{{ reaction.count }}</span>
       </button>
     </div>
+    <div class="hazy-post-actions">
+      <button class="hazy-post-action" @click="openPost">
+        <Icon class="nn-icon size-xsmall" icon="mingcute:add-fill" />
+      </button>
+      <button class="hazy-post-action" @click="openPost">
+        <Icon class="nn-icon size-xsmall" icon="mingcute:external-link-line" />
+      </button>
+    </div>
   </div>
 </template>
 

diff --git a/packages/renderer/src/pages/PostWindow/Create.vue b/packages/renderer/src/pages/PostWindow/Create.vue
@@ -4,10 +4,9 @@ import { Icon } from "@iconify/vue";
 import { computed, onMounted, reactive, ref } from "vue";
 import HazyButton from "@/components/common/HazyButton.vue";
 import hazyAlert from "@/components/common/HazyAlert.vue";
-import { User } from "@prisma/client";
 
 const state = reactive({
-  users: [] as User[],
+  users: [] as any,
   currentUserIndex: 0,
   post: {
     isSending: false,

diff --git a/packages/renderer/src/store/index.ts b/packages/renderer/src/store/index.ts
@@ -1,5 +1,4 @@
 import { ipcInvoke } from "@/utils/ipc";
-import { Instance as InstanceTable, User } from "@prisma/client";
 import { Post } from "@/types/Post";
 import { defineStore } from "pinia";
 import { Emoji, MisskeyEntities } from "@/types/misskey";

diff --git a/packages/renderer/tsconfig.json b/packages/renderer/tsconfig.json
@@ -1,19 +1,12 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "target": "esnext",
     "useDefineForClassFields": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "strict": true,
-    "jsx": "preserve",
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
     "lib": ["esnext", "dom"],
-    "baseUrl": ".",
     "allowJs": true,
     "paths": {
-      "@/*": ["src/*"]
+      "@/*": ["./src/*"],
+      "@@/*": ["../*"]
     }
   },
   "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"]

diff --git a/packages/shared/types/Store.ts b/packages/shared/types/Store.ts
@@ -0,0 +1,14 @@
+export type Timeline = {
+  id: string; // uuid
+  userId: string;
+  channel: string;
+  options: string;
+};
+
+export type Instance = {
+  id: string; // uuid
+  type: "misskey" | "mastodon";
+  name: string;
+  url: string;
+  iconUrl: string;
+};
diff --git a/packages/shared/types/hazy.ts b/packages/shared/types/hazy.ts