@riosst100/pwa-marketplace 2.0.9 → 2.1.1

package/src/intercept.js

@@ -3,6 +3,7 @@ const moduleOverridePlugin = require('./moduleOverrideWebpackPlugin');
 const { DefinePlugin } = require('webpack');
 const { getAvailableWebsitesConfigData } = require('./Utilities/graphQL');
 const LocalizationPlugin = require('@magento/pwa-buildpack/lib/WebpackTools/plugins/LocalizationPlugin');
+const CopyPlugin = require("copy-webpack-plugin");
 
 module.exports = targets => {
   // Perform the asynchronous operation outside the tap
@@ -13,6 +14,10 @@ module.exports = targets => {
     availableWebsites = await getAvailableWebsitesConfigData();
   })();
 
+  targets.of('@magento/pwa-buildpack').transformUpward.tap(def => {
+    def.staticFromRoot.inline.body.file.template.inline = './static-files/{{ filename }}';
+  });
+
   targets.of('@magento/pwa-buildpack').specialFeatures.tap(features => {
     features[targets.name] = { i18n: true, esModules: true, cssModules: true, graphqlQueries: true };
   });
@@ -23,38 +28,38 @@ module.exports = targets => {
 
   // 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 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;
+      // 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);
+        // 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];
+              }
             }
+          });
 
-            // Override mergeLocales with your custom hook
-            localizationPlugin.mergeLocales = myCustomMergeLocalesHook;
+          // Return the modified mergedLocales
+          return originalMergeLocales.call(localizationPlugin, current, update);
         }
+
+        // Override mergeLocales with your custom hook
+        localizationPlugin.mergeLocales = myCustomMergeLocalesHook;
+      }
     }
   });
 
@@ -96,6 +101,90 @@ module.exports = targets => {
       path: require.resolve("./components/SellerPage/index.js"),
       authed: false,
     },
+    {
+      exact: true,
+      name: "CollectibleGameSetsPage",
+      pattern: "/games/collectible-game/:urlKey/:productType",
+      path: require.resolve("./components/CollectibleGameSetsPage/index.js"),
+      authed: false,
+    },
+    {
+      exact: true,
+      name: "BrandListPage",
+      pattern: "/brands",
+      path: require.resolve("./components/BrandListPage/index.js"),
+      authed: false,
+    },
+    {
+      exact: true,
+      name: "BrandLandingPage",
+      pattern: "/brand",
+      path: require.resolve("./components/BrandLandingPage/index.js"),
+      authed: false,
+    },
+    {
+      exact: true,
+      name: "MtgSinglesPage",
+      pattern: "/mtg-singles",
+      path: require.resolve("./components/MtgSinglesPage/index.js"),
+      authed: false,
+    },
+    {
+      exact: true,
+      name: "FavoriteSeller",
+      pattern: "/favorite-seller",
+      path: require.resolve("./components/FavoriteSeller/index.js"),
+      authed: true,
+    },
+    {
+      exact: true,
+      name: "Quote List",
+      pattern: "/quotes",
+      path: require.resolve("./components/RFQPage/index.js"),
+      authed: true,
+    },
+    {
+      exact: true,
+      name: "Quote Detail",
+      pattern: "/quotes/:urlKey",
+      path: require.resolve("./components/RFQPage/quoteDetailPage.js"),
+      authed: true,
+    },
+    {
+      exact: true,
+      name: "RMA",
+      pattern: "/return",
+      path: require.resolve("./components/RMAPage/index.js"),
+      authed: true,
+    },
+    {
+      exact: true,
+      name: "RMA Select",
+      pattern: "/return/select",
+      path: require.resolve("./components/RMAPage/RMASelectPage.js"),
+      authed: true,
+    },
+    {
+      exact: true,
+      name: "RMA Detail",
+      pattern: "/return/view/:urlKey",
+      path: require.resolve("./components/RMAPage/RMADetailPage.js"),
+      authed: true,
+    },
+    {
+      exact: true,
+      name: "New Return",
+      pattern: "/return/create/:urlKey",
+      path: require.resolve("./components/RMAPage/RMACreatePage.js"),
+      authed: true,
+    },
+    {
+      exact: true,
+      name: "Order Detail",
+      pattern: "/order-history/view/:urlKey",
+      path: require.resolve("./components/OrderDetail/orderDetailPage.js"),
+      authed: true,
+    }
   ];
 
   // Apply DefinePlugin using the results of the asynchronous operation
@@ -106,6 +195,12 @@ module.exports = targets => {
     }).apply(compiler);
   });
 
+  targets.of('@magento/pwa-buildpack').webpackCompiler.tap(compiler => {
+    new CopyPlugin({
+      patterns: [{ from: 'node_modules/@riosst100/pwa-marketplace/src/static-files', to: 'static-files' }]
+    }).apply(compiler);
+  });
+
   // Handle the routes directly within the routes tap
   targets.of("@magento/venia-ui").routes.tap(routesArray => {
     routesArray.push(...routes);

package/src/overwrites/pagebuilder/lib/ContentTypes/Products/Carousel/__fixtures__/apolloMocks.js

@@ -0,0 +1,33 @@
+import acOperations from '../carousel.gql.ee';
+import mosOperations from '../carousel.gql.ce';
+
+export const mockGetStoreConfigAC = {
+    request: {
+        query: acOperations.getStoreConfigQuery
+    },
+    result: {
+        data: {
+            storeConfig: {
+                store_code: 'default',
+                magento_wishlist_general_is_enabled: '1',
+                enable_multiple_wishlists: '1',
+                product_url_suffix: '.html'
+            }
+        }
+    }
+};
+
+export const mockGetStoreConfigMOS = {
+    request: {
+        query: mosOperations.getStoreConfigQuery
+    },
+    result: {
+        data: {
+            storeConfig: {
+                store_code: 'default',
+                magento_wishlist_general_is_enabled: '1',
+                product_url_suffix: '.html'
+            }
+        }
+    }
+};

package/src/overwrites/pagebuilder/lib/ContentTypes/Products/Carousel/carousel.gql.ce.js

@@ -0,0 +1,16 @@
+import { gql } from '@apollo/client';
+
+export const GET_STORE_CONFIG = gql`
+    query GetStoreConfigForCarouselMOS {
+        # eslint-disable-next-line @graphql-eslint/require-id-when-available
+        storeConfig {
+            store_code
+            product_url_suffix
+            magento_wishlist_general_is_enabled
+        }
+    }
+`;
+
+export default {
+    getStoreConfigQuery: GET_STORE_CONFIG
+};

package/src/overwrites/pagebuilder/lib/ContentTypes/Products/Carousel/carousel.gql.ee.js

@@ -0,0 +1,17 @@
+import { gql } from '@apollo/client';
+
+export const GET_STORE_CONFIG = gql`
+    query GetStoreConfigForCarouselAC {
+        # eslint-disable-next-line @graphql-eslint/require-id-when-available
+        storeConfig {
+            store_code
+            product_url_suffix
+            magento_wishlist_general_is_enabled
+            enable_multiple_wishlists
+        }
+    }
+`;
+
+export default {
+    getStoreConfigQuery: GET_STORE_CONFIG
+};

package/src/overwrites/pagebuilder/lib/ContentTypes/Products/Carousel/carousel.js

@@ -0,0 +1,38 @@
+import React from 'react';
+import Slider from "react-slick";
+import GalleryItem from '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/Gallery/item';
+import { useCarousel } from './useCarousel';
+
+const Carousel = props => {
+    const { settings, items } = props;
+    const { storeConfig } = useCarousel();
+
+    const galleryItems = items.map((item, index) => {
+        return (
+            <GalleryItem key={index} item={item} storeConfig={storeConfig} rootClassName="px-2 block product-item max-w-[240px]" />
+        );
+    });
+
+    return (
+        <>
+            <Slider {...settings} className='product-carousel -mx-2'>
+                {galleryItems}
+            </Slider>
+            <style global jsx>
+                {`
+                    .product-carousel .slick-slide a {
+                        text-decoration: none !important;
+                    }
+                    // article[class*="cms-root"] {
+                    //     padding: 0;
+                    // }
+                    .product-carousel .item-product img {
+                        margin: 0 !important;
+                    }
+                `}
+            </style>
+        </>
+    );
+};
+
+export default Carousel;

package/src/overwrites/pagebuilder/lib/ContentTypes/Products/Carousel/index.js

@@ -0,0 +1 @@
+export { default } from './carousel';

package/src/overwrites/pagebuilder/lib/ContentTypes/Products/Carousel/useCarousel.js

@@ -0,0 +1,25 @@
+import { useQuery } from '@apollo/client';
+
+import { useCustomerWishlistSkus } from '@magento/peregrine/lib/hooks/useCustomerWishlistSkus/useCustomerWishlistSkus';
+
+import mergeOperations from '@magento/peregrine/lib/util/shallowMerge';
+import defaultOperations from './carousel.gql';
+
+/**
+ * This is a duplicate of @magento/peregrine/lib/talons/Gallery/useGallery.js
+ */
+export const useCarousel = (props = {}) => {
+    const operations = mergeOperations(defaultOperations, props.operations);
+
+    useCustomerWishlistSkus();
+
+    const { data: storeConfigData } = useQuery(operations.getStoreConfigQuery, {
+        fetchPolicy: 'cache-and-network'
+    });
+
+    const storeConfig = storeConfigData ? storeConfigData.storeConfig : null;
+
+    return {
+        storeConfig
+    };
+};

package/src/overwrites/pagebuilder/lib/ContentTypes/Products/configAggregator.js

@@ -0,0 +1,26 @@
+import { getAdvanced } from '../../utils';
+
+export default (node, props) => {
+    const forms = node.querySelectorAll(
+        '.product-item-details > .product-item-name > a.product-item-link'
+    );
+    let carouselConfig = {};
+
+    if (props.appearance === 'carousel') {
+        carouselConfig = {
+            autoplay: node.getAttribute('data-autoplay') === 'true',
+            autoplaySpeed: parseInt(node.getAttribute('data-autoplay-speed')),
+            infinite: node.getAttribute('data-infinite-loop') === 'true',
+            arrows: node.getAttribute('data-show-arrows') === 'true',
+            dots: node.getAttribute('data-show-dots') === 'true',
+            carouselMode: node.getAttribute('data-carousel-mode'),
+            centerPadding: node.getAttribute('data-center-padding')
+        };
+    }
+
+    return {
+        pathNames: [...forms].map(form => form.getAttribute('href')),
+        ...carouselConfig,
+        ...getAdvanced(node)
+    };
+};

package/src/overwrites/pagebuilder/lib/ContentTypes/Products/index.js

@@ -0,0 +1 @@
+export { default } from './products';