Use OpenRemote 1.33.0

.github/workflows/deploy.yml

@@ -0,0 +1,24 @@
+name: Deploy
+
+on:
+  workflow_dispatch:
+    inputs:
+      ENVIRONMENT:
+        description: "Environment to use (if any)"
+      CLEAN_INSTALL:
+        description: "Delete data before starting"
+        type: boolean
+      COMMIT:
+        description: "Repo branch or commit SHA to checkout"
+      OR_HOSTNAME:
+        description: "Host to deploy to (e.g. demo.openremote.app)"
+      OR_ADMIN_PASSWORD:
+        description: "Admin password override"
+
+jobs:
+  call-main-repo:
+    name: CI/CD
+    uses: openremote/core/.github/workflows/custom-deploy.yml@1.33.0
+    with:
+      INPUTS: ${{ toJSON(github.event.inputs) }}
+    secrets: inherit

.github/workflows/review.yml

@@ -0,0 +1,13 @@
+# This just references the CI/CD workflow in the Core OpenRemote repo
+name: Review
+
+on:
+  pull_request:
+
+jobs:
+  call-main-repo:
+    name: CI/CD
+    uses: openremote/core/.github/workflows/custom-review.yml@1.33.0
+    with:
+      INPUTS: ${{ toJSON(github.event.inputs) }}
+    secrets: inherit

.github/workflows/staging.yml

@@ -0,0 +1,21 @@
+name: Staging
+
+on:
+  # Push excluding tags and workflow changes
+  push:
+    branches:
+      - "main"
+    tags-ignore:
+      - "*.*"
+    paths-ignore:
+      - ".github/**"
+      - ".ci_cd/**"
+      - "**/*.md"
+
+jobs:
+  call-main-repo:
+    name: CI/CD
+    uses: openremote/core/.github/workflows/custom-staging.yml@1.33.0
+    with:
+      INPUTS: ${{ toJSON(github.event.inputs) }}
+    secrets: inherit

gradle.properties

@@ -7,4 +7,4 @@ version = 1.0-SNAPSHOT
 
 ideaExtPluginVersion = 1.4.1
 spotlessVersion = 8.10.3
-typescriptGeneratorVersion = 4.1.1
+typescriptGeneratorVersion = 4.2.1

gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
-axionRelease = "1.21.2"
+axionRelease = "1.21.4"
 fileEncrypt = "2.1.0"
-jackson = "2.21.4"
-openremote = "1.30.0"
+jackson = "2.21.7"
+openremote = "1.33.0"
 testLogger = "4.0.0"
-typescript-generator = "4.1.1"
+typescript-generator = "4.2.1"
 
 [libraries]
 jackson-datatype-jdk8 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", version.ref = "jackson" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

package.json

@@ -7,15 +7,13 @@
     "format": "cd ui && prettier . --write",
     "format:check": "cd ui && prettier . --check"
   },
-  "resolutions": {
-    "axios": "1.18.1"
-  },
   "workspaces": [
     "ui/app/*",
     "ui/component/*",
     "ui/demo/*"
   ],
   "devDependencies": {
+    "@types/node": "^24",
     "@typescript-eslint/eslint-plugin": "8.40.0",
     "@typescript-eslint/parser": "8.40.0",
     "eslint": "8.57.1",

profile/dev-testing.yml

@@ -4,7 +4,7 @@
 #
 # Please see profile/deploy.yml for configuration details for each service.
 #
-x-base: &base https://github.com/openremote/core.git#1.30.0:profile/deploy.yml
+x-base: &base https://github.com/openremote/core.git#1.33.0:profile/deploy.yml
 
 services:
   keycloak:
@@ -16,6 +16,9 @@ services:
     depends_on:
       postgresql:
         condition: service_healthy
+    environment:
+      # manager has a different base URL and is assumed to be reachable at this URL
+      OR_MANAGER_URL: ${OR_MANAGER_URL:-http://127.0.0.1:8080}
 
   postgresql:
     extends:

profile/dev-ui.yml

@@ -4,7 +4,7 @@
 #
 # Please see profile/deploy.yml for configuration details for each service.
 #
-x-base: &base https://github.com/openremote/core.git#1.30.0:profile/deploy.yml
+x-base: &base https://github.com/openremote/core.git#1.33.0:profile/deploy.yml
 
 volumes:
   manager-data:
@@ -24,8 +24,12 @@ services:
       postgresql:
         condition: service_healthy
     environment:
+      # Public URL used in browser redirects and OIDC discovery
+      KC_HOSTNAME: http://localhost:8081/auth
       # Prevent theme caching during dev
       KEYCLOAK_START_OPTS: --spi-theme-static-max-age=-1 --spi-theme-cache-themes=false --spi-theme-cache-templates=false
+      # manager has a different base URL and is assumed to be reachable at this URL
+      OR_MANAGER_URL: ${OR_MANAGER_URL:-http://127.0.0.1:8080}
 
   postgresql:
     extends:

ui/app/custom-react/build.gradle

@@ -1,12 +1,10 @@
-buildDir = "dist"
-
-tasks.register('clean') {
-  dependsOn npmClean
+tasks.register('clean', Delete) {
+  delete layout.buildDirectory
 }
 
 tasks.register('installDist', Copy) {
   dependsOn npmBuild
   mustRunAfter ":manager:installDist"
-  from project.buildDir
+  from layout.buildDirectory.dir("dist")
   into "${project(':deployment').buildDir}/image/manager/app/${projectDir.name}"
 }

ui/app/custom-react/package.json

@@ -6,20 +6,21 @@
   "license": "AGPL-3.0-or-later",
   "private": true,
   "scripts": {
-    "clean": "npx tsc -b --clean && npx shx rm -rf dist",
+    "clean": "npx tsc -b --clean && npx shx rm -rf build",
     "build": "npx cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 rspack build",
     "serve": "npx cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 rspack serve"
   },
   "dependencies": {
-    "@openremote/core": "~1.30.0",
-    "@openremote/model": "~1.30.0",
-    "@openremote/or-mwc-components": "~1.30.0",
+    "@openremote/core": "~1.33.0",
+    "@openremote/model": "~1.33.0",
+    "@openremote/or-mwc-components": "~1.33.0",
     "react": "^19.2.0",
     "react-dom": "^19.2.0"
   },
   "devDependencies": {
-    "@rspack/cli": "^1.7.10",
-    "@rspack/core": "^1.7.10",
+    "@rspack/cli": "~2.1.10",
+    "@rspack/core": "~2.1.10",
+    "@rspack/dev-server": "~2.1.0",
     "@types/react": "^19.2.2",
     "@types/react-dom": "^19.2.2",
     "@typescript-eslint/eslint-plugin": "8.40.0",

ui/app/custom-react/rspack.config.ts

@@ -16,6 +16,7 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+import { resolve } from "node:path";
 import { defineConfig } from "@rspack/cli";
 import { rspack } from "@rspack/core";
 
@@ -52,6 +53,11 @@ export default defineConfig({
         test: /(maplibre|mapbox|@material|gridstack|@mdi).*\.css$/, // output css as strings
         type: "asset/source",
       },
+      {
+        test: /\.css$/,
+        exclude: /(maplibre|mapbox|@material|gridstack|@mdi).*\.css$/,
+        type: "css/auto",
+      },
       {
         test: /\.tsx$/,
         type: "javascript/auto",
@@ -93,9 +99,7 @@ export default defineConfig({
     ],
   },
   output: {
-    publicPath: isDev ? "/custom-react/" : "/",
-  },
-  experiments: {
-    css: true,
+    path: resolve(__dirname, "build/dist"),
+    publicPath: isDev ? "/custom-react/" : "./",
   },
 });

ui/app/custom/build.gradle

@@ -1,12 +1,10 @@
-buildDir = "dist"
-
-tasks.register('clean') {
-  dependsOn npmClean
+tasks.register('clean', Delete) {
+  delete layout.buildDirectory
 }
 
 tasks.register('installDist', Copy) {
   dependsOn npmBuild
   mustRunAfter ":manager:installDist"
-  from project.buildDir
+  from layout.buildDirectory.dir("dist")
   into "${project(':deployment').buildDir}/image/manager/app/${projectDir.name}"
 }