Skip to content

Commit

Permalink
Upgrade to Node-18 and NG-15 (#1550)
Browse files Browse the repository at this point in the history
* kick-off node 18 upgrade

* use pay component at local

* ng update @angular/core@12 @angular/cli@12 --force

* ng update @angular/material@12 --force

* ng update @angular/core@13 @angular/cli@13 --force

* ng update @angular/material@13 --force

* ng update @angular/core@14 @angular/cli@14 --force

* cdk 14

* ts version

* upgraes for fix

* upgrade rpx-xui-translation

* upgrade yargs-parser

* upgrade cli to 15

* fix damn ng breakdown

* ng update @angular/material@14 --force

* ng update @angular/core@15 @angular/cli@15 --force

* ng update @angular/material@15 --force

* correct compilation errors after upgrades

* ignore angular cache

* set new major version

* add yarn release file

* comment out broken lint task

* temporarily use ccpay-component from local

* fix tests

* fix tests

* upgrade to media viewer pre-release

* update version tag

* delete local ccpay dist folder

* use ccpay component prerelease

* skip the tasks (to be fixed later on)

* remove steps to unblock pre-release

* use node 14 for release

* Code tide

* package json update

* fix update package.json file and code tidy

* fix update package.json file

* fix update package.json file and code tidy

* package.json file update

* Using legacy angular material

* package.json version update

* fix: EXUI-787 - Fixed lint srcipt, lint issues, code issue. Code tidy

* updated codebase

* fix: EXUI-790	unit test now working; EXUI-996- Fixed dateTime Picker; Fix issue probate buttons - cancel and continue button

* package.json updated

* Update typography.scss

* Version update

* Update npmpublish.yml

* update polling service inline with sonarcloud - Security Hotspot

* code tidy

* added updated fork version of rx-polling library

* fix - EXUI-996 - fix issue with incorrect date formate

* App version updated and code tidy

* Update RELEASE-NOTES.md

* version update

* Update case-file-view-folder.component.ts

* Vesion update

* update test and karma config

* Update karma.conf.js

* Update case-file-view-folder-selector.component.spec.ts

* ccpay-web-component version updated

* version update

* fix broken functional test and update toolkit version

* version update

* rpx-xui-translation version update - 1.0.1

* @olusegz07 rpx-xui-translation version update - 1.0.2

---------

Co-authored-by: olusegun odunukan <olusegun.odunukan@hmcts.net>
Co-authored-by: Olu <142989683+olusegz07@users.noreply.github.com>
  • Loading branch information
3 people authored Dec 5, 2023
1 parent 97e7c32 commit b51ec10
Show file tree
Hide file tree
Showing 148 changed files with 7,792 additions and 5,042 deletions.
88 changes: 88 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
module.exports = {
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended'
],
parser: '@typescript-eslint/parser',
parserOptions: {
project: [
'./tsconfig.json',
'./src/tsconfig.app.json',
'./src/tsconfig.spec.json',
'./api/tsconfig.json'
],
tsconfigRootDir: __dirname
},
plugins: ['@typescript-eslint'],
root: true,
rules: {
'@typescript-eslint/ban-ts-comment': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-extra-semi': 'off',
'@typescript-eslint/no-inferrable-types': 'off',
'@typescript-eslint/no-var-requires': 'off',
'array-bracket-spacing': 'error',
'arrow-parens': ['error', 'always'],
'arrow-spacing': 'error',
'block-spacing': 'error',
'brace-style': ['error', '1tbs'],
'comma-dangle': ['error', 'never'],
'comma-spacing': 'error',
'comma-style': 'error',
'computed-property-spacing': 'error',
'curly': ['error', 'all'],
'dot-notation': 'error',
'eol-last': 'error',
'eqeqeq': 'error',
'func-call-spacing': ['error', 'never'],
// 'func-style': ['error', 'expression'],
'getter-return': 'error',
'grouped-accessor-pairs': ['error', 'getBeforeSet'],
'key-spacing': 'error',
'keyword-spacing': 'error',
'indent': ['error', 2, {
'SwitchCase': 1
}],
'linebreak-style': 'error',
'lines-between-class-members': ['error', 'always', {
'exceptAfterSingleLine': true
}],
'new-parens': ['error', 'always'],
'no-case-declarations': 'off',
'no-else-return': 'error',
'no-empty': 'error',
// 'no-empty-function': ['error', {
// 'allow': ['constructors']
// }],
'no-extra-boolean-cast': 'off',
'no-extra-semi': 'error',
'no-mixed-spaces-and-tabs': 'error',
'no-multi-spaces': 'error',
'no-multiple-empty-lines': ['error', {
'max': 1,
'maxEOF': 1
}],
'no-prototype-builtins': 'off',
'no-tabs': 'error',
'no-trailing-spaces': 'error',
'no-whitespace-before-property': 'error',
'no-unreachable': 'error',
'no-unused-expressions': ['error', {
'allowTernary': true
}],
'no-var': 'error',
// 'object-curly-newline': ['error', { 'multiline': true }],
'object-curly-spacing': ['error', 'always'],
// 'object-property-newline': 'error',
'padded-blocks': ['error', 'never'],
'prefer-const': 'error',
'quotes': ['error', 'single'],
'semi': ['error', 'always', {
'omitLastInOneLineBlock': false
}],
'semi-spacing': 'error',
'semi-style': ['error', 'last'],
'space-in-parens': ['error', 'never'],
'switch-colon-spacing': 'error'
}
};
2 changes: 1 addition & 1 deletion .github/workflows/npmpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Create code coverage report
run: yarn test:coverage
- name: Change Report Path
run: sed -i 's+/home/runner/work/ccd-case-ui-toolkit/ccd-case-ui-toolkit+/github/workspace+g' coverage/ccd-case-ui-toolkit/lcov-report/lcov.info
run: sed -i 's+/home/runner/work/ccd-case-ui-toolkit/ccd-case-ui-toolkit+/github/workspace+g' coverage/ccd-case-ui-toolkit/lcov.info
- name: Archive code coverage results
uses: actions/upload-artifact@v3
with:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,6 @@ projects/ccd-case-ui-toolkit/.yarn/*
!projects/ccd-case-ui-toolkit/.yarn/sdks
!projects/ccd-case-ui-toolkit/.yarn/versions
cptk.sh


.angular/cache
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.17.0
18.17.0
2 changes: 1 addition & 1 deletion .storybook/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
"files": [
"./typings.d.ts"
]
}
}
555 changes: 278 additions & 277 deletions .yarn/releases/yarn-3.5.0.cjs → .yarn/releases/yarn-3.6.4.cjs

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
nodeLinker: node-modules
compressionLevel: mixed

npmAuthToken: "${NODE_AUTH_TOKEN:-}"
enableGlobalCache: false

npmPublishRegistry: "${NPM_PUBLISH_REGISTRY:-}"
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.5.0.cjs
yarnPath: .yarn/releases/yarn-3.6.4.cjs
5 changes: 4 additions & 1 deletion RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
### Version 6.19.6-case-file-view-document-upload-date-v2
**EUI-7807** Case file view v1.1

### Version 6.19.11-rc1
### Version 7.0.0-rc3
**EXUI-763** Upgrade ccd-ui-toolkit to Node 118.17.0 and Angular 15

### Version 6.19.11-rc3
**EXUI-1000** Complex type not showing data
**EXUI-1006** Case Flags stopped working

Expand Down
36 changes: 9 additions & 27 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,29 +65,12 @@
"browserTarget": "ccd-case-ui-toolkit:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [],
"scripts": [],
"assets": [
"src/favicon.ico"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"builder": "@angular-eslint/builder:lint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
"eslintConfig": ".eslintrc.cjs",
"lintFilePatterns": [
"src/**/*.ts"
]
}
}
Expand All @@ -109,12 +92,12 @@
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
"eslintConfig": ".eslintrc.cjs",
"lintFilePatterns": [
"src/**/*.ts"
]
}
}
Expand Down Expand Up @@ -143,7 +126,6 @@
}
}
},

"storybook": {
"builder": "@storybook/angular:start-storybook",
"options": {
Expand Down
2 changes: 1 addition & 1 deletion documentation.json
Original file line number Diff line number Diff line change
Expand Up @@ -85641,4 +85641,4 @@
}
]
}
}
}
Loading

0 comments on commit b51ec10

Please sign in to comment.