From 6978478c94e2c3a4196446e27c725f528713c21b Mon Sep 17 00:00:00 2001 From: SrIzan10 <66965250+SrIzan10@users.noreply.github.com> Date: Sun, 16 Jul 2023 14:14:06 +0000 Subject: [PATCH] fix: builds, macOS unsupported for a moment --- .circleci/config.yml | 9 --------- .gitignore | 3 +-- electron/index.ts | 1 - package.json | 3 ++- vite.config.ts | 4 ++++ 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a1fc314..5c3bbc1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,14 +1,5 @@ version: 2.1 jobs: - build_mac: - docker: - - image: node:lts - steps: - - checkout - - run: yarn - - run: yarn electron-ci - - run: yarn add -D dmg-license - - run: yarn build-electron-mac build_windows: docker: - image: electronuserland/builder:wine diff --git a/.gitignore b/.gitignore index 0515f8e..c1466f8 100644 --- a/.gitignore +++ b/.gitignore @@ -23,5 +23,4 @@ dist-ssr *.sln *.sw? -# some random thing from electron (it doesnt compile in a dist folder for some reason -./electron/index.js \ No newline at end of file +build/ \ No newline at end of file diff --git a/electron/index.ts b/electron/index.ts index 3ba4311..9f50027 100644 --- a/electron/index.ts +++ b/electron/index.ts @@ -1,7 +1,6 @@ import * as path from 'node:path' import { app, BrowserWindow, dialog, ipcMain } from 'electron'; import * as isDev from 'electron-is-dev'; -import * as fs from 'fs'; import * as colorette from 'colorette'; import { exec } from 'node:child_process'; diff --git a/package.json b/package.json index 0bd1967..6db1a9d 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,8 @@ "build": { "extends": null, "files": [ - "build/**/*" + "./build/**/*", + "./dist/index.js" ], "directories": { "buildResources": "assets" diff --git a/vite.config.ts b/vite.config.ts index 861b04b..5e11eff 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -4,4 +4,8 @@ import react from '@vitejs/plugin-react-swc' // https://vitejs.dev/config/ export default defineConfig({ plugins: [react()], + build: { + outDir: './build' + }, + base: '' })