diff --git a/frontend/app/package.json b/frontend/app/package.json index ee5dc639..c6aa63d5 100644 --- a/frontend/app/package.json +++ b/frontend/app/package.json @@ -14,9 +14,7 @@ "Thea Schöbl " ], "scripts": { - "analyze": "webpack-bundle-analyzer www/stats.json", - "build": "pnpm check-icons && ng build --configuration=production --stats-json && webpack-bundle-analyzer www/stats.json --mode static --report www/bundle-info.html --no-open", - "build:analyze": "npm run build:stats && npm run analyze", + "build": "pnpm check-icons && ng build --configuration=production --stats-json", "build:android": "ionic capacitor build android --no-open && cd android && ./gradlew clean assemble && cd ..", "build:prod": "ng build --configuration=production", "build:stats": "ng build --configuration=production --stats-json", @@ -177,8 +175,7 @@ "stylelint-config-standard-scss": "13.0.0", "surge": "0.23.1", "ts-node": "10.9.2", - "typescript": "5.4.2", - "webpack-bundle-analyzer": "4.10.1" + "typescript": "5.4.2" }, "cordova": { "plugins": {}, diff --git a/frontend/app/src/theme/util/_color-system.scss b/frontend/app/src/theme/util/_color-system.scss index 52f42be6..71494bd8 100644 --- a/frontend/app/src/theme/util/_color-system.scss +++ b/frontend/app/src/theme/util/_color-system.scss @@ -18,15 +18,15 @@ @import './dark'; @function to-rgb($color) { - @return red($color) + ',' + green($color) + ',' + blue($color); + @return color.red($color) + ',' + color.green($color) + ',' + color.blue($color); } @function to-shade($color) { - @return darken($color, $shade-amount); + @return color.adjust($color, $lightness: -$shade-amount); } @function to-tint($color) { - @return lighten($color, $tint-amount); + @return color.adjust($color, $lightness: $tint-amount); } @function to-contrast($color) { @@ -35,7 +35,11 @@ } @function fade($color, $amount) { - @return if(lightness($color) > $fade-threshold, darken($color, $amount), lighten($color, $amount)); + @return if( + color.lightness($color) > $fade-threshold, + color.adjust($color, $lightness: -$amount), + color.adjust($color, $lightness: $amount) + ); } @function map-range($value, $input-min, $input-max, $output-min, $output-max) { @@ -44,9 +48,9 @@ @function interpolate-colors($from, $to, $progress, $progress-min: 0, $progress-max: 100) { @return rgb( - map-range($progress, $progress-min, $progress-max, red($from), red($to)), - map-range($progress, $progress-min, $progress-max, green($from), green($to)), - map-range($progress, $progress-min, $progress-max, blue($from), blue($to)) + map-range($progress, $progress-min, $progress-max, color.red($from), color.red($to)), + map-range($progress, $progress-min, $progress-max, color.green($from), color.green($to)), + map-range($progress, $progress-min, $progress-max, color.blue($from), color.blue($to)) ); } diff --git a/packages/api-cli/package.json b/packages/api-cli/package.json index fded64f7..3c374382 100644 --- a/packages/api-cli/package.json +++ b/packages/api-cli/package.json @@ -43,7 +43,7 @@ "@types/cli-progress": "3.11.0", "@types/express": "4.17.17", "@types/fs-extra": "9.0.13", - "@types/json-schema": "7.0.11", + "@types/json-schema": "7.0.15", "@types/junit-report-builder": "3.0.0", "@types/mocha": "10.0.1", "@types/node": "18.15.3", diff --git a/packages/api-plugin/package.json b/packages/api-plugin/package.json index cc6f08e1..3cdfcc49 100644 --- a/packages/api-plugin/package.json +++ b/packages/api-plugin/package.json @@ -38,7 +38,7 @@ "@openstapps/logger": "workspace:*", "@types/body-parser": "1.19.2", "@types/express": "4.17.17", - "@types/json-schema": "7.0.11", + "@types/json-schema": "7.0.15", "@types/morgan": "1.9.4", "body-parser": "1.20.2", "express": "4.18.2", diff --git a/packages/core-tools/package.json b/packages/core-tools/package.json index 83097e51..a85b6a40 100644 --- a/packages/core-tools/package.json +++ b/packages/core-tools/package.json @@ -73,7 +73,7 @@ "@types/chai": "4.3.5", "@types/fs-extra": "9.0.13", "@types/glob": "8.1.0", - "@types/json-schema": "7.0.11", + "@types/json-schema": "7.0.15", "@types/mocha": "10.0.1", "@types/mustache": "4.2.2", "@types/node": "18.15.3", diff --git a/packages/core/package.json b/packages/core/package.json index f131d5af..e8e8a59b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -60,7 +60,7 @@ "@openstapps/tsconfig": "workspace:*", "@types/chai": "4.3.5", "@types/json-patch": "0.0.30", - "@types/json-schema": "7.0.11", + "@types/json-schema": "7.0.15", "@types/mocha": "10.0.1", "@types/node": "18.15.3", "c8": "7.14.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 128bbdf9..0947a135 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1074,9 +1074,6 @@ importers: typescript: specifier: 5.4.2 version: 5.4.2 - webpack-bundle-analyzer: - specifier: 4.10.1 - version: 4.10.1 images/app-builder: {} @@ -1213,8 +1210,8 @@ importers: specifier: 9.0.13 version: 9.0.13 '@types/json-schema': - specifier: 7.0.11 - version: 7.0.11 + specifier: 7.0.15 + version: 7.0.15 '@types/junit-report-builder': specifier: 3.0.0 version: 3.0.0 @@ -1313,8 +1310,8 @@ importers: specifier: 4.17.17 version: 4.17.17 '@types/json-schema': - specifier: 7.0.11 - version: 7.0.11 + specifier: 7.0.15 + version: 7.0.15 '@types/morgan': specifier: 1.9.4 version: 1.9.4 @@ -1522,8 +1519,8 @@ importers: specifier: 0.0.30 version: 0.0.30 '@types/json-schema': - specifier: 7.0.11 - version: 7.0.11 + specifier: 7.0.15 + version: 7.0.15 '@types/mocha': specifier: 10.0.1 version: 10.0.1 @@ -1667,8 +1664,8 @@ importers: specifier: 8.1.0 version: 8.1.0 '@types/json-schema': - specifier: 7.0.11 - version: 7.0.11 + specifier: 7.0.15 + version: 7.0.15 '@types/mocha': specifier: 10.0.1 version: 10.0.1 @@ -7471,10 +7468,6 @@ packages: engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} dev: true - /@polka/url@1.0.0-next.25: - resolution: {integrity: sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==} - dev: true - /@prettier/plugin-xml@2.2.0: resolution: {integrity: sha512-UWRmygBsyj4bVXvDiqSccwT1kmsorcwQwaIy30yVh8T+Gspx4OlC0shX1y+ZuwXZvgnafmpRYKks0bAu9urJew==} dependencies: @@ -8198,15 +8191,8 @@ packages: resolution: {integrity: sha512-MhCUjojzDhVLnZnxwPwa+rETFRDQ0ffjxYdrqOP6TBO2O0/Z64PV5tNeYApo4bc4y4frbWOrRwv/eEkXlI13Rw==} dev: true - /@types/json-schema@7.0.11: - resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==} - - /@types/json-schema@7.0.14: - resolution: {integrity: sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==} - /@types/json-schema@7.0.15: resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - dev: true /@types/jsonpath@0.2.0: resolution: {integrity: sha512-v7qlPA0VpKUlEdhghbDqRoKMxFB3h3Ch688TApBJ6v+XLDdvWCGLJIYiPKGZnS6MAOie+IorCfNYVHOPIHSWwQ==} @@ -8776,7 +8762,7 @@ packages: eslint: ^8.56.0 dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) - '@types/json-schema': 7.0.14 + '@types/json-schema': 7.0.15 '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 7.2.0 '@typescript-eslint/types': 7.2.0 @@ -8795,7 +8781,7 @@ packages: eslint: ^8.56.0 dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) - '@types/json-schema': 7.0.14 + '@types/json-schema': 7.0.15 '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 7.2.0 '@typescript-eslint/types': 7.2.0 @@ -10522,6 +10508,9 @@ packages: /commander@7.2.0: resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==} engines: {node: '>= 10'} + requiresBuild: true + dev: false + optional: true /commander@8.3.0: resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==} @@ -11576,10 +11565,6 @@ packages: /dayjs@1.11.11: resolution: {integrity: sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==} - /debounce@1.2.1: - resolution: {integrity: sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==} - dev: true - /debug@2.6.9: resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} peerDependencies: @@ -13793,13 +13778,6 @@ packages: resolution: {integrity: sha512-Y8T4vYhEfwJOTbouREvG+3XDsjr8E3kIr7uf+JZ0BYloFsttiHU0WfvANVsR7TxNUJa/WpCnw/Ino/p+DeBhBQ==} dev: false - /gzip-size@6.0.0: - resolution: {integrity: sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==} - engines: {node: '>=10'} - dependencies: - duplexer: 0.1.2 - dev: true - /hammerjs@2.0.8: resolution: {integrity: sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==} engines: {node: '>=0.8.0'} @@ -19446,15 +19424,6 @@ packages: supports-color: 7.2.0 dev: true - /sirv@2.0.4: - resolution: {integrity: sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==} - engines: {node: '>= 10'} - dependencies: - '@polka/url': 1.0.0-next.25 - mrmime: 2.0.0 - totalist: 3.0.1 - dev: true - /sisteransi@1.0.5: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} dev: true @@ -20692,11 +20661,6 @@ packages: resolution: {integrity: sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==} dev: false - /totalist@3.0.1: - resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==} - engines: {node: '>=6'} - dev: true - /touch@3.1.1: resolution: {integrity: sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==} hasBin: true @@ -20800,7 +20764,7 @@ packages: engines: {node: '>=10.0.0'} hasBin: true dependencies: - '@types/json-schema': 7.0.11 + '@types/json-schema': 7.0.15 commander: 9.5.0 glob: 8.1.0 json5: 2.2.3 @@ -21683,29 +21647,6 @@ packages: resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} dev: true - /webpack-bundle-analyzer@4.10.1: - resolution: {integrity: sha512-s3P7pgexgT/HTUSYgxJyn28A+99mmLq4HsJepMPzu0R8ImJc52QNqaFYW1Z2z2uIb1/J3eYgaAWVpaC+v/1aAQ==} - engines: {node: '>= 10.13.0'} - hasBin: true - dependencies: - '@discoveryjs/json-ext': 0.5.7 - acorn: 8.11.3 - acorn-walk: 8.3.2 - commander: 7.2.0 - debounce: 1.2.1 - escape-string-regexp: 4.0.0 - gzip-size: 6.0.0 - html-escaper: 2.0.2 - is-plain-object: 5.0.0 - opener: 1.5.2 - picocolors: 1.0.1 - sirv: 2.0.4 - ws: 7.5.9 - transitivePeerDependencies: - - bufferutil - - utf-8-validate - dev: true - /webpack-dev-middleware@7.2.1(webpack@5.91.0): resolution: {integrity: sha512-hRLz+jPQXo999Nx9fXVdKlg/aehsw1ajA9skAneGmT03xwmyuhvF93p6HUKKbWhXdcERtGTzUCtIQr+2IQegrA==} engines: {node: '>= 18.12.0'} @@ -22018,19 +21959,6 @@ packages: signal-exit: 4.1.0 dev: true - /ws@7.5.9: - resolution: {integrity: sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==} - engines: {node: '>=8.3.0'} - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ^5.0.2 - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - dev: true - /ws@8.11.0: resolution: {integrity: sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==} engines: {node: '>=10.0.0'}