Skip to content

Commit

Permalink
Added Multiple Pixoo Support & Refactored Code to ESM
Browse files Browse the repository at this point in the history
  • Loading branch information
TheBaconCat committed Oct 20, 2024
1 parent e02f2bd commit 58a07fd
Show file tree
Hide file tree
Showing 19 changed files with 3,585 additions and 1,562 deletions.
26 changes: 16 additions & 10 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,33 @@
{
"env": {
"browser": true,
"es2022": true,
"es2023": true,
"jquery": true,
"node": true,
"commonjs": true
},
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:unicorn/recommended",
"prettier"
],
"overrides": [
],
"overrides": [],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": "latest"
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": [
"@typescript-eslint",
"html"
],
"plugins": ["@typescript-eslint", "html"],
"rules": {
"@typescript-eslint/no-var-requires": "off"
}
"unicorn/better-regex": "error",
"@typescript-eslint/no-var-requires": "off",
"unicorn/prefer-top-level-await": "off",
"unicorn/filename-case":"off",
"unicorn/numeric-separators-style": [
"error",
{"onlyIfContainsSeparator": true, "binary": {"onlyIfContainsSeparator": false}}
]
},
"ignorePatterns": ["node_modules", "dist", "out", ".gitignore"]
}
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
dist
out
out
filesConfiguration.json
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"typescript.tsdk": "node_modules\\typescript\\lib"
}
2 changes: 1 addition & 1 deletion electron-builder.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
appId: com.DigiFlagTeam.DigiFlag-F1MV
artifactName: ${productName}-${version}-${os}-${arch}.${ext}
productName: DigiFlag-F1MV
copyright: Copyright © 2023 DigiFlag Team
copyright: Copyright © 2024 DigiFlag Team
generateUpdatesFilesForAllChannels: true
npmRebuild: false
publish:
Expand Down
17 changes: 13 additions & 4 deletions electron.vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,33 @@
import {defineConfig, externalizeDepsPlugin} from 'electron-vite';
export default defineConfig({

main: {
plugins: [externalizeDepsPlugin()],
build: {
outDir: './dist/main',
emptyOutDir:true
emptyOutDir: true,
rollupOptions: {
output: {
format: 'es',
},
},
},
},
preload: {
plugins: [externalizeDepsPlugin()],
build: {
outDir: './dist/preload',
emptyOutDir:true
emptyOutDir: true,
rollupOptions: {
output: {
format: 'cjs',
},
},
},
},
renderer: {
build: {
outDir: './dist/renderer',
emptyOutDir:true
emptyOutDir: true,
},
},
});
54 changes: 30 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"name": "digiflag-f1mv",
"productName": "DigiFlag-F1MV",
"version": "2.6.9",
"version": "2.7.0",
"description": "DigiFlag for F1 MultiViewer",
"main": "./dist/main/main.js",
"license": "MIT",
"type": "module",
"author": "DigiFlag Team",
"contributors": [
{
Expand Down Expand Up @@ -43,40 +44,45 @@
"dependencies": {
"@electron-toolkit/preload": "^3.0.1",
"@electron-toolkit/utils": "^3.0.0",
"@types/eslint__eslintrc": "^2.1.2",
"@types/eslint__js": "^8.42.3",
"address": "^2.0.3",
"electron-store": "8.2.0",
"electron-updater": "^6.2.1",
"express": "^4.19.2",
"i18next": "^23.11.5",
"electron-store": "^10.0.0",
"electron-updater": "^6.3.9",
"express": "^4.21.1",
"i18next": "^23.16.2",
"i18next-browser-languagedetector": "^8.0.0",
"i18next-fs-backend": "^2.3.1",
"i18next-http-backend": "^2.5.2",
"i18next-fs-backend": "^2.3.2",
"i18next-http-backend": "^2.6.2",
"jquery": "^3.7.1",
"jquery-i18next": "^1.2.1",
"npm_f1mv_api": "^1.4.8"
},
"devDependencies": {
"@electron-toolkit/tsconfig": "^1.0.1",
"@electron/notarize": "^2.3.2",
"@types/express": "^4.17.21",
"@types/jquery": "^3.5.30",
"@types/node": "^20.14.9",
"@electron/notarize": "^2.5.0",
"@types/bootstrap": "^5.2.10",
"@types/express": "^5.0.0",
"@types/jquery": "^3.5.31",
"@types/node": "^22.7.7",
"@types/request": "^2.48.12",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"electron": "^31.1.0",
"electron-builder": "^24.13.3",
"electron-log": "^5.1.5",
"@typescript-eslint/eslint-plugin": "^8.10.0",
"@typescript-eslint/parser": "^8.10.0",
"electron": "^33.0.1",
"electron-builder": "^25.1.8",
"electron-log": "^5.2.0",
"electron-vite": "^2.3.0",
"eslint": "^8.57.0",
"eslint": "^8.57.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-html": "^8.1.1",
"eslint-plugin-prettier": "^5.1.3",
"husky": "^9.0.11",
"lint-staged": "^15.2.7",
"prettier": "^3.3.2",
"typescript": "^5.5.2",
"vite": "^5.3.1"
"eslint-plugin-html": "^8.1.2",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-unicorn": "^56.0.0",
"husky": "^9.1.6",
"lint-staged": "^15.2.10",
"prettier": "^3.3.3",
"typescript": "^5.6.3",
"vite": "^5.4.9"
},
"lint-staged": {
"*.{js,ts}": "eslint --cache --fix",
Expand Down
Loading

0 comments on commit 58a07fd

Please sign in to comment.