Skip to content

Commit

Permalink
Lots of improvements from template, bump deps
Browse files Browse the repository at this point in the history
  • Loading branch information
zoton2 committed Jul 13, 2024
1 parent 0181642 commit 4bf63c2
Show file tree
Hide file tree
Showing 17 changed files with 292 additions and 432 deletions.
6 changes: 4 additions & 2 deletions .eslintrc.browser.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const path = require('path');

module.exports = {
root: true,
env: {
Expand All @@ -6,7 +8,7 @@ module.exports = {
parser: 'vue-eslint-parser',
parserOptions: {
parser: '@typescript-eslint/parser',
project: 'tsconfig.browser.json',
project: path.join(__dirname, 'tsconfig.browser.json'),
extraFileExtensions: ['.vue'],
},
globals: {
Expand All @@ -28,7 +30,7 @@ module.exports = {
'import/resolver': {
typescript: {
// This is needed to properly resolve paths.
project: 'tsconfig.browser.json',
project: path.join(__dirname, 'tsconfig.browser.json'),
},
},
'import/extensions': ['.js', '.jsx', '.ts', '.tsx'],
Expand Down
6 changes: 4 additions & 2 deletions .eslintrc.extension.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
const path = require('path');

module.exports = {
root: true,
env: {
node: true,
},
parser: '@typescript-eslint/parser',
parserOptions: {
project: 'tsconfig.extension.json',
project: path.join(__dirname, 'tsconfig.extension.json'),
},
plugins: [
'@typescript-eslint',
Expand All @@ -21,7 +23,7 @@ module.exports = {
'import/resolver': {
typescript: {
// This is needed to properly resolve paths.
project: 'tsconfig.extension.json',
project: path.join(__dirname, 'tsconfig.extension.json'),
},
},
'import/extensions': ['.js', '.jsx', '.ts', '.tsx'],
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
id: commit
continue-on-error: true
run: |
git add -f dashboard graphics extension shared/dist
git add -f dashboard extension shared/dist
git commit -m "Built files" -a
# Pushes the built files to a specific branch
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 European Speedrunner Assembly
Copyright (c) 2024 European Speedrunner Assembly

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
47 changes: 22 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,25 @@
"author": "zoton2",
"scripts": {
"autofix": "run-s autofix:*",
"autofix:browser": "eslint --fix --ext .ts,.vue src/dashboard && eslint --fix --ext .ts,.vue src/graphics",
"autofix:extension": "eslint --fix --ext .ts src/extension && eslint --fix --ext .d.ts src/types",
"autofix:dashboard": "eslint --fix --ext .ts,.vue src/dashboard",
"autofix:extension": "eslint --fix --ext .ts src/extension",
"autofix:types": "eslint --fix --ext .d.ts src/types",
"prebuild": "npm run clean",
"build": "run-s clean build:*",
"build": "run-s build:*",
"build:browser": "vite build",
"build:extension": "tsc -b tsconfig.extension.json",
"clean": "trash node_modules/.cache && trash shared/dist && trash dashboard && trash graphics && trash extension",
"lint": "run-s lint:*",
"lint:browser": "eslint --ext .ts,.vue src/dashboard && eslint --ext .ts,.vue src/graphics",
"lint:extension": "eslint --ext .ts src/extension && eslint --ext .d.ts src/types",
"clean": "run-s clean:*",
"clean:browser": "trash node_modules/.vite && trash shared/dist && trash dashboard && trash graphics",
"clean:extension": "trash extension",
"lint": "run-s lint:* -c",
"lint:dashboard": "eslint --ext .ts,.vue src/dashboard",
"lint:extension": "eslint --ext .ts src/extension",
"lint:types": "eslint --ext .d.ts src/types",
"schema-types": "nodecg schema-types",
"start": "node ../..",
"watch": "run-p watch:*",
"watch:browser": "vite",
"watch:extension": "tsc -b tsconfig.extension.json -w"
"watch": "npm run prebuild && run-p watch:*",
"watch:browser": "npm run clean:browser && vite",
"watch:extension": "npm run clean:extension && tsc -b tsconfig.extension.json -w"
},
"dependencies": {
"@nodecg/types": "^2.1.12",
Expand All @@ -39,26 +43,26 @@
"speedcontrol-util": "github:speedcontrol/speedcontrol-util.git#build"
},
"devDependencies": {
"@quasar/extras": "^1.16.11",
"@quasar/extras": "^1.16.12",
"@quasar/vite-plugin": "^1.7.0",
"@types/needle": "^3.3.0",
"@types/node": "^18.19.39",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"@typescript-eslint/eslint-plugin": "^7.16.0",
"@typescript-eslint/parser": "^7.16.0",
"@vitejs/plugin-vue": "^4.6.2",
"@vueuse/head": "^1.3.1",
"@unhead/vue": "^1.9.15",
"eslint": "^8.57.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-airbnb-typescript": "^18.0.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-vue": "^9.27.0",
"nodecg-cli": "^8.6.8",
"nodecg-vue-composable": "^1.1.0",
"npm-run-all": "^4.1.5",
"quasar": "^2.16.5",
"npm-run-all2": "^6.2.2",
"quasar": "^2.16.6",
"trash-cli": "^5.0.0",
"ts-essentials": "^9.4.2",
"ts-essentials": "^10.0.1",
"typescript": "~5.4.5",
"vite": "^4.5.3",
"vite-plugin-checker": "~0.6.4",
Expand All @@ -81,13 +85,6 @@
"headerColor": "#c49215",
"width": 3
}
],
"graphics": [
{
"file": "blank.html",
"width": 1920,
"height": 1080
}
]
}
}
Loading

0 comments on commit 4bf63c2

Please sign in to comment.