Skip to content

Commit b1c8207

Browse files
dealakodealako
authored
Merge pull request #9 from communitybridge/feature/angular-9-to-10
2 parents ff130a5 + 0a6ffb7 commit b1c8207

File tree

18 files changed

+3840
-6804
lines changed

18 files changed

+3840
-6804
lines changed

browserslist renamed to .browserslistrc

File renamed without changes.

‎.github/workflows/yarn-scan-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- main
1212

1313
jobs:
14-
yarn-scan-landing-page-pr:
14+
yarn-scan-pr:
1515
runs-on: ubuntu-latest
1616
environment: dev
1717
steps:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/.angular/cache
12
# Copyright The Linux Foundation and each contributor to CommunityBridge.
23
# SPDX-License-Identifier: MIT
34

‎angular.json‎

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,20 @@
2222
"main": "src/main.ts",
2323
"polyfills": "src/polyfills.ts",
2424
"tsConfig": "tsconfig.app.json",
25-
"aot": true,
2625
"assets": [
2726
"src/favicon.png",
2827
"src/assets"
2928
],
3029
"styles": [
3130
"src/styles.scss"
3231
],
33-
"scripts": []
32+
"scripts": [],
33+
"vendorChunk": true,
34+
"extractLicenses": false,
35+
"buildOptimizer": false,
36+
"sourceMap": true,
37+
"optimization": false,
38+
"namedChunks": true
3439
},
3540
"configurations": {
3641
"production": {
@@ -43,7 +48,6 @@
4348
"optimization": true,
4449
"outputHashing": "all",
4550
"sourceMap": false,
46-
"extractCss": true,
4751
"namedChunks": false,
4852
"extractLicenses": true,
4953
"vendorChunk": false,
@@ -71,7 +75,6 @@
7175
"optimization": true,
7276
"outputHashing": "all",
7377
"sourceMap": false,
74-
"extractCss": true,
7578
"namedChunks": false,
7679
"extractLicenses": true,
7780
"vendorChunk": false,
@@ -99,7 +102,6 @@
99102
"optimization": true,
100103
"outputHashing": "all",
101104
"sourceMap": false,
102-
"extractCss": true,
103105
"namedChunks": false,
104106
"extractLicenses": true,
105107
"vendorChunk": false,
@@ -117,7 +119,8 @@
117119
}
118120
]
119121
}
120-
}
122+
},
123+
"defaultConfiguration": ""
121124
},
122125
"serve": {
123126
"builder": "@angular-devkit/build-angular:dev-server",
@@ -159,19 +162,6 @@
159162
"scripts": []
160163
}
161164
},
162-
"lint": {
163-
"builder": "@angular-devkit/build-angular:tslint",
164-
"options": {
165-
"tsConfig": [
166-
"tsconfig.app.json",
167-
"tsconfig.spec.json",
168-
"e2e/tsconfig.json"
169-
],
170-
"exclude": [
171-
"**/node_modules/**"
172-
]
173-
}
174-
},
175165
"e2e": {
176166
"builder": "@angular-devkit/build-angular:protractor",
177167
"options": {
@@ -187,7 +177,6 @@
187177
}
188178
}
189179
},
190-
"defaultProject": "landing-page",
191180
"cli": {
192181
"analytics": false
193182
}

‎e2e/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
55
"module": "commonjs",
6-
"target": "es5",
6+
"target": "es2018",
77
"types": [
88
"jasmine",
99
"jasminewd2",

‎package.json‎

Lines changed: 33 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,16 @@
1919
"sls": "./node_modules/serverless/bin/serverless.js",
2020
"eslint": "./node_modules/.bin/eslint \"./src/**/*.ts\"",
2121
"eslint-fix": "./node_modules/.bin/eslint \"./src/**/*.ts\" --fix",
22-
"build": "yarn prebuild:dev && ./node_modules/@angular/cli/bin/ng build --prod --configuration=dev",
23-
"build:dev": "yarn prebuild:dev && ./node_modules/@angular/cli/bin/ng build --prod --configuration=dev",
22+
"build": "yarn prebuild:dev && ng build --configuration production --configuration=dev",
23+
"build:dev": "yarn prebuild:dev && ng build --configuration production --configuration=dev",
2424
"prebuild:dev": "STAGE_ENV=dev node ./src/app/config/scripts/prefetch-ssm.js",
2525
"deploy:cloudfront:dev": "SLS_DEBUG=* yarn sls deploy --stage='dev' --cloudfront=true --verbose",
2626
"deploy:frontend:dev": "SLS_DEBUG=* yarn sls client deploy --stage='dev' --cloudfront=true --no-confirm --no-policy-change --no-config-change --verbose",
2727
"deploy:invalidate:dev": "SLS_DEBUG=* yarn sls cloudfrontInvalidate --stage='dev' --region='us-east-1' --cloudfront='true'",
2828
"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'",
2929
"remove:dev": "SLS_DEBUG=* yarn sls remove --stage='dev' --region='us-east-1' --verbose",
30-
"prebuild:staging": "STAGE_ENV=staging node ./src/app/config/scripts/prefetch-ssm.js",
31-
"build:staging": "yarn prebuild:staging && ./node_modules/@angular/cli/bin/ng build --prod --configuration=staging",
32-
"deploy:cloudfront:staging": "SLS_DEBUG=* PRODUCT_DOMAIN=staging.lfcla.com yarn sls deploy --stage='staging' --cloudfront=true --verbose",
33-
"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",
34-
"deploy:invalidate:staging": "SLS_DEBUG=* PRODUCT_DOMAIN=staging.lfcla.com yarn sls cloudfrontInvalidate --stage='staging' --region='us-east-1' --cloudfront='true'",
35-
"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'",
36-
"remove:staging": "SLS_DEBUG=* yarn sls remove --stage='staging' --region='us-east-1' --verbose",
3730
"prebuild:prod": "STAGE_ENV=prod node ./src/app/config/scripts/prefetch-ssm.js",
38-
"build:prod": "yarn prebuild:prod && ./node_modules/@angular/cli/bin/ng build --prod --configuration=production",
31+
"build:prod": "yarn prebuild:prod && ng build --configuration production --configuration=production",
3932
"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",
4033
"deploy:cloudfront:prod": "SLS_DEBUG=* yarn sls deploy --stage='prod' --region='us-east-1' --cloudfront=true --verbose",
4134
"deploy:invalidate:prod": "SLS_DEBUG=* yarn sls cloudfrontInvalidate --stage='prod' --region='us-east-1' --cloudfront='true'",
@@ -44,105 +37,62 @@
4437
},
4538
"private": true,
4639
"dependencies": {
47-
"@angular/animations": "~9.1.3",
48-
"@angular/common": "~9.1.3",
49-
"@angular/compiler": "~9.1.3",
50-
"@angular/core": "~9.1.3",
51-
"@angular/forms": "~9.1.3",
52-
"@angular/localize": "9.1.13",
53-
"@angular/platform-browser": "~9.1.3",
54-
"@angular/platform-browser-dynamic": "~9.1.3",
55-
"@angular/router": "~9.1.3",
40+
"@angular/animations": "^15.1.2",
41+
"@angular/common": "^15.1.2",
42+
"@angular/compiler": "^15.1.2",
43+
"@angular/core": "^15.1.2",
44+
"@angular/forms": "^15.1.2",
45+
"@angular/localize": "15.1.2",
46+
"@angular/platform-browser": "^15.1.2",
47+
"@angular/platform-browser-dynamic": "^15.1.2",
48+
"@angular/router": "^15.1.2",
5649
"@auth0/auth0-spa-js": "^1.12.1",
57-
"@ng-bootstrap/ng-bootstrap": "^6.1.0",
50+
"@ng-bootstrap/ng-bootstrap": "^14.0.1",
5851
"@types/auth0-js": "^8.11.7",
5952
"@types/node": "^12.11.1",
6053
"auth0-js": "^9.20.1",
6154
"aws-sdk": "^2.1304.0",
62-
"bootstrap": "^4.4.0",
55+
"bootstrap": "^5.2.3",
6356
"query-string": "^6.13.6",
6457
"rxjs": "~6.6.7",
6558
"serverless": "^3.27.0",
6659
"serverless-aws-alias": "^1.8.0",
6760
"serverless-finch": "^4.0.0",
6861
"serverless-lambda-version": "^0.1.2",
6962
"serverless-plugin-tracing": "^2.0.0",
70-
"tslib": "^1.10.0",
63+
"tslib": "^2.0.0",
7164
"url-parse": "^1.5.6",
72-
"zone.js": "~0.10.2"
65+
"zone.js": "~0.11.4"
7366
},
7467
"devDependencies": {
75-
"@angular-devkit/build-angular": "~0.901.3",
76-
"@angular/cli": "~9.1.3",
77-
"@angular/compiler-cli": "~9.1.3",
78-
"@angular/language-service": "~9.1.3",
79-
"@types/jasmine": "~3.5.0",
68+
"@angular-devkit/build-angular": "^15.1.3",
69+
"@angular/cli": "^15.1.3",
70+
"@angular/compiler-cli": "^15.1.2",
71+
"@angular/language-service": "^15.1.2",
72+
"@types/jasmine": "~3.6.0",
8073
"@types/jasminewd2": "~2.0.3",
8174
"@types/node": "^12.11.1",
8275
"codelyzer": "^6.0.2",
83-
"jasmine-core": "~3.5.0",
84-
"jasmine-spec-reporter": "~4.2.1",
85-
"karma": "^6.3.14",
76+
"jasmine-core": "~4.5.0",
77+
"jasmine-spec-reporter": "~5.0.0",
78+
"karma": "~6.4.1",
8679
"karma-chrome-launcher": "~3.1.0",
87-
"karma-coverage-istanbul-reporter": "~2.1.0",
88-
"karma-jasmine": "~3.0.1",
89-
"karma-jasmine-html-reporter": "^1.4.2",
90-
"protractor": "~5.4.3",
80+
"karma-coverage-istanbul-reporter": "~3.0.2",
81+
"karma-jasmine": "~4.0.0",
82+
"karma-jasmine-html-reporter": "^1.5.0",
83+
"protractor": "~7.0.0",
9184
"ts-node": "~8.3.0",
9285
"tslint": "~6.1.0",
93-
"typescript": "~3.8.3"
86+
"typescript": "~4.9.4"
9487
},
9588
"resolutions": {
96-
"ansi-html": "^0.0.9",
97-
"ansi-regex": "^5.0.1",
98-
"async": "^3.2.2",
99-
"aws-sdk": "^2.814.0",
100-
"axios": "^0.21.4",
101-
"browserslist": "^4.16.5",
102-
"cookiejar": "^2.1.4",
103-
"dns-packet": "^5.2.2",
104-
"elliptic": "^6.5.4",
105-
"engine.io": "^6.2.1",
106-
"eventsource": "^1.1.1",
89+
"@angular/core": "15.1.2",
90+
"ansi-html": "^0.0.8",
10791
"glob-parent": "^5.1.2",
108-
"got": "^11.8.5",
109-
"hosted-git-info": "^3.0.8",
110-
"ini": "^1.3.6",
111-
"is-svg": "^4.3.0",
112-
"json5": "^2.2.2",
11392
"json-schema": "^0.4.0",
114-
"jszip": "^3.7.0",
115-
"karma": "^6.3.14",
116-
"karma-chrome-launcher": "^3.1.1",
117-
"loader-utils": "^2.0.4",
118-
"lodash": "^4.17.21",
93+
"is-svg": "^4.2.2",
11994
"minimatch": "^3.0.5",
120-
"minimist": "^1.2.6",
121-
"moment": "^2.29.4",
122-
"node-fetch": "^2.6.7",
12395
"node-forge": "^1.3.0",
124-
"normalize-url": "^6.0.1",
125-
"nth-check": "^2.0.1",
126-
"pac-resolver": "^5.0.0",
127-
"path-parse": "^1.0.7",
128-
"postcss": "^7.0.36",
129-
"set-getter": "^0.1.1",
130-
"set-value": "^4.0.1",
131-
"simple-get": "^2.8.2",
132-
"simple-git": "^3.16.0",
133-
"socket.io": "^2.4.0",
134-
"socket.io-parser": "^3.4.1",
135-
"ssri": "^8.0.1",
136-
"tar": "^6.1.9",
137-
"terser": "^4.8.1",
138-
"ts-node": "^10.9.1",
139-
"ua-parser-js": "^0.7.33",
140-
"url-parse": "^1.5.6",
141-
"vm2": "^3.9.11",
142-
"webpack-subresource-integrity": "^1.5.1",
143-
"ws": "^7.4.6",
144-
"xmlhttprequest-ssl": "^1.6.1",
145-
"y18n": "^5.0.5",
146-
"yargs-parser": "^18.1.2"
96+
"terser": "^5.14.2"
14797
}
14898
}

‎src/app/app.component.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Copyright The Linux Foundation and each contributor to CommunityBridge.
22
// SPDX-License-Identifier: MIT
33

4-
import { TestBed, async } from '@angular/core/testing';
4+
import { TestBed, waitForAsync } from '@angular/core/testing';
55
import { RouterTestingModule } from '@angular/router/testing';
66
import { AppComponent } from './app.component';
77

88
describe('AppComponent', () => {
9-
beforeEach(async(() => {
9+
beforeEach(waitForAsync(() => {
1010
TestBed.configureTestingModule({
1111
imports: [
1212
RouterTestingModule

‎src/app/components/cla-console-section/cla-console-section.component.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Copyright The Linux Foundation and each contributor to CommunityBridge.
22
// SPDX-License-Identifier: MIT
33

4-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
4+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
55

66
import { ClaConsoleSectionComponent } from './cla-console-section.component';
77

88
describe('ClaConsoleSectionComponent', () => {
99
let component: ClaConsoleSectionComponent;
1010
let fixture: ComponentFixture<ClaConsoleSectionComponent>;
1111

12-
beforeEach(async(() => {
12+
beforeEach(waitForAsync(() => {
1313
TestBed.configureTestingModule({
1414
declarations: [ ClaConsoleSectionComponent ]
1515
})

‎src/app/components/cla-footer/cla-footer.component.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Copyright The Linux Foundation and each contributor to CommunityBridge.
22
// SPDX-License-Identifier: MIT
33

4-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
4+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
55

66
import { ClaFooterComponent } from './cla-footer.component';
77

88
describe('ClaFooterComponent', () => {
99
let component: ClaFooterComponent;
1010
let fixture: ComponentFixture<ClaFooterComponent>;
1111

12-
beforeEach(async(() => {
12+
beforeEach(waitForAsync(() => {
1313
TestBed.configureTestingModule({
1414
declarations: [ ClaFooterComponent ]
1515
})

‎src/app/components/home/home.component.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Copyright The Linux Foundation and each contributor to CommunityBridge.
22
// SPDX-License-Identifier: MIT
33

4-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
4+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
55

66
import { HomeComponent } from './home.component';
77

88
describe('HomeComponent', () => {
99
let component: HomeComponent;
1010
let fixture: ComponentFixture<HomeComponent>;
1111

12-
beforeEach(async(() => {
12+
beforeEach(waitForAsync(() => {
1313
TestBed.configureTestingModule({
1414
declarations: [ HomeComponent ]
1515
})

0 commit comments

Comments
 (0)