Skip to content

Commit

Permalink
Hammer humble/update kc (#979)
Browse files Browse the repository at this point in the history
* Update node to 18 and keycloak-js to 23.0.1

Signed-off-by: Aaron Chong <[email protected]>

* Update to node 18 and kc 22.0.5

Signed-off-by: Aaron Chong <[email protected]>

* Use pnpm 9.4.0

Signed-off-by: Aaron Chong <[email protected]>

* Update canvas to 2.11.2

Signed-off-by: Aaron Chong <[email protected]>

* Using new constructor for kc

Signed-off-by: Aaron Chong <[email protected]>

* designate using legacy openssl provider

Signed-off-by: Aaron Chong <[email protected]>

* Setting env in correct place, update readme

Signed-off-by: Aaron Chong <[email protected]>

---------

Signed-off-by: Aaron Chong <[email protected]>
  • Loading branch information
aaronchongth authored Jul 31, 2024
1 parent c7ec958 commit 690a163
Show file tree
Hide file tree
Showing 7 changed files with 14,382 additions and 11,347 deletions.
4 changes: 2 additions & 2 deletions .github/actions/bootstrap/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ runs:
steps:
- uses: pnpm/[email protected]
with:
version: '8.6.12'
version: '9.4.0'
- uses: actions/setup-node@v4
with:
node-version: '16'
node-version: '18'
cache: 'pnpm'
- name: Install pipenv
run: pip3 install pipenv
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dashboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: apt update && apt install -y python3-venv python-is-python3
- name: bootstrap
env:
NODE_OPTIONS: '--max_old_space_size=4096'
NODE_OPTIONS: '--max_old_space_size=4096 --openssl-legacy-provider'
uses: ./.github/actions/bootstrap
with:
package: rmf-dashboard
Expand Down
10 changes: 2 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,10 @@ Open-RMF Web is a collection of packages that provide a web-based interface for

We currently support [Ubuntu 22.04](https://releases.ubuntu.com/jammy/), [ROS 2 Humble](https://docs.ros.org/en/humble/index.html) and Open-RMF's [22.09](https://github.com/open-rmf/rmf/releases/tag/22.09) release. Other distributions may work as well, but is not guaranteed.

Install [nodejs](https://nodejs.org/en/download/package-manager/) >= 16,
```bash
sudo apt update && sudo apt install curl
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash
nvm install 16
```

Install pnpm and nodejs
```bash
curl -fsSL https://get.pnpm.io/install.sh | bash -
pnpm env use --global 16
pnpm env use --global 18
```

Install pipenv
Expand Down Expand Up @@ -75,6 +68,7 @@ source /opt/ros/humble/setup.bash
source /path/to/workspace/install/setup.bash

cd packages/dashboard
export NODE_OPTIONS=--openssl-legacy-provider
pnpm start
```

Expand Down
4 changes: 2 additions & 2 deletions packages/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"date-fns": "^2.21.3",
"debug": "^4.2.0",
"eventemitter3": "^4.0.7",
"keycloak-js": "^11.0.2",
"keycloak-js": "^22.0.5",
"leaflet": "^1.7.1",
"node-vibrant": "^3.1.6",
"react": "^18.2.0",
Expand Down Expand Up @@ -95,7 +95,7 @@
"@testing-library/user-event": "^12.8.3",
"@types/jest": "^26.0.13",
"api-server": "file:../api-server",
"canvas": "^2.6.1",
"canvas": "^2.11.2",
"chalk": "^4.1.0",
"concurrently": "^5.3.0",
"inquirer": "^8.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/rmf-auth/lib/keycloak.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export class KeycloakAuthenticator
*/
constructor(config: Keycloak.KeycloakConfig | string, silentCheckSsoRedirectUri?: string) {
super();
this._inst = Keycloak(config);
this._inst = new Keycloak(config);
this._silentCheckSsoRedirectUri = silentCheckSsoRedirectUri;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/rmf-auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@mui/lab": "5.0.0-alpha.86",
"api-client": "workspace:*",
"eventemitter3": "^4.0.7",
"keycloak-js": "^11.0.2"
"keycloak-js": "^22.0.5"
},
"devDependencies": {
"@babel/core": "^7.18.6",
Expand Down
25,705 changes: 14,373 additions & 11,332 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

0 comments on commit 690a163

Please sign in to comment.