From b117ef11cb74e93fe1fe0bd7e72deec3c60397c5 Mon Sep 17 00:00:00 2001 From: Sean Fong Date: Thu, 4 Jul 2024 11:32:38 +0930 Subject: [PATCH] Fix sdc-assemble module resolution issue - Update sdc-assemble and assemble-express to v1.3.1 --- apps/smart-forms-app/package.json | 2 +- package-lock.json | 8 ++++---- packages/sdc-assemble/package.json | 2 +- packages/sdc-assemble/src/interfaces/index.ts | 2 +- push-assemble-image.sh | 4 +++- push-extract-image.sh | 4 +++- push-populate-image.sh | 4 +++- services/assemble-express/package.json | 4 ++-- services/assemble-express/src/index.ts | 4 ++-- 9 files changed, 20 insertions(+), 14 deletions(-) diff --git a/apps/smart-forms-app/package.json b/apps/smart-forms-app/package.json index ac6866877..fdae39b60 100644 --- a/apps/smart-forms-app/package.json +++ b/apps/smart-forms-app/package.json @@ -26,7 +26,7 @@ }, "homepage": "https://github.com/aehrc/smart-forms#readme", "dependencies": { - "@aehrc/sdc-assemble": "^1.3.0", + "@aehrc/sdc-assemble": "^1.3.1", "@aehrc/sdc-populate": "^2.2.7", "@aehrc/smart-forms-renderer": "^0.35.9", "@emotion/react": "^11.11.4", diff --git a/package-lock.json b/package-lock.json index 26e10bcbe..8a21e4860 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "version": "0.2.0", "license": "Apache-2.0", "dependencies": { - "@aehrc/sdc-assemble": "^1.3.0", + "@aehrc/sdc-assemble": "^1.3.1", "@aehrc/sdc-populate": "^2.2.7", "@aehrc/smart-forms-renderer": "^0.35.9", "@emotion/react": "^11.11.4", @@ -41602,7 +41602,7 @@ }, "packages/sdc-assemble": { "name": "@aehrc/sdc-assemble", - "version": "1.3.0", + "version": "1.3.1", "license": "Apache-2.0", "dependencies": { "axios": "^1.6.8", @@ -42609,10 +42609,10 @@ "license": "ISC" }, "services/assemble-express": { - "version": "1.3.0", + "version": "1.3.1", "license": "Apache-2.0", "dependencies": { - "@aehrc/sdc-assemble": "^1.3.0", + "@aehrc/sdc-assemble": "^1.3.1", "cors": "^2.8.5", "dotenv": "^16.4.5", "express": "^4.19.2" diff --git a/packages/sdc-assemble/package.json b/packages/sdc-assemble/package.json index d80dd71ed..f680ff228 100644 --- a/packages/sdc-assemble/package.json +++ b/packages/sdc-assemble/package.json @@ -1,6 +1,6 @@ { "name": "@aehrc/sdc-assemble", - "version": "1.3.0", + "version": "1.3.1", "description": "Performs the $assemble operation for modular forms from the HL7 FHIR SDC (Structured Data Capture) specification: http://hl7.org/fhir/uv/sdc/modular.html", "main": "lib/index.js", "scripts": { diff --git a/packages/sdc-assemble/src/interfaces/index.ts b/packages/sdc-assemble/src/interfaces/index.ts index fa67f665d..abbab52f4 100644 --- a/packages/sdc-assemble/src/interfaces/index.ts +++ b/packages/sdc-assemble/src/interfaces/index.ts @@ -15,5 +15,5 @@ * limitations under the License. */ -export { InputParameters, OutputParameters } from './parameters.interface'; +export { InputParameters, OutputParameters, OutcomeParameter } from './parameters.interface'; export { FetchQuestionnaireCallback } from './callback.interface'; diff --git a/push-assemble-image.sh b/push-assemble-image.sh index 9e4351e21..e05cd7e1b 100644 --- a/push-assemble-image.sh +++ b/push-assemble-image.sh @@ -22,5 +22,7 @@ set -xe cd services/assemble-express && npm run compile && cd - # Build the Docker image for multiple architectures, then push to Docker Hub. -docker buildx build --file ./services/assemble-express/Dockerfile --tag aehrc/smart-forms-assemble:latest \ +docker buildx build --file ./services/assemble-express/Dockerfile \ + --tag aehrc/smart-forms-assemble:latest \ + --tag aehrc/smart-forms-assemble:v1.3.1 \ --platform linux/amd64,linux/arm64/v8 --push --no-cache . diff --git a/push-extract-image.sh b/push-extract-image.sh index d19dceafb..6ef8567c5 100644 --- a/push-extract-image.sh +++ b/push-extract-image.sh @@ -22,5 +22,7 @@ set -xe cd services/extract-express && npm run compile && cd - # Build the Docker image for multiple architectures, then push to Docker Hub. -docker buildx build --file ./services/extract-express/Dockerfile --tag aehrc/smart-forms-extract:latest \ +docker buildx build --file ./services/extract-express/Dockerfile \ + --tag aehrc/smart-forms-extract:latest \ + --tag aehrc/smart-forms-extract:v0.3.0 \ --platform linux/amd64,linux/arm64/v8 --push --no-cache . diff --git a/push-populate-image.sh b/push-populate-image.sh index dcdad19c9..1dd2368a7 100644 --- a/push-populate-image.sh +++ b/push-populate-image.sh @@ -22,5 +22,7 @@ set -xe cd services/populate-express && npm run compile && cd - # Build the Docker image for multiple architectures, then push to Docker Hub. -docker buildx build --file ./services/populate-express/Dockerfile --tag aehrc/smart-forms-populate:latest \ +docker buildx build --file ./services/populate-express/Dockerfile \ + --tag aehrc/smart-forms-populate:latest \ + --tag aehrc/smart-forms-populate:v2.2.7 \ --platform linux/amd64,linux/arm64/v8 --push --no-cache . diff --git a/services/assemble-express/package.json b/services/assemble-express/package.json index 98f0b8b87..0f1c73201 100644 --- a/services/assemble-express/package.json +++ b/services/assemble-express/package.json @@ -1,6 +1,6 @@ { "name": "assemble-express", - "version": "1.3.0", + "version": "1.3.1", "description": "", "main": "lib/index.js", "scripts": { @@ -13,7 +13,7 @@ "license": "Apache-2.0", "dependencies": { "express": "^4.19.2", - "@aehrc/sdc-assemble": "^1.3.0", + "@aehrc/sdc-assemble": "^1.3.1", "dotenv": "^16.4.5", "cors": "^2.8.5" }, diff --git a/services/assemble-express/src/index.ts b/services/assemble-express/src/index.ts index 3f31c560d..9b59496d3 100644 --- a/services/assemble-express/src/index.ts +++ b/services/assemble-express/src/index.ts @@ -17,17 +17,17 @@ import express from 'express'; import cors from 'cors'; +import type { OutcomeParameter } from '@aehrc/sdc-assemble'; import { assemble, isInputParameters } from '@aehrc/sdc-assemble'; +import type { RequestConfig } from './callback'; import { fetchQuestionnaireCallback } from './callback'; import dotenv from 'dotenv'; -import type { RequestConfig } from 'populate-express/lib/callback'; import { addEndpointToNotFoundIssues, createInvalidParametersOutcome, createOperationOutcome } from './operationOutcome'; import { createInputParameters, isQuestionnaire } from './questionnaire'; -import { OutcomeParameter } from '@aehrc/sdc-assemble/lib/interfaces/parameters.interface'; const app = express(); const port = 3002;