Fix lint

client/angular.json

@@ -161,7 +161,7 @@
       },
       "architect": {
         "build": {
-          "builder": "@angular/build:application",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
             "i18nMissingTranslation": "ignore",
             "localize": true,
@@ -171,7 +171,8 @@
             "index": "src/index.html",
             "tsConfig": "tsconfig.json",
             "polyfills": [
-              "src/polyfills.ts"
+              "src/polyfills.ts",
+              "@angular/localize/init"
             ],
             "baseHref": "/",
             "stylePreprocessorOptions": {
@@ -285,15 +286,12 @@
           }
         },
         "serve": {
-          "builder": "@angular/build:dev-server",
+          "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
             "proxyConfig": "proxy.config.json",
             "buildTarget": "PeerTube:build"
           },
           "configurations": {
-            "production": {
-              "buildTarget": "PeerTube:build:production"
-            },
             "hmr": {
               "buildTarget": "PeerTube:build:hmr"
             },
@@ -303,10 +301,7 @@
           }
         },
         "extract-i18n": {
-          "builder": "@angular/build:extract-i18n",
-          "options": {
-            "buildTarget": "PeerTube:build"
-          }
+          "builder": "@angular-devkit/build-angular:extract-i18n"
         },
         "lint": {
           "builder": "@angular-eslint/builder:lint",

client/package.json

@@ -33,6 +33,7 @@
   ],
   "typings": "*.d.ts",
   "devDependencies": {
+    "@angular-devkit/build-angular": "^18.0.6",
     "@angular-eslint/builder": "^18.0.1",
     "@angular-eslint/eslint-plugin": "^18.0.1",
     "@angular-eslint/eslint-plugin-template": "^18.0.1",

client/src/polyfills.ts

@@ -1,62 +1,4 @@
-/**
- * This file includes polyfills needed by Angular and is loaded before the app.
- * You can add your own extra polyfills to this file.
- *
- * This file is divided into 2 sections:
- *   1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
- *   2. Application imports. Files imported after ZoneJS that should be loaded before your main
- *      file.
- *
- * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
- * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
- * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
- *
- * Learn more in https://angular.io/guide/browser-support
- */
-
-/***************************************************************************************************
-* BROWSER POLYFILLS
-*/
-
-import 'core-js/es/object'
-import 'core-js/es/global-this'
-
-/** IE10 and IE11 requires the following for the Reflect API. */
-
-// For Google Bot
-// import 'core-js/es6/reflect'; // --> dealt with in src/environment.ts
-
-/**
- * Evergreen browsers require these.
- */
-// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
-// import 'core-js/es7/reflect' // --> dealt with in src/environment.ts
-
-/**
- * By default, zone.js will patch all possible macroTask and DomEvents
- * user can disable parts of macroTask/DomEvents patch by setting following flags
- */
-
-// (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
-// (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
-// (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
-/*
-* in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
-* with the following flag, it will bypass `zone.js` patch for IE/Edge
-*/
-// (window as any).__Zone_enable_cross_context_check = true;
-
-/***************************************************************************************************
- * Zone JS is required by default for Angular itself.
- */
-/* eslint-disable */
-import 'zone.js'  // Included with Angular CLI.
-
-/***************************************************************************************************
- * APPLICATION IMPORTS
- */
-
-// global/process polyfills
+import 'zone.js'
 
 ;(window as any).global = window
 ;(window as any).process = require('process/')

client/src/sass/include/_bootstrap-variables.scss

@@ -1,3 +1,5 @@
+@use 'sass:map';
+
 @use '_variables' as *;
 
 $modal-footer-border-width: 0;
@@ -24,7 +26,7 @@ $grid-breakpoints: (
 );
 
 @function breakpoint($label) {
-  @return map-get($grid-breakpoints, $label);
+  @return map.get($grid-breakpoints, $label);
 }
 
 $container-max-widths: (

client/src/sass/include/_mixins.scss

@@ -225,7 +225,7 @@
   $color: color.adjust($color: #c54130, $lightness: 10%);
   $text: #fff6f5;
 
-  @include button-focus(scale-color($color, $alpha: -95%));
+  @include button-focus(color.scale($color, $alpha: -95%));
 
   background-color: $color;
   color: $text;

client/src/sass/include/_variables.scss

@@ -1,5 +1,6 @@
 @use 'sass:math';
 @use 'sass:color';
+@use 'sass:map';
 
 $small-view: 800px;
 $mobile-view: 500px;
@@ -154,8 +155,8 @@ $variables: (
 
 // SASS type check our CSS variables
 @function pvar($variable) {
-  @if map-has-key($variables, $variable) {
-    @return map-get($variables, $variable);
+  @if map.has-key($variables, $variable) {
+    @return map.get($variables, $variable);
   } @else {
     @error 'ERROR: Variable #{$variable} does not exist';
   }
@@ -182,5 +183,5 @@ $zindex: (
 );
 
 @function z($label) {
-  @return map-get($zindex, $label);
+  @return map.get($zindex, $label);
 }

scripts/dev/client.sh

@@ -20,5 +20,3 @@ else
     "$clientCommand" \
     "$serverCommand"
 fi
-
-