Skip to content

Commit

Permalink
Angular 16 upgrade (#1072)
Browse files Browse the repository at this point in the history
* defaultProject depreactaed

* ang 12 -> 13

* ang mat 12 -> 13

* ang 13 -> 14

* ang 13 -> 14

* ang 14 -> ang 15

* ang mat 14 -> 15

* updated zone

* ang 15 -> 16

* ang mat 15 -> 16

* npm changes

* more fixes

* more angular update changes -- swiper + lru cache

* fixed build
css left

* Fix theming files

* Fixes

* Update openapi

* Change node version in github workflows

* Put themes back

* Import legacy snackbar module

* Fix tests

* Fix linting

* Edit workflows

* Karma config fixes

* Theming for RUI

* Revert changes to workflows

* Finish fixing EUI styles

* Fix RUI theming

* Update tests

* Remove deprecations

* Small styling change

* Fixes

* Fix the workflows (for real)

* Theming improvements, remove some deprecated modules

* Update styles

* Fix test

* More styling fixes for EUI

* Update RUI styles

* More style fixes for RUI

* Update more styles

* Update mat dialog

* Finish updating angular materials for EUI

* Revert slider back to legacy for now

* Convert remaining MatLegacy

---------

Co-authored-by: Pramod <[email protected]>
Co-authored-by: Edward Lu <[email protected]>
Co-authored-by: edlu77 <[email protected]>
  • Loading branch information
4 people authored Sep 6, 2023
1 parent fccdcbb commit d22fece
Show file tree
Hide file tree
Showing 266 changed files with 26,944 additions and 20,840 deletions.
2 changes: 0 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
"indent": "off",
"keyword-spacing": "off",
"no-dupe-class-members": "off",
"no-duplicate-imports": "off",
"no-implied-eval": "off",
"no-return-await": "off",
"no-shadow": "off",
Expand Down Expand Up @@ -181,7 +180,6 @@
"format": ["camelCase", "UPPER_CASE"]
}
],
"@typescript-eslint/no-duplicate-imports": "error",
"@typescript-eslint/no-explicit-any": [
"error",
{
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/beta-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x]
node-version: [18.x]

steps:
- uses: actions/checkout@v2
Expand All @@ -35,16 +35,16 @@ jobs:
- run: npm run build:libs
- name: Build EUI
run: |
npm run build -- --output-hashing=none --base-href=/ --configuration=staging
npm run build ccf-eui -- --output-hashing=none --base-href=/ --configuration=staging
npm run build:ccf-eui:wc
- name: Build RUI
run: |
npm run build -- --project ccf-rui --output-hashing=none --base-href=/rui/ --configuration=staging
npm run build ccf-rui -- --project ccf-rui --output-hashing=none --base-href=/rui/ --configuration=staging
npm run build:ccf-rui:wc
cp -r dist/ccf-rui dist/ccf-ui/rui
- name: Build Organ Info
run: |
npm run build -- --project ccf-organ-info --output-hashing=none --base-href=/organ-info/ --configuration=staging
npm run build ccf-organ-info -- --project ccf-organ-info --output-hashing=none --base-href=/organ-info/ --configuration=staging
npm run build:ccf-organ-info:wc
cp -r dist/ccf-organ-info dist/ccf-ui/organ-info
- run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-previews.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x]
node-version: [18.x]

steps:
- uses: actions/checkout@v1
Expand All @@ -33,23 +33,23 @@ jobs:
- run: npm run build:libs
- name: Build EUI
run: |
npm run build -- --output-hashing=none --base-href=/ --configuration=staging
npm run build ccf-eui -- --output-hashing=none --base-href=/ --configuration=staging
npm run build:ccf-eui:wc
- name: Build RUI
run: |
npm run build -- --project ccf-rui --output-hashing=none --base-href=/rui/ --configuration=staging
npm run build ccf-rui -- --project ccf-rui --output-hashing=none --base-href=/rui/ --configuration=staging
npm run build:ccf-rui:wc
mkdir -p dist/ccf-ui
cp -r dist/ccf-rui dist/ccf-ui/rui
- name: Build Organ Info
run: |
npm run build -- --project ccf-organ-info --output-hashing=none --base-href=/organ-info/ #--configuration=staging
npm run build ccf-organ-info -- --project ccf-organ-info --output-hashing=none --base-href=/organ-info/ #--configuration=staging
#npm run build:ccf-organ-info:wc
mkdir -p dist/ccf-ui
cp -r dist/ccf-organ-info dist/ccf-ui/organ-info
- name: Build Body UI WC
run: |
npm run build -- --project ccf-body-ui-wc --output-hashing=none --base-href=/body-ui/ #--configuration=staging
npm run build ccf-body-ui-wc -- --project ccf-body-ui-wc --output-hashing=none --base-href=/body-ui/ #--configuration=staging
npm run build:ccf-body-ui-wc:wc
mkdir -p dist/ccf-ui
cp -r dist/ccf-body-ui-wc dist/ccf-ui/body-ui
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/production-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x]
node-version: [18.x]

steps:
- uses: actions/checkout@v2
Expand All @@ -39,21 +39,21 @@ jobs:
- run: npm run build:libs
- name: Build EUI
run: |
npm run build -- --output-hashing=none --base-href=/ccf-ui/
npm run build ccf-eui -- --output-hashing=none --base-href=/ccf-ui/
npm run build:ccf-eui:wc
- name: Build RUI
run: |
npm run build -- --project ccf-rui --output-hashing=none --base-href=/ccf-ui/rui/
npm run build ccf-rui -- --project ccf-rui --output-hashing=none --base-href=/ccf-ui/rui/
npm run build:ccf-rui:wc
cp -r dist/ccf-rui dist/ccf-ui/rui
- name: Build Organ Info
run: |
npm run build -- --project ccf-organ-info --output-hashing=none --base-href=/ccf-ui/organ-info/ --configuration=staging
npm run build ccf-organ-info -- --project ccf-organ-info --output-hashing=none --base-href=/ccf-ui/organ-info/ --configuration=staging
npm run build:ccf-organ-info:wc
cp -r dist/ccf-organ-info dist/ccf-ui/organ-info
- name: Build Body UI WC
run: |
npm run build -- --project ccf-body-ui-wc --output-hashing=none --base-href=/body-ui/ #--configuration=staging
npm run build ccf-body-ui-wc -- --project ccf-body-ui-wc --output-hashing=none --base-href=/body-ui/ #--configuration=staging
npm run build:ccf-body-ui-wc:wc
mkdir -p dist/ccf-ui
cp -r dist/ccf-body-ui-wc dist/ccf-ui/body-ui
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/staging-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x]
node-version: [18.x]

steps:
- uses: actions/checkout@v2
Expand All @@ -39,21 +39,21 @@ jobs:
- run: npm run build:libs
- name: Build EUI
run: |
npm run build -- --output-hashing=none --base-href=/ --configuration=staging
npm run build ccf-eui -- --output-hashing=none --base-href=/ --configuration=staging
npm run build:ccf-eui:wc
- name: Build RUI
run: |
npm run build -- --project ccf-rui --output-hashing=none --base-href=/rui/ --configuration=staging
npm run build ccf-rui -- --project ccf-rui --output-hashing=none --base-href=/rui/ --configuration=staging
npm run build:ccf-rui:wc
cp -r dist/ccf-rui dist/ccf-ui/rui
- name: Build Organ Info
run: |
npm run build -- --project ccf-organ-info --output-hashing=none --base-href=/organ-info/ --configuration=staging
npm run build ccf-organ-info -- --project ccf-organ-info --output-hashing=none --base-href=/organ-info/ --configuration=staging
npm run build:ccf-organ-info:wc
cp -r dist/ccf-organ-info dist/ccf-ui/organ-info
- name: Build Body UI WC
run: |
npm run build -- --project ccf-body-ui-wc --output-hashing=none --base-href=/body-ui/ #--configuration=staging
npm run build ccf-body-ui-wc -- --project ccf-body-ui-wc --output-hashing=none --base-href=/body-ui/ #--configuration=staging
npm run build:ccf-body-ui-wc:wc
mkdir -p dist/ccf-ui
cp -r dist/ccf-body-ui-wc dist/ccf-ui/body-ui
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x]
node-version: [18.x]

steps:
- uses: actions/checkout@v1
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ speed-measure-plugin*.json
.venv

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
8 changes: 6 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
"styles": [
"projects/ccf-eui/src/styles.scss"
],
"stylePreprocessorOptions": {
"includePaths": ["node_modules/swiper"]
},
"scripts": [
{
"input": "node_modules/document-register-element/build/document-register-element.js"
Expand Down Expand Up @@ -831,9 +834,10 @@
}
}
},
"defaultProject": "ccf-eui",
"cli": {
"analytics": "40bb8025-0693-4352-b08d-efd2a1f935cd",
"defaultCollection": "@angular-eslint/schematics"
"schematicCollections": [
"@angular-eslint/schematics"
]
}
}
2 changes: 1 addition & 1 deletion openapitools.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
"spaces": 2,
"generator-cli": {
"version": "5.4.0"
"version": "6.6.0"
}
}
Loading

0 comments on commit d22fece

Please sign in to comment.