Merge pull request #7988 from Ocelot-Social-Community/7340-devopsweba…

…pp-depricated-warning-on-running-the-webapp refactor(webapp): migrate sass devisions
Ocelot-Social-Community · Oct 27, 2024 · 8df4330 · 8df4330
2 parents aec4236 + af85ef0
commit 8df4330
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 25 deletions.
diff --git a/webapp/components/Badges.vue b/webapp/components/Badges.vue
@@ -18,6 +18,7 @@ export default {
 </script>
 
 <style lang="scss">
+@use 'sass:math';
 .hc-badges {
   text-align: center;
   position: relative;
@@ -38,7 +39,7 @@ export default {
   $offset: $size * -0.2;
 
   &.hc-badges-dual {
-    padding-top: $size / 2 - 2;
+    padding-top: math.div($size, 2) - 2;
   }
 
   .hc-badge-container {
@@ -58,10 +59,10 @@ export default {
       margin-left: -6px;
     }
     &:first-child {
-      margin-left: -$size / 3;
+      margin-left: math.div(-$size, 3);
     }
     &:last-child {
-      margin-right: -$size / 3;
+      margin-right: math.div(-$size, 3);
     }
   }
 }

diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js
@@ -107,6 +107,7 @@ export default {
       '~assets/styles/imports/_branding.scss',
       '~assets/_new/styles/export.scss',
     ],
+    hoistUseStatements: true,
   },
 
   /*

diff --git a/webapp/package.json b/webapp/package.json
@@ -28,7 +28,7 @@
     "@nuxtjs/dotenv": "~1.4.1",
     "@nuxtjs/pwa": "^3.0.0-beta.20",
     "@nuxtjs/sentry": "^4.0.0",
-    "@nuxtjs/style-resources": "~1.0.0",
+    "@nuxtjs/style-resources": "~1.1.0",
     "accounting": "~0.4.1",
     "apollo-cache-inmemory": "~1.6.6",
     "apollo-client": "~2.6.10",

diff --git a/webapp/yarn.lock b/webapp/yarn.lock
@@ -3092,14 +3092,14 @@
     consola "^2.11.3"
     deepmerge "^4.2.2"
 
-"@nuxtjs/style-resources@~1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@nuxtjs/style-resources/-/style-resources-1.0.0.tgz#7c4d6be19d7f7cc5d687d689f2ab16c0b94773a1"
-  integrity sha512-tDRcC/pm8B0Kpxtzb/1/HOBkv3/kPD+2FiCiUBGMB7YriRud9OUPw1pnYCsAH9ftwpMJS4k4XOyUY8FCTk6OxA==
+"@nuxtjs/style-resources@~1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@nuxtjs/style-resources/-/style-resources-1.1.0.tgz#74f942cd984d992f903786cb8ed49a68c608dc2b"
+  integrity sha512-bgzKcNyfV+zdR0nrm27ESCxJ7L36AUFjdQZG9A15wQhZgsffx967ZnJ7PlbTGny1mGTCJWFKCDf8Zrhs9A/HFw==
   dependencies:
     consola "^2.4.0"
     glob-all "^3.1.0"
-    sass-resources-loader "^2.0.0"
+    sass-resources-loader "^2.2.1"
 
 "@nuxtjs/youch@^4.2.3":
   version "4.2.3"
@@ -6007,12 +6007,10 @@ async-validator@^3.2.4:
   resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-3.2.4.tgz#4e773a1d0d741016b455b7995b469a47cce0dbe0"
   integrity sha512-mTgzMJixkrh+5t2gbYoua8MLy11GHkQqFE6tbhY5Aqc4jEDGsR4BWP+sVQiYDHtzTMB8WIwI/ypObTVPcTZInw==
 
-async@^2.1.4:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
-  integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
-  dependencies:
-    lodash "^4.17.11"
+async@^3.2.3:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
+  integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -10232,7 +10230,7 @@ glob@^10.0.0:
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
     path-scurry "^1.10.1"
 
-glob@^7.0.0, glob@^7.0.5, glob@^7.1.1, glob@^7.1.6, glob@~7.1.1:
+glob@^7.0.0, glob@^7.0.5, glob@^7.1.6, glob@~7.1.1:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -12608,7 +12606,7 @@ loader-utils@^0.2.16:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@^1.0.2, loader-utils@^1.0.4, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
+loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
   integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
@@ -16782,15 +16780,15 @@ sass-loader@~10.1.1:
     schema-utils "^3.0.0"
     semver "^7.3.2"
 
-sass-resources-loader@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/sass-resources-loader/-/sass-resources-loader-2.0.0.tgz#88569c542fbf1f18f33a6578b77cc5b36c56911d"
-  integrity sha512-I+5FfV+Hb29U5Nt8DbslWOBgRmTv1M/EwOn4/4rc6Aqy9yjygoa8UTnyCFXfTZV8FoQyIBZbEyKSBryhByqQbA==
+sass-resources-loader@^2.2.1:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/sass-resources-loader/-/sass-resources-loader-2.2.5.tgz#75131cdb26bae51fcffc007d8155d57b5e825ca7"
+  integrity sha512-po8rfETH9cOQACWxubT/1CCu77KjxwRtCDm6QAXZH99aUHBydwSoxdIjC40SGp/dcS/FkSNJl0j1VEojGZqlvQ==
   dependencies:
-    async "^2.1.4"
-    chalk "^1.1.3"
-    glob "^7.1.1"
-    loader-utils "^1.0.4"
+    async "^3.2.3"
+    chalk "^4.1.0"
+    glob "^7.1.6"
+    loader-utils "^2.0.0"
 
 sass@^1.75.0:
   version "1.75.0"
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,6 +107,7 @@ export default { @@
           '~assets/styles/imports/_branding.scss',
           '~assets/_new/styles/export.scss',
         ],
+        hoistUseStatements: true,
       },
       /*
@@ Expand Down @@