Skip to content

Commit

Permalink
Merge branch 'main' into O3-3521
Browse files Browse the repository at this point in the history
  • Loading branch information
jnsereko authored Aug 28, 2024
2 parents 45b349b + 2b5de25 commit a1adf2b
Show file tree
Hide file tree
Showing 4 changed files with 3,484 additions and 1,451 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"sass": "^1.54.3",
"swc-loader": "^0.2.3",
"swr": "^2.2.4",
"turbo": "^2.0.6",
"turbo": "^2.0.12",
"typescript": "^4.0.3",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1"
Expand Down
3 changes: 1 addition & 2 deletions packages/esm-form-entry-app/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
"lodash",
"moment",
"raf",
"rgbcolor",
"zone.js"
"rgbcolor"
],
"preserveSymlinks": true,
"outputPath": "dist",
Expand Down
52 changes: 25 additions & 27 deletions packages/esm-form-entry-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@openmrs/esm-form-entry-app",
"version": "8.1.0",
"license": "MPL-2.0",
"description": "Form engine entry capabilities for the OpenMRS SPA",
"description": "Angular form engine for O3",
"browser": "dist/openmrs-esm-form-entry-app.js",
"main": "src/index.ts",
"source": true,
Expand Down Expand Up @@ -35,25 +35,25 @@
"url": "https://github.com/openmrs/openmrs-esm-patient-chart/issues"
},
"dependencies": {
"@angular-extensions/elements": "^16.0.0",
"@angular/animations": "^16.2.12",
"@angular/cdk": "^16.2.12",
"@angular/common": "^16.2.12",
"@angular/compiler": "^16.2.12",
"@angular/compiler-cli": "^16.2.12",
"@angular/core": "^16.2.12",
"@angular/forms": "^16.2.12",
"@angular/platform-browser": "^16.2.12",
"@angular/platform-browser-dynamic": "^16.2.12",
"@angular/router": "^16.2.12",
"@angular-extensions/elements": "^17.1.1",
"@angular/animations": "^17.3.12",
"@angular/cdk": "^17.3.10",
"@angular/common": "^17.3.12",
"@angular/compiler": "^17.3.12",
"@angular/compiler-cli": "^17.3.12",
"@angular/core": "^17.3.12",
"@angular/forms": "^17.3.12",
"@angular/platform-browser": "^17.3.12",
"@angular/platform-browser-dynamic": "^17.3.12",
"@angular/router": "^17.3.12",
"@carbon/styles": "~1.14.0",
"@ng-select/ng-select": "^11.2.0",
"@ng-select/ng-select": "^12.0.7",
"@ngx-translate/core": "^15.0.0",
"@openmrs/ngx-file-uploader": "next",
"@openmrs/ngx-formentry": "next",
"jspdf": "^2.5.1",
"moment": "^2.29.4",
"ngx-bootstrap": "^11.0.1",
"ngx-bootstrap": "^12.0.0",
"ngx-webcam": "^0.4.1",
"reflect-metadata": "^0.1.13",
"single-spa-angular": "^9.0.1",
Expand All @@ -62,24 +62,22 @@
"tree-model": "^1.0.7",
"tslib": "^2.4.1",
"uuid": "^8.3.2",
"zone.js": "~0.13.3"
"zone.js": "~0.14.8"
},
"peerDependencies": {
"@openmrs/esm-framework": "5.x",
"single-spa": "6.x"
},
"devDependencies": {
"@angular-devkit/build-angular": "^16.2.11",
"@angular-eslint/builder": "^16.3.1",
"@angular-eslint/eslint-plugin": "^16.3.1",
"@angular-eslint/eslint-plugin-template": "^16.3.1",
"@angular-eslint/schematics": "^16.3.1",
"@angular-eslint/template-parser": "^16.3.1",
"@angular/cli": "^16.2.11",
"@angular/compiler-cli": "^16.2.12",
"@angular/language-service": "^16.2.12",
"@angular/localize": "^16.2.12",
"@openmrs/esm-framework": "next",
"@angular-devkit/build-angular": "^17.3.8",
"@angular-eslint/builder": "^17.5.2",
"@angular-eslint/eslint-plugin": "^17.5.2",
"@angular-eslint/eslint-plugin-template": "^17.5.2",
"@angular-eslint/schematics": "^17.5.2",
"@angular-eslint/template-parser": "^17.5.2",
"@angular/cli": "^17.3.8",
"@angular/language-service": "^17.3.12",
"@angular/localize": "^17.3.12",
"@types/jasmine": "~3.6.11",
"@types/jasminewd2": "~2.0.3",
"@types/webpack-env": "^1.18.2",
Expand All @@ -95,7 +93,7 @@
"karma-coverage-istanbul-reporter": "~3.0.3",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "^2.1.0",
"ngx-build-plus": "^16.0.0",
"ngx-build-plus": "^17.0.0",
"openmrs": "next",
"protractor": "~7.0.0",
"rxjs": "^7.8.0",
Expand Down
Loading

0 comments on commit a1adf2b

Please sign in to comment.