Merge branch 'main' into plugin-atem

This commit is contained in:
2023-03-17 09:47:26 -05:00
4 changed files with 13 additions and 10 deletions
+3
View File
@@ -13,6 +13,7 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 18
cache: 'npm'
- run: npm ci
- run: npm run release
build-windows:
@@ -23,6 +24,7 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 18
cache: 'npm'
- run: npm ci
- run: npm run release
build-macos:
@@ -38,5 +40,6 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 18
cache: 'npm'
- run: npm ci
- run: npm run release
+4 -4
View File
@@ -20,13 +20,13 @@
},
"devDependencies": {
"@electron/notarize": "^1.2.3",
"electron": "^22.0.3",
"electron": "^22.2.0",
"electron-builder": "^23.6.0",
"eslint": "^8.32.0",
"eslint": "^8.36.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^8.6.0",
"eslint-config-prettier": "^8.7.0",
"eslint-plugin-import": "^2.27.5",
"prettier": "^2.8.3"
"prettier": "^2.8.4"
}
},
"node_modules/@develar/schema-utils": {
+4 -4
View File
@@ -21,13 +21,13 @@
"repository": "https://github.com/stagehacks/Cue-View",
"devDependencies": {
"@electron/notarize": "^1.2.3",
"electron": "^22.0.3",
"electron": "^22.2.0",
"electron-builder": "^23.6.0",
"eslint": "^8.32.0",
"eslint": "^8.36.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^8.6.0",
"eslint-config-prettier": "^8.7.0",
"eslint-plugin-import": "^2.27.5",
"prettier": "^2.8.3"
"prettier": "^2.8.4"
},
"dependencies": {
"atem-connection": "^3.1.3",
+2 -2
View File
@@ -37,7 +37,7 @@ function drawDeviceFrame(id) {
<link href='src/assets/css/plugin_default.css' rel='stylesheet' type='text/css'>
</head>
<body>
${generateBodyHTML(d)};
${generateBodyHTML(d)}
</body>
</html>
`;
@@ -85,7 +85,7 @@ function generateBodyHTML(d) {
</div>
<div class="device-info">
${PLUGINS.all[d.type].info()}
<div>
</div>
`;
}
}