diff --git a/packages/client/capacitor.config.ts b/packages/client/capacitor.config.ts index 27b89fbb2b..4a8a6db06a 100644 --- a/packages/client/capacitor.config.ts +++ b/packages/client/capacitor.config.ts @@ -1,15 +1,15 @@ -import { CapacitorConfig } from '@capacitor/cli'; +import { CapacitorConfig } from "@capacitor/cli"; const config: CapacitorConfig = { - appId: 'org.calckey.app', - appName: 'Calckey', - webDir: '../../built/_client_dist_', - bundledWebRuntime: false, + appId: "org.calckey.app", + appName: "Calckey", + webDir: "../../built/_client_dist_", + bundledWebRuntime: false, plugins: { - PushNotifications: { - presentationOptions: ["badge", "sound", "alert"] - } - } + PushNotifications: { + presentationOptions: ["badge", "sound", "alert"], + }, + }, }; export default config; diff --git a/packages/client/src/config.ts b/packages/client/src/config.ts index 462f16c922..4f161b8df3 100644 --- a/packages/client/src/config.ts +++ b/packages/client/src/config.ts @@ -16,9 +16,11 @@ export const url = $i?.instanceUrl; export const url = address.origin; // #v-endif export const apiUrl = `${url ? url : "http://localhost"}/api`; -export const wsUrl = `${url ? url - .replace("http://", "ws://") - .replace("https://", "wss://") : "ws://localhost"}/streaming`; +export const wsUrl = `${ + url + ? url.replace("http://", "ws://").replace("https://", "wss://") + : "ws://localhost" +}/streaming`; export const lang = localStorage.getItem("lang"); export const langs = _LANGS_; export const locale = JSON.parse(localStorage.getItem("locale")); diff --git a/packages/client/src/i18n.ts b/packages/client/src/i18n.ts index 2197332bd8..b1534ead8b 100644 --- a/packages/client/src/i18n.ts +++ b/packages/client/src/i18n.ts @@ -12,4 +12,3 @@ declare module "@vue/runtime-core" { $ts: typeof i18n["locale"]; } } - diff --git a/packages/client/src/scripts/theme.ts b/packages/client/src/scripts/theme.ts index f56e26e1ab..c37980b0de 100644 --- a/packages/client/src/scripts/theme.ts +++ b/packages/client/src/scripts/theme.ts @@ -146,7 +146,7 @@ function compile(theme: Theme): Record { // #v-ifdef VITE_CAPACITOR if (storedDeviceInfo.platform === "ios") { StatusBar.setStyle({ - style: theme.base === "dark" ? Style.Dark : Style.Light, + style: theme.base === "dark" ? Style.Dark : Style.Light, }); } // #v-endif diff --git a/packages/client/src/stream.ts b/packages/client/src/stream.ts index d63a57a1f1..5bba8b6ad4 100644 --- a/packages/client/src/stream.ts +++ b/packages/client/src/stream.ts @@ -6,7 +6,7 @@ import { url } from "@/config"; export const stream = markRaw( new Misskey.Stream( // #v-ifdef VITE_CAPACITOR - $i? $i.instanceUrl : "localhost", + $i ? $i.instanceUrl : "localhost", // #v-else url, // #v-endif diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts index 86f7cf1004..b82822ad44 100644 --- a/packages/client/vite.config.ts +++ b/packages/client/vite.config.ts @@ -2,14 +2,14 @@ import * as fs from "fs"; import pluginVue from "@vitejs/plugin-vue"; import { defineConfig } from "vite"; -import locales from '../../locales'; -import { dependencies } from './package.json'; +import locales from "../../locales"; +import { dependencies } from "./package.json"; -import meta from '../../package.json'; -import pluginJson5 from './vite.json5'; -import viteCompression from 'vite-plugin-compression'; +import meta from "../../package.json"; +import pluginJson5 from "./vite.json5"; +import viteCompression from "vite-plugin-compression"; import ConditionalCompile from "vite-plugin-conditional-compiler"; -import tsconfigPaths from 'vite-tsconfig-paths' +import tsconfigPaths from "vite-tsconfig-paths"; const extensions = [ ".ts", @@ -28,7 +28,11 @@ const extensions = [ export default defineConfig(({ command, mode }) => { fs.mkdirSync(`${__dirname}/../../built`, { recursive: true }); - fs.writeFileSync(`${__dirname}/../../built/meta.json`, JSON.stringify({ version: meta.version }), 'utf-8'); + fs.writeFileSync( + `${__dirname}/../../built/meta.json`, + JSON.stringify({ version: meta.version }), + "utf-8", + ); return { base: "/assets/", @@ -52,9 +56,9 @@ export default defineConfig(({ command, mode }) => { resolve: { extensions, alias: { - '@/': `${__dirname}/src/`, - '/client-assets/': `${__dirname}/assets/`, - '/static-assets/': `${__dirname}/../backend/assets/`, + "@/": `${__dirname}/src/`, + "/client-assets/": `${__dirname}/assets/`, + "/static-assets/": `${__dirname}/../backend/assets/`, }, }, @@ -74,25 +78,23 @@ export default defineConfig(({ command, mode }) => { }, build: { - target: [ - 'es2017', - ], - manifest: 'manifest.json', + target: ["es2017"], + manifest: "manifest.json", rollupOptions: { input: { - index: 'index.html', - app: './src/init.ts', + index: "index.html", + app: "./src/init.ts", }, output: { manualChunks: { - vendor: ['vue'], - } + vendor: ["vue"], + }, }, }, cssCodeSplit: true, assetsInlineLimit: 0, outDir: `${__dirname}/../../built/_client_dist_`, - assetsDir: '.', + assetsDir: ".", emptyOutDir: false, sourcemap: process.env.NODE_ENV === "development", reportCompressedSize: false,