Merge pull request #9 from communitybridge/feature/angular-9-to-10

communitybridge · Jan 30, 2023 · b1c8207 · b1c8207
2 parents ff130a5 + 0a6ffb7
commit b1c8207
Show file tree

Hide file tree

Showing 18 changed files with 3,840 additions and 6,804 deletions.
diff --git a/browserslist → .browserslistrc b/browserslist → .browserslistrc
diff --git a/.github/workflows/yarn-scan-pr.yml b/.github/workflows/yarn-scan-pr.yml
@@ -11,7 +11,7 @@ on:
       - main
 
 jobs:
-  yarn-scan-landing-page-pr:
+  yarn-scan-pr:
     runs-on: ubuntu-latest
     environment: dev
     steps:

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/.angular/cache
 # Copyright The Linux Foundation and each contributor to CommunityBridge.
 # SPDX-License-Identifier: MIT
 

diff --git a/angular.json b/angular.json
@@ -22,15 +22,20 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
-            "aot": true,
             "assets": [
               "src/favicon.png",
               "src/assets"
             ],
             "styles": [
               "src/styles.scss"
             ],
-            "scripts": []
+            "scripts": [],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "production": {
@@ -43,7 +48,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "extractLicenses": true,
               "vendorChunk": false,
@@ -71,7 +75,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "extractLicenses": true,
               "vendorChunk": false,
@@ -99,7 +102,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "extractLicenses": true,
               "vendorChunk": false,
@@ -117,7 +119,8 @@
                 }
               ]
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
@@ -159,19 +162,6 @@
             "scripts": []
           }
         },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "tsconfig.app.json",
-              "tsconfig.spec.json",
-              "e2e/tsconfig.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
-        },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
@@ -187,7 +177,6 @@
       }
     }
   },
-  "defaultProject": "landing-page",
   "cli": {
     "analytics": false
   }

diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es2018",
     "types": [
       "jasmine",
       "jasminewd2",

diff --git a/package.json b/package.json
@@ -19,23 +19,16 @@
     "sls": "./node_modules/serverless/bin/serverless.js",
     "eslint": "./node_modules/.bin/eslint \"./src/**/*.ts\"",
     "eslint-fix": "./node_modules/.bin/eslint \"./src/**/*.ts\" --fix",
-    "build": "yarn prebuild:dev && ./node_modules/@angular/cli/bin/ng build --prod --configuration=dev",
-    "build:dev": "yarn prebuild:dev && ./node_modules/@angular/cli/bin/ng build --prod --configuration=dev",
+    "build": "yarn prebuild:dev && ng build --configuration production --configuration=dev",
+    "build:dev": "yarn prebuild:dev && ng build --configuration production --configuration=dev",
     "prebuild:dev": "STAGE_ENV=dev node ./src/app/config/scripts/prefetch-ssm.js",
     "deploy:cloudfront:dev": "SLS_DEBUG=* yarn sls deploy --stage='dev' --cloudfront=true --verbose",
     "deploy:frontend:dev": "SLS_DEBUG=* yarn sls client deploy --stage='dev' --cloudfront=true --no-confirm --no-policy-change --no-config-change --verbose",
     "deploy:invalidate:dev": "SLS_DEBUG=* yarn sls cloudfrontInvalidate --stage='dev' --region='us-east-1' --cloudfront='true'",
     "deploy:dev": "echo 'Deploying to DEV...' && SLS_DEBUG=* yarn sls client deploy --stage='dev' --region='us-east-1' --no-confirm --no-policy-change --no-config-change --verbose && SLS_DEBUG=* yarn sls deploy --stage='dev' --region='us-east-1' --verbose && SLS_DEBUG=* yarn sls cloudfrontInvalidate --stage='dev' --region='us-east-1'",
     "remove:dev": "SLS_DEBUG=* yarn sls remove --stage='dev' --region='us-east-1' --verbose",
-    "prebuild:staging": "STAGE_ENV=staging node ./src/app/config/scripts/prefetch-ssm.js",
-    "build:staging": "yarn prebuild:staging && ./node_modules/@angular/cli/bin/ng build --prod --configuration=staging",
-    "deploy:cloudfront:staging": "SLS_DEBUG=* PRODUCT_DOMAIN=staging.lfcla.com yarn sls deploy --stage='staging' --cloudfront=true --verbose",
-    "deploy:frontend:staging": "SLS_DEBUG=* PRODUCT_DOMAIN=staging.lfcla.com yarn sls client deploy --stage='staging' --cloudfront=true --no-confirm --no-policy-change --no-config-change --verbose",
-    "deploy:invalidate:staging": "SLS_DEBUG=* PRODUCT_DOMAIN=staging.lfcla.com yarn sls cloudfrontInvalidate --stage='staging' --region='us-east-1' --cloudfront='true'",
-    "deploy:staging": "echo 'Deploying to STAGING...' && SLS_DEBUG=* yarn sls client deploy --stage='staging' --region='us-east-1' --cloudfront=true --no-confirm --no-policy-change --no-config-change --verbose && SLS_DEBUG=* yarn sls deploy --stage='staging' --region='us-east-1' --cloudfront=true --verbose && SLS_DEBUG=* yarn sls cloudfrontInvalidate --stage='staging' --region='us-east-1' --cloudfront='true'",
-    "remove:staging": "SLS_DEBUG=* yarn sls remove --stage='staging' --region='us-east-1' --verbose",
     "prebuild:prod": "STAGE_ENV=prod node ./src/app/config/scripts/prefetch-ssm.js",
-    "build:prod": "yarn prebuild:prod && ./node_modules/@angular/cli/bin/ng build --prod --configuration=production",
+    "build:prod": "yarn prebuild:prod && ng build --configuration production --configuration=production",
     "deploy:frontend:prod": "SLS_DEBUG=* yarn sls client deploy --stage='prod' --region='us-east-1' --cloudfront=true --no-confirm --no-policy-change --no-config-change --verbose",
     "deploy:cloudfront:prod": "SLS_DEBUG=* yarn sls deploy --stage='prod' --region='us-east-1' --cloudfront=true --verbose",
     "deploy:invalidate:prod": "SLS_DEBUG=* yarn sls cloudfrontInvalidate --stage='prod' --region='us-east-1' --cloudfront='true'",
@@ -44,105 +37,62 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~9.1.3",
-    "@angular/common": "~9.1.3",
-    "@angular/compiler": "~9.1.3",
-    "@angular/core": "~9.1.3",
-    "@angular/forms": "~9.1.3",
-    "@angular/localize": "9.1.13",
-    "@angular/platform-browser": "~9.1.3",
-    "@angular/platform-browser-dynamic": "~9.1.3",
-    "@angular/router": "~9.1.3",
+    "@angular/animations": "^15.1.2",
+    "@angular/common": "^15.1.2",
+    "@angular/compiler": "^15.1.2",
+    "@angular/core": "^15.1.2",
+    "@angular/forms": "^15.1.2",
+    "@angular/localize": "15.1.2",
+    "@angular/platform-browser": "^15.1.2",
+    "@angular/platform-browser-dynamic": "^15.1.2",
+    "@angular/router": "^15.1.2",
     "@auth0/auth0-spa-js": "^1.12.1",
-    "@ng-bootstrap/ng-bootstrap": "^6.1.0",
+    "@ng-bootstrap/ng-bootstrap": "^14.0.1",
     "@types/auth0-js": "^8.11.7",
     "@types/node": "^12.11.1",
     "auth0-js": "^9.20.1",
     "aws-sdk": "^2.1304.0",
-    "bootstrap": "^4.4.0",
+    "bootstrap": "^5.2.3",
     "query-string": "^6.13.6",
     "rxjs": "~6.6.7",
     "serverless": "^3.27.0",
     "serverless-aws-alias": "^1.8.0",
     "serverless-finch": "^4.0.0",
     "serverless-lambda-version": "^0.1.2",
     "serverless-plugin-tracing": "^2.0.0",
-    "tslib": "^1.10.0",
+    "tslib": "^2.0.0",
     "url-parse": "^1.5.6",
-    "zone.js": "~0.10.2"
+    "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.901.3",
-    "@angular/cli": "~9.1.3",
-    "@angular/compiler-cli": "~9.1.3",
-    "@angular/language-service": "~9.1.3",
-    "@types/jasmine": "~3.5.0",
+    "@angular-devkit/build-angular": "^15.1.3",
+    "@angular/cli": "^15.1.3",
+    "@angular/compiler-cli": "^15.1.2",
+    "@angular/language-service": "^15.1.2",
+    "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
     "codelyzer": "^6.0.2",
-    "jasmine-core": "~3.5.0",
-    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "^6.3.14",
+    "jasmine-core": "~4.5.0",
+    "jasmine-spec-reporter": "~5.0.0",
+    "karma": "~6.4.1",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~2.1.0",
-    "karma-jasmine": "~3.0.1",
-    "karma-jasmine-html-reporter": "^1.4.2",
-    "protractor": "~5.4.3",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma-jasmine": "~4.0.0",
+    "karma-jasmine-html-reporter": "^1.5.0",
+    "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~3.8.3"
+    "typescript": "~4.9.4"
   },
   "resolutions": {
-    "ansi-html": "^0.0.9",
-    "ansi-regex": "^5.0.1",
-    "async": "^3.2.2",
-    "aws-sdk": "^2.814.0",
-    "axios": "^0.21.4",
-    "browserslist": "^4.16.5",
-    "cookiejar": "^2.1.4",
-    "dns-packet": "^5.2.2",
-    "elliptic": "^6.5.4",
-    "engine.io": "^6.2.1",
-    "eventsource": "^1.1.1",
+    "@angular/core": "15.1.2",
+    "ansi-html": "^0.0.8",
     "glob-parent": "^5.1.2",
-    "got": "^11.8.5",
-    "hosted-git-info": "^3.0.8",
-    "ini": "^1.3.6",
-    "is-svg": "^4.3.0",
-    "json5": "^2.2.2",
     "json-schema": "^0.4.0",
-    "jszip": "^3.7.0",
-    "karma": "^6.3.14",
-    "karma-chrome-launcher": "^3.1.1",
-    "loader-utils": "^2.0.4",
-    "lodash": "^4.17.21",
+    "is-svg": "^4.2.2",
     "minimatch": "^3.0.5",
-    "minimist": "^1.2.6",
-    "moment": "^2.29.4",
-    "node-fetch": "^2.6.7",
     "node-forge": "^1.3.0",
-    "normalize-url": "^6.0.1",
-    "nth-check": "^2.0.1",
-    "pac-resolver": "^5.0.0",
-    "path-parse": "^1.0.7",
-    "postcss": "^7.0.36",
-    "set-getter": "^0.1.1",
-    "set-value": "^4.0.1",
-    "simple-get": "^2.8.2",
-    "simple-git": "^3.16.0",
-    "socket.io": "^2.4.0",
-    "socket.io-parser": "^3.4.1",
-    "ssri": "^8.0.1",
-    "tar": "^6.1.9",
-    "terser": "^4.8.1",
-    "ts-node": "^10.9.1",
-    "ua-parser-js": "^0.7.33",
-    "url-parse": "^1.5.6",
-    "vm2": "^3.9.11",
-    "webpack-subresource-integrity": "^1.5.1",
-    "ws": "^7.4.6",
-    "xmlhttprequest-ssl": "^1.6.1",
-    "y18n": "^5.0.5",
-    "yargs-parser": "^18.1.2"
+    "terser": "^5.14.2"
   }
 }
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
@@ -1,12 +1,12 @@
 // Copyright The Linux Foundation and each contributor to CommunityBridge.
 // SPDX-License-Identifier: MIT
 
-import { TestBed, async } from '@angular/core/testing';
+import { TestBed, waitForAsync } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         RouterTestingModule

diff --git a/src/app/components/cla-console-section/cla-console-section.component.spec.ts b/src/app/components/cla-console-section/cla-console-section.component.spec.ts
@@ -1,15 +1,15 @@
 // Copyright The Linux Foundation and each contributor to CommunityBridge.
 // SPDX-License-Identifier: MIT
 
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { ClaConsoleSectionComponent } from './cla-console-section.component';
 
 describe('ClaConsoleSectionComponent', () => {
   let component: ClaConsoleSectionComponent;
   let fixture: ComponentFixture<ClaConsoleSectionComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [ ClaConsoleSectionComponent ]
     })

diff --git a/src/app/components/cla-footer/cla-footer.component.spec.ts b/src/app/components/cla-footer/cla-footer.component.spec.ts
@@ -1,15 +1,15 @@
 // Copyright The Linux Foundation and each contributor to CommunityBridge.
 // SPDX-License-Identifier: MIT
 
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { ClaFooterComponent } from './cla-footer.component';
 
 describe('ClaFooterComponent', () => {
   let component: ClaFooterComponent;
   let fixture: ComponentFixture<ClaFooterComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [ ClaFooterComponent ]
     })

diff --git a/src/app/components/home/home.component.spec.ts b/src/app/components/home/home.component.spec.ts
@@ -1,15 +1,15 @@
 // Copyright The Linux Foundation and each contributor to CommunityBridge.
 // SPDX-License-Identifier: MIT
 
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { HomeComponent } from './home.component';
 
 describe('HomeComponent', () => {
   let component: HomeComponent;
   let fixture: ComponentFixture<HomeComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [ HomeComponent ]
     })

diff --git a/src/app/components/lfx-header/lfx-header.component.spec.ts b/src/app/components/lfx-header/lfx-header.component.spec.ts
@@ -1,15 +1,15 @@
 // Copyright The Linux Foundation and each contributor to CommunityBridge.
 // SPDX-License-Identifier: MIT
 
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { LfxHeaderComponent } from './lfx-header.component';
 
 describe('LfxHeaderComponent', () => {
   let component: LfxHeaderComponent;
   let fixture: ComponentFixture<LfxHeaderComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [ LfxHeaderComponent ]
     })

diff --git a/src/app/components/page-not-found/page-not-found.component.spec.ts b/src/app/components/page-not-found/page-not-found.component.spec.ts
@@ -1,15 +1,15 @@
 // Copyright The Linux Foundation and each contributor to CommunityBridge.
 // SPDX-License-Identifier: MIT
 
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { PageNotFoundComponent } from './page-not-found.component';
 
 describe('PageNotFoundComponent', () => {
   let component: PageNotFoundComponent;
   let fixture: ComponentFixture<PageNotFoundComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [ PageNotFoundComponent ]
     })

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -17,4 +17,4 @@ export const environment = {
  * This import should be commented out in production mode because it will have a negative impact
  * on performance if an error is thrown.
  */
-// import 'zone.js/dist/zone-error';  // Included with Angular CLI.
+// import 'zone.js/plugins/zone-error';  // Included with Angular CLI.