fix rest issues

moeru-ai · Jan 3, 2025 · 4f0ab73 · 4f0ab73
1 parent 179787f
commit 4f0ab73
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 81 deletions.
diff --git a/packages/tamagotchi/.editorconfig b/packages/tamagotchi/.editorconfig
diff --git a/packages/tamagotchi/.vscode/extensions.json b/packages/tamagotchi/.vscode/extensions.json
diff --git a/packages/tamagotchi/.vscode/launch.json b/packages/tamagotchi/.vscode/launch.json
diff --git a/packages/tamagotchi/.vscode/settings.json b/packages/tamagotchi/.vscode/settings.json
diff --git a/packages/tamagotchi/README.md b/packages/tamagotchi/README.md
@@ -1,6 +1,6 @@
-# AIRI Tamagotchi
+# たまごっち アイリ
 
-A desktop application for AIRI Tamagotchi.
+A desktop application for たまごっち アイリ.
 
 ## Project Setup
 

diff --git a/packages/tamagotchi/electron-builder.yml b/packages/tamagotchi/electron-builder.yml
@@ -1,4 +1,4 @@
-appId: io.ayaka.moeru-ai.airi-tamagotchi
+appId: com.github.moeru-ai.airi-tamagotchi
 productName: airi
 directories:
   buildResources: build

diff --git a/packages/tamagotchi/electron.vite.config.ts b/packages/tamagotchi/electron.vite.config.ts
@@ -1,4 +1,4 @@
-import { resolve } from 'node:path'
+import { join, resolve } from 'node:path'
 import vue from '@vitejs/plugin-vue'
 import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
 
@@ -12,7 +12,7 @@ export default defineConfig({
   renderer: {
     resolve: {
       alias: {
-        '@renderer': resolve('src/renderer/src'),
+        '@renderer': resolve(join('src', 'renderer', 'src')),
       },
     },
     plugins: [vue()],

diff --git a/packages/tamagotchi/package.json b/packages/tamagotchi/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@proj-airi/tamagotchi",
+  "name": "@proj-airi/stage-tamagotchi",
   "version": "1.0.0",
   "description": "An Electron application with Vue and TypeScript",
   "author": "LemonNekoGH",

diff --git a/packages/tamagotchi/src/main/index.ts b/packages/tamagotchi/src/main/index.ts
@@ -1,14 +1,14 @@
 import { readFileSync } from 'node:fs'
 import { dirname, join } from 'node:path'
-import process from 'node:process'
+import { platform } from 'node:process'
 import { fileURLToPath } from 'node:url'
 import { electronApp, is, optimizer } from '@electron-toolkit/utils'
 import { app, BrowserWindow, ipcMain, shell } from 'electron'
 import icon from '../../build/icon.png?asset'
 
-function createWindow(): void {
-  const __dirname = dirname(fileURLToPath(import.meta.url))
+const __dirname = dirname(fileURLToPath(import.meta.url))
 
+function createWindow(): void {
   // Create the browser window.
   const mainWindow = new BrowserWindow({
     width: 300,
@@ -20,9 +20,9 @@ function createWindow(): void {
     resizable: false,
     hasShadow: false,
     alwaysOnTop: true,
-    ...(process.platform === 'linux' ? { icon } : {}),
+    ...(platform === 'linux' ? { icon } : {}),
     webPreferences: {
-      preload: join(__dirname, '../preload/index.js'),
+      preload: join(__dirname, '..', 'preload', 'index.js'),
       sandbox: false,
     },
   })
@@ -50,7 +50,7 @@ function createWindow(): void {
     })
   }
   else {
-    mainWindow.loadFile(join(__dirname, '../../out/renderer/index.html'))
+    mainWindow.loadFile(join(__dirname, '..', '..', 'out', 'renderer', 'index.html'))
   }
 
   ipcMain.on('move-window', (_, dx, dy) => {
@@ -64,7 +64,7 @@ function createWindow(): void {
 // Some APIs can only be used after this event occurs.
 app.whenReady().then(() => {
   // Set app user model id for windows
-  electronApp.setAppUserModelId('moe.ayaka.proj-airi')
+  electronApp.setAppUserModelId('com.github.moeru-ai.airi-tamagotchi')
 
   // Default open or close DevTools by F12 in development
   // and ignore CommandOrControl + R in production.
@@ -74,8 +74,6 @@ app.whenReady().then(() => {
   })
 
   // IPC test
-  // eslint-disable-next-line no-console
-  ipcMain.on('ping', () => console.log('pong'))
   ipcMain.on('quit', () => app.quit())
 
   createWindow()
@@ -93,7 +91,7 @@ app.whenReady().then(() => {
 // for applications and their menu bar to stay active until the user quits
 // explicitly with Cmd + Q.
 app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
+  if (platform !== 'darwin') {
     app.quit()
   }
 })

diff --git a/packages/tamagotchi/src/preload/index.ts b/packages/tamagotchi/src/preload/index.ts
@@ -1,4 +1,4 @@
-import process from 'node:process'
+import { contextIsolated } from 'node:process'
 import { electronAPI } from '@electron-toolkit/preload'
 import { contextBridge } from 'electron'
 
@@ -8,7 +8,7 @@ const api = {}
 // Use `contextBridge` APIs to expose Electron APIs to
 // renderer only if context isolation is enabled, otherwise
 // just add to the DOM global.
-if (process.contextIsolated) {
+if (contextIsolated) {
   try {
     contextBridge.exposeInMainWorld('electron', electronAPI)
     contextBridge.exposeInMainWorld('api', api)

diff --git a/packages/tamagotchi/src/renderer/index.html b/packages/tamagotchi/src/renderer/index.html
@@ -2,7 +2,8 @@
 <html>
   <head>
     <meta charset="UTF-8" />
-    <title>Electron</title>
+    <title>アイリ</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0" />
     <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
     <meta
       http-equiv="Content-Security-Policy"