From 463a827f866715c9caab0e91c25a968bbf073578 Mon Sep 17 00:00:00 2001 From: Lucy Cifferello <12953208+elvece@users.noreply.github.com> Date: Tue, 28 Jan 2025 17:53:25 -0700 Subject: [PATCH] revert to test --- container-runtime/package-lock.json | 10 +++---- .../Systems/SystemForEmbassy/index.ts | 26 ++++++++++++++++--- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/container-runtime/package-lock.json b/container-runtime/package-lock.json index 2ff4bb8c6..097c3ccb7 100644 --- a/container-runtime/package-lock.json +++ b/container-runtime/package-lock.json @@ -64,7 +64,7 @@ }, "../sdk/dist": { "name": "@start9labs/start-sdk", - "version": "0.3.6-alpha8", + "version": "0.3.6-beta.4", "license": "MIT", "dependencies": { "@iarna/toml": "^2.2.5", @@ -72,8 +72,8 @@ "@noble/hashes": "^1.4.0", "isomorphic-fetch": "^3.0.0", "lodash.merge": "^4.6.2", - "mime": "^4.0.3", - "ts-matches": "^5.5.1", + "mime-types": "^2.1.35", + "ts-matches": "^6.2.1", "yaml": "^2.2.2" }, "devDependencies": { @@ -6799,11 +6799,11 @@ "isomorphic-fetch": "^3.0.0", "jest": "^29.4.3", "lodash.merge": "^4.6.2", - "mime": "^4.0.3", + "mime-types": "^2.1.35", "peggy": "^3.0.2", "prettier": "^3.2.5", "ts-jest": "^29.0.5", - "ts-matches": "^5.5.1", + "ts-matches": "^6.2.1", "ts-node": "^10.9.1", "ts-pegjs": "^4.2.1", "tsx": "^4.7.1", diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts index ba7dffdda..3438fccdf 100644 --- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts +++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts @@ -701,11 +701,11 @@ export class SystemForEmbassy implements System { path: EMBASSY_DEPENDS_ON_PATH_PREFIX, })) as Record - const dependsOn: Record = storedDependsOn ? storedDependsOn : { + const dependsOn: Record = storedDependsOn ? storedDependsOn : { ...Object.fromEntries( - Object.entries(this.manifest.dependencies || {})?.filter(x => x[1].requirement.type === "required").map((x) => [ + Object.entries(this.manifest.dependencies || {})?.map((x) => [ x[0], - [], + null, ]) || [], ), ...rawDepends, @@ -721,6 +721,26 @@ export class SystemForEmbassy implements System { ([key, value]): T.Dependencies => { const dependency = this.manifest.dependencies?.[key] if (!dependency) return [] + if (value == null) { + const versionRange = dependency.version + if (dependency.requirement.type === "required") { + return [ + { + id: key, + versionRange, + kind: "running", + healthChecks: [], + }, + ] + } + return [ + { + kind: "exists", + id: key, + versionRange, + }, + ] + } const versionRange = dependency.version const kind = "running" return [