Skip to content

Commit

Permalink
[CL-506] Upgrade to Angular 18 (#12218)
Browse files Browse the repository at this point in the history
  • Loading branch information
vleague2 authored Jan 6, 2025
1 parent ce07e40 commit ea10c29
Show file tree
Hide file tree
Showing 6 changed files with 2,192 additions and 1,996 deletions.
4 changes: 2 additions & 2 deletions apps/web/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { LayoutModule } from "@angular/cdk/layout";
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";

import { AppComponent } from "./app.component";
import { CoreModule } from "./core";
Expand All @@ -23,7 +23,7 @@ import { WildcardRoutingModule } from "./wildcard-routing.module";
BrowserAnimationsModule,
FormsModule,
CoreModule,
InfiniteScrollModule,
InfiniteScrollDirective,
DragDropModule,
LayoutModule,
OssRoutingModule,
Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/app/shared/shared.module.ts
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
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='
;img-src
'self'
data:
Expand Down
4 changes: 2 additions & 2 deletions bitwarden_license/bit-web/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { NgModule } from "@angular/core";
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";

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

0 comments on commit ea10c29

Please sign in to comment.