Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Electron 30 #116

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update to Electron 30 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30e61ec
update dependency
NeroBlackstone May 27, 2024
e824799
update react
NeroBlackstone May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "astrofox",
"version": "1.4.0",
"version": "1.4.1",
"productName": "Astrofox",
"description": "Audio reactive motion graphics program",
"author": "Mike Cao <[email protected]>",
Expand Down Expand Up @@ -92,28 +92,28 @@
]
},
"dependencies": {
"classnames": "^2.3.1",
"debug": "^4.3.1",
"del": "^6.0.0",
"classnames": "^2.5.1",
"debug": "^4.3.4",
"del": "^7.1.0",
"electron-localshortcut": "^3.2.1",
"fourier-transform": "^1.1.2",
"glob": "^7.1.6",
"glob": "^10.0.0",
"id3js": "2.1.1",
"immer": "^9.0.6",
"immer": "^10.1.1",
"lodash": "^4.17.21",
"mime": "^2.5.2",
"mime": "^4.0.3",
"path-browserify": "^1.0.1",
"prop-types": "^15.7.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-spring": "^9.0.0",
"react-window": "^1.8.6",
"reselect": "^4.0.0",
"semver": "^7.3.5",
"prop-types": "^15.8.1",
"react": "^18.3.0",
"react-dom": "^18.3.0",
"react-spring": "^9.7.3",
"react-window": "^1.8.10",
"reselect": "^5.1.0",
"semver": "^7.6.2",
"three": "0.139.2",
"tinycolor2": "^1.4.2",
"tinycolor2": "^1.6.0",
"window-function": "^2.1.0",
"yauzl": "^2.10.0",
"yauzl": "^3.1.3",
"zustand": "^3.4.0"
},
"devDependencies": {
Expand All @@ -135,9 +135,9 @@
"css-minimizer-webpack-plugin": "^3.1.1",
"dotenv": "^10.0.0",
"dotenv-cli": "^4.0.0",
"electron": "18.3.7",
"electron-builder": "^23.0.3",
"electron-notarize": "^1.0.0",
"electron": "30.0.8",
"electron-builder": "^24.13.3",
"electron-notarize": "^1.2.2",
"electron-updater": "^5.0.1",
"eslint": "^8.0.1",
"eslint-config-airbnb": "^18.2.1",
Expand Down
4 changes: 2 additions & 2 deletions src/main/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { app, session, systemPreferences } from 'electron';
import fs from 'fs';
import path from 'path';
import glob from 'glob';
import {globSync} from 'glob';
import debug from 'debug';
import { removeFile, createFolder } from 'utils/io';
import * as env from './environment';
Expand All @@ -12,7 +12,7 @@ import initEvents from './events';
const log = debug('init');

async function removeTempFiles() {
const files = glob.sync('*.*', { cwd: env.TEMP_PATH });
const files = globSync('*.*', { cwd: env.TEMP_PATH });
const promises = [];

files.forEach(file => promises.push(removeFile(path.join(env.TEMP_PATH, file))));
Expand Down
16 changes: 7 additions & 9 deletions src/main/window.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BrowserWindow, BrowserView } from 'electron';
import { BrowserWindow, WebContentsView } from 'electron';
import path from 'path';
import url from 'url';
import debug from 'debug';
Expand Down Expand Up @@ -69,24 +69,22 @@ export function createWindow() {
textAreasAreResizable: false,
devTools: true,
webgl: true,
sandbox: false,
},
});

if (process.env.NODE_ENV === 'production') {
const view = new BrowserView();
win.setBrowserView(view);
const view = new WebContentsView();
win.contentView.addChildView(view);
view.setBounds({ x: 0, y: 0, width: 0, height: 0 });
view.webContents.loadURL('https://astrofox.io/hello');
}

const url_index = new URL("file://"+path.join(__dirname, 'index.html'))
// Load index page
win.loadURL(
process.env.NODE_ENV === 'production'
? url.format({
pathname: path.join(__dirname, 'index.html'),
protocol: 'file',
slashes: true,
})
? url_index.toString()
: `http://localhost:${PORT}`,
);

Expand All @@ -111,4 +109,4 @@ export function createWindow() {
win.on('unmaximize', updateWindowState);
win.on('focus', updateWindowState);
win.on('blur', updateWindowState);
}
}
Loading