From 3792fce3b9e1a925529859018dc2e63393423ea6 Mon Sep 17 00:00:00 2001 From: Rafee Date: Thu, 8 Feb 2024 19:42:21 -0500 Subject: [PATCH] Revert PR #4314 Protocol SCSS version upgrade This reverts commit 4b01656e6c413b591582ee51aeb06a7e7218c277 and 90fd6f11e9309e84534bdfe2220632294edc8211. --- frontend/package.json | 2 +- frontend/src/components/Banner.module.scss | 3 +-- frontend/src/components/Button.module.scss | 3 +-- .../dashboard/FreeOnboarding.module.scss | 3 +-- .../dashboard/PremiumOnboarding.module.scss | 3 +-- .../dashboard/SubdomainPicker.module.scss | 3 +-- .../aliases/AddressPickerModal.module.scss | 3 +-- .../aliases/AliasDeletionButton.module.scss | 3 +-- .../AliasDeletionButtonPermanent.module.scss | 3 +-- .../dashboard/aliases/AliasList.module.scss | 3 +-- .../CustomAddressGenerationModal.module.scss | 3 +-- .../navigation/whatsnew/WhatsNewMenu.module.scss | 3 +-- .../phones/onboarding/RealPhoneSetup.module.scss | 3 +-- .../RelayNumberConfirmationModal.module.scss | 3 +-- .../onboarding/RelayNumberPicker.module.scss | 3 +-- .../components/waitlist/WaitlistPage.module.scss | 3 +-- package-lock.json | 16 ++++++++-------- 17 files changed, 24 insertions(+), 39 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index a1359b8abc..e2981affdc 100644 --- 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 index 90c759c42a..9f773ee8da 100644 --- 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 index 6679d60ebb..2c24c728d3 100644 --- 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 index c522ecee23..a3d57d4189 100644 --- 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 index 254cbf094d..1b01f6031a 100644 --- 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 index 85ddd04164..ece17eaab4 100644 --- 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 index d5eab41b27..c5d2411c46 100644 --- 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 index 2e74c8ff7c..7feddcee33 100644 --- 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 index 69a4202dad..aad1108371 100644 --- 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 index d0e1bec293..ef976e859d 100644 --- 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 index 91e1a497ec..9ac60d57ca 100644 --- 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 index a44328ad90..f2230fecd2 100644 --- 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 index 298693d6bc..922757c3cf 100644 --- 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 index 1d14ef54d7..123a328974 100644 --- 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 index b8e08af1aa..a87b5e2107 100644 --- 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 index 354d8db3de..bd913edace 100644 --- 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 index 75e1353c5e..9a52731028 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,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", @@ -1828,9 +1828,9 @@ } }, "node_modules/@mozilla-protocol/core": { - "version": "19.0.0", - "resolved": "https://registry.npmjs.org/@mozilla-protocol/core/-/core-19.0.0.tgz", - "integrity": "sha512-2kitmeSKbSixV41OUgYAp/nbhXd8ftY4FEG/QKsoinSg7njawQuNCM5NwPWiP9wdhGinxVJU5FBblif7FB5srA==" + "version": "17.0.1", + "resolved": "https://registry.npmjs.org/@mozilla-protocol/core/-/core-17.0.1.tgz", + "integrity": "sha512-xN6DNJ1P93lqrzhEHhx6J8HvIVpWDBLNOO4cqlHWH6HNPOoD/vsfygCwg6UJ+pkWBAwQLbS10xgB3Y2+kCP82Q==" }, "node_modules/@mswjs/cookies": { "version": "1.1.0", @@ -16515,9 +16515,9 @@ } }, "@mozilla-protocol/core": { - "version": "19.0.0", - "resolved": "https://registry.npmjs.org/@mozilla-protocol/core/-/core-19.0.0.tgz", - "integrity": "sha512-2kitmeSKbSixV41OUgYAp/nbhXd8ftY4FEG/QKsoinSg7njawQuNCM5NwPWiP9wdhGinxVJU5FBblif7FB5srA==" + "version": "17.0.1", + "resolved": "https://registry.npmjs.org/@mozilla-protocol/core/-/core-17.0.1.tgz", + "integrity": "sha512-xN6DNJ1P93lqrzhEHhx6J8HvIVpWDBLNOO4cqlHWH6HNPOoD/vsfygCwg6UJ+pkWBAwQLbS10xgB3Y2+kCP82Q==" }, "@mswjs/cookies": { "version": "1.1.0", @@ -20371,7 +20371,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", "@next/eslint-plugin-next": "^14.1.0", "@stripe/stripe-js": "^2.4.0", "@testing-library/dom": "^9.3.4",