Merge pull request #558 from Tzahi12345/angular-13-update

Angular/dependencies updates
2026-03-07 12:00:01 +03:00 · 2022-04-23 08:44:27 +02:00
parent 2ee64c7a65 8ded160775
commit 9977340161
16 changed files with 5169 additions and 8021 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@
 !.vscode/extensions.json

 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage
--- a/angular.json
+++ b/angular.json
@@ -17,7 +17,6 @@
        "build": {
          "builder": "@angular-devkit/build-angular:browser",
          "options": {
-            "aot": true,
            "outputPath": "backend/public",
            "index": "src/index.html",
            "main": "src/main.ts",
@@ -33,7 +32,17 @@
            "styles": [
              "src/styles.scss"
            ],
-            "scripts": []
+            "scripts": [],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true,
+            "allowedCommonJsDependencies": [
+              "rxjs",
+              "crypto-js"
+            ]
          },
          "configurations": {
            "production": {
@@ -46,7 +55,6 @@
              "optimization": true,
              "outputHashing": "all",
              "namedChunks": false,
-              "aot": true,
              "extractLicenses": true,
              "vendorChunk": false,
              "buildOptimizer": true,
@@ -60,7 +68,8 @@
            "es": {
              "localize": ["es"]
            }
-          }
+          },
+          "defaultConfiguration": ""
        },
        "serve": {
          "builder": "@angular-devkit/build-angular:dev-server",
@@ -152,16 +161,6 @@
              "src/backend"
            ]
          }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
-            ],
-            "exclude": []
-          }
        }
      }
    },
@@ -176,15 +175,6 @@
            "protractorConfig": "./protractor.conf.js",
            "devServerTarget": "youtube-dl-material:serve"
          }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "e2e/tsconfig.e2e.json"
-            ],
-            "exclude": []
-          }
        }
      }
    }
--- a/backend/app.js
+++ b/backend/app.js
@@ -1496,18 +1496,14 @@ app.post('/api/downloadFileFromServer', optionalJwt, async (req, res) => {
        }

        // generate zip
-        file_path_to_download = await utils.createContainerZipFile(playlist, playlist_files_to_download);
+        file_path_to_download = await utils.createContainerZipFile(playlist['name'], playlist_files_to_download);
    } else if (sub_id && !uid) {
        zip_file_generated = true;
-        const sub_files_to_download = [];
-        const sub = subscriptions_api.getSubscription(sub_id, uuid);
-        for (let i = 0; i < sub['videos'].length; i++) {
-            const sub_file = sub['videos'][i];
-            sub_files_to_download.push(sub_file);
-        }
+        const sub = await db_api.getRecord('subscriptions', {id: sub_id});
+        const sub_files_to_download = await db_api.getRecords('files', {sub_id: sub_id});

        // generate zip
-        file_path_to_download = await utils.createContainerZipFile(sub, sub_files_to_download);
+        file_path_to_download = await utils.createContainerZipFile(sub['name'], sub_files_to_download);
    } else {
        const file_obj = await db_api.getVideo(uid, uuid, sub_id)
        file_path_to_download = file_obj.path;
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
--- a/backend/package.json
+++ b/backend/package.json
@@ -30,15 +30,14 @@
  },
  "homepage": "",
  "dependencies": {
-    "archiver": "^3.1.1",
-    "async": "^3.2.2",
+    "archiver": "^5.3.1",
+    "async": "^3.2.3",
    "async-mutex": "^0.3.1",
    "axios": "^0.21.2",
    "bcryptjs": "^2.4.0",
    "compression": "^1.7.4",
    "config": "^3.2.3",
-    "exe": "^1.0.2",
-    "express": "^4.17.1",
+    "express": "^4.17.3",
    "fluent-ffmpeg": "^2.1.2",
    "fs-extra": "^9.0.0",
    "glob": "^7.1.6",
@@ -46,7 +45,7 @@
    "lowdb": "^1.0.0",
    "md5": "^2.2.1",
    "merge-files": "^0.1.2",
-    "mocha": "^8.4.0",
+    "mocha": "^9.2.2",
    "moment": "^2.29.2",
    "mongodb": "^3.6.9",
    "multer": "^1.4.2",
@@ -54,10 +53,10 @@
    "node-id3": "^0.1.14",
    "node-schedule": "^2.1.0",
    "nodemon": "^2.0.7",
-    "passport": "^0.4.1",
+    "passport": "^0.5.2",
    "passport-http": "^0.3.0",
    "passport-jwt": "^4.0.0",
-    "passport-ldapauth": "^2.1.4",
+    "passport-ldapauth": "^3.0.1",
    "passport-local": "^1.0.0",
    "progress": "^2.0.3",
    "ps-node": "^0.1.6",
@@ -66,7 +65,7 @@
    "shortid": "^2.2.15",
    "unzipper": "^0.10.10",
    "uuidv4": "^6.0.6",
-    "winston": "^3.3.3",
+    "winston": "^3.7.2",
    "xmlbuilder2": "^3.0.2",
    "youtube-dl": "^3.0.2"
  }
--- a/backend/utils.js
+++ b/backend/utils.js
@@ -58,13 +58,13 @@ async function getDownloadedFilesByType(basePath, type, full_metadata = false) {
    return files;
 }

-async function createContainerZipFile(container_obj, container_file_objs) {
+async function createContainerZipFile(file_name, container_file_objs) {
    const container_files_to_download = [];
    for (let i = 0; i < container_file_objs.length; i++) {
        const container_file_obj = container_file_objs[i];
        container_files_to_download.push(container_file_obj.path);
    }
-    return await createZipFile(path.join('appdata', container_obj.name + '.zip'), container_files_to_download);
+    return await createZipFile(path.join('appdata', file_name + '.zip'), container_files_to_download);
 }

 async function createZipFile(zip_file_path, file_paths) {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
  "scripts": {
    "ng": "ng",
    "start": "ng serve",
-    "build": "ng build --prod",
+    "build": "ng build --configuration production",
    "prebuild": "node src/postbuild.mjs",
    "heroku-postbuild": "npm install --prefix backend",
    "test": "ng test",
@@ -20,44 +20,44 @@
  },
  "private": true,
  "dependencies": {
-    "@angular-devkit/core": "^11.0.4",
-    "@angular/animations": "^11.0.4",
-    "@angular/cdk": "^11.0.2",
-    "@angular/common": "^11.0.4",
-    "@angular/compiler": "^11.0.4",
-    "@angular/core": "^11.0.4",
-    "@angular/forms": "^11.0.4",
-    "@angular/localize": "^11.0.4",
-    "@angular/material": "^11.0.2",
-    "@angular/platform-browser": "^11.0.4",
-    "@angular/platform-browser-dynamic": "^11.0.4",
-    "@angular/router": "^11.0.4",
+    "@angular-devkit/core": "^13.3.3",
+    "@angular/animations": "^13.3.4",
+    "@angular/cdk": "^13.3.4",
+    "@angular/common": "^13.3.4",
+    "@angular/compiler": "^13.3.4",
+    "@angular/core": "^13.3.4",
+    "@angular/forms": "^13.3.4",
+    "@angular/localize": "^13.3.4",
+    "@angular/material": "^13.3.4",
+    "@angular/platform-browser": "^13.3.4",
+    "@angular/platform-browser-dynamic": "^13.3.4",
+    "@angular/router": "^13.3.4",
+    "@fontsource/material-icons": "^4.5.4",
    "@ngneat/content-loader": "^5.0.0",
-    "@videogular/ngx-videogular": "^2.1.0",
+    "@videogular/ngx-videogular": "^5.0.1",
    "core-js": "^2.4.1",
    "crypto-js": "^4.1.1",
    "file-saver": "^2.0.2",
    "filesize": "^6.1.0",
    "fingerprintjs2": "^2.1.0",
    "fs-extra": "^10.0.0",
-    "material-icons": "^0.5.4",
+    "material-icons": "^1.10.8",
    "nan": "^2.14.1",
    "ng-lazyload-image": "^7.0.1",
-    "ngx-avatar": "^4.0.0",
-    "ngx-file-drop": "^9.0.1",
+    "ngx-avatars": "^1.3.1",
+    "ngx-file-drop": "^13.0.0",
    "rxjs": "^6.6.3",
    "rxjs-compat": "^6.0.0-rc.0",
    "tslib": "^2.0.0",
-    "typescript": "~4.0.5",
-    "web-animations-js": "^2.3.2",
+    "typescript": "~4.6.3",
    "xliff-to-json": "^1.0.4",
-    "zone.js": "~0.10.2"
+    "zone.js": "~0.11.4"
  },
  "devDependencies": {
-    "@angular-devkit/build-angular": "^0.1100.4",
-    "@angular/cli": "^11.0.4",
-    "@angular/compiler-cli": "^11.0.4",
-    "@angular/language-service": "^11.0.4",
+    "@angular-devkit/build-angular": "^13.3.3",
+    "@angular/cli": "^13.3.3",
+    "@angular/compiler-cli": "^13.3.4",
+    "@angular/language-service": "^13.3.4",
    "@types/core-js": "^2.5.2",
    "@types/file-saver": "^2.0.1",
    "@types/jasmine": "~3.6.0",
@@ -75,7 +75,7 @@
    "karma-coverage-istanbul-reporter": "~3.0.2",
    "karma-jasmine": "~4.0.0",
    "karma-jasmine-html-reporter": "^1.5.0",
-    "openapi-typescript-codegen": "^0.4.11",
+    "openapi-typescript-codegen": "^0.21.0",
    "protractor": "~7.0.0",
    "ts-node": "~3.0.4",
    "tslint": "~6.1.0"
--- a/src/_palette.scss
+++ b/src/_palette.scss
@@ -1,11 +1,11 @@
 /* Coolors Exported Palette - coolors.co/e8aeb7-b8e1ff-a9fff7-94fbab-82aba1 */

 /* HSL */
-$color1: hsla(351%, 56%, 80%, 1);
-$softblue: hsla(205%, 100%, 86%, 1);
-$color3: hsla(174%, 100%, 83%, 1);
-$color4: hsla(133%, 93%, 78%, 1);
-$color5: hsla(165%, 20%, 59%, 1);
+$color1: hsla(351, 56%, 80%, 1);
+$softblue: hsla(205, 100%, 86%, 1);
+$color3: hsla(174, 100%, 83%, 1);
+$color4: hsla(133, 93%, 78%, 1);
+$color5: hsla(165, 20%, 59%, 1);

 /* RGB */
 $color1: rgba(232, 174, 183, 1);
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -45,8 +45,6 @@ import { VgBufferingModule } from '@videogular/ngx-videogular/buffering';
 import { VgOverlayPlayModule } from '@videogular/ngx-videogular/overlay-play';
 import { VgCoreModule } from '@videogular/ngx-videogular/core';
 import { InputDialogComponent } from './input-dialog/input-dialog.component';
-import { LazyLoadImageModule, IsVisibleProps } from 'ng-lazyload-image';
-import { audioFilesMouseHovering, videoFilesMouseHovering, audioFilesOpened, videoFilesOpened } from './main/main.component';
 import { CreatePlaylistComponent } from './create-playlist/create-playlist.component';
 import { SubscriptionsComponent } from './subscriptions/subscriptions.component';
 import { SubscribeDialogComponent } from './dialogs/subscribe-dialog/subscribe-dialog.component';
@@ -56,7 +54,7 @@ import { SubscriptionInfoDialogComponent } from './dialogs/subscription-info-dia
 import { SettingsComponent } from './settings/settings.component';
 import { MatChipsModule } from '@angular/material/chips';
 import { NgxFileDropModule } from 'ngx-file-drop';
-import { AvatarModule } from 'ngx-avatar';
+import { AvatarModule } from 'ngx-avatars';
 import { ContentLoaderModule } from '@ngneat/content-loader';

 import es from '@angular/common/locales/es';
@@ -94,122 +92,110 @@ import { RestoreDbDialogComponent } from './dialogs/restore-db-dialog/restore-db

 registerLocaleData(es, 'es');

-export function isVisible({ event, element, scrollContainer, offset }: IsVisibleProps<any>) {
-  return (element.id === 'video' ? videoFilesMouseHovering || videoFilesOpened : audioFilesMouseHovering || audioFilesOpened);
-}
-
@NgModule({
-  declarations: [
-    AppComponent,
-    MainComponent,
-    PlayerComponent,
-    InputDialogComponent,
-    CreatePlaylistComponent,
-    SubscriptionsComponent,
-    SubscribeDialogComponent,
-    SubscriptionComponent,
-    SubscriptionFileCardComponent,
-    SubscriptionInfoDialogComponent,
-    SettingsComponent,
-    AboutDialogComponent,
-    VideoInfoDialogComponent,
-    ArgModifierDialogComponent,
-    HighlightPipe,
-    LinkifyPipe,
-    UpdaterComponent,
-    UpdateProgressDialogComponent,
-    ShareMediaDialogComponent,
-    LoginComponent,
-    DownloadsComponent,
-    UserProfileDialogComponent,
-    SetDefaultAdminDialogComponent,
-    ModifyUsersComponent,
-    AddUserDialogComponent,
-    ManageUserComponent,
-    ManageRoleComponent,
-    CookiesUploaderDialogComponent,
-    LogsViewerComponent,
-    ModifyPlaylistComponent,
-    ConfirmDialogComponent,
-    UnifiedFileCardComponent,
-    RecentVideosComponent,
-    EditSubscriptionDialogComponent,
-    CustomPlaylistsComponent,
-    EditCategoryDialogComponent,
-    TwitchChatComponent,
-    SeeMoreComponent,
-    ConcurrentStreamComponent,
-    SkipAdButtonComponent,
-    TasksComponent,
-    UpdateTaskScheduleDialogComponent,
-    RestoreDbDialogComponent
-  ],
-  imports: [
-    CommonModule,
-    BrowserModule,
-    BrowserAnimationsModule,
-    MatNativeDateModule,
-    MatRadioModule,
-    FormsModule,
-    MatInputModule,
-    MatSelectModule,
-    ReactiveFormsModule,
-    HttpClientModule,
-    MatToolbarModule,
-    MatCardModule,
-    MatSnackBarModule,
-    MatButtonModule,
-    MatCheckboxModule,
-    MatSidenavModule,
-    MatIconModule,
-    MatListModule,
-    MatGridListModule,
-    MatExpansionModule,
-    MatProgressBarModule,
-    MatProgressSpinnerModule,
-    MatButtonToggleModule,
-    MatRippleModule,
-    MatMenuModule,
-    MatDialogModule,
-    MatSlideToggleModule,
-    MatAutocompleteModule,
-    MatTabsModule,
-    MatTooltipModule,
-    MatPaginatorModule,
-    MatSortModule,
-    MatTableModule,
-    MatDatepickerModule,
-    MatChipsModule,
-    DragDropModule,
-    ClipboardModule,
-    TextFieldModule,
-    NgxFileDropModule,
-    AvatarModule,
-    ContentLoaderModule,
-    VgCoreModule,
-    VgControlsModule,
-    VgOverlayPlayModule,
-    VgBufferingModule,
-    LazyLoadImageModule.forRoot({ isVisible }),
-    RouterModule,
-    AppRoutingModule,
-  ],
-  entryComponents: [
-    InputDialogComponent,
-    CreatePlaylistComponent,
-    SubscribeDialogComponent,
-    SubscriptionInfoDialogComponent,
-    SettingsComponent
-  ],
-  providers: [
-    PostsService,
-    { provide: HTTP_INTERCEPTORS, useClass: H401Interceptor, multi: true }
-  ],
-  exports: [
-    HighlightPipe,
-    LinkifyPipe
-  ],
-  bootstrap: [AppComponent]
+    declarations: [
+        AppComponent,
+        MainComponent,
+        PlayerComponent,
+        InputDialogComponent,
+        CreatePlaylistComponent,
+        SubscriptionsComponent,
+        SubscribeDialogComponent,
+        SubscriptionComponent,
+        SubscriptionFileCardComponent,
+        SubscriptionInfoDialogComponent,
+        SettingsComponent,
+        AboutDialogComponent,
+        VideoInfoDialogComponent,
+        ArgModifierDialogComponent,
+        HighlightPipe,
+        LinkifyPipe,
+        UpdaterComponent,
+        UpdateProgressDialogComponent,
+        ShareMediaDialogComponent,
+        LoginComponent,
+        DownloadsComponent,
+        UserProfileDialogComponent,
+        SetDefaultAdminDialogComponent,
+        ModifyUsersComponent,
+        AddUserDialogComponent,
+        ManageUserComponent,
+        ManageRoleComponent,
+        CookiesUploaderDialogComponent,
+        LogsViewerComponent,
+        ModifyPlaylistComponent,
+        ConfirmDialogComponent,
+        UnifiedFileCardComponent,
+        RecentVideosComponent,
+        EditSubscriptionDialogComponent,
+        CustomPlaylistsComponent,
+        EditCategoryDialogComponent,
+        TwitchChatComponent,
+        SeeMoreComponent,
+        ConcurrentStreamComponent,
+        SkipAdButtonComponent,
+        TasksComponent,
+        UpdateTaskScheduleDialogComponent,
+        RestoreDbDialogComponent
+    ],
+    imports: [
+        CommonModule,
+        BrowserModule,
+        BrowserAnimationsModule,
+        MatNativeDateModule,
+        MatRadioModule,
+        FormsModule,
+        MatInputModule,
+        MatSelectModule,
+        ReactiveFormsModule,
+        HttpClientModule,
+        MatToolbarModule,
+        MatCardModule,
+        MatSnackBarModule,
+        MatButtonModule,
+        MatCheckboxModule,
+        MatSidenavModule,
+        MatIconModule,
+        MatListModule,
+        MatGridListModule,
+        MatExpansionModule,
+        MatProgressBarModule,
+        MatProgressSpinnerModule,
+        MatButtonToggleModule,
+        MatRippleModule,
+        MatMenuModule,
+        MatDialogModule,
+        MatSlideToggleModule,
+        MatAutocompleteModule,
+        MatTabsModule,
+        MatTooltipModule,
+        MatPaginatorModule,
+        MatSortModule,
+        MatTableModule,
+        MatDatepickerModule,
+        MatChipsModule,
+        DragDropModule,
+        ClipboardModule,
+        TextFieldModule,
+        NgxFileDropModule,
+        AvatarModule,
+        ContentLoaderModule,
+        VgCoreModule,
+        VgControlsModule,
+        VgOverlayPlayModule,
+        VgBufferingModule,
+        RouterModule,
+        AppRoutingModule,
+    ],
+    providers: [
+        PostsService,
+        { provide: HTTP_INTERCEPTORS, useClass: H401Interceptor, multi: true }
+    ],
+    exports: [
+        HighlightPipe,
+        LinkifyPipe
+    ],
+    bootstrap: [AppComponent]
 })

 export class AppModule { }
--- a/src/app/components/see-more/see-more.component.html
+++ b/src/app/components/see-more/see-more.component.html
@@ -1,6 +1,6 @@
 <span class="text" [ngStyle]="{'-webkit-line-clamp': !see_more_active ? line_limit : null}" [innerHTML]="text | linkify"></span>
 <span>
-    <a [routerLink]="" (click)="toggleSeeMore()">
+    <a [routerLink]="[]" (click)="toggleSeeMore()">
        <ng-container *ngIf="!see_more_active" i18n="See more">
            See more.
        </ng-container>
--- a/src/app/components/skip-ad-button/skip-ad-button.component.ts
+++ b/src/app/components/skip-ad-button/skip-ad-button.component.ts
@@ -62,7 +62,7 @@ export class SkipAdButtonComponent implements OnInit {

  getVideoIDHashFromURL(video_id) {
    if (!video_id) return null;
-    return CryptoJS.SHA256(video_id).toString(CryptoJS.enc.Hex);;
+    return CryptoJS.SHA256(video_id).toString(CryptoJS.enc.Hex);
  }

  getVideoIDFromURL(url) {
--- a/src/app/posts.services.ts
+++ b/src/app/posts.services.ts
@@ -1,7 +1,6 @@
 import {Injectable, isDevMode, Inject} from '@angular/core';
 import { HttpClient, HttpParams } from '@angular/common/http';
 import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/map';
 import 'rxjs/add/operator/catch';
 import 'rxjs/add/observable/throw';
 import { THEMES_CONFIG } from '../themes';
--- a/src/app/subscription/subscription/subscription.component.ts
+++ b/src/app/subscription/subscription/subscription.component.ts
@@ -49,8 +49,8 @@ export class SubscriptionComponent implements OnInit, OnDestroy {
  constructor(private postsService: PostsService, private route: ActivatedRoute, private router: Router, private dialog: MatDialog) { }

  ngOnInit() {
-    if (this.route.snapshot.paramMap.get('id')) {
-      this.id = this.route.snapshot.paramMap.get('id');
+    this.route.params.subscribe(params => {
+      this.id = params['id'];

      this.postsService.service_initialized.subscribe(init => {
        if (init) {
@@ -59,7 +59,7 @@ export class SubscriptionComponent implements OnInit, OnDestroy {
          this.sub_interval = setInterval(() => this.getSubscription(true), 1000);
        }
      });
-    }
+    });

    // set filter property to cached
    const cached_filter_property = localStorage.getItem('filter_property');
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@@ -20,44 +20,14 @@ import '@angular/localize/init';

 /***************************************************************************************************
 * BROWSER POLYFILLS
- */
-
-/** IE9, IE10 and IE11 requires all of the following polyfills. **/
-// import 'core-js/es6/symbol';
-// import 'core-js/es6/object';
-// import 'core-js/es6/function';
-// import 'core-js/es6/parse-int';
-// import 'core-js/es6/parse-float';
-// import 'core-js/es6/number';
-// import 'core-js/es6/math';
-// import 'core-js/es6/string';
-// import 'core-js/es6/date';
-// import 'core-js/es6/array';
-// import 'core-js/es6/regexp';
-// import 'core-js/es6/map';
-// import 'core-js/es6/weak-map';
-// import 'core-js/es6/set';
-
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
-// import 'classlist.js';  // Run `npm install --save classlist.js`.
-
-/** IE10 and IE11 requires the following to support `@angular/animation`. */
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
-
-/** Evergreen browsers require these. **/
-// import 'core-js/es6/reflect';
-
-
-/** ALL Firefox browsers require the following to support `@angular/animation`. **/
-import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+ */  // Run `npm install --save web-animations-js`.



 /***************************************************************************************************
 * Zone JS is required by Angular itself.
 */
-import 'zone.js/dist/zone';  // Included with Angular CLI.
+import 'zone.js';  // Included with Angular CLI.



--- a/src/test.ts
+++ b/src/test.ts
@@ -22,7 +22,9 @@ __karma__.loaded = function () {};
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(), {
+    teardown: { destroyAfterEach: false }
+}
 );
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);