Skip to content

Commit 967ce9d

Browse files
committed
fix: allow Adyen payment with a credit card that requires 3D Secure 2 authentication
disable minifier in rust to avoid a build that is not working due to some compatibility issue with adyen package
1 parent 0d40588 commit 967ce9d

8 files changed

Lines changed: 421 additions & 428 deletions

File tree

@typings/missing.d.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

components/composite/CheckoutContainer/index.tsx

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { CheckoutHead } from "components/composite/CheckoutTitle"
44
import { AppProvider } from "components/data/AppProvider"
55
import GlobalStylesProvider from "components/data/GlobalStylesProvider"
66
import { GTMProvider } from "components/data/GTMProvider"
7-
import { RollbarProvider } from "components/data/RollbarProvider"
87

98
interface Props {
109
settings: CheckoutSettings
@@ -14,23 +13,21 @@ const CheckoutContainer: React.FC<Props> = ({ settings, children }) => {
1413
return (
1514
<div>
1615
<CheckoutHead title={settings.companyName} favicon={settings.favicon} />
17-
<RollbarProvider>
18-
<CommerceLayer
16+
<CommerceLayer
17+
accessToken={settings.accessToken}
18+
endpoint={settings.endpoint}
19+
>
20+
<GlobalStylesProvider primaryColor={settings.primaryColor} />
21+
22+
<AppProvider
23+
orderId={settings.orderId}
1924
accessToken={settings.accessToken}
20-
endpoint={settings.endpoint}
25+
slug={settings.slug}
26+
domain={settings.domain}
2127
>
22-
<GlobalStylesProvider primaryColor={settings.primaryColor} />
23-
24-
<AppProvider
25-
orderId={settings.orderId}
26-
accessToken={settings.accessToken}
27-
slug={settings.slug}
28-
domain={settings.domain}
29-
>
30-
<GTMProvider gtmId={settings.gtmId}>{children}</GTMProvider>
31-
</AppProvider>
32-
</CommerceLayer>
33-
</RollbarProvider>
28+
<GTMProvider gtmId={settings.gtmId}>{children}</GTMProvider>
29+
</AppProvider>
30+
</CommerceLayer>
3431
</div>
3532
)
3633
}

components/composite/OrderSummary/ReturnToCart/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { useTranslation } from "next-i18next"
21
import Link from "next/link"
2+
// eslint-disable-next-line import/order
3+
import { useTranslation } from "next-i18next"
34

45
import { CartLinkWrapper, LinkWrapper } from "./styled"
56

components/data/RollbarProvider/index.tsx

Lines changed: 0 additions & 25 deletions
This file was deleted.

next.config.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ const shouldAnalyzeBundles = process.env.ANALYZE === "true"
66
let nextConfig = {
77
eslint: {},
88
poweredByHeader: false,
9-
swcMinify: true,
9+
swcMinify: false,
1010
webpack: (config) => {
1111
return config
1212
},
1313
// When when app is exported as SPA and served in a sub-folder
14-
assetPrefix: process.env.NEXT_PUBLIC_BASE_PATH ? `${process.env.NEXT_PUBLIC_BASE_PATH}/` : undefined,
14+
assetPrefix: process.env.NEXT_PUBLIC_BASE_PATH
15+
? `${process.env.NEXT_PUBLIC_BASE_PATH}/`
16+
: undefined,
1517
// https://nextjs.org/docs/api-reference/next.config.js/custom-page-extensions#including-non-page-files-in-the-pages-directory
1618
pageExtensions: ["page.tsx"],
1719
// rewrite rules affect only development mode, since Next router will return 404 for paths that only exist in react-router

package.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@
7070
"commercelayer"
7171
],
7272
"dependencies": {
73+
"@adyen/adyen-web": "^5.31.1",
7374
"@commercelayer/react-components": "3.15.5",
7475
"@commercelayer/sdk": "^4.21.0",
7576
"@headlessui/react": "^1.7.7",
76-
"@rollbar/react": "^0.11.1",
7777
"@tailwindcss/forms": "^0.5.3",
7878
"@tailwindcss/line-clamp": "^0.4.2",
7979
"@types/async-retry": "1.4.3",
@@ -88,13 +88,12 @@
8888
"jwt-decode": "^3.1.2",
8989
"next": "^12.3.4",
9090
"next-i18next": "^12.1.0",
91-
"postcss": "^8.4.20",
91+
"postcss": "^8.4.21",
9292
"react": "^17.0.2",
9393
"react-dom": "^17.0.2",
9494
"react-gtm-module": "^2.0.11",
9595
"react-i18next": "^11.18.6",
96-
"react-router-dom": "^6.6.1",
97-
"rollbar": "^2.26.0",
96+
"react-router-dom": "^6.6.2",
9897
"styled-components": "^5.3.6",
9998
"tailwindcss": "^3.2.4",
10099
"twin.macro": "2.8.2",
@@ -105,15 +104,15 @@
105104
"@faker-js/faker": "^7.6.0",
106105
"@next/bundle-analyzer": "^12.3.4",
107106
"@next/eslint-plugin-next": "^12.3.4",
108-
"@playwright/test": "^1.29.1",
107+
"@playwright/test": "^1.29.2",
109108
"@semantic-release/changelog": "^6.0.2",
110109
"@semantic-release/commit-analyzer": "^9.0.2",
111110
"@semantic-release/git": "^10.0.1",
112111
"@semantic-release/github": "^8.0.7",
113-
"@semantic-release/npm": "^9.0.1",
112+
"@semantic-release/npm": "^9.0.2",
114113
"@semantic-release/release-notes-generator": "^10.0.3",
115-
"@typescript-eslint/eslint-plugin": "^5.48.0",
116-
"@typescript-eslint/parser": "^5.48.0",
114+
"@typescript-eslint/eslint-plugin": "^5.48.1",
115+
"@typescript-eslint/parser": "^5.48.1",
117116
"dotenv": "^16.0.3",
118117
"eslint": "^8.23.1",
119118
"eslint-config-next": "^12.3.4",
@@ -123,9 +122,9 @@
123122
"eslint-plugin-node": "^11.1.0",
124123
"eslint-plugin-prettier": "^4.2.1",
125124
"eslint-plugin-promise": "^6.1.1",
126-
"eslint-plugin-react": "^7.31.11",
125+
"eslint-plugin-react": "^7.32.0",
127126
"eslint-plugin-tailwind": "^0.2.1",
128-
"prettier": "^2.8.1",
127+
"prettier": "^2.8.3",
129128
"serve": "^14.1.2",
130129
"stylelint": "^14.16.1",
131130
"stylelint-config-standard": "^28.0.0"

pages/_app.page.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import type { AppProps } from "next/app"
12
import "../styles/globals.css"
3+
// eslint-disable-next-line import/order
24
import { appWithTranslation } from "next-i18next"
3-
import type { AppProps } from "next/app"
5+
46
import "components/data/i18n"
57

68
function CheckoutApp(props: AppProps) {

0 commit comments

Comments
 (0)