Skip to content

chore: upgrade to angular 12 #1073

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.

Sign up for GitHub

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

Merged
merged 26 commits into from
Aug 20, 2021
Merged

chore: upgrade to angular 12 #1073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8bf3da5
fix: donut chart fixes
itssharmasandeep Jul 13, 2021
5599c6a
Revert "fix: donut chart fixes"
itssharmasandeep Jul 13, 2021
88d3bd4
Merge branch 'main' of github.com:hypertrace/hypertrace-ui
itssharmasandeep Jul 15, 2021
cd18474
Merge branch 'main' of github.com:hypertrace/hypertrace-ui
itssharmasandeep Jul 19, 2021
2aa1a9b
Merge branch 'main' of github.com:hypertrace/hypertrace-ui
itssharmasandeep Jul 20, 2021
111e41d
Merge branch 'main' of github.com:hypertrace/hypertrace-ui
itssharmasandeep Jul 26, 2021
9b40fc4
Merge branch 'main' of github.com:hypertrace/hypertrace-ui
itssharmasandeep Jul 28, 2021
00b1e07
Merge branch 'main' of github.com:hypertrace/hypertrace-ui
itssharmasandeep Jul 29, 2021
f81b19d
Merge branch 'main' of github.com:hypertrace/hypertrace-ui
itssharmasandeep Jul 30, 2021
423dc6d
Merge branch 'main' of github.com:hypertrace/hypertrace-ui
itssharmasandeep Aug 9, 2021
9466514
Merge branch 'main' of github.com:hypertrace/hypertrace-ui
itssharmasandeep Aug 11, 2021
b2b04ba
Merge branch 'main' of github.com:hypertrace/hypertrace-ui
itssharmasandeep Aug 18, 2021
c8afe63
fix: adding exception for peer deps in npm 7
itssharmasandeep Aug 18, 2021
56b4a19
chore: ng 12 base update
itssharmasandeep Aug 18, 2021
3890e75
chore: upgrading @angular/cdk @angular/flex-layout @angular/material
itssharmasandeep Aug 18, 2021
3144cbc
chore: update peer dependencies
itssharmasandeep Aug 18, 2021
5adfde7
fix: lint errors
itssharmasandeep Aug 18, 2021
e50953e
Merge remote-tracking branch 'origin/main' into ng-12
itssharmasandeep Aug 19, 2021
0733640
fix: review comments
itssharmasandeep Aug 19, 2021
b287d7a
fix: errors
itssharmasandeep Aug 19, 2021
c8afafa
refactor: import and package json
itssharmasandeep Aug 19, 2021
c2c6829
Merge branch 'main' into ng-12
anandtiwary Aug 19, 2021
77c549a
Merge remote-tracking branch 'origin/main' into ng-12
itssharmasandeep Aug 20, 2021
0cd1353
fix: node modules cache
itssharmasandeep Aug 20, 2021
84b7cff
Merge branch 'ng-12' of github.com:hypertrace/hypertrace-ui into ng-12
itssharmasandeep Aug 20, 2021
5fceefe
fix: angular material imports
itssharmasandeep Aug 20, 2021
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
10 changes: 5 additions & 5 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json') }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs to be updated in the publish job, too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw that and I think we're doing something different in publish job

  1. restoreKeys contain package.json instead of package-lock.json in the key value and I think it would always be different right?
  2. we're not checking cache-hit and every time we're doing npm ci so cache part seems unused here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

name: Publish artifacts
on:
  # Will only run when release is published.
  release:
    types:
      - created
  workflow_dispatch:

jobs:
  publish-docker:
    runs-on: ubuntu-20.04
    steps:
      # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
      - name: Check out code
        uses: actions/checkout@v2.3.4
        with:
          fetch-depth: 0

      - name: Cache node modules
        uses: actions/cache@v2
        with:
          path: ~/.npm
          key: ${{ runner.os }}-node-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
          restore-keys: |
            ${{ runner.os }}-node-${{ hashFiles('package.json') }}-
            ${{ runner.os }}-node-

      - name: NPM Install
        run: npm ci

      - name: Build
        run: npm run build:ci

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whoops - yeah, that one is different but shouldn't be. It will still work, just off fresh node modules each time - so we can come back to that as tech debt.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we go ahead and merge this PR?


- name: NPM Install
if: steps.cache.outputs.cache-hit != 'true'
Expand All @@ -37,7 +37,7 @@ jobs:
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json') }}

- name: Build
run: npm run build:ci
Expand All @@ -58,7 +58,7 @@ jobs:
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json') }}

- name: Lint
run: npm run lint
Expand All @@ -81,7 +81,7 @@ jobs:
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json') }}

- id: set-test-chunks
name: Set Chunks
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json') }}

- name: Test
run: npm run test:ci -- $(echo $CHUNKS | jq -r '.[${{ matrix.chunk }}] | .[] | "--testPathPattern "+.')
Expand Down
14 changes: 9 additions & 5 deletions angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist/hypertrace-ui",
"index": "src/index.html",
"main": "src/main.ts",
Expand Down Expand Up @@ -46,7 +45,13 @@
"includePaths": ["./projects/assets-library/assets/styles", "./node_modules"]
},
"scripts": [],
"allowedCommonJsDependencies": ["graphql-tag", "zen-observable"]
"allowedCommonJsDependencies": ["graphql-tag", "zen-observable"],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
Expand All @@ -59,9 +64,7 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep. This would fix that warning

"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
Expand All @@ -77,7 +80,8 @@
}
]
}
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
Expand Down
Loading