dcp-810 upgrade node to 14.15.5 and angular to 12.1.5

ebi-ait · Jul 28, 2022 · 4bac408 · 4bac408
1 parent f6a0803
commit 4bac408
Show file tree

Hide file tree

Showing 5 changed files with 270 additions and 944 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v14.15.5
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # Stage 1 (build)
 # base image
-FROM quay.io/ebi-ait/ingest-base-images:node_12.16.3-alpine as build-step
+FROM quay.io/ebi-ait/ingest-base-images:node_14.15.5-alpine as build-step
 
 # set working directory
 RUN mkdir /app
@@ -25,7 +25,7 @@ COPY ./src /app/src
 RUN ng build -c=env
 
 # Stage 2 (serve)
-FROM quay.io/ebi-ait/ingest-base-images:nginx_1.19.3-alpine
+FROM quay.io/ebi-ait/ingest-base-images:nginx_1.22.0-alpine
 
 COPY --from=build-step /app/dist /usr/share/nginx/html
 COPY ./docker-assets/nginx.conf /etc/nginx/conf.d/default.conf

diff --git a/README.md b/README.md
@@ -7,26 +7,49 @@ This is the UI app for monitoring and tracking submissions to the DCP.
 
 ## Setting up
 1. Install `nvm` to install node.https://github.com/nvm-sh/nvm
-2. Clone this repo
-4. `yarn install`
-5. `ng serve -c=dev` (quickly check if UI is working, this will point to Ingest API in dev)
+1. `nvm install` To get the node version listed at: `/.nvmrc`
+1. Clone this repo, or remove your **node_modules** folder: `rm -rf node_modules`
+1`yarn install`
+1. `ng serve -c=dev` (quickly check if UI is working, this will point to Ingest API in dev)
 
-(Optional) if you're just updating your setup, do the ff before yarn install:
+## Development server
+1. Run `nvm use` to set the used version to the one listed at: `/.nvmrc`
 
-```
-rm -rf node_modules/
-npm cache verify
+1. Run `ng serve` or `ng serve -c=[dev|staging|prod]` for a dev server pointing to the ingest api urls configuration in the `environment.<env>.ts`. 
 
-```
+1. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
 
-Currently working with the ff versions:
+## Deployment
+Please check `ingest-kube-deployment` repo
 
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
+
+## Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
+
+## About Versions and Support
+The versions of **Angular**, **Node**, **TypeScript** and **RxJS** are tightly coupled with each-other, as described by [this table](https://gist.github.com/LayZeeDK/c822cc812f75bb07b7c55d07ba2719b3).
+
+Furthermore, Angular 12 is only in Long-Term Support until 2022-11-12, [source](https://angular.io/guide/releases#support-policy-and-schedule) and Node 14 is only Maintained until 2023-04-30 [source](https://github.com/nodejs/Release#nodejs-release-working-group). This project should expect to be migrated to supported versions of Node and Angular as appropriate.
+
+### Currently working versions
 ```
-$ node --version
-v12.16.2
+$ varn --version
+1.22.19
 
-$ npm --version
-6.14.4
+$ node --version
+v14.15.5
 
 $ ng --version
 
@@ -38,49 +61,28 @@ $ ng --version
                 |___/
     
 
-Angular CLI: 12.1.3
-Node: 12.16.3
-Package Manager: yarn 1.22.4
+Angular CLI: 12.1.4
+Node: 14.15.5
+Package Manager: yarn 1.22.19
 OS: darwin x64
 
-Angular: 12.1.3
-... animations, cdk, cli, common, compiler, compiler-cli, core
-... forms, language-service, material, platform-browser
-... platform-browser-dynamic, router
+Angular: 12.1.5
+... animations, common, compiler, compiler-cli, core, forms
+... language-service, platform-browser, platform-browser-dynamic
+... router
 
 Package                         Version
 ---------------------------------------------------------
-@angular-devkit/architect       0.1201.3
-@angular-devkit/build-angular   12.1.3
-@angular-devkit/core            12.1.3
-@angular-devkit/schematics      12.1.3
-@angular/flex-layout            12.0.0-beta.34
-@schematics/angular             12.1.3
+@angular-devkit/architect       0.1201.4
+@angular-devkit/build-angular   12.1.4
+@angular-devkit/core            12.1.4
+@angular-devkit/schematics      12.1.4
+@angular/cdk                    12.1.4
+@angular/cli                    12.1.4
+@angular/flex-layout            12.0.0-beta.35
+@angular/material               12.1.4
+@schematics/angular             12.1.4
+rxjs                            6.6.7
 typescript                      4.3.5
     
 ```
-
-## Development server
-
-1. Run `ng serve` or `ng serve -c=[dev|staging|prod]` for a dev server pointing to the ingest api urls configuration in the `environment.<env>.ts`. 
-
-2. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
-
-## Deployment
-Please check `ingest-kube-deployment` repo
-
-## Code scaffolding
-
-Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
-
-## Running unit tests
-
-Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
-
-## Running end-to-end tests
-
-Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
-
-## Further help
-
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
diff --git a/package.json b/package.json
@@ -19,49 +19,49 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "12.1.3",
-    "@angular/cdk": "^12.1.3",
-    "@angular/common": "12.1.3",
-    "@angular/compiler": "12.1.3",
-    "@angular/core": "12.1.3",
-    "@angular/flex-layout": "^12.0.0-beta.34",
-    "@angular/forms": "12.1.3",
-    "@angular/material": "^12.1.3",
-    "@angular/platform-browser": "12.1.3",
-    "@angular/platform-browser-dynamic": "12.1.3",
-    "@angular/router": "12.1.3",
+    "@angular/animations": "~12.1.5",
+    "@angular/cdk": "~12.1.4",
+    "@angular/common": "~12.1.5",
+    "@angular/compiler": "~12.1.5",
+    "@angular/core": "~12.1.5",
+    "@angular/flex-layout": "~12.0.0-beta.35",
+    "@angular/forms": "~12.1.5",
+    "@angular/material": "~12.1.4",
+    "@angular/platform-browser": "~12.1.5",
+    "@angular/platform-browser-dynamic": "~12.1.5",
+    "@angular/router": "~12.1.5",
     "@auth0/angular-jwt": "^5.0.2",
     "@swimlane/ngx-charts": "^18.0.1",
-    "@swimlane/ngx-datatable": "^19.0.0",
-    "@swimlane/ngx-graph": "^7.2.0",
+    "@swimlane/ngx-datatable": "^20.0.0",
+    "@swimlane/ngx-graph": "^8.0.1",
     "@types/file-saver": "^2.0.3",
     "core-js": "^3.15.2",
     "ejs": "^3.1.6",
     "file-saver": "^2.0.5",
     "hammerjs": "^2.0.8",
     "lodash": "^4.17.21",
-    "npm": "^7.20.1",
+    "ngx-cookie-service": "12.0.3",
     "oidc-client": "^1.11.5",
     "pluralize": "^8.0.0",
+    "rxjs": "^6.5.5",
     "snyk": "^1.667.0",
     "ts-enum-util": "^4.0.2",
     "tslib": "^2.0.0",
-    "zone.js": "~0.11.4",
-    "ngx-cookie-service": "13.0.0"
+    "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^12.1.3",
+    "@angular-devkit/build-angular": "~12.1.4",
     "@angular-eslint/builder": "12.5.0",
     "@angular-eslint/eslint-plugin": "12.5.0",
     "@angular-eslint/eslint-plugin-template": "12.5.0",
     "@angular-eslint/schematics": "12.5.0",
     "@angular-eslint/template-parser": "12.5.0",
-    "@angular/cli": "^12.1.3",
-    "@angular/compiler-cli": "^12.1.3",
-    "@angular/language-service": "12.1.3",
+    "@angular/cli": "~12.1.4",
+    "@angular/compiler-cli": "~12.1.5",
+    "@angular/language-service": "~12.1.5",
     "@types/jasmine": "^3.8.1",
     "@types/jasminewd2": "^2.0.10",
-    "@types/node": "^16.4.3",
+    "@types/node": "^14.15.5",
     "@typescript-eslint/eslint-plugin": "4.28.2",
     "@typescript-eslint/parser": "4.28.2",
     "eslint": "^7.26.0",
@@ -80,12 +80,13 @@
     "replace-in-file": "^6.2.0",
     "tar": "^6.1.1",
     "ts-node": "~10.1.0",
-    "typescript": "4.3.5",
+    "typescript": ">= 4.2.4 <= 4.3.5",
     "url-parse": ">=1.5.3"
   },
   "snyk": true,
   "engines": {
     "npm": "please-use-yarn",
+    "node": ">=14.15.5 <15",
     "yarn": ">= 1.22.0"
   }
 }