Skip to content

Commit ef42c51

Browse files
authored
Condense shared folder into main project (#19)
* It compiles * Remove some shared stuff * Remove last files from shared * Flags are mounted * Fix media box * Clean music if-statement gutter * re-enable markdown parser * Clean up mediabox if chain
1 parent 508f5fb commit ef42c51

File tree

450 files changed

+2448
-4773
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

450 files changed

+2448
-4773
lines changed

.eslintrc.browser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module.exports = {
4646
// Everything is compiled for the browser so dev dependencies are fine.
4747
'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
4848
// max-len set to ignore "import" lines (as they usually get long and messy).
49-
'max-len': ['error', { code: 100, ignorePattern: '^import\\s.+\\sfrom\\s.+;' }],
49+
'max-len': ['error', { code: 120, ignorePattern: '^import\\s.+\\sfrom\\s.+;' }],
5050
// I mainly have this off as it ruins auto import sorting in VSCode.
5151
'object-curly-newline': 'off',
5252
'@typescript-eslint/lines-between-class-members': 'off',

.eslintrc.extension.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = {
3131
rules: {
3232
'@typescript-eslint/lines-between-class-members': 'off',
3333
// max-len set to ignore "import" lines (as they usually get long and messy).
34-
'max-len': ['error', { code: 100, ignorePattern: '^import\\s.+\\sfrom\\s.+;' }],
34+
'max-len': ['error', { code: 120, ignorePattern: '^import\\s.+\\sfrom\\s.+;' }],
3535
// I mainly have this off as it ruins auto import sorting in VSCode.
3636
'object-curly-newline': 'off',
3737
'import/extensions': ['error', 'ignorePackages', {
@@ -43,6 +43,7 @@ module.exports = {
4343

4444
'no-restricted-syntax': 'off',
4545
'no-await-in-loop': 'off',
46+
'class-methods-use-this': 'off',
4647
},
4748

4849
// Overrides for types.

.github/workflows/build.yml

-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ jobs:
132132
- name: Commit built files (1)
133133
run: |
134134
git add -f dashboard graphics extension
135-
git add -f ':(glob)./zoton_shared/extension/*/dist/**'
136135
git commit -m "Built files" -a --allow-empty
137136
138137
# Squash the previous 2 commits down for convenience and create the final build commit.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

package.json

+20-4
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,25 @@
2727
"start": "node ../..",
2828
"watch": "run-p watch:*",
2929
"watch:browser": "webpack -w",
30-
"watch:extension": "tsc -b tsconfig.extension.json -w",
31-
"postinstall": "cd zoton_shared && node postinstall.js"
30+
"watch:extension": "tsc -b tsconfig.extension.json -w"
3231
},
3332
"dependencies": {
3433
"@esamarathon/mq-events": "^1.0.1",
34+
"amqp-connection-manager": "^4.1.14",
35+
"amqplib": "^0.10.4",
3536
"animate.css": "^4.1.1",
3637
"clone": "^2.1.2",
3738
"comfy.js": "^1.1.16",
3839
"discord.js": "^13.17.1",
40+
"fs-extra": "^11.2.0",
41+
"get-video-duration": "^4.1.0",
3942
"lodash": "^4.17.21",
4043
"module-alias": "^2.2.3",
4144
"moment": "^2.30.1",
4245
"needle": "^3.3.1",
46+
"node-fetch": "^3.3.2",
47+
"obs-websocket-js": "4",
48+
"osc": "^2.4.5",
4349
"pusher-js": "^7.1.1-beta",
4450
"sharp": "^0.33.2",
4551
"socket.io": "^4.7.4",
@@ -48,22 +54,30 @@
4854
"speedcontrol-util": "github:speedcontrol/speedcontrol-util#build",
4955
"streamdeck-util": "^0.4.0",
5056
"strict-event-emitter": "^0.5.1",
57+
"string-similarity": "^4.0.4",
58+
"tiny-typed-emitter": "^2.1.0",
5159
"uuid": "^9.0.1",
52-
"ws": "^8.16.0"
60+
"ws": "^8.16.0",
61+
"xkeys": "^3.1.2"
5362
},
5463
"devDependencies": {
5564
"@fontsource/barlow-condensed": "^4.5.9",
5665
"@fontsource/montserrat": "^4.5.14",
5766
"@fontsource/roboto": "^4.5.8",
5867
"@mdi/font": "^7.4.47",
5968
"@nodecg/types": "^2.1.12",
69+
"@types/amqp-connection-manager": "^3.4.1",
70+
"@types/amqplib": "^0.10.5",
6071
"@types/async": "^3.2.24",
6172
"@types/clone": "^2.1.4",
73+
"@types/fs-extra": "^11.0.4",
6274
"@types/lodash": "^4.14.202",
75+
"@types/markdown-it": "^14.1.2",
6376
"@types/module-alias": "^2.0.4",
6477
"@types/needle": "^3.3.0",
6578
"@types/node": "^18.19.8",
6679
"@types/sharp": "^0.31.1",
80+
"@types/string-similarity": "^4.0.2",
6781
"@types/uuid": "^9.0.7",
6882
"@types/webpack-env": "^1.18.4",
6983
"@types/ws": "^8.5.10",
@@ -75,6 +89,7 @@
7589
"css-loader": "^6.9.1",
7690
"dayjs": "^1.11.10",
7791
"deepmerge": "^4.3.1",
92+
"dompurify": "^3.2.3",
7893
"eslint": "^8.56.0",
7994
"eslint-config-airbnb-base": "^15.0.0",
8095
"eslint-config-airbnb-typescript": "^16.2.0",
@@ -88,6 +103,7 @@
88103
"globby": "^12.2.0",
89104
"gsap": "^3.12.5",
90105
"html-webpack-plugin": "^5.6.0",
106+
"markdown-it": "^14.1.0",
91107
"mini-css-extract-plugin": "^2.7.7",
92108
"nodecg-cli": "^8.6.8",
93109
"npm-run-all": "^4.1.5",
@@ -362,7 +378,7 @@
362378
],
363379
"mount": [
364380
{
365-
"directory": "zoton_shared/flags",
381+
"directory": "layout_assets/flags",
366382
"endpoint": "flags"
367383
},
368384
{

0 commit comments

Comments
 (0)