Skip to content

Commit c9a455e

Browse files
committed
Merge branch 'develop'
2 parents 8a69ce6 + 65e4e5b commit c9a455e

Some content is hidden

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

72 files changed

+13828
-10856
lines changed

.github/workflows/build-windows.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,16 @@ jobs:
2525
- name: Use Node.js
2626
uses: actions/setup-node@v4
2727
with:
28-
node-version: '16'
28+
node-version: '18'
2929

3030
- name: Run build
3131
env:
3232
CI: true
3333
PKG_CACHE_PATH: ${{ runner.temp }}
3434
run: |
35+
corepack enable
3536
# try and avoid timeout errors
36-
yarn config set network-timeout 100000 -g
37+
yarn config set httpTimeout 100000
3738
3839
yarn install
3940
yarn do:build-win32:ci

.github/workflows/lint-and-test.yaml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,12 @@ jobs:
2323
- name: Use Node.js
2424
uses: actions/setup-node@v4
2525
with:
26-
node-version: '16'
27-
- name: Cache node_modules
28-
uses: actions/cache@v4
29-
with:
30-
path: '**/node_modules'
31-
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
26+
node-version: '18'
3227

3328
- name: Prepare Environment
34-
run: yarn
29+
run: |
30+
corepack enable
31+
yarn
3532
env:
3633
CI: true
3734
- name: Type check
@@ -49,7 +46,7 @@ jobs:
4946
runs-on: ${{ matrix.os }}
5047
strategy:
5148
matrix:
52-
node_version: ['16']
49+
node_version: ['18']
5350
os: [ubuntu-latest] # [windows-latest, macOS-latest]
5451
timeout-minutes: 10
5552
steps:
@@ -61,14 +58,10 @@ jobs:
6158
uses: actions/setup-node@v4
6259
with:
6360
node-version: ${{ matrix.node_version }}
64-
- name: Cache node_modules
65-
uses: actions/cache@v4
66-
with:
67-
path: '**/node_modules'
68-
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
6961

7062
- name: Prepare Environment
7163
run: |
64+
corepack enable
7265
yarn
7366
yarn build
7467
env:

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,13 @@ wallaby.conf.js
1515
packages/*/coverage/
1616
.npmrc
1717

18+
.pnp.*
19+
.yarn/*
20+
!.yarn/patches
21+
!.yarn/plugins
22+
!.yarn/releases
23+
!.yarn/sdks
24+
!.yarn/versions
25+
1826
# Ignore JetBrains IDE specific files
1927
.idea

.husky/pre-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22
. "$(dirname "$0")/_/husky.sh"
33

4-
yarn lerna run --concurrency 1 --stream precommit --exclude-dependents
4+
yarn precommit

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.14
1+
18.19

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.14
1+
18.19

.vscode/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
tasks.json
21
settings.json

.vscode/launch.json

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,28 @@
66
"configurations": [
77
{
88
"type": "node",
9-
"request": "attach",
10-
"name": "Attach to Playout Gateway",
9+
"request": "launch",
10+
"name": "Build & Run Input Gateway",
11+
"preLaunchTask": "Input Gateway: build",
12+
"program": "${workspaceFolder}/packages/input-gateway/dist/index.js",
13+
"args": ["-id", "localDevInp"],
14+
"console": "integratedTerminal",
1115
"outFiles": [
12-
"${workspaceFolder}/dist/*.js"
16+
"${workspaceFolder}/packages/input-gateway/dist/**/*.js",
17+
"${workspaceFolder}/packages/input-manager/dist/**/*.js"
18+
]
19+
},
20+
{
21+
"type": "node",
22+
"request": "launch",
23+
"name": "Run Input Gateway",
24+
"program": "${workspaceFolder}/packages/input-gateway/dist/index.js",
25+
"args": ["-id", "localDevInp"],
26+
"console": "integratedTerminal",
27+
"outFiles": [
28+
"${workspaceFolder}/packages/input-gateway/dist/**/*.js",
29+
"${workspaceFolder}/packages/input-manager/dist/**/*.js"
1330
]
1431
}
1532
]
16-
}
33+
}

.vscode/tasks.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"type": "shell",
6+
"command": "yarn build",
7+
"label": "Input Gateway: build",
8+
"group": {
9+
"kind": "build",
10+
"isDefault": true
11+
},
12+
}
13+
],
14+
}

.yarnrc.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
compressionLevel: mixed
2+
3+
enableGlobalCache: false
4+
5+
nodeLinker: node-modules

0 commit comments

Comments
 (0)