Skip to content

Commit

Permalink
Merge pull request #874 from hmcts/PAY-7021-Angular17-Upgrade
Browse files Browse the repository at this point in the history
PAY-7021 angular 17
  • Loading branch information
Thor-tech-of-metal authored May 31, 2024
2 parents 6ee4ea7 + 7d624a2 commit 079694d
Show file tree
Hide file tree
Showing 7 changed files with 2,634 additions and 904 deletions.
6 changes: 3 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,18 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "ccpay-bubble:build"
"buildTarget": "ccpay-bubble:build"
},
"configurations": {
"production": {
"browserTarget": "ccpay-bubble:build:production"
"buildTarget": "ccpay-bubble:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "ccpay-bubble:build"
"buildTarget": "ccpay-bubble:build"
}
},
"test": {
Expand Down
39 changes: 20 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@
},
"private": true,
"dependencies": {
"@angular-eslint/schematics": "^17.3.0",
"@babel/eslint-parser": "^7.11.0",
"@babel/helper-create-class-features-plugin": "^7.21.8",
"@hmcts/ccpay-web-component": "6.2.0",
"@hmcts/ccpay-web-component": "6.2.1",
"@hmcts/cookie-manager": "^1.0.0",
"@hmcts/nodejs-healthcheck": "^1.8.0",
"@hmcts/nodejs-logging": "^4.0.4",
Expand Down Expand Up @@ -80,15 +81,15 @@
"moment": "2.29.4",
"moment-timezone": "^0.5.35",
"ngx-cookie-service": "^16.0.1",
"ngx-pagination": "6.0.0",
"ngx-pagination": "^6.0.3",
"npm-run-all": "^4.1.5",
"otp": "^0.1.3",
"pa11y-reporter-html": "^1.0.0",
"prismjs": "^1.23.0",
"pug": "3.0.3",
"request": "^2.88.0",
"request-promise-native": "^1.0.5",
"rpx-xui-translation": "1.0.2",
"rpx-xui-translation": "^1.0.3-angular-upgrade-17-rc",
"rxjs": "~6.6.7",
"rxjs-compat": "^6.5.2",
"superagent": "8.0.8",
Expand All @@ -99,33 +100,32 @@
"uuid": "3.3.2",
"web-animations-js": "^2.3.2",
"yargs-parser": "^20.2.7",
"zone.js": "~0.13.1"
"zone.js": "~0.14.4"
},
"peerDependencies": {
"@types/express": "^4.17.21",
"postcss": "^8.0.0"
},
"devDependencies": {
"@angular-builders/custom-webpack": "16.0.1",
"@angular-devkit/build-angular": "^16.1.6",
"@angular-devkit/build-angular": "^17.3.6",
"@angular-eslint/builder": "16.1.0",
"@angular-eslint/eslint-plugin": "16.1.0",
"@angular-eslint/eslint-plugin-template": "16.1.0",
"@angular-eslint/schematics": "16.1.0",
"@angular-eslint/template-parser": "16.1.0",
"@angular/animations": "~16.1.6",
"@angular/animations": "~17.3.6",
"@angular/cdk": "^16.1.6",
"@angular/cli": "16.2.4",
"@angular/common": "16.1.6",
"@angular/compiler": "~16.1.6",
"@angular/compiler-cli": "~16.1.6",
"@angular/core": "^16.2.7",
"@angular/forms": "~16.1.6",
"@angular/language-service": "~16.1.6",
"@angular/cli": "17.3.6",
"@angular/common": "17.3.6",
"@angular/compiler": "~17.3.6",
"@angular/compiler-cli": "~17.3.6",
"@angular/core": "^17.3.6",
"@angular/forms": "~17.3.6",
"@angular/language-service": "~17.3.6",
"@angular/material": "16.2.6",
"@angular/platform-browser": "~16.1.6",
"@angular/platform-browser-dynamic": "~16.1.6",
"@angular/router": "~16.1.6",
"@angular/platform-browser": "~17.3.6",
"@angular/platform-browser-dynamic": "~17.3.6",
"@angular/router": "~17.3.6",
"@codeceptjs/allure-legacy": "^1.0.2",
"@codeceptjs/helper": "^1.0.2",
"@hmcts/eslint-config": "^1.4.0",
Expand Down Expand Up @@ -171,7 +171,7 @@
"lodash": "^4.17.15",
"mocha": "^6.2.3",
"mocha-multi": "^1.1.3",
"ng-packagr": "^16.1.0",
"ng-packagr": "^17.3.0",
"nock": "^10.0.6",
"nodemon": "^1.18.10",
"notifications-node-client": "^4.7.3",
Expand All @@ -193,10 +193,11 @@
"fsevents": "*"
},
"resolutions": {
"typescript": "^5.2",
"formidable": "^3.2.4",
"express": "4.19.2",
"@babel/traverse": ">=7.23.2",
"axios": "^0.21.1",
"axios": "^0.28.0",
"ejs": "^3.1.7",
"pug": "3.0.3",
"pugit": "5.0.2",
Expand Down
4 changes: 2 additions & 2 deletions projects/fee-register-search/src/test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files

import 'core-js/es7/reflect';
import 'zone.js/dist/zone';
import 'zone.js/dist/zone-testing';
import 'zone.js';
import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
Expand Down
4 changes: 2 additions & 2 deletions projects/view-payment/src/test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files

import 'core-js/es7/reflect';
import 'zone.js/dist/zone';
import 'zone.js/dist/zone-testing';
import 'zone.js';
import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
Expand Down
2 changes: 1 addition & 1 deletion src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ import 'web-animations-js'; // Run `npm install --save web-animations-js`.
/***************************************************************************************************
* 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
@@ -1,6 +1,6 @@
// 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
Loading

0 comments on commit 079694d

Please sign in to comment.