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

1070 ang upgrade #1072

Merged
merged 45 commits into from
Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
1079ae5
defaultProject depreactaed
Jul 18, 2023
f3b0309
ang 12 -> 13
Jul 18, 2023
e43055d
ang mat 12 -> 13
Jul 18, 2023
7bdc8de
ang 13 -> 14
Jul 18, 2023
ff81a8d
ang 13 -> 14
Jul 18, 2023
0ceb646
ang 14 -> ang 15
Jul 18, 2023
392a07f
ang mat 14 -> 15
Jul 18, 2023
9c1ccbd
updated zone
Jul 18, 2023
0b23609
ang 15 -> 16
Jul 18, 2023
0888a8a
ang mat 15 -> 16
Jul 18, 2023
3c1f747
npm changes
Jul 25, 2023
3d55ea4
more fixes
Jul 26, 2023
35689d9
more angular update changes -- swiper + lru cache
Aug 1, 2023
6380c85
fixed build
Aug 1, 2023
3d76038
Merge branch 'develop' into 1070-ang-upgrade
edlu77 Aug 15, 2023
15e49f8
Fix theming files
edlu77 Aug 15, 2023
f25baf3
Fixes
edlu77 Aug 16, 2023
fb6021f
Update openapi
edlu77 Aug 16, 2023
8beed33
Change node version in github workflows
edlu77 Aug 16, 2023
a6592d3
Put themes back
edlu77 Aug 16, 2023
c0a6d85
Import legacy snackbar module
edlu77 Aug 16, 2023
eb33118
Fix tests
edlu77 Aug 16, 2023
9816bd6
Fix linting
edlu77 Aug 16, 2023
4ef4125
Edit workflows
edlu77 Aug 16, 2023
f8c5f88
Karma config fixes
edlu77 Aug 16, 2023
182601d
Theming for RUI
edlu77 Aug 17, 2023
6368807
Revert changes to workflows
edlu77 Aug 17, 2023
238a236
Finish fixing EUI styles
edlu77 Aug 17, 2023
5c99135
Fix RUI theming
edlu77 Aug 18, 2023
e8c10da
Update tests
edlu77 Aug 18, 2023
81faa2d
Remove deprecations
edlu77 Aug 18, 2023
b746ef2
Small styling change
edlu77 Aug 18, 2023
f8ab747
Fixes
edlu77 Aug 18, 2023
a0643ed
Fix the workflows (for real)
edlu77 Aug 18, 2023
ad2b1c8
Theming improvements, remove some deprecated modules
edlu77 Aug 18, 2023
bda1cf9
Update styles
edlu77 Aug 30, 2023
4606c00
Fix test
edlu77 Aug 30, 2023
e1fa875
More styling fixes for EUI
edlu77 Aug 30, 2023
ed175d0
Update RUI styles
edlu77 Sep 1, 2023
cd4c83d
More style fixes for RUI
edlu77 Sep 1, 2023
4aac421
Update more styles
edlu77 Sep 1, 2023
2409d76
Update mat dialog
edlu77 Sep 2, 2023
97190c9
Finish updating angular materials for EUI
edlu77 Sep 6, 2023
c34f0f5
Revert slider back to legacy for now
edlu77 Sep 6, 2023
9483fad
Convert remaining MatLegacy
edlu77 Sep 6, 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
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