Merge pull request #4396 from mozilla/Revert-PR-4314

MPP-3739: Revert PR #4314 Protocol SCSS version upgrade
mozilla · Feb 9, 2024 · 23083e0 · 23083e0
2 parents daee914 + 3792fce
commit 23083e0
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 39 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -21,7 +21,7 @@
     "@fluent/bundle": "^0.18.0",
     "@fluent/langneg": "^0.7.0",
     "@fluent/react": "^0.15.2",
-    "@mozilla-protocol/core": "^19.0.0",
+    "@mozilla-protocol/core": "^17.0.1",
     "@stripe/stripe-js": "^2.4.0",
     "chokidar-cli": "^3.0.0",
     "cldr-localenames-modern": "^44.1.0",

diff --git a/frontend/src/components/Banner.module.scss b/frontend/src/components/Banner.module.scss
@@ -1,6 +1,5 @@
-@use "~@mozilla-protocol/core/protocol/css/includes/forms" as *;
-
 @import "~@mozilla-protocol/core/protocol/css/includes/lib";
+@import "~@mozilla-protocol/core/protocol/css/includes/forms/lib";
 @import "../styles/tokens.scss";
 
 .banner {

diff --git a/frontend/src/components/Button.module.scss b/frontend/src/components/Button.module.scss
@@ -1,7 +1,6 @@
-@use "~@mozilla-protocol/core/protocol/css/includes/forms" as *;
-
 @import "../styles/tokens.scss";
 @import "~@mozilla-protocol/core/protocol/css/includes/mixins/typography";
+@import "~@mozilla-protocol/core/protocol/css/includes/forms/lib";
 
 .button {
   display: inline-flex;

diff --git a/frontend/src/components/dashboard/FreeOnboarding.module.scss b/frontend/src/components/dashboard/FreeOnboarding.module.scss
@@ -1,7 +1,6 @@
-@use "~@mozilla-protocol/core/protocol/css/includes/forms" as *;
-
 @import "../../styles/tokens.scss";
 @import "~@mozilla-protocol/core/protocol/css/includes/lib";
+@import "~@mozilla-protocol/core/protocol/css/includes/forms/lib";
 
 .onboarding {
   display: flex;

diff --git a/frontend/src/components/dashboard/PremiumOnboarding.module.scss b/frontend/src/components/dashboard/PremiumOnboarding.module.scss
@@ -1,7 +1,6 @@
-@use "~@mozilla-protocol/core/protocol/css/includes/forms" as *;
-
 @import "../../styles/tokens.scss";
 @import "~@mozilla-protocol/core/protocol/css/includes/lib";
+@import "~@mozilla-protocol/core/protocol/css/includes/forms/lib";
 
 .onboarding {
   display: flex;

diff --git a/frontend/src/components/dashboard/SubdomainPicker.module.scss b/frontend/src/components/dashboard/SubdomainPicker.module.scss
@@ -1,7 +1,6 @@
-@use "~@mozilla-protocol/core/protocol/css/includes/forms" as *;
-
 @import "../../styles/tokens.scss";
 @import "~@mozilla-protocol/core/protocol/css/includes/lib";
+@import "~@mozilla-protocol/core/protocol/css/includes/forms/lib";
 
 .card {
   border-radius: $border-radius-md;

diff --git a/frontend/src/components/dashboard/aliases/AddressPickerModal.module.scss b/frontend/src/components/dashboard/aliases/AddressPickerModal.module.scss
@@ -1,7 +1,6 @@
-@use "~@mozilla-protocol/core/protocol/css/includes/forms" as *;
-
 @import "../../../styles/tokens.scss";
 @import "~@mozilla-protocol/core/protocol/css/includes/lib";
+@import "~@mozilla-protocol/core/protocol/css/includes/forms/lib";
 
 .underlay {
   position: fixed;

diff --git a/frontend/src/components/dashboard/aliases/AliasDeletionButton.module.scss b/frontend/src/components/dashboard/aliases/AliasDeletionButton.module.scss
@@ -1,7 +1,6 @@
-@use "~@mozilla-protocol/core/protocol/css/includes/forms" as *;
-
 @import "../../../styles/tokens.scss";
 @import "~@mozilla-protocol/core/protocol/css/includes/lib";
+@import "~@mozilla-protocol/core/protocol/css/includes/forms/lib";
 
 .deletion-button {
   display: inline-flex;

diff --git a/frontend/src/components/dashboard/aliases/AliasDeletionButtonPermanent.module.scss b/frontend/src/components/dashboard/aliases/AliasDeletionButtonPermanent.module.scss
@@ -1,7 +1,6 @@
-@use "~@mozilla-protocol/core/protocol/css/includes/forms" as *;
-
 @import "../../../styles/tokens.scss";
 @import "~@mozilla-protocol/core/protocol/css/includes/lib";
+@import "~@mozilla-protocol/core/protocol/css/includes/forms/lib";
 
 .deletion-button {
   display: inline-flex;

diff --git a/frontend/src/components/dashboard/aliases/AliasList.module.scss b/frontend/src/components/dashboard/aliases/AliasList.module.scss
@@ -1,7 +1,6 @@
-@use "~@mozilla-protocol/core/protocol/css/includes/forms" as *;
-
 @import "../../../styles/tokens.scss";
 @import "~@mozilla-protocol/core/protocol/css/includes/lib";
+@import "~@mozilla-protocol/core/protocol/css/includes/forms/lib";
 
 // Resolves mobile extra spacing issues for 2nd step of updated free onboarding (MPP-3597).
 .alias-list-container {

diff --git a/frontend/src/components/dashboard/aliases/CustomAddressGenerationModal.module.scss b/frontend/src/components/dashboard/aliases/CustomAddressGenerationModal.module.scss
@@ -1,6 +1,5 @@
-@use "~@mozilla-protocol/core/protocol/css/includes/forms" as *;
-
 @import "~@mozilla-protocol/core/protocol/css/includes/lib";
+@import "~@mozilla-protocol/core/protocol/css/includes/forms/lib";
 @import "../../../styles/tokens.scss";
 
 .underlay {

diff --git a/frontend/src/components/layout/navigation/whatsnew/WhatsNewMenu.module.scss b/frontend/src/components/layout/navigation/whatsnew/WhatsNewMenu.module.scss
@@ -1,7 +1,6 @@
-@use "~@mozilla-protocol/core/protocol/css/includes/forms" as *;
-
 @import "../../../../styles/tokens.scss";
 @import "~@mozilla-protocol/core/protocol/css/includes/lib";
+@import "~@mozilla-protocol/core/protocol/css/includes/forms/lib";
 
 button.trigger {
   flex-shrink: 0;

diff --git a/frontend/src/components/phones/onboarding/RealPhoneSetup.module.scss b/frontend/src/components/phones/onboarding/RealPhoneSetup.module.scss
@@ -1,6 +1,5 @@
-@use "~@mozilla-protocol/core/protocol/css/includes/forms" as *;
-
 @import "~@mozilla-protocol/core/protocol/css/includes/lib";
+@import "~@mozilla-protocol/core/protocol/css/includes/forms/lib";
 @import "../../../styles/tokens.scss";
 
 .step {

diff --git a/frontend/src/components/phones/onboarding/RelayNumberConfirmationModal.module.scss b/frontend/src/components/phones/onboarding/RelayNumberConfirmationModal.module.scss
@@ -1,7 +1,6 @@
-@use "~@mozilla-protocol/core/protocol/css/includes/forms" as *;
-
 @import "../../../styles/tokens.scss";
 @import "~@mozilla-protocol/core/protocol/css/includes/lib";
+@import "~@mozilla-protocol/core/protocol/css/includes/forms/lib";
 
 .underlay {
   position: fixed;

diff --git a/frontend/src/components/phones/onboarding/RelayNumberPicker.module.scss b/frontend/src/components/phones/onboarding/RelayNumberPicker.module.scss
@@ -1,6 +1,5 @@
-@use "~@mozilla-protocol/core/protocol/css/includes/forms" as *;
-
 @import "~@mozilla-protocol/core/protocol/css/includes/lib";
+@import "~@mozilla-protocol/core/protocol/css/includes/forms/lib";
 @import "../../../styles/tokens.scss";
 
 .step,

diff --git a/frontend/src/components/waitlist/WaitlistPage.module.scss b/frontend/src/components/waitlist/WaitlistPage.module.scss
@@ -1,7 +1,6 @@
-@use "~@mozilla-protocol/core/protocol/css/includes/forms" as *;
-
 @import "~@mozilla-protocol/core/protocol/css/includes/tokens/dist/index.scss";
 @import "~@mozilla-protocol/core/protocol/css/includes/lib";
+@import "~@mozilla-protocol/core/protocol/css/includes/forms/lib";
 
 .wrapper {
   display: flex;

diff --git a/package-lock.json b/package-lock.json