Skip to content

Commit

Permalink
Merge pull request #43 from JustJoostNL/rebuild
Browse files Browse the repository at this point in the history
V3.0.0
  • Loading branch information
JustJoostNL authored Mar 7, 2024
2 parents 1cad4a4 + 519b317 commit 6f75974
Show file tree
Hide file tree
Showing 277 changed files with 17,064 additions and 20,512 deletions.
48 changes: 0 additions & 48 deletions .eslintrc.js

This file was deleted.

75 changes: 75 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"settings": {
"react": {
"version": "detect"
}
},
"env": {
"browser": true,
"es2021": true,
"node": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:prettier/recommended"
],
"overrides": [
{
"files": ["vite.config.ts", "codegen.ts"],
"rules": {
"import/no-default-export": "off"
}
}
],
"ignorePatterns": ["node_modules/", "dist/", "build/", "out/", "dist-electron/"],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": [
"unused-imports",
"import",
"react",
"react-hooks",
"@typescript-eslint",
"prettier"
],
"rules": {
"prettier/prettier": [
"warn",
{},
{
"usePrettierrc": true
}
],
"linebreak-style": ["error", "windows"],
"quotes": ["error", "double"],
"semi": ["error", "always"],
"object-curly-spacing": ["warn", "always"],
"object-shorthand": ["warn", "always"],
"import/order": [
"error",
{ "pathGroups": [{ "pattern": "@/**", "group": "internal" }] }
],
"import/first": "error",
"import/no-amd": "error",
"import/no-webpack-loader-syntax": "error",
"import/no-default-export": "warn",
"import/no-duplicates": "error",
"unused-imports/no-unused-imports": "error",
"react-hooks/rules-of-hooks": "error",
"react/no-unescaped-entities": "off",
"react/jsx-curly-brace-presence": "warn",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-vars": [
"warn",
{ "argsIgnorePattern": "^_", "varsIgnorePattern": "^_" }
],
"@typescript-eslint/ban-ts-comment": "off"
}
}
31 changes: 14 additions & 17 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,46 @@ on:
push:
branches:
- master
- rebuild

jobs:
release:
build:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [macos-12, ubuntu-latest, windows-latest]
os: [macos-14, ubuntu-latest, windows-latest]

steps:
- name: Check out Git repository
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: 18

- name: Build/release Electron app
uses: Yan-Jobs/[email protected]
- name: Install dependencies
run: yarn install --frozen-lockfile --network-timeout 400000

- name: Build app
run: yarn build
env:
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASS }}
CSC_LINK: ${{ secrets.CSC_LINK }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
with:
# GitHub token, automatically provided to the action
# (No need to define this secret in the repo settings)
github_token: ${{ secrets.github_token }}

# If the commit is tagged with a version (e.g. "v1.0.0"),
# release the app after building
release: ${{ startsWith(github.ref, 'refs/tags/v') }}
GH_TOKEN: ${{ secrets.github_token }}

- name: Upload a Build Artifact
uses: actions/upload-artifact@v3.1.1
uses: actions/upload-artifact@v4
with:
name: build
name: ${{ runner.os }}-build
path: |
out/win-unpacked
out/linux-unpacked
out/*.dmg
out/*.AppImage
out/*.exe
out/*.exe
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ output/*
dist/*
release/*
dist-electron/*

.prettierrc
.prettierrc.json
codegen.yml
yarn-error.log
```
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

3 changes: 3 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"endOfLine": "auto"
}
3 changes: 3 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"recommendations": ["esbenp.prettier-vscode", "dbaeumer.vscode-eslint"]
}
19 changes: 19 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"editor.codeActionsOnSave": {
"source.fixAll": "explicit"
},
"editor.formatOnSave": true,
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
],
"files.autoSave": "onFocusChange",
"files.insertFinalNewline": true,
"files.trimTrailingWhitespace": true,
"files.readonlyInclude": {
"**/node_modules/**": true
},
"typescript.tsdk": "node_modules/typescript/lib"
}
37 changes: 37 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Version 3.0.0 - 2024-03-07

**Important**: This update will reset your configuration due to major application changes, you will need to reconfigure your devices and events. There is no way around this, sorry for the inconvenience.

### Changed
- Complete UI redesign of the app
- Major performance improvements
- Major stability improvements
- Insane amount of bug fixes
- Updated dependencies
- Device selection pages will no longer open in a new window
- Add support for multiple Elgato Stream Deck devices
- Improved error handling
- Remove unused analytics
- Improved update process
- Major changes to configuration handling
- **Effects are now called events, here is everything you need to know:**
- Effects are now called events
- An event can have multiple triggers
- Events will replace the custom colors, and "go back to static".
- Events can be shared with a hyperlink.
- You can achieve the same "go back to static" behavior as before, by creating an event that ends with delay (1000 ms) and sets the color to the wanted static color.
- New event triggers are added, such as: Chequered flag, DRS Enabled, DRS Disabled, Time penalty, Pit exit open, and more. *Let me know if you want to see more triggers.*
- You can now simulate events on the event editor page.
- You can now duplicate events.

For questions or ideas, please contact me on Discord :)



2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:

F1MV Lights Integration Copyright (C) 2023 JustJoostNL
F1MV Lights Integration Copyright (C) 2024 JustJoostNL
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ Distributed under the GNU General Public License v3.0. See `LICENSE.md` for more

<!-- ACKNOWLEDGMENTS -->
## Acknowledgments
* [Thanks to @LapsTimeOFF for helping me with the hue integration!](https://github.com/LapsTimeOFF/)
* [Thanks to all who contributed to this project!](https://github.com/JustJoostNL/F1MV-Lights-Integration/graphs/contributors)
* [Thanks to MultiViewer for the amazing software!](https://multiviewer.app)


Expand Down Expand Up @@ -248,4 +248,4 @@ Distributed under the GNU General Public License v3.0. See `LICENSE.md` for more
[home-assistant-url]: https://www.home-assistant.io/

[github_username]: JustJoostNL
[repo_name]: F1MV-Lights-Integration
[repo_name]: F1MV-Lights-Integration
20 changes: 16 additions & 4 deletions electron-builder.json5
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"productName": "F1MV-Lights-Integration",
"appId": "com.justjoostnl.f1mv.lights.integration",
"copyright": "Copyright © 2023 JustJoostNL",
"copyright": "Copyright © 2024 JustJoostNL",

generateUpdatesFilesForAllChannels: true,
"asar": true,
Expand Down Expand Up @@ -30,9 +30,21 @@
entitlements: "build/entitlements.mac.plist",
entitlementsInherit: "build/entitlements.mac.plist",
category: "public.app-category.utilities",
"target": [
"dmg",
"zip"
target: [
{
target: "dmg",
arch: [
"x64",
"arm64"
],
},
{
target: "zip",
arch: [
"x64",
"arm64"
],
},
]
},

Expand Down
68 changes: 0 additions & 68 deletions electron/main/app/analytics/analytics.ts

This file was deleted.

Loading

0 comments on commit 6f75974

Please sign in to comment.