From 7a5c0f4df13c11d6ac222db7abf29750281089b1 Mon Sep 17 00:00:00 2001 From: Loan Laux Date: Sun, 30 May 2021 17:27:12 +0400 Subject: [PATCH 1/2] remove usage of border-accents-9 which broke compilation Signed-off-by: Loan Laux --- components/product/Swatch/Swatch.module.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/product/Swatch/Swatch.module.css b/components/product/Swatch/Swatch.module.css index ede13267ba..c2a7b39fd9 100644 --- a/components/product/Swatch/Swatch.module.css +++ b/components/product/Swatch/Swatch.module.css @@ -35,7 +35,7 @@ } .active { - @apply border-accents-9 border-2; + @apply border-2; padding-right: 1px; padding-left: 1px; } @@ -46,7 +46,7 @@ } .active.textLabel { - @apply border-accents-9 border-2; + @apply border-2; padding-right: calc(1rem - 1px); padding-left: calc(1rem - 1px); } From efdddc2c230662d1391b841a5502269f9a0dece5 Mon Sep 17 00:00:00 2001 From: Loan Laux Date: Sun, 30 May 2021 17:39:49 +0400 Subject: [PATCH 2/2] relocate @components/checkout/* to provider Signed-off-by: Loan Laux --- framework/shopify/commerce.config.json | 3 ++- .../CheckoutSidebarView/CheckoutSidebarView.module.css | 0 .../checkout/CheckoutSidebarView/CheckoutSidebarView.tsx | 0 .../shopify/components}/checkout/CheckoutSidebarView/index.ts | 0 .../checkout/PaymentMethodView/PaymentMethodView.module.css | 0 .../checkout/PaymentMethodView/PaymentMethodView.tsx | 0 .../shopify/components}/checkout/PaymentMethodView/index.ts | 0 .../components}/checkout/ShippingView/ShippingView.module.css | 0 .../shopify/components}/checkout/ShippingView/ShippingView.tsx | 0 .../shopify/components}/checkout/ShippingView/index.ts | 0 package.json | 3 --- tsconfig.json | 1 + 12 files changed, 3 insertions(+), 4 deletions(-) rename {components => framework/shopify/components}/checkout/CheckoutSidebarView/CheckoutSidebarView.module.css (100%) rename {components => framework/shopify/components}/checkout/CheckoutSidebarView/CheckoutSidebarView.tsx (100%) rename {components => framework/shopify/components}/checkout/CheckoutSidebarView/index.ts (100%) rename {components => framework/shopify/components}/checkout/PaymentMethodView/PaymentMethodView.module.css (100%) rename {components => framework/shopify/components}/checkout/PaymentMethodView/PaymentMethodView.tsx (100%) rename {components => framework/shopify/components}/checkout/PaymentMethodView/index.ts (100%) rename {components => framework/shopify/components}/checkout/ShippingView/ShippingView.module.css (100%) rename {components => framework/shopify/components}/checkout/ShippingView/ShippingView.tsx (100%) rename {components => framework/shopify/components}/checkout/ShippingView/index.ts (100%) diff --git a/framework/shopify/commerce.config.json b/framework/shopify/commerce.config.json index b30ab39d9b..593fe3bbf7 100644 --- a/framework/shopify/commerce.config.json +++ b/framework/shopify/commerce.config.json @@ -1,6 +1,7 @@ { "provider": "shopify", "features": { - "wishlist": false + "wishlist": false, + "customCheckout": true } } diff --git a/components/checkout/CheckoutSidebarView/CheckoutSidebarView.module.css b/framework/shopify/components/checkout/CheckoutSidebarView/CheckoutSidebarView.module.css similarity index 100% rename from components/checkout/CheckoutSidebarView/CheckoutSidebarView.module.css rename to framework/shopify/components/checkout/CheckoutSidebarView/CheckoutSidebarView.module.css diff --git a/components/checkout/CheckoutSidebarView/CheckoutSidebarView.tsx b/framework/shopify/components/checkout/CheckoutSidebarView/CheckoutSidebarView.tsx similarity index 100% rename from components/checkout/CheckoutSidebarView/CheckoutSidebarView.tsx rename to framework/shopify/components/checkout/CheckoutSidebarView/CheckoutSidebarView.tsx diff --git a/components/checkout/CheckoutSidebarView/index.ts b/framework/shopify/components/checkout/CheckoutSidebarView/index.ts similarity index 100% rename from components/checkout/CheckoutSidebarView/index.ts rename to framework/shopify/components/checkout/CheckoutSidebarView/index.ts diff --git a/components/checkout/PaymentMethodView/PaymentMethodView.module.css b/framework/shopify/components/checkout/PaymentMethodView/PaymentMethodView.module.css similarity index 100% rename from components/checkout/PaymentMethodView/PaymentMethodView.module.css rename to framework/shopify/components/checkout/PaymentMethodView/PaymentMethodView.module.css diff --git a/components/checkout/PaymentMethodView/PaymentMethodView.tsx b/framework/shopify/components/checkout/PaymentMethodView/PaymentMethodView.tsx similarity index 100% rename from components/checkout/PaymentMethodView/PaymentMethodView.tsx rename to framework/shopify/components/checkout/PaymentMethodView/PaymentMethodView.tsx diff --git a/components/checkout/PaymentMethodView/index.ts b/framework/shopify/components/checkout/PaymentMethodView/index.ts similarity index 100% rename from components/checkout/PaymentMethodView/index.ts rename to framework/shopify/components/checkout/PaymentMethodView/index.ts diff --git a/components/checkout/ShippingView/ShippingView.module.css b/framework/shopify/components/checkout/ShippingView/ShippingView.module.css similarity index 100% rename from components/checkout/ShippingView/ShippingView.module.css rename to framework/shopify/components/checkout/ShippingView/ShippingView.module.css diff --git a/components/checkout/ShippingView/ShippingView.tsx b/framework/shopify/components/checkout/ShippingView/ShippingView.tsx similarity index 100% rename from components/checkout/ShippingView/ShippingView.tsx rename to framework/shopify/components/checkout/ShippingView/ShippingView.tsx diff --git a/components/checkout/ShippingView/index.ts b/framework/shopify/components/checkout/ShippingView/index.ts similarity index 100% rename from components/checkout/ShippingView/index.ts rename to framework/shopify/components/checkout/ShippingView/index.ts diff --git a/package.json b/package.json index 5a9d40b790..1689e5797f 100644 --- a/package.json +++ b/package.json @@ -102,9 +102,6 @@ "@config/*": [ "config/*" ], - "@components/*": [ - "components/*" - ], "@utils/*": [ "utils/*" ] diff --git a/tsconfig.json b/tsconfig.json index e20f370990..fd60987b2e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,6 +19,7 @@ "@utils/*": ["utils/*"], "@config/*": ["config/*"], "@assets/*": ["assets/*"], + "@components/checkout/*": ["framework/shopify/components/checkout/*"], "@components/*": ["components/*"], "@commerce": ["framework/commerce"], "@commerce/*": ["framework/commerce/*"],