Skip to content

Commit

Permalink
RT-1513:(charts-on-fhir) Update to new angular builder (#256)
Browse files Browse the repository at this point in the history
* RT-1513:(charts-on-fhir) Update to new angular builder

* Fixed unit test issue

* Fixed the sonar issue

* Updated minor version of ngx-charts-on-fhir
  • Loading branch information
yashpmohod authored Aug 28, 2024
1 parent e150f26 commit 317313b
Show file tree
Hide file tree
Showing 12 changed files with 36 additions and 34 deletions.
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ FROM node:18.13.0-alpine AS build
USER node
WORKDIR /home/node
COPY --chown=node package*.json ./
RUN npm ci --ignore-scripts
RUN npm rebuild @parcel/watcher nice-napi nx esbuild @swc/core
RUN npm ci --ignore-scripts && npm rebuild @parcel/watcher nice-napi nx esbuild @swc/core
COPY --chown=node . .
ARG app
RUN npm run build ${app}
Expand All @@ -15,6 +14,6 @@ RUN rm -rf /usr/share/nginx/html/*
COPY nginx.conf /etc/nginx/
COPY ./docker-entrypoint.sh /etc/nginx/
ARG app
COPY --from=build /home/node/dist/apps/${app} /usr/share/nginx/html
COPY --from=build /home/node/dist/apps/${app}/browser /usr/share/nginx/html
ENTRYPOINT ["/etc/nginx/docker-entrypoint.sh"]
CMD ["nginx"]
12 changes: 5 additions & 7 deletions apps/cardio-patient/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@
},
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
"executor": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/apps/cardio-patient",
"index": "apps/cardio-patient/src/index.html",
"main": "apps/cardio-patient/src/main.ts",
"polyfills": "apps/cardio-patient/src/polyfills.ts",
"polyfills": ["apps/cardio-patient/src/polyfills.ts"],
"tsConfig": "apps/cardio-patient/tsconfig.json",
"inlineStyleLanguage": "scss",
"assets": ["apps/cardio-patient/src/favicon.ico", "apps/cardio-patient/src/assets", "apps/cardio-patient/src/launch.html"],
Expand All @@ -27,7 +26,8 @@
"inject": false,
"bundleName": "fhirclient"
}
]
],
"browser": "apps/cardio-patient/src/main.ts"
},
"configurations": {
"production": {
Expand All @@ -53,9 +53,7 @@
"tsConfig": "apps/cardio-patient/tsconfig.app.json"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true,
Expand Down Expand Up @@ -108,7 +106,7 @@
"karmaConfig": "apps/cardio-patient/karma.conf.js",
"inlineStyleLanguage": "scss",
"assets": ["apps/cardio-patient/src/favicon.ico", "apps/cardio-patient/src/assets"],
"styles": ["libs/ngx-charts-on-fhir/src/default.scss", "apps/cardio-patient/src/styles.scss"],
"styles": ["apps/cardio-patient/src/styles.scss"],
"scripts": []
}
}
Expand Down
5 changes: 4 additions & 1 deletion apps/cardio-patient/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"extends": "../../tsconfig.base.json",
"files": ["src/main.ts", "src/polyfills.ts"],
"include": ["**/*.ts"]
"include": ["**/*.ts"],
"compilerOptions": {
"esModuleInterop": true
}
}
14 changes: 6 additions & 8 deletions apps/cardio/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@
},
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
"executor": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/apps/cardio",
"index": "apps/cardio/src/index.html",
"main": "apps/cardio/src/main.ts",
"polyfills": "apps/cardio/src/polyfills.ts",
"polyfills": ["apps/cardio/src/polyfills.ts"],
"tsConfig": "apps/cardio/tsconfig.json",
"inlineStyleLanguage": "scss",
"assets": ["apps/cardio/src/favicon.ico", "apps/cardio/src/assets", "apps/cardio/src/launch.html"],
"styles": ["libs/ngx-charts-on-fhir/src/default.scss", "apps/cardio/src/styles.scss"],
"styles": ["apps/cardio/src/styles.scss"],
"scripts": [
{
"input": "node_modules/fhirclient/build/fhir-client.js",
"inject": false,
"bundleName": "fhirclient"
}
]
],
"browser": "apps/cardio/src/main.ts"
},
"configurations": {
"production": {
Expand All @@ -53,9 +53,7 @@
"tsConfig": "apps/cardio/tsconfig.app.json"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true,
Expand Down Expand Up @@ -108,7 +106,7 @@
"karmaConfig": "apps/cardio/karma.conf.js",
"inlineStyleLanguage": "scss",
"assets": ["apps/cardio/src/favicon.ico", "apps/cardio/src/assets"],
"styles": ["libs/ngx-charts-on-fhir/src/default.scss", "apps/cardio/src/styles.scss"],
"styles": ["apps/cardio/src/styles.scss"],
"scripts": []
}
}
Expand Down
5 changes: 4 additions & 1 deletion apps/cardio/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"extends": "../../tsconfig.base.json",
"files": ["src/main.ts", "src/polyfills.ts"],
"include": ["**/*.ts"]
"include": ["**/*.ts"],
"compilerOptions": {
"esModuleInterop": true
}
}
2 changes: 1 addition & 1 deletion apps/documentation/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"apps/documentation/src/favicon.ico",
"apps/documentation/src/assets"
],
"styles": ["node_modules/@ng-doc/app/styles/global.css", "apps/documentation/src/styles.scss"],
"styles": ["libs/ngx-charts-on-fhir/src/default.scss", "node_modules/@ng-doc/app/styles/global.css", "apps/documentation/src/styles.scss"],
"scripts": [],
"allowedCommonJsDependencies": ["@ng-doc/core"]
},
Expand Down
3 changes: 0 additions & 3 deletions apps/documentation/src/styles.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
/* You can add global styles to this file, and also import other style files */
$material-icons-font-path: "material-icons/iconfont/";
@import "libs/ngx-charts-on-fhir/src/default.scss";

:root {
--ng-doc-app-max-width: 1600px;
}
3 changes: 2 additions & 1 deletion apps/documentation/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"types": []
"types": [],
"esModuleInterop": true
},
"files": ["src/main.ts", "src/polyfills.ts"],
"include": ["src/**/*.d.ts"]
Expand Down
12 changes: 5 additions & 7 deletions apps/showcase/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@
},
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
"executor": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/apps/showcase",
"index": "apps/showcase/src/index.html",
"main": "apps/showcase/src/main.ts",
"polyfills": "apps/showcase/src/polyfills.ts",
"polyfills": ["apps/showcase/src/polyfills.ts"],
"tsConfig": "apps/showcase/tsconfig.json",
"inlineStyleLanguage": "scss",
"assets": ["apps/showcase/src/favicon.ico", "apps/showcase/src/assets", "apps/showcase/src/launch.html"],
Expand All @@ -27,7 +26,8 @@
"inject": false,
"bundleName": "fhirclient"
}
]
],
"browser": "apps/showcase/src/main.ts"
},
"configurations": {
"production": {
Expand All @@ -53,9 +53,7 @@
"tsConfig": "apps/showcase/tsconfig.app.json"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true,
Expand Down Expand Up @@ -119,7 +117,7 @@
"karmaConfig": "apps/showcase/karma.conf.js",
"inlineStyleLanguage": "scss",
"assets": ["apps/showcase/src/favicon.ico", "apps/showcase/src/assets"],
"styles": ["libs/ngx-charts-on-fhir/src/default.scss", "apps/showcase/src/styles.scss"],
"styles": ["apps/showcase/src/styles.scss"],
"scripts": []
}
}
Expand Down
5 changes: 4 additions & 1 deletion apps/showcase/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"extends": "../../tsconfig.base.json",
"files": ["src/main.ts", "src/polyfills.ts"],
"include": ["**/*.ts"]
"include": ["**/*.ts"],
"compilerOptions": {
"esModuleInterop": true
}
}
2 changes: 1 addition & 1 deletion libs/ngx-charts-on-fhir/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elimuinformatics/ngx-charts-on-fhir",
"version": "4.0.0",
"version": "4.0.1",
"description": "Charts-on-FHIR: A data visualization library for SMART-on-FHIR healthcare applications",
"license": "Apache-2.0",
"homepage": "https://elimuinformatics.github.io/charts-on-fhir",
Expand Down
2 changes: 2 additions & 0 deletions libs/ngx-charts-on-fhir/src/default-fonts.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
$material-icons-font-path: "material-icons/iconfont/";

@import "material-icons/iconfont/material-icons.scss";
@import "@fontsource/roboto/300.css";
@import "@fontsource/roboto/400.css";
Expand Down

0 comments on commit 317313b

Please sign in to comment.