Fix Sass deprecation warning import

MathieuMatiques · MathieuMatiques · commit b2ebcfa799bb · 2026-01-12T17:34:01.000-08:00
diff --git a/src/css/common.scss b/src/css/common.scss
@@ -1,3 +1,7 @@
+@use "mixins" as *;
+@use "ui_resource" as *;
+@use "variables" as *;
+
 @use "sass:color";
 
 // Common classes and style
diff --git a/src/css/game_state.scss b/src/css/game_state.scss
@@ -1,3 +1,5 @@
+@use "variables" as *;
+
 $gameStateTransition: 0.2s ease-out;
 
 @mixin StateAnim($properties...) {
diff --git a/src/css/ingame_hud/beta_overlay.scss b/src/css/ingame_hud/beta_overlay.scss
@@ -1,3 +1,5 @@
+@use "../variables" as *;
+
 #ingame_HUD_BetaOverlay {
     position: fixed;
     top: 7rem;
diff --git a/src/css/ingame_hud/blueprint_placer.scss b/src/css/ingame_hud/blueprint_placer.scss
@@ -1,3 +1,5 @@
+@use "../variables" as *;
+
 #ingame_HUD_BlueprintPlacer {
     position: absolute;
     top: 7rem;
diff --git a/src/css/ingame_hud/building_placer.scss b/src/css/ingame_hud/building_placer.scss
@@ -1,3 +1,6 @@
+@use "../mixins" as *;
+@use "../variables" as *;
+
 @use "sass:color";
 
 #ingame_HUD_PlacementHints {
diff --git a/src/css/ingame_hud/buildings_toolbar.scss b/src/css/ingame_hud/buildings_toolbar.scss
@@ -1,3 +1,7 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 @use "sass:color";
 
 .ingame_buildingsToolbar {
diff --git a/src/css/ingame_hud/color_blind_helper.scss b/src/css/ingame_hud/color_blind_helper.scss
@@ -1,3 +1,6 @@
+@use "../mixins" as *;
+@use "../variables" as *;
+
 #ingame_HUD_ColorBlindBelowTileHelper {
     position: absolute;
 
diff --git a/src/css/ingame_hud/dialogs.scss b/src/css/ingame_hud/dialogs.scss
@@ -1,3 +1,7 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 @use "sass:color";
 
 .ingameDialog {
diff --git a/src/css/ingame_hud/entity_debugger.scss b/src/css/ingame_hud/entity_debugger.scss
@@ -1,3 +1,5 @@
+@use "../variables" as *;
+
 #ingame_HUD_EntityDebugger {
     position: absolute;
     background: $ingameHudBg;
diff --git a/src/css/ingame_hud/game_menu.scss b/src/css/ingame_hud/game_menu.scss
@@ -1,3 +1,7 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 #ingame_HUD_GameMenu {
     position: absolute;
     top: 1rem;
diff --git a/src/css/ingame_hud/interactive_tutorial.scss b/src/css/ingame_hud/interactive_tutorial.scss
@@ -1,3 +1,6 @@
+@use "../mixins" as *;
+@use "../variables" as *;
+
 #ingame_HUD_InteractiveTutorial {
     position: absolute;
     left: 1rem;
diff --git a/src/css/ingame_hud/keybindings_overlay.scss b/src/css/ingame_hud/keybindings_overlay.scss
@@ -1,3 +1,7 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 #ingame_HUD_KeybindingOverlay {
     position: absolute;
     top: 1rem;
diff --git a/src/css/ingame_hud/notifications.scss b/src/css/ingame_hud/notifications.scss
@@ -1,3 +1,6 @@
+@use "../mixins" as *;
+@use "../variables" as *;
+
 #ingame_HUD_Notifications {
     position: absolute;
     bottom: 6rem;
diff --git a/src/css/ingame_hud/pinned_shapes.scss b/src/css/ingame_hud/pinned_shapes.scss
@@ -1,3 +1,7 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 #ingame_HUD_PinnedShapes {
     position: absolute;
     left: 0.9rem;
diff --git a/src/css/ingame_hud/puzzle_back_to_menu.scss b/src/css/ingame_hud/puzzle_back_to_menu.scss
@@ -1,3 +1,7 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 #ingame_HUD_PuzzleBackToMenu {
     position: absolute;
     top: 1rem;
diff --git a/src/css/ingame_hud/puzzle_complete_notification.scss b/src/css/ingame_hud/puzzle_complete_notification.scss
@@ -1,3 +1,7 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 #ingame_HUD_PuzzleCompleteNotification {
     position: absolute;
     top: 0;
diff --git a/src/css/ingame_hud/puzzle_dlc_logo.scss b/src/css/ingame_hud/puzzle_dlc_logo.scss
@@ -1,3 +1,6 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+
 #ingame_HUD_PuzzleDLCLogo {
     position: absolute;
     width: 12rem;
diff --git a/src/css/ingame_hud/puzzle_editor_controls.scss b/src/css/ingame_hud/puzzle_editor_controls.scss
@@ -1,3 +1,6 @@
+@use "../mixins" as *;
+@use "../variables" as *;
+
 #ingame_HUD_PuzzleEditorControls {
     position: absolute;
 
diff --git a/src/css/ingame_hud/puzzle_editor_review.scss b/src/css/ingame_hud/puzzle_editor_review.scss
@@ -1,3 +1,7 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 #ingame_HUD_PuzzleEditorReview {
     position: absolute;
     top: 1.7rem;
diff --git a/src/css/ingame_hud/puzzle_editor_settings.scss b/src/css/ingame_hud/puzzle_editor_settings.scss
@@ -1,3 +1,5 @@
+@use "../variables" as *;
+
 #ingame_HUD_PuzzleEditorSettings {
     position: absolute;
     background: $ingameHudBg;
diff --git a/src/css/ingame_hud/puzzle_next.scss b/src/css/ingame_hud/puzzle_next.scss
@@ -1,3 +1,7 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 #ingame_HUD_PuzzleNextPuzzle {
     position: absolute;
     top: 1.7rem;
diff --git a/src/css/ingame_hud/puzzle_play_metadata.scss b/src/css/ingame_hud/puzzle_play_metadata.scss
@@ -1,3 +1,7 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 @use "sass:color";
 
 #ingame_HUD_PuzzlePlayMetadata {
diff --git a/src/css/ingame_hud/puzzle_play_settings.scss b/src/css/ingame_hud/puzzle_play_settings.scss
@@ -1,3 +1,5 @@
+@use "../variables" as *;
+
 #ingame_HUD_PuzzlePlaySettings {
     position: absolute;
     background: $ingameHudBg;
diff --git a/src/css/ingame_hud/sandbox_controller.scss b/src/css/ingame_hud/sandbox_controller.scss
@@ -1,3 +1,5 @@
+@use "../variables" as *;
+
 #ingame_HUD_SandboxController {
     position: absolute;
     background: $ingameHudBg;
diff --git a/src/css/ingame_hud/settings_menu.scss b/src/css/ingame_hud/settings_menu.scss
@@ -1,3 +1,6 @@
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 #ingame_HUD_SettingsMenu {
     .statsElement {
         position: absolute;
diff --git a/src/css/ingame_hud/shape_viewer.scss b/src/css/ingame_hud/shape_viewer.scss
@@ -1,3 +1,6 @@
+@use "../mixins" as *;
+@use "../variables" as *;
+
 @use "sass:math";
 
 #ingame_HUD_ShapeViewer {
diff --git a/src/css/ingame_hud/shop.scss b/src/css/ingame_hud/shop.scss
@@ -1,3 +1,7 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 @use "sass:color";
 
 #ingame_HUD_Shop {
diff --git a/src/css/ingame_hud/statistics.scss b/src/css/ingame_hud/statistics.scss
@@ -1,3 +1,7 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 @use "sass:color";
 
 #ingame_HUD_Statistics {
diff --git a/src/css/ingame_hud/tutorial_hints.scss b/src/css/ingame_hud/tutorial_hints.scss
@@ -1,3 +1,7 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 #ingame_HUD_TutorialHints {
     position: absolute;
     left: 1rem;
diff --git a/src/css/ingame_hud/unlock_notification.scss b/src/css/ingame_hud/unlock_notification.scss
@@ -1,3 +1,7 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 #ingame_HUD_UnlockNotification {
     position: absolute;
     top: 0;
diff --git a/src/css/ingame_hud/vignette_overlay.scss b/src/css/ingame_hud/vignette_overlay.scss
@@ -1,3 +1,6 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+
 #ingame_VignetteOverlay {
     position: absolute;
     top: 0;
diff --git a/src/css/ingame_hud/waypoints.scss b/src/css/ingame_hud/waypoints.scss
@@ -1,3 +1,7 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 #ingame_HUD_Waypoints_Hint {
     position: absolute;
     right: 1rem;
diff --git a/src/css/main.scss b/src/css/main.scss
@@ -1,63 +1,51 @@
-@use "sass:string";
+@use "resources";
 
-// Control here whether to inline all resources or instead load them
-@function uiResource($pth) {
-    @if (string.index($string: $pth, $substring: ".noinline")) {
-        @return resolve($pth);
-    }
-    @return inline($pth);
-}
-
-@import "resources";
-@import "variables";
-
-@import "mixins";
-@import "common";
-@import "game_state";
-@import "textual_game_state";
-@import "error_handler";
+@use "common";
+@use "game_state";
+@use "textual_game_state";
+@use "error_handler";
 
-@import "states/preload";
-@import "states/main_menu";
-@import "states/ingame";
-@import "states/keybindings";
-@import "states/settings";
-@import "states/about";
-@import "states/changelog";
-@import "states/puzzle_menu";
-@import "states/mods";
+@use "states/preload";
+@use "states/main_menu";
+@use "states/ingame";
+@use "states/keybindings";
+@use "states/settings";
+@use "states/about";
+@use "states/changelog";
+@use "states/puzzle_menu";
+@use "states/mods";
 
-@import "ingame_hud/buildings_toolbar";
-@import "ingame_hud/building_placer";
-@import "ingame_hud/beta_overlay";
-@import "ingame_hud/keybindings_overlay";
-@import "ingame_hud/unlock_notification";
-@import "ingame_hud/shop";
-@import "ingame_hud/game_menu";
-@import "ingame_hud/dialogs";
-@import "ingame_hud/vignette_overlay";
-@import "ingame_hud/statistics";
-@import "ingame_hud/pinned_shapes";
-@import "ingame_hud/notifications";
-@import "ingame_hud/settings_menu";
-@import "ingame_hud/debug_info";
-@import "ingame_hud/entity_debugger";
-@import "ingame_hud/tutorial_hints";
-@import "ingame_hud/blueprint_placer";
-@import "ingame_hud/waypoints";
-@import "ingame_hud/interactive_tutorial";
-@import "ingame_hud/color_blind_helper";
-@import "ingame_hud/shape_viewer";
-@import "ingame_hud/sandbox_controller";
-@import "ingame_hud/puzzle_back_to_menu";
-@import "ingame_hud/puzzle_editor_review";
-@import "ingame_hud/puzzle_dlc_logo";
-@import "ingame_hud/puzzle_editor_controls";
-@import "ingame_hud/puzzle_editor_settings";
-@import "ingame_hud/puzzle_play_settings";
-@import "ingame_hud/puzzle_play_metadata";
-@import "ingame_hud/puzzle_complete_notification";
-@import "ingame_hud/puzzle_next";
+@use "ingame_hud/buildings_toolbar";
+@use "ingame_hud/building_placer";
+@use "ingame_hud/beta_overlay";
+@use "ingame_hud/keybindings_overlay";
+@use "ingame_hud/unlock_notification";
+@use "ingame_hud/shop";
+@use "ingame_hud/game_menu";
+@use "ingame_hud/dialogs";
+@use "ingame_hud/vignette_overlay";
+@use "ingame_hud/statistics";
+@use "ingame_hud/pinned_shapes";
+@use "ingame_hud/notifications";
+@use "ingame_hud/settings_menu";
+@use "ingame_hud/debug_info";
+@use "ingame_hud/entity_debugger";
+@use "ingame_hud/tutorial_hints";
+@use "ingame_hud/blueprint_placer";
+@use "ingame_hud/waypoints";
+@use "ingame_hud/interactive_tutorial";
+@use "ingame_hud/color_blind_helper";
+@use "ingame_hud/shape_viewer";
+@use "ingame_hud/sandbox_controller";
+@use "ingame_hud/puzzle_back_to_menu";
+@use "ingame_hud/puzzle_editor_review";
+@use "ingame_hud/puzzle_dlc_logo";
+@use "ingame_hud/puzzle_editor_controls";
+@use "ingame_hud/puzzle_editor_settings";
+@use "ingame_hud/puzzle_play_settings";
+@use "ingame_hud/puzzle_play_metadata";
+@use "ingame_hud/puzzle_complete_notification";
+@use "ingame_hud/puzzle_next";
 
 // prettier-ignore
 $elements:
diff --git a/src/css/resources.scss b/src/css/resources.scss
@@ -1,3 +1,5 @@
+@use "ui_resource" as *;
+
 $buildings: belt, cutter, miner, mixer, painter, rotator, balancer, stacker, trash, underground_belt, wire,
     constant_signal, logic_gate, lever, filter, wire_tunnel, display, virtual_processor, reader, storage,
     transistor, analyzer, comparator, item_producer, constant_producer, goal_acceptor, block;
diff --git a/src/css/states/about.scss b/src/css/states/about.scss
@@ -1,3 +1,5 @@
+@use "../variables" as *;
+
 #state_AboutState {
     > .container .content {
         max-width: 60rem;
diff --git a/src/css/states/changelog.scss b/src/css/states/changelog.scss
@@ -1,3 +1,5 @@
+@use "../variables" as *;
+
 #state_ChangelogState {
     .content {
         max-width: 80rem;
diff --git a/src/css/states/ingame.scss b/src/css/states/ingame.scss
@@ -1,3 +1,6 @@
+@use "../mixins" as *;
+@use "../variables" as *;
+
 @use "sass:color";
 
 #state_InGameState {
diff --git a/src/css/states/keybindings.scss b/src/css/states/keybindings.scss
@@ -1,3 +1,7 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 @use "sass:color";
 
 #state_KeybindingsState {
diff --git a/src/css/states/main_menu.scss b/src/css/states/main_menu.scss
@@ -1,3 +1,7 @@
+@use "../mixins" as *;
+@use "../ui_resource" as *;
+@use "../variables" as *;
+
 @use "sass:color";
 
 #state_MainMenuState {
diff --git a/src/css/states/mods.scss b/src/css/states/mods.scss
@@ -1,3 +1,6 @@
+@use "../mixins" as *;
+@use "../variables" as *;
+
 @use "sass:color";
 
 #state_ModsState {
diff --git a/src/css/states/preload.scss b/src/css/states/preload.scss
@@ -1,3 +1,7 @@
+@use "../game_state" as *;
+@use "../mixins" as *;
+@use "../variables" as *;
+
 #state_PreloadState {
     .changelogDialogEntry {
         margin-top: 1rem;
diff --git a/src/css/states/puzzle_menu.scss b/src/css/states/puzzle_menu.scss
diff --git a/src/css/states/settings.scss b/src/css/states/settings.scss
diff --git a/src/css/textual_game_state.scss b/src/css/textual_game_state.scss
diff --git a/src/css/ui_resource.scss b/src/css/ui_resource.scss

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+@use "variables" as *;`
	`2`	`+`
`1`	`3`	`$gameStateTransition: 0.2s ease-out;`
`2`	`4`
`3`	`5`	`@mixin StateAnim($properties...) {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+@use "../variables" as *;`
	`2`	`+`
`1`	`3`	`#ingame_HUD_BetaOverlay {`
`2`	`4`	`position: fixed;`
`3`	`5`	`top: 7rem;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+@use "../variables" as *;`
	`2`	`+`
`1`	`3`	`#ingame_HUD_BlueprintPlacer {`
`2`	`4`	`position: absolute;`
`3`	`5`	`top: 7rem;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+@use "../variables" as *;`
	`2`	`+`
`1`	`3`	`#ingame_HUD_EntityDebugger {`
`2`	`4`	`position: absolute;`
`3`	`5`	`background: $ingameHudBg;`