Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Node-18 and NG-15 #1550

Merged
merged 77 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
2216e4a
kick-off node 18 upgrade
codaimaster Aug 21, 2023
e721922
use pay component at local
codaimaster Aug 21, 2023
34b8930
ng update @angular/core@12 @angular/cli@12 --force
codaimaster Aug 21, 2023
14b49f6
ng update @angular/material@12 --force
codaimaster Aug 21, 2023
5d808cd
ng update @angular/core@13 @angular/cli@13 --force
codaimaster Aug 22, 2023
2095f70
ng update @angular/material@13 --force
codaimaster Aug 22, 2023
071d036
ng update @angular/core@14 @angular/cli@14 --force
codaimaster Aug 22, 2023
f83421b
cdk 14
codaimaster Aug 22, 2023
12f9070
ts version
codaimaster Aug 22, 2023
5095276
upgraes for fix
codaimaster Aug 22, 2023
5805e5c
upgrade rpx-xui-translation
codaimaster Aug 22, 2023
d83ef00
upgrade yargs-parser
codaimaster Aug 22, 2023
9dde0d8
upgrade cli to 15
codaimaster Aug 22, 2023
d2e5e14
fix damn ng breakdown
codaimaster Aug 22, 2023
2bb3997
ng update @angular/material@14 --force
codaimaster Aug 22, 2023
c0c71b2
ng update @angular/core@15 @angular/cli@15 --force
codaimaster Aug 22, 2023
7ecd059
ng update @angular/material@15 --force
codaimaster Aug 22, 2023
c9b4173
correct compilation errors after upgrades
codaimaster Aug 22, 2023
e854b5c
ignore angular cache
codaimaster Aug 22, 2023
adbed5a
set new major version
codaimaster Aug 22, 2023
0dc8a17
add yarn release file
codaimaster Aug 22, 2023
4378ffd
comment out broken lint task
codaimaster Aug 22, 2023
2089b3e
temporarily use ccpay-component from local
codaimaster Aug 22, 2023
0d8b792
fix tests
codaimaster Aug 22, 2023
b427b1a
fix tests
codaimaster Aug 22, 2023
5a0c21a
upgrade to media viewer pre-release
codaimaster Aug 22, 2023
52bc141
Merge branch 'master' into EXUI-763_upgrade-node18-and-ng15
codaimaster Sep 5, 2023
ffc6524
update version tag
codaimaster Sep 5, 2023
7b9362d
delete local ccpay dist folder
codaimaster Sep 5, 2023
40e14f6
use ccpay component prerelease
codaimaster Sep 5, 2023
77109ff
skip the tasks (to be fixed later on)
codaimaster Sep 5, 2023
ea7ff32
remove steps to unblock pre-release
codaimaster Sep 5, 2023
b6f1eb4
use node 14 for release
codaimaster Sep 5, 2023
b966897
Merge branch 'master' into EXUI-763_upgrade-node18-and-ng15
olusegz07 Sep 20, 2023
0c802af
Merge branch 'master' into EXUI-763_upgrade-node18-and-ng15
olusegz07 Sep 29, 2023
359cc3e
Code tide
olusegz07 Oct 6, 2023
23e6860
package json update
olusegz07 Oct 6, 2023
c090a54
fix update package.json file and code tidy
olusegz07 Oct 9, 2023
721e06b
fix update package.json file
olusegz07 Oct 9, 2023
9756b97
fix update package.json file and code tidy
olusegz07 Oct 9, 2023
f7dbb49
Merge branch 'EXUI-763-testing' into EXUI-763_upgrade-node18-and-ng15
olusegz07 Oct 9, 2023
3750fc2
package.json file update
olusegz07 Oct 9, 2023
6673d1a
Using legacy angular material
olusegz07 Oct 11, 2023
5f4b124
package.json version update
olusegz07 Oct 12, 2023
f00ed65
fix: EXUI-787 - Fixed lint srcipt, lint issues, code issue. Code tidy
olusegz07 Oct 17, 2023
17d370c
Merge pull request #1593 from hmcts/fix/EXUI-787-code-issues
olusegz07 Oct 17, 2023
e5f9171
updated codebase
olusegz07 Oct 17, 2023
39a9220
fix: EXUI-790 unit test now working; EXUI-996- Fixed dateTime Picker;…
olusegz07 Oct 31, 2023
2144c59
Merge branch 'master' into material-legacy
olusegz07 Oct 31, 2023
3101355
Merge pull request #1590 from hmcts/material-legacy
olusegz07 Oct 31, 2023
58016e2
package.json updated
olusegz07 Oct 31, 2023
e54586b
Update typography.scss
olusegz07 Oct 31, 2023
c078883
Version update
olusegz07 Oct 31, 2023
c9ddbc8
Update npmpublish.yml
olusegz07 Oct 31, 2023
5b83348
update polling service inline with sonarcloud - Security Hotspot
olusegz07 Oct 31, 2023
ac8dfc3
code tidy
olusegz07 Nov 1, 2023
3e53135
added updated fork version of rx-polling library
olusegz07 Nov 1, 2023
557ee4c
fix - EXUI-996 - fix issue with incorrect date formate
olusegz07 Nov 2, 2023
126a8e7
App version updated and code tidy
olusegz07 Nov 2, 2023
40e96aa
Update RELEASE-NOTES.md
olusegz07 Nov 3, 2023
c852219
Merge branch 'master' into EXUI-763_upgrade-node18-and-ng15
olusegz07 Nov 8, 2023
c18059b
version update
olusegz07 Nov 8, 2023
36fd171
Update case-file-view-folder.component.ts
olusegz07 Nov 8, 2023
6d43fdd
Merge branch 'master' into EXUI-763_upgrade-node18-and-ng15
olusegz07 Nov 8, 2023
8149c29
Vesion update
olusegz07 Nov 8, 2023
3458820
Merge branch 'master' into EXUI-763_upgrade-node18-and-ng15
olusegz07 Nov 10, 2023
067917c
update test and karma config
olusegz07 Nov 27, 2023
47067a1
Update karma.conf.js
olusegz07 Nov 27, 2023
38b1444
Update case-file-view-folder-selector.component.spec.ts
olusegz07 Nov 27, 2023
cbc0a9a
ccpay-web-component version updated
olusegz07 Nov 29, 2023
d830fce
version update
olusegz07 Nov 29, 2023
0d7b3c1
Merge branch 'master' into EXUI-763_upgrade-node18-and-ng15
olusegz07 Nov 30, 2023
ae3c636
fix broken functional test and update toolkit version
olusegz07 Nov 30, 2023
3858191
Merge branch 'master' into EXUI-763_upgrade-node18-and-ng15
olusegz07 Nov 30, 2023
f8958d2
version update
olusegz07 Dec 5, 2023
42944e2
rpx-xui-translation version update - 1.0.1
olusegz07 Dec 5, 2023
4a55542
@olusegz07 rpx-xui-translation version update - 1.0.2
olusegz07 Dec 5, 2023
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
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