From 194acf15e8fec06028f79f70acae147dbc441192 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Tue, 7 Apr 2026 10:19:34 -0700 Subject: [PATCH] common: use peerDependencies --- common/package-lock.json | 6 +- common/package.json | 4 +- plugins/objectdetector/package-lock.json | 81 ++++++++++++++++++++---- plugins/objectdetector/package.json | 3 + plugins/objectdetector/src/polygon.ts | 2 +- 5 files changed, 81 insertions(+), 15 deletions(-) diff --git a/common/package-lock.json b/common/package-lock.json index 7d39fd559..4f186e2d6 100644 --- a/common/package-lock.json +++ b/common/package-lock.json @@ -10,7 +10,6 @@ "license": "ISC", "dependencies": { "@scrypted/sdk": "file:../sdk", - "@scrypted/types": "^0.5.55", "http-auth-utils": "^5.0.1", "typescript": "^5.5.3" }, @@ -18,6 +17,9 @@ "@types/node": "^20.19.11", "monaco-editor": "^0.50.0", "ts-node": "^10.9.2" + }, + "peerDependencies": { + "@scrypted/types": "^0.5.55" } }, "../sdk": { @@ -3255,6 +3257,7 @@ "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.5.55.tgz", "integrity": "sha512-99YAdiPRwR3q4ysA1hLZk1ZTdBwUFFUlh+18ESdcPOTRMWo0TI3JxfwniNsVMPmGZHcoM1yipC8xWkf9v+PB0g==", "license": "ISC", + "peer": true, "dependencies": { "openai": "^6.1.0" } @@ -3351,6 +3354,7 @@ "resolved": "https://registry.npmjs.org/openai/-/openai-6.33.0.tgz", "integrity": "sha512-xAYN1W3YsDXJWA5F277135YfkEk6H7D3D6vWwRhJ3OEkzRgcyK8z/P5P9Gyi/wB4N8kK9kM5ZjprfvyHagKmpw==", "license": "Apache-2.0", + "peer": true, "bin": { "openai": "bin/cli" }, diff --git a/common/package.json b/common/package.json index c13478223..947b2aaf2 100644 --- a/common/package.json +++ b/common/package.json @@ -10,9 +10,11 @@ }, "author": "", "license": "ISC", + "peerDependencies": { + "@scrypted/types": "^0.5.55" + }, "dependencies": { "@scrypted/sdk": "file:../sdk", - "@scrypted/types": "^0.5.55", "http-auth-utils": "^5.0.1", "typescript": "^5.5.3" }, diff --git a/plugins/objectdetector/package-lock.json b/plugins/objectdetector/package-lock.json index f96c3ab0b..fbb4d029c 100644 --- a/plugins/objectdetector/package-lock.json +++ b/plugins/objectdetector/package-lock.json @@ -14,6 +14,9 @@ }, "devDependencies": { "@types/node": "^22.19.0" + }, + "peerDependencies": { + "@scrypted/types": "^0.5.55" } }, "../../common": { @@ -22,7 +25,7 @@ "license": "ISC", "dependencies": { "@scrypted/sdk": "file:../sdk", - "@scrypted/types": "^0.5.27", + "@scrypted/types": "^0.5.55", "http-auth-utils": "^5.0.1", "typescript": "^5.5.3" }, @@ -34,7 +37,7 @@ }, "../../sdk": { "name": "@scrypted/sdk", - "version": "0.5.51", + "version": "0.5.59", "license": "ISC", "dependencies": { "@babel/preset-typescript": "^7.27.1", @@ -44,8 +47,8 @@ "@rollup/plugin-terser": "^0.4.4", "@rollup/plugin-typescript": "^12.3.0", "@rollup/plugin-virtual": "^3.0.2", + "@scrypted/auth-fetch": "^1.0.5", "adm-zip": "^0.5.16", - "axios": "^1.10.0", "babel-loader": "^10.0.0", "babel-plugin-const-enum": "^1.2.0", "ncp": "^2.0.0", @@ -61,16 +64,19 @@ "webpack-bundle-analyzer": "^4.10.2" }, "bin": { - "scrypted-changelog": "bin/scrypted-changelog.js", - "scrypted-debug": "bin/scrypted-debug.js", - "scrypted-deploy": "bin/scrypted-deploy.js", - "scrypted-deploy-debug": "bin/scrypted-deploy-debug.js", - "scrypted-package-json": "bin/scrypted-package-json.js", - "scrypted-setup-project": "bin/scrypted-setup-project.js", - "scrypted-webpack": "bin/scrypted-webpack.js" + "scrypted-changelog": "bin/cli.js", + "scrypted-debug": "bin/cli.js", + "scrypted-deploy": "bin/cli.js", + "scrypted-deploy-debug": "bin/cli.js", + "scrypted-package-json": "bin/cli.js", + "scrypted-setup-project": "bin/cli.js", + "scrypted-webpack": "bin/cli.js" }, "devDependencies": { + "@types/adm-zip": "^0.5.8", + "@types/ncp": "^2.0.8", "@types/node": "^24.9.2", + "@types/tmp": "^0.2.6", "ts-node": "^10.9.2", "typedoc": "^0.28.14" } @@ -83,6 +89,16 @@ "resolved": "../../sdk", "link": true }, + "node_modules/@scrypted/types": { + "version": "0.5.55", + "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.5.55.tgz", + "integrity": "sha512-99YAdiPRwR3q4ysA1hLZk1ZTdBwUFFUlh+18ESdcPOTRMWo0TI3JxfwniNsVMPmGZHcoM1yipC8xWkf9v+PB0g==", + "license": "ISC", + "peer": true, + "dependencies": { + "openai": "^6.1.0" + } + }, "node_modules/@types/node": { "version": "22.19.0", "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.0.tgz", @@ -93,6 +109,28 @@ "undici-types": "~6.21.0" } }, + "node_modules/openai": { + "version": "6.33.0", + "resolved": "https://registry.npmjs.org/openai/-/openai-6.33.0.tgz", + "integrity": "sha512-xAYN1W3YsDXJWA5F277135YfkEk6H7D3D6vWwRhJ3OEkzRgcyK8z/P5P9Gyi/wB4N8kK9kM5ZjprfvyHagKmpw==", + "license": "Apache-2.0", + "peer": true, + "bin": { + "openai": "bin/cli" + }, + "peerDependencies": { + "ws": "^8.18.0", + "zod": "^3.25 || ^4.0" + }, + "peerDependenciesMeta": { + "ws": { + "optional": true + }, + "zod": { + "optional": true + } + } + }, "node_modules/undici-types": { "version": "6.21.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", @@ -123,7 +161,7 @@ "version": "file:../../common", "requires": { "@scrypted/sdk": "file:../sdk", - "@scrypted/types": "^0.5.27", + "@scrypted/types": "^0.5.55", "@types/node": "^20.19.11", "http-auth-utils": "^5.0.1", "monaco-editor": "^0.50.0", @@ -141,9 +179,12 @@ "@rollup/plugin-terser": "^0.4.4", "@rollup/plugin-typescript": "^12.3.0", "@rollup/plugin-virtual": "^3.0.2", + "@scrypted/auth-fetch": "^1.0.5", + "@types/adm-zip": "^0.5.8", + "@types/ncp": "^2.0.8", "@types/node": "^24.9.2", + "@types/tmp": "^0.2.6", "adm-zip": "^0.5.16", - "axios": "^1.10.0", "babel-loader": "^10.0.0", "babel-plugin-const-enum": "^1.2.0", "ncp": "^2.0.0", @@ -161,6 +202,15 @@ "webpack-bundle-analyzer": "^4.10.2" } }, + "@scrypted/types": { + "version": "0.5.55", + "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.5.55.tgz", + "integrity": "sha512-99YAdiPRwR3q4ysA1hLZk1ZTdBwUFFUlh+18ESdcPOTRMWo0TI3JxfwniNsVMPmGZHcoM1yipC8xWkf9v+PB0g==", + "peer": true, + "requires": { + "openai": "^6.1.0" + } + }, "@types/node": { "version": "22.19.0", "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.0.tgz", @@ -170,6 +220,13 @@ "undici-types": "~6.21.0" } }, + "openai": { + "version": "6.33.0", + "resolved": "https://registry.npmjs.org/openai/-/openai-6.33.0.tgz", + "integrity": "sha512-xAYN1W3YsDXJWA5F277135YfkEk6H7D3D6vWwRhJ3OEkzRgcyK8z/P5P9Gyi/wB4N8kK9kM5ZjprfvyHagKmpw==", + "peer": true, + "requires": {} + }, "undici-types": { "version": "6.21.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", diff --git a/plugins/objectdetector/package.json b/plugins/objectdetector/package.json index 29927e8fc..6ec80ebe1 100644 --- a/plugins/objectdetector/package.json +++ b/plugins/objectdetector/package.json @@ -44,6 +44,9 @@ ], "realfs": true }, + "peerDependencies": { + "@scrypted/types": "^0.5.55" + }, "dependencies": { "@scrypted/common": "file:../../common", "@scrypted/sdk": "file:../../sdk" diff --git a/plugins/objectdetector/src/polygon.ts b/plugins/objectdetector/src/polygon.ts index 4b59b1576..2a7e33429 100644 --- a/plugins/objectdetector/src/polygon.ts +++ b/plugins/objectdetector/src/polygon.ts @@ -1,4 +1,4 @@ -import type { ClipPath, Point } from '@scrypted/sdk'; +import type { ClipPath, Point } from '@scrypted/types'; // x y w h export type BoundingBox = [number, number, number, number];