UI build fixes

openremote · Jun 21, 2024 · e40b3ac · e40b3ac
1 parent a07d2db
commit e40b3ac
Show file tree

Hide file tree

Showing 7 changed files with 237 additions and 328 deletions.
diff --git a/ui/app/custom/package.json b/ui/app/custom/package.json
@@ -18,9 +18,9 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@openremote/custom-model": "workspace:*",
-    "@openremote/custom-rest": "workspace:*",
-    "@openremote/manager": "^1.2.0-snapshot"
+    "@openremote/manager": "1.2.0-snapshot.20240616202404",
+    "model": "workspace:*",
+    "rest": "workspace:*"
   },
   "devDependencies": {
     "@babel/core": "^7.16.0",

diff --git a/ui/app/custom/src/pages/page-custom.ts b/ui/app/custom/src/pages/page-custom.ts
@@ -2,8 +2,8 @@ import {css, html, TemplateResult} from "lit";
 import {customElement} from "lit/decorators.js";
 import {AppStateKeyed, Page, PageProvider} from "@openremote/or-app";
 import {EnhancedStore} from "@reduxjs/toolkit";
-import {CustomData} from "@openremote/custom-model";
-import rest from "@openremote/custom-rest";
+import {CustomData} from "model";
+import rest from "rest";
 
 export function pageCustomProvider(store: EnhancedStore<AppStateKeyed>): PageProvider<AppStateKeyed> {
     return {

diff --git a/ui/component/model/README.md b/ui/component/model/README.md
diff --git a/ui/component/model/package.json b/ui/component/model/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@openremote/custom-model",
+  "name": "model",
   "version": "1.0.0",
   "description": "Model Types",
   "main": "dist/umd/index.bundle.js",

diff --git a/ui/component/rest/README.md b/ui/component/rest/README.md
diff --git a/ui/component/rest/package.json b/ui/component/rest/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@openremote/custom-rest",
+  "name": "rest",
   "version": "1.0.0",
   "description": "REST API",
   "main": "dist/umd/index.bundle.js",
@@ -22,9 +22,9 @@
   "author": "OpenRemote",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@openremote/model": "^1.2.0-snapshot",
     "@openremote/rest": "^1.2.0-snapshot",
     "axios": "0.24.0",
+    "model": "workspace:*",
     "qs": "^6.8.0"
   },
   "devDependencies": {