@riosst100/pwa-marketplace 1.2.5 → 1.2.7

package/src/overwrites/venia-ui/lib/components/SearchBar/suggestedProducts.js

@@ -1,43 +1,43 @@
-import React from 'react';
-import { arrayOf, func, number, oneOfType, shape, string } from 'prop-types';
-
-import { useStyle } from '@magento/venia-ui/lib/classify';
-import mapProduct from '@magento/venia-ui/lib/util/mapProduct';
-import SuggestedProduct from './suggestedProduct';
-import defaultClasses from './suggestedProducts.module.css';
-
-const SuggestedProducts = props => {
-    const { limit, onNavigate, products } = props;
-    const classes = useStyle(defaultClasses, props.classes);
-
-    const items = products.slice(0, limit).map(product => (
-        <li key={product.id} className={classes.item}>
-            <SuggestedProduct
-                {...mapProduct(product)}
-                onNavigate={onNavigate}
-            />
-        </li>
-    ));
-
-    return <ul className={classes.root}>{items}</ul>;
-};
-
-export default SuggestedProducts;
-
-SuggestedProducts.defaultProps = {
-    limit: 3
-};
-
-SuggestedProducts.propTypes = {
-    classes: shape({
-        item: string,
-        root: string
-    }),
-    limit: number.isRequired,
-    onNavigate: func,
-    products: arrayOf(
-        shape({
-            id: oneOfType([number, string]).isRequired
-        })
-    ).isRequired
-};
+import React from 'react';
+import { arrayOf, func, number, oneOfType, shape, string } from 'prop-types';
+
+import { useStyle } from '@magento/venia-ui/lib/classify';
+import mapProduct from '@magento/venia-ui/lib/util/mapProduct';
+import SuggestedProduct from './suggestedProduct';
+import defaultClasses from './suggestedProducts.module.css';
+
+const SuggestedProducts = props => {
+    const { limit, onNavigate, products } = props;
+    const classes = useStyle(defaultClasses, props.classes);
+
+    const items = products.slice(0, limit).map(product => (
+        <li key={product.id} className={classes.item}>
+            <SuggestedProduct
+                {...mapProduct(product)}
+                onNavigate={onNavigate}
+            />
+        </li>
+    ));
+
+    return <ul className={classes.root}>{items}</ul>;
+};
+
+export default SuggestedProducts;
+
+SuggestedProducts.defaultProps = {
+    limit: 3
+};
+
+SuggestedProducts.propTypes = {
+    classes: shape({
+        item: string,
+        root: string
+    }),
+    limit: number.isRequired,
+    onNavigate: func,
+    products: arrayOf(
+        shape({
+            id: oneOfType([number, string]).isRequired
+        })
+    ).isRequired
+};

package/src/overwrites/venia-ui/lib/components/SearchBar/suggestedProducts.module.css

@@ -1,13 +1,13 @@
-.products {
-    composes: border-t from global;
-    composes: border-solid from global;
-    composes: border-subtle from global;
-    composes: gap-3 from global;
-    composes: grid from global;
-    composes: pt-3 from global;
-}
-
-/* TODO @TW: cannot compose */
-.products:empty {
-    display: none;
-}
+.products {
+    composes: border-t from global;
+    composes: border-solid from global;
+    composes: border-subtle from global;
+    composes: gap-3 from global;
+    composes: grid from global;
+    composes: pt-3 from global;
+}
+
+/* TODO @TW: cannot compose */
+.products:empty {
+    display: none;
+}

package/src/overwrites/venia-ui/lib/components/SearchBar/suggestions.js

@@ -1,75 +1,75 @@
-import React, { Fragment } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { arrayOf, bool, func, shape, string } from 'prop-types';
-import { useSuggestions } from '@magento/peregrine/lib/talons/SearchBar';
-
-import { useStyle } from '@magento/venia-ui/lib/classify';
-import SuggestedCategories from './suggestedCategories';
-import SuggestedProducts from './suggestedProducts';
-import defaultClasses from './suggestions.module.css';
-
-const Suggestions = props => {
-    const {
-        displayResult,
-        filters,
-        products,
-        searchValue,
-        setVisible,
-        visible
-    } = props;
-    const { items } = products;
-
-    const talonProps = useSuggestions({
-        displayResult,
-        filters,
-        items,
-        setVisible,
-        visible
-    });
-    const { categories, onNavigate, shouldRender } = talonProps;
-    const classes = useStyle(defaultClasses, props.classes);
-
-    // render null without data
-    if (!shouldRender) {
-        return null;
-    }
-
-    return (
-        <Fragment>
-            <SuggestedCategories
-                categories={categories}
-                onNavigate={onNavigate}
-                value={searchValue}
-            />
-            <h2 data-cy="Suggestions-heading" className={classes.heading}>
-                <span>
-                    <FormattedMessage
-                        id={'searchBar.heading'}
-                        defaultMessage={'Product Suggestions'}
-                    />
-                </span>
-            </h2>
-            <SuggestedProducts onNavigate={onNavigate} products={items} />
-        </Fragment>
-    );
-};
-
-export default Suggestions;
-
-Suggestions.propTypes = {
-    classes: shape({
-        heading: string
-    }),
-    products: shape({
-        filters: arrayOf(
-            shape({
-                filter_items: arrayOf(shape({})),
-                name: string.isRequired
-            }).isRequired
-        ),
-        items: arrayOf(shape({}))
-    }),
-    searchValue: string,
-    setVisible: func,
-    visible: bool
-};
+import React, { Fragment } from 'react';
+import { FormattedMessage } from 'react-intl';
+import { arrayOf, bool, func, shape, string } from 'prop-types';
+import { useSuggestions } from '@magento/peregrine/lib/talons/SearchBar';
+
+import { useStyle } from '@magento/venia-ui/lib/classify';
+import SuggestedCategories from './suggestedCategories';
+import SuggestedProducts from './suggestedProducts';
+import defaultClasses from './suggestions.module.css';
+
+const Suggestions = props => {
+    const {
+        displayResult,
+        filters,
+        products,
+        searchValue,
+        setVisible,
+        visible
+    } = props;
+    const { items } = products;
+
+    const talonProps = useSuggestions({
+        displayResult,
+        filters,
+        items,
+        setVisible,
+        visible
+    });
+    const { categories, onNavigate, shouldRender } = talonProps;
+    const classes = useStyle(defaultClasses, props.classes);
+
+    // render null without data
+    if (!shouldRender) {
+        return null;
+    }
+
+    return (
+        <Fragment>
+            <SuggestedCategories
+                categories={categories}
+                onNavigate={onNavigate}
+                value={searchValue}
+            />
+            <h2 data-cy="Suggestions-heading" className={classes.heading}>
+                <span>
+                    <FormattedMessage
+                        id={'searchBar.heading'}
+                        defaultMessage={'Product Suggestions'}
+                    />
+                </span>
+            </h2>
+            <SuggestedProducts onNavigate={onNavigate} products={items} />
+        </Fragment>
+    );
+};
+
+export default Suggestions;
+
+Suggestions.propTypes = {
+    classes: shape({
+        heading: string
+    }),
+    products: shape({
+        filters: arrayOf(
+            shape({
+                filter_items: arrayOf(shape({})),
+                name: string.isRequired
+            }).isRequired
+        ),
+        items: arrayOf(shape({}))
+    }),
+    searchValue: string,
+    setVisible: func,
+    visible: bool
+};

package/src/overwrites/venia-ui/lib/components/SearchBar/suggestions.module.css

@@ -1,6 +1,6 @@
-.heading {
-    composes: pt-3 from global;
-    composes: text-sm from global;
-    composes: text-subtle from global;
-    composes: uppercase from global;
-}
+.heading {
+    composes: pt-3 from global;
+    composes: text-sm from global;
+    composes: text-subtle from global;
+    composes: uppercase from global;
+}

package/src/overwrites/venia-ui/lib/components/StoreCodeRoute/storeCodeRoute.js

@@ -1,75 +1,75 @@
-import { useEffect, useMemo } from 'react';
-import { useHistory } from 'react-router-dom';
-import { BrowserPersistence } from '@magento/peregrine/lib/util';
-
-const storage = new BrowserPersistence();
-
-/**
- * This component checks for use of a store code in the url that is not the
- * current base. If found, it updates the local storage values for code/currency
- * and reloads the page so that they are used in the graphQL headers.
- */
-const StoreCodeRoute = () => {
-    const history = useHistory();
-
-    const websiteCodes = [];
-    const websiteStores = useMemo(() => ({}), []);
-    const storeCurrencies = useMemo(() => ({}), []);
-    const storeSecureBaseMediaUrl = useMemo(() => ({}), []);
-
-    AVAILABLE_WEBSITES.forEach(store => {
-        websiteCodes.push(store.website_code);
-        websiteStores[store.website_code] = store.store_code;
-        storeCurrencies[store.store_code] = store.default_display_currency_code;
-        storeSecureBaseMediaUrl[store.store_code] = store.secure_base_media_url;
-    });
-
-    // Sort by length (longest first) to avoid false hits ie "en" matching just
-    // the "/en" in "/en-us/home.html" when "en-us" is also in storeCodes.
-    websiteCodes.sort((a, b) => b.length - a.length);
-
-    // Find the store code in the url. This will always be the first path.
-    // ie `https://example.com/fr/foo/baz.html` => `fr`.
-    const { location } = globalThis;
-    const match = location && location.pathname.split("/")[1];
-    let websiteCodeInUrl = websiteCodes.find((str) => str === match);
-
-    // Determine what the current store code is using the configured basename.
-    const currentWebsiteCode = storage && storage.getItem('website_code') || process.env.WEBSITE_CODE;
-
-    // If we find a store code in the url that is not the current one, update
-    // the storage value and refresh so that we start using the new code.
-    useEffect(() => {
-        if (!websiteCodeInUrl) {
-            history.replace(location.pathname)
-        } else if (websiteCodeInUrl && websiteCodeInUrl !== currentWebsiteCode) {
-            let storeCodeInUrl = websiteStores[websiteCodeInUrl];
-
-            storage.setItem('store_view_code', storeCodeInUrl);
-            storage.setItem('website_code', websiteCodeInUrl);
-            storage.setItem(
-                'store_view_currency',
-                storeCurrencies[storeCodeInUrl]
-            );
-            storage.setItem(
-                'store_view_secure_base_media_url',
-                storeSecureBaseMediaUrl[storeCodeInUrl]
-            );
-
-            // We're required to reload the page as the basename doesn't
-            // change entirely without a full page reload.
-            history.go(0);
-        }
-    }, [
-        websiteCodeInUrl,
-        // currentWebsiteCode,
-        history
-        // storeCodeInUrl,
-        // storeCurrencies,
-        // storeSecureBaseMediaUrl
-    ]);
-
-    return null;
-};
-
-export default StoreCodeRoute;
+import { useEffect, useMemo } from 'react';
+import { useHistory } from 'react-router-dom';
+import { BrowserPersistence } from '@magento/peregrine/lib/util';
+
+const storage = new BrowserPersistence();
+
+/**
+ * This component checks for use of a store code in the url that is not the
+ * current base. If found, it updates the local storage values for code/currency
+ * and reloads the page so that they are used in the graphQL headers.
+ */
+const StoreCodeRoute = () => {
+    const history = useHistory();
+
+    const websiteCodes = [];
+    const websiteStores = useMemo(() => ({}), []);
+    const storeCurrencies = useMemo(() => ({}), []);
+    const storeSecureBaseMediaUrl = useMemo(() => ({}), []);
+
+    AVAILABLE_WEBSITES.forEach(store => {
+        websiteCodes.push(store.website_code);
+        websiteStores[store.website_code] = store.store_code;
+        storeCurrencies[store.store_code] = store.default_display_currency_code;
+        storeSecureBaseMediaUrl[store.store_code] = store.secure_base_media_url;
+    });
+
+    // Sort by length (longest first) to avoid false hits ie "en" matching just
+    // the "/en" in "/en-us/home.html" when "en-us" is also in storeCodes.
+    websiteCodes.sort((a, b) => b.length - a.length);
+
+    // Find the store code in the url. This will always be the first path.
+    // ie `https://example.com/fr/foo/baz.html` => `fr`.
+    const { location } = globalThis;
+    const match = location && location.pathname.split("/")[1];
+    let websiteCodeInUrl = websiteCodes.find((str) => str === match);
+
+    // Determine what the current store code is using the configured basename.
+    const currentWebsiteCode = storage && storage.getItem('website_code') || process.env.WEBSITE_CODE;
+
+    // If we find a store code in the url that is not the current one, update
+    // the storage value and refresh so that we start using the new code.
+    useEffect(() => {
+        if (!websiteCodeInUrl) {
+            history.replace(location.pathname)
+        } else if (websiteCodeInUrl && websiteCodeInUrl !== currentWebsiteCode) {
+            let storeCodeInUrl = websiteStores[websiteCodeInUrl];
+
+            storage.setItem('store_view_code', storeCodeInUrl);
+            storage.setItem('website_code', websiteCodeInUrl);
+            storage.setItem(
+                'store_view_currency',
+                storeCurrencies[storeCodeInUrl]
+            );
+            storage.setItem(
+                'store_view_secure_base_media_url',
+                storeSecureBaseMediaUrl[storeCodeInUrl]
+            );
+
+            // We're required to reload the page as the basename doesn't
+            // change entirely without a full page reload.
+            history.go(0);
+        }
+    }, [
+        websiteCodeInUrl,
+        // currentWebsiteCode,
+        history
+        // storeCodeInUrl,
+        // storeCurrencies,
+        // storeSecureBaseMediaUrl
+    ]);
+
+    return null;
+};
+
+export default StoreCodeRoute;

package/src/overwrites/venia-ui/lib/targets/venia-ui-intercept.js

@@ -1,70 +1,70 @@
-/**
- * @module VeniaUI/Targets
- */
-const { Targetables } = require('@magento/pwa-buildpack');
-const CategoryListProductAttributes = require('./CategoryListProductAttributes');
-const RichContentRendererList = require('./RichContentRendererList');
-const makeRoutesTarget = require('./makeRoutesTarget');
-const CheckoutPagePaymentsList = require('./CheckoutPagePaymentsList');
-const SavedPaymentTypes = require('./SavedPaymentTypes');
-const EditablePaymentTypes = require('./EditablePaymentTypes');
-const SummaryPaymentTypes = require('./SummaryPaymentTypes');
-const RootShimmerTypes = require('./RootShimmerTypes');
-
-module.exports = veniaTargets => {
-    const venia = Targetables.using(veniaTargets);
-
-    venia.setSpecialFeatures(
-        'cssModules',
-        'esModules',
-        'graphqlQueries',
-        'rootComponents',
-        'upward'
-    );
-
-    makeRoutesTarget(venia);
-
-    const renderers = new RichContentRendererList(venia);
-
-    renderers.add({
-        componentName: 'PlainHtmlRenderer',
-        importPath: './plainHtmlRenderer'
-    });
-
-    const checkoutPagePaymentsList = new CheckoutPagePaymentsList(venia);
-    checkoutPagePaymentsList.add({
-        paymentCode: 'braintree',
-        importPath:
-            '@magento/venia-ui/lib/components/CheckoutPage/PaymentInformation/creditCard'
-    });
-
-    const savedPaymentTypes = new SavedPaymentTypes(venia);
-    savedPaymentTypes.add({
-        paymentCode: 'braintree',
-        importPath:
-            '@magento/venia-ui/lib/components/SavedPaymentsPage/creditCard'
-    });
-
-    const editablePayments = new EditablePaymentTypes(venia);
-    editablePayments.add({
-        paymentCode: 'braintree',
-        importPath:
-            '@magento/venia-ui/lib/components/CheckoutPage/PaymentInformation/editCard'
-    });
-
-    const summaryPagePaymentTypes = new SummaryPaymentTypes(venia);
-    summaryPagePaymentTypes.add({
-        paymentCode: 'braintree',
-        importPath:
-            '@magento/venia-ui/lib/components/CheckoutPage/PaymentInformation/braintreeSummary'
-    });
-
-    new CategoryListProductAttributes(venia);
-
-    const rootShimmerTypes = new RootShimmerTypes(venia);
-    rootShimmerTypes.add({
-        shimmerType: 'CATEGORY_SHIMMER',
-        importPath:
-            '@magento/venia-ui/lib/RootComponents/Category/categoryContent.shimmer'
-    });
-};
+/**
+ * @module VeniaUI/Targets
+ */
+const { Targetables } = require('@magento/pwa-buildpack');
+const CategoryListProductAttributes = require('./CategoryListProductAttributes');
+const RichContentRendererList = require('./RichContentRendererList');
+const makeRoutesTarget = require('./makeRoutesTarget');
+const CheckoutPagePaymentsList = require('./CheckoutPagePaymentsList');
+const SavedPaymentTypes = require('./SavedPaymentTypes');
+const EditablePaymentTypes = require('./EditablePaymentTypes');
+const SummaryPaymentTypes = require('./SummaryPaymentTypes');
+const RootShimmerTypes = require('./RootShimmerTypes');
+
+module.exports = veniaTargets => {
+    const venia = Targetables.using(veniaTargets);
+
+    venia.setSpecialFeatures(
+        'cssModules',
+        'esModules',
+        'graphqlQueries',
+        'rootComponents',
+        'upward'
+    );
+
+    makeRoutesTarget(venia);
+
+    const renderers = new RichContentRendererList(venia);
+
+    renderers.add({
+        componentName: 'PlainHtmlRenderer',
+        importPath: './plainHtmlRenderer'
+    });
+
+    const checkoutPagePaymentsList = new CheckoutPagePaymentsList(venia);
+    checkoutPagePaymentsList.add({
+        paymentCode: 'braintree',
+        importPath:
+            '@magento/venia-ui/lib/components/CheckoutPage/PaymentInformation/creditCard'
+    });
+
+    const savedPaymentTypes = new SavedPaymentTypes(venia);
+    savedPaymentTypes.add({
+        paymentCode: 'braintree',
+        importPath:
+            '@magento/venia-ui/lib/components/SavedPaymentsPage/creditCard'
+    });
+
+    const editablePayments = new EditablePaymentTypes(venia);
+    editablePayments.add({
+        paymentCode: 'braintree',
+        importPath:
+            '@magento/venia-ui/lib/components/CheckoutPage/PaymentInformation/editCard'
+    });
+
+    const summaryPagePaymentTypes = new SummaryPaymentTypes(venia);
+    summaryPagePaymentTypes.add({
+        paymentCode: 'braintree',
+        importPath:
+            '@magento/venia-ui/lib/components/CheckoutPage/PaymentInformation/braintreeSummary'
+    });
+
+    new CategoryListProductAttributes(venia);
+
+    const rootShimmerTypes = new RootShimmerTypes(venia);
+    rootShimmerTypes.add({
+        shimmerType: 'CATEGORY_SHIMMER',
+        importPath:
+            '@magento/venia-ui/lib/RootComponents/Category/categoryContent.shimmer'
+    });
+};

package/src/queries/getAvailableWebsitesConfigData.graphql

@@ -1,14 +1,14 @@
-query getAvailableWebsitesConfigData {
-    availableStoresByUserIp {
-        store_code
-        id
-        secure_base_media_url
-        store_name
-        default_display_currency_code
-        website_code
-        is_default_store
-        website_code
-        website_name
-        is_suggested
-    }
-}
+query getAvailableWebsitesConfigData {
+    availableStoresByUserIp {
+        store_code
+        id
+        secure_base_media_url
+        store_name
+        default_display_currency_code
+        website_code
+        is_default_store
+        website_code
+        website_name
+        is_suggested
+    }
+}

package/src/queries/index.js

@@ -1,30 +1,30 @@
-const fs = require('fs');
-const path = require('path');
-
-/**
- * Normal `require` doesn't know what to do with .graphql files, so this helper function
- * simply imports their contents as a string.
- * @see https://github.com/apollographql/apollo-server/issues/1175#issuecomment-397257339.
- *
- * @param   {String} filepath - A relative path to a .graphql file to read.
- * @returns {String} - The contents of the file as a string.
- */
-const requireGraphQL = filePath => {
-    const absolutePath = path.resolve(__dirname, filePath);
-    return stripComments(fs.readFileSync(absolutePath, { encoding: 'utf8' }));
-};
-
-const singleLineCommentRegex = /(^#.*\n)/gm;
-const stripComments = string => {
-    return string.replace(singleLineCommentRegex, '');
-};
-
-// Import all the build-time queries.
-const getAvailableWebsitesConfigData = requireGraphQL(
-    './getAvailableWebsitesConfigData.graphql'
-);
-
-// Export the queries for use by the rest of buildpack.
-module.exports = {
-    getAvailableWebsitesConfigData
-};
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * Normal `require` doesn't know what to do with .graphql files, so this helper function
+ * simply imports their contents as a string.
+ * @see https://github.com/apollographql/apollo-server/issues/1175#issuecomment-397257339.
+ *
+ * @param   {String} filepath - A relative path to a .graphql file to read.
+ * @returns {String} - The contents of the file as a string.
+ */
+const requireGraphQL = filePath => {
+    const absolutePath = path.resolve(__dirname, filePath);
+    return stripComments(fs.readFileSync(absolutePath, { encoding: 'utf8' }));
+};
+
+const singleLineCommentRegex = /(^#.*\n)/gm;
+const stripComments = string => {
+    return string.replace(singleLineCommentRegex, '');
+};
+
+// Import all the build-time queries.
+const getAvailableWebsitesConfigData = requireGraphQL(
+    './getAvailableWebsitesConfigData.graphql'
+);
+
+// Export the queries for use by the rest of buildpack.
+module.exports = {
+    getAvailableWebsitesConfigData
+};