Migrate /base to use @use (#10896)

NOTE: when a module is already loaded, it can not later be loaded with configuration
mozilla · Feb 4, 2025 · b348876 · b348876
1 parent 639a535
commit b348876
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 21 deletions.
diff --git a/media/css/base/banners/firefox-app-store.scss b/media/css/base/banners/firefox-app-store.scss
@@ -2,10 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-$font-path: '/media/protocol/fonts';
-$image-path: '/media/protocol/img';
-
-@import '~@mozilla-protocol/core/protocol/css/includes/lib';
+@use '~@mozilla-protocol/core/protocol/css/includes/lib' as * with ($font-path: '/media/protocol/fonts', $image-path: '/media/protocol/img');
 
 #firefox-app-store-banner {
     font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';

diff --git a/media/css/base/banners/includes/_base.scss b/media/css/base/banners/includes/_base.scss
@@ -2,10 +2,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-$font-path: '/media/protocol/fonts';
-$image-path: '/media/protocol/img';
-
-@import '~@mozilla-protocol/core/protocol/css/includes/lib';
+// NOTE: config must be handled by file @use-ing this includes file
+@use '~@mozilla-protocol/core/protocol/css/includes/lib' as *;
 
 .c-banner {
     @include clearfix;

diff --git a/media/css/base/banners/includes/_basic.scss b/media/css/base/banners/includes/_basic.scss
@@ -2,10 +2,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-$font-path: '/media/protocol/fonts';
-$image-path: '/media/protocol/img';
-
-@import '~@mozilla-protocol/core/protocol/css/includes/lib';
+// NOTE: config must be handled by file @use-ing this includes file
+@use '~@mozilla-protocol/core/protocol/css/includes/lib' as *;
 
 .c-banner {
     @include clearfix;

diff --git a/media/css/base/page-not-found.scss b/media/css/base/page-not-found.scss
@@ -2,10 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-@import '~@mozilla-protocol/core/protocol/css/includes/lib';
-
-$font-path: '/media/protocol/fonts';
-$image-path: '/media/protocol/img';
+@use '~@mozilla-protocol/core/protocol/css/includes/lib' as *;
 
 .page-header {
     .mzp-l-content {

diff --git a/media/css/mozorg/home/includes/monitor-banner.scss b/media/css/mozorg/home/includes/monitor-banner.scss
@@ -2,11 +2,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-$font-path: '/media/protocol/fonts';
-$image-path: '/media/protocol/img';
-
-@import '~@mozilla-protocol/core/protocol/css/includes/lib';
-@import '../../../base/banners/includes/basic';
+@use '~@mozilla-protocol/core/protocol/css/includes/lib' as * with ($font-path: '/media/protocol/fonts', $image-path: '/media/protocol/img');
+@use '../../../base/banners/includes/basic';
 
 $gradient: to right,
 rgba(229, 63, 176, 0.15) 0%,