@riosst100/pwa-marketplace 1.2.7 → 1.2.9

package/src/intercept.js

@@ -1,114 +1,114 @@
-const componentOverrideMapping = require('./componentOverrideMapping');
-const moduleOverridePlugin = require('./moduleOverrideWebpackPlugin');
-const { DefinePlugin } = require('webpack');
-const { getAvailableWebsitesConfigData } = require('./Utilities/graphQL');
-const LocalizationPlugin = require('@magento/pwa-buildpack/lib/WebpackTools/plugins/LocalizationPlugin');
-
-module.exports = targets => {
-  // Perform the asynchronous operation outside the tap
-  let availableWebsites;
-
-  // Use an IIFE (Immediately Invoked Function Expression) to enable async/await
-  (async () => {
-    availableWebsites = await getAvailableWebsitesConfigData();
-  })();
-
-  targets.of('@magento/pwa-buildpack').specialFeatures.tap(features => {
-    features[targets.name] = { i18n: true, esModules: true, cssModules: true, graphqlQueries: true };
-  });
-
-  targets.of('@magento/pwa-buildpack').webpackCompiler.tap(compiler => {
-    new moduleOverridePlugin(componentOverrideMapping).apply(compiler);
-  });
-
-  // Tap into webpackCompiler
-  targets.of('@magento/pwa-buildpack').webpackCompiler.tap(compiler => {
-      // Check if the LocalizationPlugin is present
-      if (compiler.options.plugins) {
-        const localizationPlugin = compiler.options.plugins.find(
-            plugin => plugin instanceof LocalizationPlugin
-        );
-
-        // Check if LocalizationPlugin is found
-        if (localizationPlugin) {
-            // Store the original mergeLocales function
-            const originalMergeLocales = localizationPlugin.mergeLocales;
-
-            // Define your custom hook
-            function myCustomMergeLocalesHook(current, update) {
-                // Modify the mergedLocales data here
-                Object.keys(update).forEach(key => {
-                  if (typeof current[key] === 'undefined') {
-                      current[key] = [];
-                  }
-                  if (Array.isArray(current[key]) && Array.isArray(update[key])) {
-                    if (update[key].toString().includes("venia-ui")) {
-                      delete update[key];
-                    }
-                  }
-              });
-
-                // Return the modified mergedLocales
-                return originalMergeLocales.call(localizationPlugin, current, update);
-            }
-
-            // Override mergeLocales with your custom hook
-            localizationPlugin.mergeLocales = myCustomMergeLocalesHook;
-        }
-    }
-  });
-
-  targets.of('@magento/pwa-buildpack').envVarDefinitions.tap(defs => {
-    defs.sections.push({
-      name: "Default Website Code",
-      variables: [
-        {
-          name: "WEBSITE_CODE",
-          type: "str",
-          desc: "Default Website Code for Multi Website Extension",
-        },
-      ],
-    });
-  });
-
-  // Define the routes using the results of the asynchronous operation
-  const routes = [
-    {
-      exact: true,
-      name: "BecomeSellerRoute",
-      pattern: "/become-seller",
-      path: require.resolve("./components/BecomeSellerPage/index.js"),
-      authed: true,
-      redirectTo: "/sign-in"
-    },
-    {
-      exact: true,
-      name: "SellerAccountRoute",
-      pattern: "/seller-account",
-      path: require.resolve("./components/SellerAccountPage/index.js"),
-      authed: true,
-      redirectTo: "/become-seller"
-    },
-    {
-      exact: true,
-      name: "SellerPage",
-      pattern: "/seller/:urlKey",
-      path: require.resolve("./components/SellerPage/index.js"),
-      authed: false,
-    },
-  ];
-
-  // Apply DefinePlugin using the results of the asynchronous operation
-  targets.of('@magento/pwa-buildpack').webpackCompiler.tap(compiler => {
-    new DefinePlugin({
-      AVAILABLE_WEBSITES: JSON.stringify(availableWebsites.availableStoresByUserIp),
-      WEBSITE_CODE: process.env.WEBSITE_CODE
-    }).apply(compiler);
-  });
-
-  // Handle the routes directly within the routes tap
-  targets.of("@magento/venia-ui").routes.tap(routesArray => {
-    routesArray.push(...routes);
-    return routesArray;
-  });
+const componentOverrideMapping = require('./componentOverrideMapping');
+const moduleOverridePlugin = require('./moduleOverrideWebpackPlugin');
+const { DefinePlugin } = require('webpack');
+const { getAvailableWebsitesConfigData } = require('./Utilities/graphQL');
+const LocalizationPlugin = require('@magento/pwa-buildpack/lib/WebpackTools/plugins/LocalizationPlugin');
+
+module.exports = targets => {
+  // Perform the asynchronous operation outside the tap
+  let availableWebsites;
+
+  // Use an IIFE (Immediately Invoked Function Expression) to enable async/await
+  (async () => {
+    availableWebsites = await getAvailableWebsitesConfigData();
+  })();
+
+  targets.of('@magento/pwa-buildpack').specialFeatures.tap(features => {
+    features[targets.name] = { i18n: true, esModules: true, cssModules: true, graphqlQueries: true };
+  });
+
+  targets.of('@magento/pwa-buildpack').webpackCompiler.tap(compiler => {
+    new moduleOverridePlugin(componentOverrideMapping).apply(compiler);
+  });
+
+  // Tap into webpackCompiler
+  targets.of('@magento/pwa-buildpack').webpackCompiler.tap(compiler => {
+      // Check if the LocalizationPlugin is present
+      if (compiler.options.plugins) {
+        const localizationPlugin = compiler.options.plugins.find(
+            plugin => plugin instanceof LocalizationPlugin
+        );
+
+        // Check if LocalizationPlugin is found
+        if (localizationPlugin) {
+            // Store the original mergeLocales function
+            const originalMergeLocales = localizationPlugin.mergeLocales;
+
+            // Define your custom hook
+            function myCustomMergeLocalesHook(current, update) {
+                // Modify the mergedLocales data here
+                Object.keys(update).forEach(key => {
+                  if (typeof current[key] === 'undefined') {
+                      current[key] = [];
+                  }
+                  if (Array.isArray(current[key]) && Array.isArray(update[key])) {
+                    if (update[key].toString().includes("venia-ui")) {
+                      delete update[key];
+                    }
+                  }
+              });
+
+                // Return the modified mergedLocales
+                return originalMergeLocales.call(localizationPlugin, current, update);
+            }
+
+            // Override mergeLocales with your custom hook
+            localizationPlugin.mergeLocales = myCustomMergeLocalesHook;
+        }
+    }
+  });
+
+  targets.of('@magento/pwa-buildpack').envVarDefinitions.tap(defs => {
+    defs.sections.push({
+      name: "Default Website Code",
+      variables: [
+        {
+          name: "WEBSITE_CODE",
+          type: "str",
+          desc: "Default Website Code for Multi Website Extension",
+        },
+      ],
+    });
+  });
+
+  // Define the routes using the results of the asynchronous operation
+  const routes = [
+    {
+      exact: true,
+      name: "BecomeSellerRoute",
+      pattern: "/become-seller",
+      path: require.resolve("./components/BecomeSellerPage/index.js"),
+      authed: true,
+      redirectTo: "/sign-in"
+    },
+    {
+      exact: true,
+      name: "SellerAccountRoute",
+      pattern: "/seller-account",
+      path: require.resolve("./components/SellerAccountPage/index.js"),
+      authed: true,
+      redirectTo: "/become-seller"
+    },
+    {
+      exact: true,
+      name: "SellerPage",
+      pattern: "/seller/:urlKey",
+      path: require.resolve("./components/SellerPage/index.js"),
+      authed: false,
+    },
+  ];
+
+  // Apply DefinePlugin using the results of the asynchronous operation
+  targets.of('@magento/pwa-buildpack').webpackCompiler.tap(compiler => {
+    new DefinePlugin({
+      AVAILABLE_WEBSITES: JSON.stringify(availableWebsites.availableStoresByUserIp),
+      WEBSITE_CODE: process.env.WEBSITE_CODE
+    }).apply(compiler);
+  });
+
+  // Handle the routes directly within the routes tap
+  targets.of("@magento/venia-ui").routes.tap(routesArray => {
+    routesArray.push(...routes);
+    return routesArray;
+  });
 };

package/src/moduleOverrideWebpackPlugin.js

@@ -1,71 +1,71 @@
-const path = require('path');
-const glob = require('glob');
-
-module.exports = class NormalModuleOverridePlugin {
-  constructor(moduleOverrideMap) {
-    this.name = 'NormalModuleOverridePlugin';
-    this.moduleOverrideMap = moduleOverrideMap;
-  }
-
-  requireResolveIfCan(id, options = undefined) {
-    try {
-      return require.resolve(id, options);
-    } catch (e) {
-      return undefined;
-    }
-  }
-  resolveModulePath(context, request) {
-    const filePathWithoutExtension = path.resolve(context, request);
-    const files = glob.sync(`${filePathWithoutExtension}@(|.*)`);
-    if (files.length === 0) {
-      throw new Error(`There is no file '${filePathWithoutExtension}'`);
-    }
-    if (files.length > 1) {
-      throw new Error(
-        `There is more than one file '${filePathWithoutExtension}'`
-      );
-    }
-
-    return require.resolve(files[0]);
-  }
-
-  resolveModuleOverrideMap(context, map) {
-    return Object.keys(map).reduce(
-      (result, x) => ({
-        ...result,
-        [require.resolve(x)]:
-          this.requireResolveIfCan(map[x]) ||
-          this.resolveModulePath(context, map[x]),
-      }),
-      {}
-    );
-  }
-
-  apply(compiler) {
-    if (Object.keys(this.moduleOverrideMap).length === 0) {
-      return;
-    }
-
-    const moduleMap = this.resolveModuleOverrideMap(
-      compiler.context,
-      this.moduleOverrideMap
-    );
-
-    compiler.hooks.normalModuleFactory.tap(this.name, (nmf) => {
-      nmf.hooks.beforeResolve.tap(this.name, (resolve) => {
-        if (!resolve) {
-          return;
-        }
-
-        const moduleToReplace = this.requireResolveIfCan(resolve.request, {
-          paths: [resolve.context],
-        });
-        if (moduleToReplace && moduleMap[moduleToReplace]) {
-          resolve.request = moduleMap[moduleToReplace];
-        }
-
-        return resolve;
-      });
-    });
-  }
+const path = require('path');
+const glob = require('glob');
+
+module.exports = class NormalModuleOverridePlugin {
+  constructor(moduleOverrideMap) {
+    this.name = 'NormalModuleOverridePlugin';
+    this.moduleOverrideMap = moduleOverrideMap;
+  }
+
+  requireResolveIfCan(id, options = undefined) {
+    try {
+      return require.resolve(id, options);
+    } catch (e) {
+      return undefined;
+    }
+  }
+  resolveModulePath(context, request) {
+    const filePathWithoutExtension = path.resolve(context, request);
+    const files = glob.sync(`${filePathWithoutExtension}@(|.*)`);
+    if (files.length === 0) {
+      throw new Error(`There is no file '${filePathWithoutExtension}'`);
+    }
+    if (files.length > 1) {
+      throw new Error(
+        `There is more than one file '${filePathWithoutExtension}'`
+      );
+    }
+
+    return require.resolve(files[0]);
+  }
+
+  resolveModuleOverrideMap(context, map) {
+    return Object.keys(map).reduce(
+      (result, x) => ({
+        ...result,
+        [require.resolve(x)]:
+          this.requireResolveIfCan(map[x]) ||
+          this.resolveModulePath(context, map[x]),
+      }),
+      {}
+    );
+  }
+
+  apply(compiler) {
+    if (Object.keys(this.moduleOverrideMap).length === 0) {
+      return;
+    }
+
+    const moduleMap = this.resolveModuleOverrideMap(
+      compiler.context,
+      this.moduleOverrideMap
+    );
+
+    compiler.hooks.normalModuleFactory.tap(this.name, (nmf) => {
+      nmf.hooks.beforeResolve.tap(this.name, (resolve) => {
+        if (!resolve) {
+          return;
+        }
+
+        const moduleToReplace = this.requireResolveIfCan(resolve.request, {
+          paths: [resolve.context],
+        });
+        if (moduleToReplace && moduleMap[moduleToReplace]) {
+          resolve.request = moduleMap[moduleToReplace];
+        }
+
+        return resolve;
+      });
+    });
+  }
 };

package/src/overwrites/peregrine/lib/store/actions/user/asyncActions.js

@@ -1,96 +1,96 @@
-import BrowserPersistence from '@magento/peregrine/lib/util/simplePersistence';
-import { removeCart } from '@magento/peregrine/lib/store/actions/cart';
-import { clearCheckoutDataFromStorage } from '@magento/peregrine/lib/store/actions/checkout';
-
-import actions from '@magento/peregrine/lib/store/actions/user/actions';
-
-const storage = new BrowserPersistence();
-
-export const signOut = (payload = {}) =>
-    async function thunk(dispatch, getState, { apolloClient }) {
-        const { revokeToken } = payload;
-
-        if (revokeToken) {
-            // Send mutation to revoke token.
-            try {
-                await revokeToken();
-            } catch (error) {
-                console.error('Error Revoking Token', error);
-            }
-        }
-
-        // Remove token from local storage and Redux.
-        await dispatch(clearToken());
-        await dispatch(actions.reset());
-        await clearCheckoutDataFromStorage();
-        await apolloClient.clearCacheData(apolloClient, 'cart');
-        await apolloClient.clearCacheData(apolloClient, 'customer');
-
-        // Now that we're signed out, forget the old (customer) cart.
-        // We don't need to create a new cart here because we're going to refresh
-        // the page immediately after.
-        await dispatch(removeCart());
-    };
-
-export const getUserDetails = ({ fetchUserDetails }) =>
-    async function thunk(...args) {
-        const [dispatch, getState] = args;
-        const { user } = getState();
-
-        if (user.isSignedIn) {
-            dispatch(actions.getDetails.request());
-
-            try {
-                const { data } = await fetchUserDetails();
-                
-                if (data.customer) {
-                    const isSeller = data.customer.is_seller;
-                    if (isSeller) {
-                        storage.setItem('is_seller', true);
-                    }
-                }
-
-                dispatch(actions.getDetails.receive(data.customer));
-            } catch (error) {
-                dispatch(actions.getDetails.receive(error));
-            }
-        }
-    };
-
-export const resetPassword = ({ email }) =>
-    async function thunk(...args) {
-        const [dispatch] = args;
-
-        dispatch(actions.resetPassword.request());
-
-        // TODO: actually make the call to the API.
-        // For now, just return a resolved promise.
-        await Promise.resolve(email);
-
-        dispatch(actions.resetPassword.receive());
-    };
-
-export const setToken = token =>
-    async function thunk(...args) {
-        const [dispatch] = args;
-
-        // Store token in local storage.
-        // TODO: Get correct token expire time from API
-        storage.setItem('signin_token', token, 3600);
-
-        // Persist in store
-        dispatch(actions.setToken(token));
-    };
-
-export const clearToken = () =>
-    async function thunk(...args) {
-        const [dispatch] = args;
-
-        // Clear token from local storage
-        storage.removeItem('signin_token');
-
-        storage.removeItem('is_seller');
-
-        // Remove from store
-        dispatch(actions.clearToken());
-    };
+import BrowserPersistence from '@magento/peregrine/lib/util/simplePersistence';
+import { removeCart } from '@magento/peregrine/lib/store/actions/cart';
+import { clearCheckoutDataFromStorage } from '@magento/peregrine/lib/store/actions/checkout';
+
+import actions from '@magento/peregrine/lib/store/actions/user/actions';
+
+const storage = new BrowserPersistence();
+
+export const signOut = (payload = {}) =>
+    async function thunk(dispatch, getState, { apolloClient }) {
+        const { revokeToken } = payload;
+
+        if (revokeToken) {
+            // Send mutation to revoke token.
+            try {
+                await revokeToken();
+            } catch (error) {
+                console.error('Error Revoking Token', error);
+            }
+        }
+
+        // Remove token from local storage and Redux.
+        await dispatch(clearToken());
+        await dispatch(actions.reset());
+        await clearCheckoutDataFromStorage();
+        await apolloClient.clearCacheData(apolloClient, 'cart');
+        await apolloClient.clearCacheData(apolloClient, 'customer');
+
+        // Now that we're signed out, forget the old (customer) cart.
+        // We don't need to create a new cart here because we're going to refresh
+        // the page immediately after.
+        await dispatch(removeCart());
+    };
+
+export const getUserDetails = ({ fetchUserDetails }) =>
+    async function thunk(...args) {
+        const [dispatch, getState] = args;
+        const { user } = getState();
+
+        if (user.isSignedIn) {
+            dispatch(actions.getDetails.request());
+
+            try {
+                const { data } = await fetchUserDetails();
+                
+                if (data.customer) {
+                    const isSeller = data.customer.is_seller;
+                    if (isSeller) {
+                        storage.setItem('is_seller', true);
+                    }
+                }
+
+                dispatch(actions.getDetails.receive(data.customer));
+            } catch (error) {
+                dispatch(actions.getDetails.receive(error));
+            }
+        }
+    };
+
+export const resetPassword = ({ email }) =>
+    async function thunk(...args) {
+        const [dispatch] = args;
+
+        dispatch(actions.resetPassword.request());
+
+        // TODO: actually make the call to the API.
+        // For now, just return a resolved promise.
+        await Promise.resolve(email);
+
+        dispatch(actions.resetPassword.receive());
+    };
+
+export const setToken = token =>
+    async function thunk(...args) {
+        const [dispatch] = args;
+
+        // Store token in local storage.
+        // TODO: Get correct token expire time from API
+        storage.setItem('signin_token', token, 3600);
+
+        // Persist in store
+        dispatch(actions.setToken(token));
+    };
+
+export const clearToken = () =>
+    async function thunk(...args) {
+        const [dispatch] = args;
+
+        // Clear token from local storage
+        storage.removeItem('signin_token');
+
+        storage.removeItem('is_seller');
+
+        // Remove from store
+        dispatch(actions.clearToken());
+    };