Skip to content

Commit

Permalink
Merge branch 'beta-4.50.6' into fix-button-verbs
Browse files Browse the repository at this point in the history
  • Loading branch information
bwp91 authored Sep 18, 2023
2 parents b88aae1 + 8bda53b commit 0e0f59b
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/attach-artifact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 20.x

# Sanity check to ensure that release tags don't start with a 'v' version prefix but adhere to the X.Y.Z format
- name: Check for Tag name Format
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,20 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
node-version: [16.x, 17.x, 18.x]
node-version: [18.x, 20.x]
include:
- os: macos-latest
node-version: 16.x
- os: macos-latest
node-version: 18.x
- os: windows-2019
node-version: 16.x
- os: macos-latest
node-version: 20.x
- os: windows-2019
node-version: 18.x
- os: windows-latest
node-version: 16.x
- os: windows-2019
node-version: 20.x
- os: windows-latest
node-version: 18.x
- os: windows-latest
node-version: 20.x

runs-on: ${{ matrix.os }}

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node-version: [16.x, 17.x, 18.x]
node-version: [18.x, 20.x]
include:
- os: macos-latest
node-version: 16.x
- os: macos-latest
node-version: 18.x
- os: windows-2019
node-version: 16.x
- os: macos-latest
node-version: 20.x
- os: windows-2019
node-version: 18.x
- os: windows-latest
node-version: 16.x
- os: windows-2019
node-version: 20.x
- os: windows-latest
node-version: 18.x
- os: windows-latest
node-version: 20.x

runs-on: ${{ matrix.os }}

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"homebridge": ">=1.6.0"
},
"scripts": {
"check": "npm install && npm outdated",
"watch": "concurrently \"npm run watch:ui\" \"npm run watch:server\"",
"watch:server": "nodemon",
"watch:ui": "npm run start --prefix ui",
Expand Down
52 changes: 26 additions & 26 deletions ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "0.0.0",
"license": "MIT",
"scripts": {
"check": "npm install && npm outdated",
"ng": "ng",
"start": "ng serve",
"build": "ng build --configuration production --output-path=../public --source-map=false --aot=true",
Expand All @@ -20,7 +21,7 @@
"@angular/platform-browser-dynamic": "^14.1.1",
"@angular/router": "^14.1.1",
"@auth0/angular-jwt": "^5.0.2",
"@homebridge/plugin-ui-utils": "0.1.0",
"@homebridge/plugin-ui-utils": "0.0.19",
"@ng-bootstrap/ng-bootstrap": "^11.0.1",
"@ngx-translate/core": "^14.0.0",
"@ngx-translate/http-loader": "^7.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,14 @@ export class CustomPluginsComponent implements OnInit, OnDestroy {
case 'loaded':
this.injectDefaultStyles(e);
this.confirmReady(e);
this.uiLoaded = true;
break;
case 'request': {
this.handleRequest(e);
break;
}
case 'scrollHeight':
this.setiFrameHeight(e);
this.uiLoaded = true;
break;
case 'config.get': {
this.requestResponse(e, this.getConfigBlocks());
Expand Down

0 comments on commit 0e0f59b

Please sign in to comment.