UI build fixes

openremote · Jun 14, 2024 · 6f8e5c9 · 6f8e5c9
1 parent 50f9539
commit 6f8e5c9
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 33 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/manager": "^1.2.0-snapshot",
-    "model": "^1.0.0",
-    "rest": "^1.0.0"
+    "@openremote/custom-model": "workspace:*",
+    "@openremote/custom-rest": "workspace:*",
+    "@openremote/manager": "^1.2.0-snapshot"
   },
   "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 "../../../../component/model";
-import rest from "../../../../component/rest";
+import {CustomData} from "@openremote/custom-model";
+import rest from "@openremote/custom-rest";
 
 export function pageCustomProvider(store: EnhancedStore<AppStateKeyed>): PageProvider<AppStateKeyed> {
     return {

diff --git a/ui/app/custom/tsconfig.json b/ui/app/custom/tsconfig.json
@@ -8,4 +8,8 @@
   "include": [
     "./src"
   ],
+  "references": [
+    { "path": "../../component/model" },
+    { "path": "../../component/rest" }
+  ]
 }
diff --git a/ui/component/model/package.json b/ui/component/model/package.json
@@ -1,9 +1,10 @@
 {
-  "name": "model",
+  "name": "@openremote/custom-model",
   "version": "1.0.0",
   "description": "Model Types",
   "main": "dist/umd/index.bundle.js",
   "module": "lib/index.js",
+  "private": true,
   "exports": {
     ".": "./lib/index.js",
     "./*": "./lib/*.js"
@@ -24,6 +25,6 @@
     "@openremote/util": "^1.2.0-snapshot"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "restricted"
   }
 }
diff --git a/ui/component/rest/package.json b/ui/component/rest/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rest",
+  "name": "@openremote/custom-rest",
   "version": "1.0.0",
   "description": "REST API",
   "main": "dist/umd/index.bundle.js",
@@ -30,5 +30,8 @@
   "devDependencies": {
     "@openremote/util": "^1.2.0-snapshot",
     "@types/qs": "^6.9.7"
+  },
+  "publishConfig": {
+    "access": "restricted"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -2312,6 +2312,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@openremote/custom-model@workspace:*, @openremote/custom-model@workspace:ui/component/model":
+  version: 0.0.0-use.local
+  resolution: "@openremote/custom-model@workspace:ui/component/model"
+  dependencies:
+    "@openremote/util": "npm:^1.2.0-snapshot"
+  languageName: unknown
+  linkType: soft
+
+"@openremote/custom-rest@workspace:*, @openremote/custom-rest@workspace:ui/component/rest":
+  version: 0.0.0-use.local
+  resolution: "@openremote/custom-rest@workspace:ui/component/rest"
+  dependencies:
+    "@openremote/model": "npm:^1.2.0-snapshot"
+    "@openremote/rest": "npm:^1.2.0-snapshot"
+    "@openremote/util": "npm:^1.2.0-snapshot"
+    "@types/qs": "npm:^6.9.7"
+    axios: "npm:0.24.0"
+    qs: "npm:^6.8.0"
+  languageName: unknown
+  linkType: soft
+
 "@openremote/custom@workspace:ui/app/custom":
   version: 0.0.0-use.local
   resolution: "@openremote/custom@workspace:ui/app/custom"
@@ -2323,7 +2344,9 @@ __metadata:
     "@babel/plugin-transform-runtime": "npm:^7.16.4"
     "@babel/preset-env": "npm:^7.16.4"
     "@babel/runtime": "npm:^7.16.3"
-    "@openremote/manager": "npm:^1.2.0-snapshot"
+    "@openremote/custom-model": "workspace:*"
+    "@openremote/custom-rest": "workspace:*"
+    "@openremote/manager": "npm:^1.2.0-snapshot.20240512160637"
     "@openremote/util": "npm:^1.2.0-snapshot"
     "@typescript-eslint/eslint-plugin": "npm:^5.9.0"
     "@typescript-eslint/parser": "npm:^5.9.0"
@@ -2342,10 +2365,8 @@ __metadata:
     fork-ts-checker-notifier-webpack-plugin: "npm:^4.0.0"
     fork-ts-checker-webpack-plugin: "npm:^6.5.0"
     html-webpack-plugin: "npm:^5.5.0"
-    model: "npm:^1.0.0"
     prettier: "npm:^2.5.1"
     querystring-es3: "npm:^0.2.1"
-    rest: "npm:^1.0.0"
     shx: "npm:^0.3.3"
     source-map-loader: "npm:^3.0.0"
     style-loader: "npm:^3.3.1"
@@ -2357,7 +2378,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openremote/manager@npm:^1.2.0-snapshot":
+"@openremote/manager@npm:^1.2.0-snapshot.20240512160637":
   version: 1.2.0-snapshot.20240512162641
   resolution: "@openremote/manager@npm:1.2.0-snapshot.20240512162641"
   dependencies:
@@ -7246,14 +7267,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"model@npm:^1.0.0, model@workspace:ui/component/model":
-  version: 0.0.0-use.local
-  resolution: "model@workspace:ui/component/model"
-  dependencies:
-    "@openremote/util": "npm:^1.2.0-snapshot"
-  languageName: unknown
-  linkType: soft
-
 "moment@npm:2.29.4":
   version: 2.29.4
   resolution: "moment@npm:2.29.4"
@@ -8325,19 +8338,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rest@npm:^1.0.0, rest@workspace:ui/component/rest":
-  version: 0.0.0-use.local
-  resolution: "rest@workspace:ui/component/rest"
-  dependencies:
-    "@openremote/model": "npm:^1.2.0-snapshot"
-    "@openremote/rest": "npm:^1.2.0-snapshot"
-    "@openremote/util": "npm:^1.2.0-snapshot"
-    "@types/qs": "npm:^6.9.7"
-    axios: "npm:0.24.0"
-    qs: "npm:^6.8.0"
-  languageName: unknown
-  linkType: soft
-
 "retry@npm:^0.12.0":
   version: 0.12.0
   resolution: "retry@npm:0.12.0"