Skip to content

Commit

Permalink
Merge branch 'main' of github.com:acrosman/electron-sf-base
Browse files Browse the repository at this point in the history
* 'main' of github.com:acrosman/electron-sf-base:
  pass with no tests
  lint fixes
  electron forge switch over
  • Loading branch information
acrosman committed Mar 15, 2023
2 parents 628b951 + 1cf5d03 commit e26b254
Show file tree
Hide file tree
Showing 10 changed files with 15,485 additions and 7,946 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Build
on: [pull_request]

jobs:
build_on_linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@master
with:
node-version: 18
- name: install dependencies
run: npm install
- name: build
run: npm run make

build_on_mac:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@master
with:
node-version: 18
- name: install dependencies
run: npm install
- name: build
run: npm run make

build_on_win:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@master
with:
node-version: 18
- name: install dependencies
run: npm install
- name: build
run: npm run make
48 changes: 48 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Release
on:
push:
tags:
- "v*"

jobs:
publish_on_linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@master
with:
node-version: 18
- name: install dependencies
run: npm install
- name: publish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: npm run publish

publish_on_mac:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@master
with:
node-version: 18
- name: install dependencies
run: npm install
- name: publish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: npm run publish

publish_on_win:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@master
with:
node-version: 18
- name: install dependencies
run: npm install
- name: publish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: npm run publish
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Distro folder
dist
out

# Logs
logs
Expand Down
1 change: 0 additions & 1 deletion app/preload.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Preload script.
const { contextBridge, ipcRenderer } = require('electron'); // eslint-disable-line
const { handlers } = require('../src/sf_calls');

// Expose protected methods that allow the renderer process to use
// the ipcRenderer without exposing the entire object.
Expand Down
4 changes: 2 additions & 2 deletions app/render.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ $.when($.ready).then(() => {

// Setup event listener for when the console modal opens,
// pull in the most recent 50 messages.
$('#consoleModal').on('show.bs.modal', (event) => {
$('#consoleModal').on('show.bs.modal', () => {
// Clear existing messages.
const messageTable = document.querySelector('#consoleMessageTable');
while (messageTable.rows.length > 1) {
Expand Down Expand Up @@ -135,7 +135,7 @@ function showLogMessage(timestamp, channel, title, message) {
*/
function displayMessages(messageList) {
messageList.forEach((message) => {
showLogMessage(message.timestamp, message.channel, message.message)
showLogMessage(message.timestamp, message.channel, message.message);
});

let currentCount = parseInt(document.getElementById('log-console-load-more').dataset.count, 10);
Expand Down
49 changes: 49 additions & 0 deletions forge.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// eslint-disable-next-line import/no-extraneous-dependencies
const { utils: { fromBuildIdentifier } } = require('@electron-forge/core');

module.exports = {
buildIdentifier: process.env.IS_BETA ? 'beta' : 'prod',
packagerConfig: {
appBundleId: fromBuildIdentifier({ beta: 'com.beta.acrosman.sf-bar', prod: 'com.sf-base' }),
},
rebuildConfig: {},
makers: [
{
name: '@electron-forge/maker-squirrel',
config: {
exe: 'sf-base.exe',
name: 'sf-base',
authors: 'Aaron Crosman',
},
},
{
name: '@electron-forge/maker-zip',
platforms: ['darwin', 'linux'],
},
{
name: '@electron-forge/maker-rpm',
config: {},
},
{
name: '@electron-forge/maker-dmg',
config: {
format: 'ULFO',
overwrite: true,
},
},
],
plugins: [],
publishers: [
{
name: '@electron-forge/publisher-github',
config: {
repository: {
owner: 'acrosman',
name: 'sf-base',
},
prerelease: false,
draft: true,
},
},
],
};
10 changes: 10 additions & 0 deletions jest.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"verbose": true,
"testPathIgnorePatterns": [
"/node_modules/",
"/out/"
],
"modulePathIgnorePatterns": [
"/out/"
]
}
4 changes: 4 additions & 0 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ if (isDev) {
require("electron-debug")(); // eslint-disable-line
}

// run this as early in the main process as possible
// eslint-disable-next-line global-require
if (require('electron-squirrel-startup')) app.quit();

// Additional Tooling.
const path = require('path');

Expand Down
Loading

0 comments on commit e26b254

Please sign in to comment.