From bbbbe71bc426bafb13bd8437cee7b8ef69b0e575 Mon Sep 17 00:00:00 2001 From: Gaetan Craig-Riou Date: Wed, 17 Dec 2025 14:42:15 +1100 Subject: [PATCH] Remove deprecated `~`prefix https://github.com/webpack/sass-loader/blob/main/README.md#the-style-new-api-by-default-since-16-version-and-outputstyle-old-api-options-in-production-mode --- app/webpacker/css/admin_v3/all.scss | 17 ++++++++--------- app/webpacker/css/darkswarm/all.scss | 2 +- app/webpacker/css/darkswarm/variables.scss | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/webpacker/css/admin_v3/all.scss b/app/webpacker/css/admin_v3/all.scss index 3393a90cbb..6e0d8da2aa 100644 --- a/app/webpacker/css/admin_v3/all.scss +++ b/app/webpacker/css/admin_v3/all.scss @@ -2,20 +2,19 @@ // While in feature-toggle, we inherit all files from old admin design. // Individual files may be copied in order to replace the old files. -// TODO remove ~ @import "assets/stylesheets/normalize"; @import "assets/stylesheets/responsive-tables"; @import "assets/stylesheets/jquery.powertip"; -@import "~jquery-ui/themes/base/core"; -@import "~jquery-ui/themes/base/button"; -@import "~jquery-ui/themes/base/resizable"; +@import "jquery-ui/themes/base/core"; +@import "jquery-ui/themes/base/button"; +@import "jquery-ui/themes/base/resizable"; @import "assets/stylesheets/jquery-ui-theme"; -@import "~jquery-ui/themes/base/dialog"; +@import "jquery-ui/themes/base/dialog"; @import "../shared/ng-tags-input.min"; @import "assets/stylesheets/select2"; -@import "~flatpickr/dist/flatpickr"; -@import "~flatpickr/dist/themes/material_blue"; -@import "~shortcut-buttons-flatpickr/dist/themes/light"; +@import "flatpickr/dist/flatpickr"; +@import "flatpickr/dist/themes/material_blue"; +@import "shortcut-buttons-flatpickr/dist/themes/light"; @import "../admin/globals/functions"; @import "globals/palette"; // admin_v3 @@ -124,7 +123,7 @@ @import "shared/question-mark-icon"; @import "../admin/question-mark-tooltip"; -@import "~tom-select/src/scss/tom-select.default"; +@import "tom-select/src/scss/tom-select.default"; @import "components/tom_select"; // admin_v3 @import "modal_component/modal_component"; diff --git a/app/webpacker/css/darkswarm/all.scss b/app/webpacker/css/darkswarm/all.scss index d0b9a4d70e..b9ea99065b 100644 --- a/app/webpacker/css/darkswarm/all.scss +++ b/app/webpacker/css/darkswarm/all.scss @@ -4,7 +4,7 @@ @import 'variables'; @import '../shared/variables/layout'; @import '../shared/utilities'; -@import '~foundation-sites/scss/foundation'; +@import 'foundation-sites/scss/foundation'; @import 'big-input'; @import 'branding'; diff --git a/app/webpacker/css/darkswarm/variables.scss b/app/webpacker/css/darkswarm/variables.scss index 28d7df1a25..1eea3e3ad7 100644 --- a/app/webpacker/css/darkswarm/variables.scss +++ b/app/webpacker/css/darkswarm/variables.scss @@ -1,4 +1,4 @@ -@import "~foundation-sites/scss/foundation/components/global"; +@import "foundation-sites/scss/foundation/components/global"; // Brand guide colours: // International: #81c26e