Revise npm dependencies and grunt scripts

globaleaks · May 15, 2024 · 573621a · 573621a
1 parent 206a9a2
commit 573621a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 97 deletions.
diff --git a/client/Gruntfile.js b/client/Gruntfile.js
@@ -433,8 +433,6 @@ module.exports = function(grunt) {
     },
   });
 
-  grunt.loadNpmTasks("@lodder/grunt-postcss");
-  grunt.loadNpmTasks("grunt-angular-templates");
   grunt.loadNpmTasks("grunt-confirm");
   grunt.loadNpmTasks("grunt-contrib-clean");
   grunt.loadNpmTasks("grunt-contrib-concat");

diff --git a/client/angular.json b/client/angular.json
@@ -43,7 +43,6 @@
               "app/css/bootstrap-fixes.css",
               "node_modules/ng-multiselect-dropdown/themes/ng-multiselect-dropdown.theme.scss",
               "node_modules/@ng-select/ng-select/themes/default.theme.css",
-              "node_modules/font-awesome/css/font-awesome.css",
               "node_modules/@fortawesome/fontawesome-free/css/fontawesome.css",
               "app/assets/lib/webfonts/@fontawesome/fontawesome-all.css",
               "app/assets/lib/webfonts/@fontsource/fontsource-all.css"
@@ -56,58 +55,9 @@
               "customWebpackConfig": {
                 "path": "./build.config.ts"
               }
-            },
-            "development": {
-              "optimization": false,
-              "vendorChunk": true,
-              "extractLicenses": false,
-              "sourceMap": true,
-              "namedChunks": true
-            },
-            "testing": {
-              "extractLicenses": false,
-              "vendorChunk": true,
-              "customWebpackConfig": {
-                "path": "./cypress/test.config.ts"
-              },
-              "styles": [
-                "app/css/components/switch.css",
-                "app/css/components/select.css",
-                "app/css/components/date-picker.css",
-                "app/css/main.css",
-                "app/css/components/loader.css",
-                "app/css/components/button.css",
-                "app/css/components/ng-select.css",
-                "app/css/bootstrap-fixes.css",
-                "node_modules/ng-multiselect-dropdown/themes/ng-multiselect-dropdown.theme.scss",
-                "node_modules/@ng-select/ng-select/themes/default.theme.css",
-                "node_modules/font-awesome/css/font-awesome.css",
-                "node_modules/@fortawesome/fontawesome-free/css/fontawesome.css",
-                "app/assets/lib/webfonts/@fontawesome/fontawesome-all.css",
-                "app/assets/lib/webfonts/@fontsource/fontsource-all.css",
-                "app/css/test.css"
-              ]
             }
           },
           "defaultConfiguration": "production"
-        },
-        "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
-          "configurations": {
-            "production": {
-              "buildTarget": "Globaleaks:build:production"
-            },
-            "development": {
-              "buildTarget": "Globaleaks:build:development"
-            }
-          },
-          "defaultConfiguration": "development"
-        },
-        "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
-          "options": {
-            "buildTarget": "Globaleaks:build"
-          }
         }
       }
     }

diff --git a/client/cypress/test.config.ts b/client/cypress/test.config.ts
diff --git a/client/package.json b/client/package.json
@@ -2,10 +2,7 @@
   "name": "globaleaks",
   "version": "4.14.8",
   "scripts": {
-    "proxy": "ng serve --proxy-config proxy.conf.json",
-    "e2e:coverage": "npx nyc report --reporter=lcov --report-dir=./cypress/coverage --reporter=text-summary --browser electron",
-    "test": "npx cypress run && npm run e2e:coverage",
-    "test_local": "grunt test_build && npx cypress run && npm run e2e:coverage"
+    "test": "npx cypress run && npx nyc report --reporter=lcov --report-dir=./cypress/coverage --reporter=text-summary --browser electron"
   },
   "private": true,
   "dependencies": {
@@ -39,40 +36,34 @@
     "@fontsource/noto-sans-thai": "5.0.14",
     "@fontsource/noto-serif-tibetan": "5.0.13",
     "@fortawesome/fontawesome-free": "6.5.2",
-    "@lodder/grunt-postcss": "3.1.1",
     "@ng-bootstrap/ng-bootstrap": "16.0.0",
     "@ng-idle/core": "14.0.0",
     "@ng-idle/keepalive": "14.0.0",
     "@ng-select/ng-select": "12.0.7",
     "@ngx-translate/core": "15.0.0",
     "@ngx-translate/http-loader": "8.0.0",
     "@popperjs/core": "2.11.8",
-    "angular2-qrcode": "2.0.3",
     "angularx-qrcode": "17.0.1",
     "bootstrap": "5.3.3",
     "chart.js": "4.4.2",
-    "font-awesome": "4.7.0",
     "gettext-parser": "7.0.1",
-    "grunt-angular-templates": "1.2.0",
     "grunt-confirm": "1.0.8",
     "grunt-contrib-clean": "2.0.1",
     "grunt-contrib-copy": "1.0.0",
     "grunt-shell": "4.0.0",
     "grunt-string-replace": "1.3.3",
-    "grunt-stylelint": "0.20.0",
     "gruntify-eslint": "5.0.0",
     "load-grunt-tasks": "5.1.0",
     "lodash": "4.17.21",
     "marked": "12.0.2",
     "ng-multiselect-dropdown": "1.0.0",
     "ng2-charts": "6.0.1",
     "ng2-select": "2.0.0",
+    "ngx-clipboard": "^16.0.0",
     "ngx-markdown": "17.2.1",
     "ngx-order-pipe": "2.2.0",
-    "ngx-qrcode": "0.1.0-rc.1",
     "node-gettext": "3.0.0",
     "npm-check-updates": "^16.14.20",
-    "postcss-rtl": "2.0.0",
     "rxjs": "7.8.1",
     "superagent": "9.0.2",
     "tslib": "2.6.2",
@@ -89,23 +80,18 @@
     "@cypress/code-coverage": "3.12.39",
     "@cypress/schematic": "2.5.1",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
-    "@jsdevtools/coverage-istanbul-loader": "3.0.5",
     "@types/angular": "1.8.9",
     "@types/flowjs__flow.js": "2.13.3",
     "@types/lodash": "4.17.1",
-    "@types/marked": "6.0.0",
-    "@types/qrcode": "1.5.5",
     "@typescript-eslint/eslint-plugin": "7.9.0",
     "cypress": "13.9.0",
     "grunt": "1.6.1",
     "grunt-contrib-concat": "2.1.0",
-    "istanbul-api": "3.0.0",
-    "istanbul-lib-coverage": "3.2.2",
-    "istanbul-reports": "3.1.7",
-    "ngx-clipboard": "16.0.0",
+    "grunt-stylelint": "0.20.0",
     "nyc": "15.1.0",
+    "stylelint": "16.5.0",
+    "stylelint-config-standard": "36.0.0",
     "ts-node": "10.9.2",
-    "webpack": "5.91.0",
-    "webpack-cli": "5.1.4"
+    "webpack-dev-server": "^5.0.4"
   }
 }