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.

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

[CL-506] Upgrade to Angular 18 #12218

Merged
merged 15 commits into from
Jan 6, 2025
Merged

[CL-506] Upgrade to Angular 18 #12218

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c81afe2
update to angular 18
vleague2 Dec 2, 2024
8d0881a
update other peer libraries
vleague2 Dec 2, 2024
7243d37
update csp hash for ng-select
vleague2 Dec 3, 2024
dc574bd
switch to infiniteScrollDirective now that module is deprecated
vleague2 Dec 3, 2024
762953f
Merge branch 'main' into ds/cl-506/angular-18
vleague2 Dec 3, 2024
5c08158
temp change for easier testing
vleague2 Dec 4, 2024
d9219b1
Merge branch 'main' into ds/cl-506/angular-18
vleague2 Dec 10, 2024
76e5f8a
Merge branch 'main' into ds/cl-506/angular-18
vleague2 Dec 19, 2024
3b05584
Merge branch 'main' into ds/cl-506/angular-18
vleague2 Dec 26, 2024
3078994
revert change
vleague2 Dec 26, 2024
0bc6931
Merge branch 'main' into ds/cl-506/angular-18
vleague2 Jan 2, 2025
a28fc37
Merge branch 'main' into ds/cl-506/angular-18
vleague2 Jan 3, 2025
6173262
re-sync package lock after merge from main
vleague2 Jan 3, 2025
662c24d
Merge branch 'main' into ds/cl-506/angular-18
vleague2 Jan 6, 2025
2699343
fix package-lock for webpack-merge package
vleague2 Jan 6, 2025
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
4 changes: 2 additions & 2 deletions apps/web/src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { NgModule } from "@angular/core";
import { FormsModule } from "@angular/forms";
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
import { InfiniteScrollModule } from "ngx-infinite-scroll";
import { InfiniteScrollDirective } from "ngx-infinite-scroll";

Check warning on line 6 in apps/web/src/app/app.module.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/app.module.ts#L6 

Added line #L6 was not covered by tests

import { AppComponent } from "./app.component";
import { CoreModule } from "./core";
Expand All @@ -23,7 +23,7 @@
BrowserAnimationsModule,
FormsModule,
CoreModule,
InfiniteScrollModule,
InfiniteScrollDirective,
DragDropModule,
LayoutModule,
OssRoutingModule,
Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/app/shared/shared.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { CommonModule, DatePipe } from "@angular/common";
import { NgModule } from "@angular/core";
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
import { RouterModule } from "@angular/router";
import { InfiniteScrollModule } from "ngx-infinite-scroll";
import { InfiniteScrollDirective } from "ngx-infinite-scroll";

import { JslibModule } from "@bitwarden/angular/jslib.module";
import {
Expand Down Expand Up @@ -49,7 +49,7 @@ import "./locales";
DragDropModule,
FormsModule,
ReactiveFormsModule,
InfiniteScrollModule,
InfiniteScrollDirective,
RouterModule,
JslibModule,

Expand Down Expand Up @@ -86,7 +86,7 @@ import "./locales";
DragDropModule,
FormsModule,
ReactiveFormsModule,
InfiniteScrollModule,
InfiniteScrollDirective,
RouterModule,
JslibModule,

Expand Down
2 changes: 1 addition & 1 deletion apps/web/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ const devServer =
'sha256-JVRXyYPueLWdwGwY9m/7u4QlZ1xeQdqUj2t8OVIzZE4='
'sha256-or0p3LaHetJ4FRq+flVORVFFNsOjQGWrDvX8Jf7ACWg='
'sha256-jvLh2uL2/Pq/gpvNJMaEL4C+TNhBeGadLIUyPcVRZvY='
'sha256-Oca9ZYU1dwNscIhdNV7tFBsr4oqagBhZx9/p4w8GOcg='
'sha256-VZTcMoTEw3nbAHejvqlyyRm1Mdx+DVNgyKANjpWw0qg='
willmartian marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

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

This will require a note to be added to our release cards to ensure the prod rules are updated pre-release.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ty for this comment -- I am now working with sre to get the rules updated for the QA environments and for prod!

;img-src
'self'
data:
Expand Down
2 changes: 1 addition & 1 deletion bitwarden_license/bit-web/src/app/admin-console/providers/clients/base-clients.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

private searching = false;
protected scrolled = false;
protected pageSize = 100;
protected pageSize = 10;

Check warning on line 33 in bitwarden_license/bit-web/src/app/admin-console/providers/clients/base-clients.component.ts

View check run for this annotation

Codecov / codecov/patch

bitwarden_license/bit-web/src/app/admin-console/providers/clients/base-clients.component.ts#L33 

Added line #L33 was not covered by tests
private pagedClientsCount = 0;
protected selection = new SelectionModel<string>(true, []);

Expand Down
4 changes: 2 additions & 2 deletions bitwarden_license/bit-web/src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
import { RouterModule } from "@angular/router";
import { InfiniteScrollModule } from "ngx-infinite-scroll";
import { InfiniteScrollDirective } from "ngx-infinite-scroll";

Check warning on line 7 in bitwarden_license/bit-web/src/app/app.module.ts

View check run for this annotation

Codecov / codecov/patch

bitwarden_license/bit-web/src/app/app.module.ts#L7 

Added line #L7 was not covered by tests

import { JslibModule } from "@bitwarden/angular/jslib.module";
import { CoreModule } from "@bitwarden/web-vault/app/core";
Expand Down Expand Up @@ -36,7 +36,7 @@
FormsModule,
ReactiveFormsModule,
CoreModule,
InfiniteScrollModule,
InfiniteScrollDirective,
DragDropModule,
AppRoutingModule,
OssRoutingModule,
Expand Down
Loading
Loading