Skip to content
This repository was archived by the owner on Apr 13, 2025. It is now read-only.

Commit 40ac791

Browse files
committed
Merge branch 'main' into feat/encrypt-using-password-hash
2 parents e85a4a8 + 8fd7228 commit 40ac791

File tree

122 files changed

+6823
-3652
lines changed

Some content is hidden

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

122 files changed

+6823
-3652
lines changed

.github/dependabot.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ updates:
33
- package-ecosystem: "github-actions"
44
directory: "/"
55
schedule:
6-
interval: "daily"
6+
interval: "monthly"
77
- package-ecosystem: "npm"
88
directory: "/"
99
schedule:
10-
interval: "weekly"
11-
day: "saturday"
10+
interval: "monthly"

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v3
15-
- uses: actions/setup-node@v3.4.1
15+
- uses: actions/setup-node@v3.5.0
1616
with:
1717
node-version: "16"
1818

@@ -40,7 +40,7 @@ jobs:
4040
runs-on: ubuntu-latest
4141
steps:
4242
- uses: actions/checkout@v3
43-
- uses: actions/setup-node@v3.4.1
43+
- uses: actions/setup-node@v3.5.0
4444
with:
4545
node-version: "16"
4646

@@ -64,7 +64,7 @@ jobs:
6464
os: [ubuntu-latest, windows-2019]
6565
runs-on: ${{ matrix.os }}
6666
steps:
67-
- uses: actions/setup-node@v3.4.1
67+
- uses: actions/setup-node@v3.5.0
6868
with:
6969
node-version: "16"
7070

@@ -142,7 +142,7 @@ jobs:
142142
- nodecg
143143
steps:
144144
- uses: actions/checkout@v3
145-
- uses: actions/setup-node@v3.4.1
145+
- uses: actions/setup-node@v3.5.0
146146
with:
147147
node-version: "16"
148148

.github/workflows/lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
steps:
88
- uses: actions/checkout@v3
99

10-
- uses: actions/setup-node@v3.4.1
10+
- uses: actions/setup-node@v3.5.0
1111
with:
1212
node-version: "16"
1313

.prettierrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ module.exports = {
1212
arrowParens: "always",
1313
proseWrap: "preserve",
1414
vueIndentScriptAndStyle: false,
15-
endOfLine: "lf",
15+
endOfLine: "auto",
1616
};

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,21 @@ nodecg-io is the successor of [ChatOverflow](https://github.com/codeoverflow-org
2222
- Android (using adb)
2323
- Art-Net
2424
- Atem
25-
- CurseForge
2625
- DBus
2726
- Discord
2827
- Discord RPC
2928
- Elgato lights
3029
- GitHub
3130
- Google APIs
31+
- Google Cast
3232
- IntelliJ IDEs
3333
- IRC (Internet Relay Chat)
3434
- MIDI Input
3535
- MIDI Output
3636
- MQTT
3737
- Nanoleafs
3838
- OBS
39+
- [OpenTTS](https://github.com/synesthesiam/opentts)
3940
- Philips Hue
4041
- RCON
4142
- Reddit

nodecg-io-core/dashboard/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
"watch": "node esbuild.config.js --watch"
2020
},
2121
"devDependencies": {
22-
"esbuild": "^0.14.49",
23-
"monaco-editor": "^0.33.0",
24-
"typescript": "^4.7.4"
22+
"esbuild": "^0.15.8",
23+
"monaco-editor": "^0.34.0",
24+
"nodecg-types": "^1.9.0",
25+
"typescript": "^4.8.4"
2526
},
2627
"dependencies": {
2728
"crypto-js": "^4.1.1",
2829
"nodecg-io-core": "^0.3.0",
29-
"nodecg-types": "^1.8.3",
3030
"events": "^3.3.0"
3131
},
3232
"license": "MIT"

nodecg-io-core/extension/__tests__/mocks.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ export class MockNodeCG implements NodeCG {
6666
return newReplicant;
6767
}
6868

69+
readReplicant<V>(name: string): V;
70+
readReplicant<V>(name: string, namespace: string): V;
71+
readReplicant<V>(name: string, namespace?: string): V {
72+
return this.Replicant<V>(name, namespace).value;
73+
}
74+
6975
getSocketIOServer = jest.fn();
7076
Router = jest.fn();
7177
mount = jest.fn();

nodecg-io-core/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
"license": "MIT",
4646
"devDependencies": {
4747
"@types/crypto-js": "^4.1.1",
48-
"@types/jest": "^28.1.6",
49-
"@types/node": "^18.0.3",
48+
"@types/jest": "^28.1.7",
49+
"@types/node": "^18.7.18",
5050
"jest": "^28.1.3",
51-
"nodecg-types": "^1.8.3",
52-
"typescript": "^4.7.4",
53-
"ts-jest": "^28.0.5"
51+
"nodecg-types": "^1.9.0",
52+
"typescript": "^4.8.4",
53+
"ts-jest": "^28.0.8"
5454
},
5555
"dependencies": {
5656
"ajv": "^8.11.0",

0 commit comments

Comments
 (0)