Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 18
cache: yarn
cache-dependency-path: "yarn.lock"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 18
cache: yarn
cache-dependency-path: "yarn.lock"

Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 18
cache: yarn
cache-dependency-path: "yarn.lock"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 18
cache: yarn
cache-dependency-path: "yarn.lock"

Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 18
cache: yarn
cache-dependency-path: "yarn.lock"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 18
cache: yarn
cache-dependency-path: "yarn.lock"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snyk-scan-edge-npm-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '16'
node-version: '18'
cache: 'yarn'
cache-dependency-path: 'yarn.lock'
- name: Yarn Version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snyk-scan-npm-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '16'
node-version: '18'
cache: 'yarn'
cache-dependency-path: 'yarn.lock'
- name: Yarn Version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yarn-scan-cypress-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: "16"
node-version: "18"
cache: "yarn"
cache-dependency-path: "test/functional/yarn.lock"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yarn-scan-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '16'
node-version: '18'
cache: 'yarn'
cache-dependency-path: 'yarn.lock'
- name: Setup
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,4 @@ Thumbs.db
.nosync
out
*.swp
.angular/
9 changes: 7 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,16 @@
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"aot": true,
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["src/styles.scss"],
"scripts": [],
"allowedCommonJsDependencies": ["url-parse", "query-string", "src/app/core/services/cla-contributor.service"]
"allowedCommonJsDependencies": ["url-parse", "query-string", "src/app/core/services/cla-contributor.service", "@linuxfoundation/lfx-ui-core"],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
Expand Down
4 changes: 2 additions & 2 deletions edge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"license": "MIT",
"scripts": {
"prebuild": "yarn install",
"build": "webpack",
"build": "NODE_OPTIONS=--openssl-legacy-provider webpack",
"pretest": "yarn install",
"lint": "./node_modules/.bin/eslint \"src/*.js\"",
"test": "./node_modules/.bin/jasmine --config=jasmine.json"
},
"engines": {
"node": ">=16.0.0",
"node": ">=18.0.0",
"npm": ">=8.0.0"
},
"dependencies": {
Expand Down
62 changes: 37 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://www.linuxfoundation.org/"
},
"engines": {
"node": ">=12.0.0",
"node": ">=18.0.0",
"npm": ">=8.0.0"
},
"version": "1.0.0",
Expand All @@ -17,9 +17,9 @@
"serve": "ng serve",
"build": "ng build",
"serve:dev:local": "yarn prebuild:dev && ng serve --port 8100",
"build:dev": "yarn prebuild:dev && ng build --prod --configuration=dev",
"build:staging": "yarn prebuild:staging && ng build --prod --configuration=staging",
"build:prod": "yarn prebuild:prod && ng build --prod --configuration=production",
"build:dev": "yarn prebuild:dev && ng build --configuration dev",
"build:staging": "yarn prebuild:staging && ng build --configuration staging",
"build:prod": "yarn prebuild:prod && ng build --configuration production",
"serve-local": "ng serve --port 8100",
"test": "yarn test:unit",
"test:unit": "ng test --watch=false --progress=false --browsers=ChromeHeadless",
Expand All @@ -43,19 +43,20 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~11.2.14",
"@angular/common": "~11.2.14",
"@angular/compiler": "~11.2.14",
"@angular/core": "~11.2.14",
"@angular/forms": "~11.2.14",
"@angular/localize": "~11.2.14",
"@angular/platform-browser": "~11.2.14",
"@angular/platform-browser-dynamic": "~11.2.14",
"@angular/router": "~11.2.14",
"@auth0/auth0-angular": "1.5.1",
"@angular/animations": "~13.4.0",
"@angular/common": "~13.4.0",
"@angular/compiler": "~13.4.0",
"@angular/core": "~13.4.0",
"@angular/forms": "~13.4.0",
"@angular/localize": "~13.4.0",
"@angular/platform-browser": "~13.4.0",
"@angular/platform-browser-dynamic": "~13.4.0",
"@angular/router": "~13.4.0",
"@auth0/auth0-angular": "2.2.3",
"@fortawesome/fontawesome-free": "^6.4.0",
"@linuxfoundation/lfx-ui-core": "^0.0.12",
"@ng-bootstrap/ng-bootstrap": "^6.1.0",
"@linuxfoundation/lfx-ui-core": "^0.0.19",
"@ng-bootstrap/ng-bootstrap": "^12.1.2",
"@popperjs/core": "^2.11.8",
"@silvermine/serverless-plugin-cloudfront-lambda-edge": "^2.1.1",
"@types/node": "^18.16.0",
"auth0-spa-js": "^1.6.5",
Expand All @@ -67,13 +68,13 @@
"rxjs": "~6.6.3",
"tslib": "^2.0.0",
"url-parse": "^1.5.0",
"zone.js": "~0.11.3"
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1102.19",
"@angular/cli": "~11.2.19",
"@angular/compiler-cli": "~11.2.14",
"@angular/language-service": "~11.2.14",
"@angular-devkit/build-angular": "~13.3.11",
"@angular/cli": "~13.3.11",
"@angular/compiler-cli": "~13.4.0",
"@angular/language-service": "~13.4.0",
"@types/jasmine": "~4.3.1",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^18.16.0",
Expand All @@ -98,7 +99,7 @@
"serverless-prune-plugin": "^2.0.2",
"ts-node": "~8.3.0",
"tslint": "~6.1.0",
"typescript": "~4.1.6"
"typescript": "~4.6.4"
},
"husky": {
"hooks": {
Expand All @@ -114,7 +115,7 @@
"dns-packet": "^5.4.0",
"husky": "^8.0.3",
"@angular/core": "^11.0.5",
"axios": "^0.21.2",
"axios": "^0.30.0",
"cookiejar": "^2.1.4",
"degenerator": "^3.0.1",
"follow-redirects": "^1.14.8",
Expand All @@ -139,6 +140,17 @@
"ws": "^7.5.5",
"xmlhttprequest-ssl": "^1.6.3",
"@babel/traverse": "^7.23.2",
"postcss": "^8.4.31"
"postcss": "^8.4.31",
"@cypress/request": "^3.0.0",
"form-data": "^2.5.4",
"braces": "^3.0.3",
"micromatch": "^4.0.8",
"cross-spawn": "^7.0.5",
"brace-expansion": "^1.1.12",
"webpack-dev-middleware": "^5.3.4",
"webpack": "^5.94.0",
"esbuild": "^0.25.0",
"@babel/runtime": "^7.26.10",
"webpack-dev-server": "^5.2.1"
}
}
}
2 changes: 1 addition & 1 deletion src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
<app-alert></app-alert>
<router-outlet></router-outlet>
</div>
<lfx-footer></lfx-footer>
<lfx-footer cookie-tracking></lfx-footer>
2 changes: 1 addition & 1 deletion src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,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.
2 changes: 1 addition & 1 deletion src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import '@angular/localize/init';
/***************************************************************************************************
* Zone JS is required by default for Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.
import 'zone.js'; // Included with Angular CLI.


/***************************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

// This file is required by karma.conf.js and loads recursively all the .spec and framework files

import 'zone.js/dist/zone-testing';
import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
Expand Down
8 changes: 7 additions & 1 deletion test/functional/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@
"is-my-json-valid": "^2.20.3",
"ramda": "^0.27.2",
"semver": "^7.5.2",
"tough-cookie": "^4.1.3"
"tough-cookie": "^4.1.3",
"@cypress/request": "^3.0.0",
"form-data": "^2.5.4",
"braces": "^3.0.3",
"micromatch": "^4.0.8",
"cross-spawn": "^7.0.5",
"brace-expansion": "^1.1.12"
}
}
Loading
Loading