Merge branch 'feature/card-fields-v2-support' of https://github.com/p…

…aypal/react-paypal-js into feature/card-fields-v2-support
paypal · Apr 16, 2024 · b0d9f83 · b0d9f83
2 parents 3e03c3b + dcdebaa
commit b0d9f83
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [8.2.0](https://github.com/paypal/react-paypal-js/compare/v8.1.4...v8.2.0) (2024-03-20)
+
+### Features
+
+-   add DATA_JS_SDK_LIBRARY to constants ([aa1b771](https://github.com/paypal/react-paypal-js/commit/aa1b771d85fa75083ad152f9d9b55d9c46ae051f))
+-   add js library to options ([acc5123](https://github.com/paypal/react-paypal-js/commit/acc512371460da4b7d2f59ba10c69034f7ecef45))
+-   hardcode js library ([95a29fa](https://github.com/paypal/react-paypal-js/commit/95a29fae3895042eca2b55f33a98a0d85ed97eae))
+-   rename constant ([1d027b6](https://github.com/paypal/react-paypal-js/commit/1d027b6b93d23309a4d6966f998e320fcf7c94e5))
+
+### Bug Fixes
+
+-   alphabetize constants ([0d9b495](https://github.com/paypal/react-paypal-js/commit/0d9b495a15e2fd8e923bc55237bb6ba0c69cd11e))
+-   enforce values ([faa6278](https://github.com/paypal/react-paypal-js/commit/faa6278d1ad530658999c21be36f24fa1322d8e6))
+
 ### [8.1.4](https://github.com/paypal/react-paypal-js/compare/v8.1.3...v8.1.4) (2024-02-28)
 
 ### Bug Fixes

diff --git a/README.md b/README.md
@@ -417,7 +417,6 @@ export default function App() {
         <PayPalScriptProvider
             options={{
                 clientId: "your-client-id",
-                dataUserIdToken: "your-data-user-id-token",
                 components: "card-fields",
             }}
         >

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@paypal/react-paypal-js",
-    "version": "8.1.4",
+    "version": "8.2.0",
     "description": "React components for the PayPal JS SDK",
     "keywords": [
         "react",
@@ -45,7 +45,7 @@
     },
     "homepage": "https://paypal.github.io/react-paypal-js/",
     "dependencies": {
-        "@paypal/paypal-js": "^8.0.2",
+        "@paypal/paypal-js": "^8.0.4",
         "@paypal/sdk-constants": "^1.0.122"
     },
     "devDependencies": {

diff --git a/src/components/PayPalScriptProvider.test.tsx b/src/components/PayPalScriptProvider.test.tsx
@@ -48,7 +48,8 @@ describe("<PayPalScriptProvider />", () => {
             clientId: "test",
             [SCRIPT_ID]: expect.stringContaining("react-paypal-js"),
             [SDK_SETTINGS.DATA_SDK_INTEGRATION_SOURCE]:
-                SDK_SETTINGS.DATA_SDK_INTEGRATION_SOURCE_VALUE,
+                SDK_SETTINGS.DATA_LIBRARY_VALUE,
+            [SDK_SETTINGS.DATA_JS_SDK_LIBRARY]: SDK_SETTINGS.DATA_LIBRARY_VALUE,
         });
 
         // verify initial loading state
@@ -74,7 +75,8 @@ describe("<PayPalScriptProvider />", () => {
             clientId: "test",
             [SCRIPT_ID]: expect.stringContaining("react-paypal-js"),
             [SDK_SETTINGS.DATA_SDK_INTEGRATION_SOURCE]:
-                SDK_SETTINGS.DATA_SDK_INTEGRATION_SOURCE_VALUE,
+                SDK_SETTINGS.DATA_LIBRARY_VALUE,
+            [SDK_SETTINGS.DATA_JS_SDK_LIBRARY]: SDK_SETTINGS.DATA_LIBRARY_VALUE,
         });
 
         // verify initial loading state
@@ -140,7 +142,8 @@ describe("<PayPalScriptProvider />", () => {
             clientId: "test",
             [SCRIPT_ID]: expect.stringContaining("react-paypal-js"),
             [SDK_SETTINGS.DATA_SDK_INTEGRATION_SOURCE]:
-                SDK_SETTINGS.DATA_SDK_INTEGRATION_SOURCE_VALUE,
+                SDK_SETTINGS.DATA_LIBRARY_VALUE,
+            [SDK_SETTINGS.DATA_JS_SDK_LIBRARY]: SDK_SETTINGS.DATA_LIBRARY_VALUE,
         });
 
         expect(state.isPending).toBe(true);

diff --git a/src/components/PayPalScriptProvider.tsx b/src/components/PayPalScriptProvider.tsx
@@ -25,9 +25,10 @@ export const PayPalScriptProvider: FC<ScriptProviderProps> = ({
 }: ScriptProviderProps) => {
     const [state, dispatch] = useReducer(scriptReducer, {
         options: {
-            [SDK_SETTINGS.DATA_SDK_INTEGRATION_SOURCE]:
-                SDK_SETTINGS.DATA_SDK_INTEGRATION_SOURCE_VALUE,
             ...options,
+            [SDK_SETTINGS.DATA_JS_SDK_LIBRARY]: SDK_SETTINGS.DATA_LIBRARY_VALUE,
+            [SDK_SETTINGS.DATA_SDK_INTEGRATION_SOURCE]:
+                SDK_SETTINGS.DATA_LIBRARY_VALUE,
             [SCRIPT_ID]: `${getScriptID(options)}`,
         },
         loadingStatus: deferLoading

diff --git a/src/constants.ts b/src/constants.ts
@@ -7,10 +7,11 @@ export const SCRIPT_ID = "data-react-paypal-script-id";
 
 export const SDK_SETTINGS = {
     DATA_CLIENT_TOKEN: "dataClientToken",
-    DATA_USER_ID_TOKEN: "dataUserIdToken",
-    DATA_SDK_INTEGRATION_SOURCE: "dataSdkIntegrationSource",
-    DATA_SDK_INTEGRATION_SOURCE_VALUE: "react-paypal-js",
+    DATA_JS_SDK_LIBRARY: "dataJsSdkLibrary",
+    DATA_LIBRARY_VALUE: "react-paypal-js",
     DATA_NAMESPACE: "dataNamespace",
+    DATA_SDK_INTEGRATION_SOURCE: "dataSdkIntegrationSource",
+    DATA_USER_ID_TOKEN: "dataUserIdToken",
 };
 export const LOAD_SCRIPT_ERROR = "Failed to load the PayPal JS SDK script.";
 

diff --git a/src/context/scriptProviderContext.ts b/src/context/scriptProviderContext.ts
@@ -72,7 +72,7 @@ export function scriptReducer(
                 loadingStatus: SCRIPT_LOADING_STATE.PENDING,
                 options: {
                     [SDK_SETTINGS.DATA_SDK_INTEGRATION_SOURCE]:
-                        SDK_SETTINGS.DATA_SDK_INTEGRATION_SOURCE_VALUE,
+                        SDK_SETTINGS.DATA_LIBRARY_VALUE,
                     ...action.value,
                     [SCRIPT_ID]: `${getScriptID(action.value)}`,
                 },