@akinon/next 1.21.0-rc.2 → 1.21.0-rc.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @akinon/next
 
+## 1.21.0-rc.4
+
+### Minor Changes
+
+- Revert ZERO-2435
+
+## 1.21.0-rc.3
+
+### Minor Changes
+
+- af8e38e0: ZERO-2247: Add additionalParams to MasterpassProvider and set them in buildPurchaseForm and buildDirectPurchaseForm
+- 16027410: ZERO-2451: Refactor extraHeaders assignment in client.ts
+- 9edd725b: Datalayer init changed to 3rd party script. Declare is the same as next
+
 ## 1.21.0-rc.2
 
 ### Minor Changes

package/api/client.ts

@@ -43,13 +43,18 @@ async function proxyRequest(...args) {
       urlSearchParams.append(key, `${searchParams.get(key)}`);
     });
 
-  const extraHeaders = Object.fromEntries(req.headers.entries());
+  const extraHeaders: Record<string, string> = {};
+
+  for (const [key, value] of Array.from(req.headers.entries())) {
+    extraHeaders[key.toLowerCase()] = value;
+  }
 
   [
     'x-forwarded-host',
     'x-forwarded-for',
     'x-forwarded-proto',
     'x-forwarded-port',
+    'x-requested-with',
     'origin',
     'host',
     'referer',

package/bin/pz-install-plugins.js

@@ -1,40 +1,39 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
 const path = require('path');
+const rootDir = path.resolve(process.cwd());
 const spawn = require('cross-spawn');
+const availablePlugins = require('../plugins');
 
-function findBaseDir() {
-  const insideNodeModules = __dirname.includes('node_modules');
-  return insideNodeModules
-    ? path.resolve(__dirname, '../../../../')
-    : path.resolve(__dirname, '../../../apps/projectzeronext');
-}
-
-const BASE_DIR = findBaseDir();
+let plugins;
 
-const getFullPath = (relativePath) => path.join(BASE_DIR, relativePath);
+try {
+  plugins = require(path.resolve(rootDir, './src/plugins.js'));
+} catch (error) {
+  console.error('No plugins.js file found, skipping plugin installation.');
+  process.exit(0);
+}
 
-const packageJsonPath = getFullPath('package.json');
-const akinonPackageNumber = require(packageJsonPath).dependencies[
-  '@akinon/next'
-].replace('^', '');
-//just in case
+let installCmd = [];
 
-const availablePlugins = require('../plugins');
+availablePlugins
+  .filter((p) => plugins?.includes(p))
+  .forEach((name) => {
+    installCmd.push(`@akinon/${name}`);
+  });
 
-let installCmd = availablePlugins.map(
-  (name) => `@akinon/${name}@${akinonPackageNumber}`
-);
+spawn.sync('yarn', ['cache clean']);
 
-spawn.sync('yarn', ['cache clean'], { stdio: 'inherit', cwd: BASE_DIR });
+for (const plugin of availablePlugins) {
+  spawn.sync('yarn', ['remove', `@akinon/${plugin}`]);
+}
 
-availablePlugins.forEach((plugin) => {
-  spawn.sync('yarn', ['remove', `@akinon/${plugin}`], {
-    stdio: 'inherit',
-    cwd: BASE_DIR
+if (
+  installCmd.length > 0 &&
+  !fs.existsSync(path.resolve(rootDir, '../../turbo.json'))
+) {
+  spawn.sync('yarn', ['add', ...installCmd, '--ignore-scripts'], {
+    stdio: 'inherit'
   });
-});
-
-if (installCmd.length > 0) {
-  const yarnArgs = ['add', ...installCmd, '--ignore-scripts'];
-
-  spawn.sync('yarn', yarnArgs, { stdio: 'inherit', cwd: BASE_DIR });
 }

package/data/client/checkout.ts

@@ -83,12 +83,18 @@ const completeMasterpassPayment = async (
   reduxStore: AppStore
 ) => {
   const state = reduxStore.getState();
-  const { token, order_no } = context.page_context;
+  const { token, order_no, extras } = context.page_context;
   const { endpoints: apiEndpoints } = checkoutApi;
   const { preOrder } = state.checkout ?? {};
 
-  const { isDirectPurchase, referenceNo, credentials, msisdn, selectedCard } =
-    state.masterpass ?? {};
+  const {
+    isDirectPurchase,
+    referenceNo,
+    credentials,
+    msisdn,
+    selectedCard,
+    additionalParams
+  } = state.masterpass ?? {};
 
   const commonFormValues = {
     token,
@@ -96,12 +102,16 @@ const completeMasterpassPayment = async (
     referenceNo,
     merchantId: credentials?.merchant_id ?? null,
     msisdn,
-    amount: preOrder?.unpaid_amount?.replace('.', '') ?? ''
+    amount: preOrder?.unpaid_amount?.replace('.', '') ?? '',
+    additionalParams: additionalParams ?? extras?.additionalParams
   };
 
   const form = isDirectPurchase
     ? await buildDirectPurchaseForm(commonFormValues, params)
-    : await buildPurchaseForm({ ...commonFormValues, selectedCard });
+    : await buildPurchaseForm({
+        ...commonFormValues,
+        selectedCard
+      });
 
   window.MFS?.[
     state.masterpass.isDirectPurchase ? 'directPurchase' : 'purchase'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.21.0-rc.2",
+  "version": "1.21.0-rc.4",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -32,7 +32,7 @@
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
     "eslint": "^8.14.0",
-    "@akinon/eslint-plugin-projectzero": "1.21.0-rc.2",
+    "@akinon/eslint-plugin-projectzero": "1.21.0-rc.4",
     "eslint-config-prettier": "8.5.0"
   }
 }

package/types/index.ts

@@ -4,8 +4,11 @@ import { Control, FieldError } from 'react-hook-form';
 import { ReactNode } from 'react';
 
 declare global {
-  export interface Window {
-    dataLayer: Record<string, any>[];
+  interface Window {
+    // we did it like this because declare types needs to be identical, if not it will fail
+    // eslint-disable-next-line @typescript-eslint/ban-types
+    dataLayer?: Object[];
+    [key: string]: any;
   }
 }