Merge pull request #3896 from reduxframework/update-extendify-bpzzjn0

Update Extendify Library

Author: kprovance

extendify-sdk/app/Library/Welcome.php

@@ -130,17 +130,19 @@ public function createAdminPage()
                     </div>
                 </div>
                 <hr class="is-small"/>
-                <div class="welcome-section">
-                    <h2 class="aligncenter">
-                        <?php \esc_html_e('Upgrade to Extendify Pro', 'extendify'); ?>
-                    </h2>
-                    <p class="aligncenter is-subheading">
-                        <?php \esc_html_e('Do you want more patterns and layouts - without limits? Choose one of our plans and receive unlimited access to our complete library.', 'extendify'); ?>
-                    </p>
-                </div>
-                <a href="https://extendify.com/pricing/?utm_source=welcome&amp;utm_medium=settings&amp;utm_campaign=get_started&amp;utm_campaign=get_started" class="button button-primary components-button">
-                    <?php echo \esc_html__('View Pricing', 'extendify'); ?></a>
-                <hr/>
+                <?php if (!defined('EXTENDIFY_SITE_LICENSE')) : ?>
+                    <div class="welcome-section">
+                        <h2 class="aligncenter">
+                            <?php \esc_html_e('Upgrade to Extendify Pro', 'extendify'); ?>
+                        </h2>
+                        <p class="aligncenter is-subheading">
+                            <?php \esc_html_e('Do you want more patterns and layouts - without limits? Choose one of our plans and receive unlimited access to our complete library.', 'extendify'); ?>
+                        </p>
+                    </div>
+                    <a href="https://extendify.com/pricing/?utm_source=welcome&amp;utm_medium=settings&amp;utm_campaign=get_started&amp;utm_campaign=get_started" class="button button-primary components-button">
+                        <?php echo \esc_html__('View Pricing', 'extendify'); ?></a>
+                    <hr/>
+                <?php endif; ?>
             </div>
         </div>
         <?php

extendify-sdk/app/Onboarding/Admin.php

@@ -191,6 +191,10 @@ public function addScopedScriptsAndStyles()
                 'partnerName' => defined('EXTENDIFY_PARTNER_NAME') ? constant('EXTENDIFY_PARTNER_NAME') : null,
                 'partnerSkipSteps' => defined('EXTENDIFY_SKIP_STEPS') ? constant('EXTENDIFY_SKIP_STEPS') : [],
                 'devbuild' => \esc_attr(Config::$environment === 'DEVELOPMENT'),
+                'version' => Config::$version,
+                'insightsId' => \get_option('extendify_site_id', ''),
+                // Only send insights if they have opted in explicitly.
+                'insightsEnabled' => defined('EXTENDIFY_INSIGHTS_URL'),
             ]),
             'before'
         );

extendify-sdk/public/build/extendify-onboarding.css

@@ -34,6 +34,15 @@ PERFORMANCE OF THIS SOFTWARE.
 
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
+/** @license React v16.13.1
+ * react-is.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 /** @license React v17.0.2
  * react-jsx-runtime.production.min.js
  *

extendify-sdk/public/build/extendify-onboarding.js

@@ -3,7 +3,7 @@ Contributors: extendify, richtabor, kbat82, clubkert, arturgrabo
 Tags: templates, patterns, layouts, blocks, gutenberg
 Requires at least: 5.4
 Tested up to: 6.0
-Stable tag: 0.9.2
+Stable tag: 0.9.3
 Requires PHP: 5.6
 License: GPLv2
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -124,6 +124,9 @@ Nope! Extendify imports lightweight block-based content that is served directly
 
 == Changelog ==
 
+= 0.9.3 - 2022-08-11 =
+- Various bug fixes and performance improvements
+
 = 0.9.2 - 2022-07-29 =
 - Various bug fixes and performance improvements
 

extendify-sdk/public/build/extendify-onboarding.js.LICENSE.txt

@@ -26,7 +26,7 @@ export const TypeSelect = ({ className }) => {
                 <button
                     type="button"
                     className={classNames({
-                        'outline-none w-full m-0 -ml-px min-w-sm cursor-pointer items-center rounded-tr-sm rounded-br-sm py-2.5 px-4 text-xs leading-none': true,
+                        'outline-none w-full m-0 -ml-px min-w-sm cursor-pointer items-center rounded py-2.5 px-4 text-xs leading-none': true,
                         'bg-gray-900 text-white': currentType === 'template',
                         'bg-transparent text-black': currentType !== 'template',
                     })}

extendify-sdk/public/build/extendify.css

@@ -9,6 +9,7 @@ import { Finished } from '@onboarding/pages/Finished'
 import { useGlobalStore } from '@onboarding/state/Global'
 import { usePagesStore } from '@onboarding/state/Pages'
 import { updateOption } from './api/WPApi'
+import { useSentry } from './hooks/useSentry'
 import { useTelemetry } from './hooks/useTelemetry'
 import { NeedsTheme } from './pages/NeedsTheme'
 
@@ -26,6 +27,7 @@ export const Onboarding = () => {
     const [show, setShow] = useState(false)
     const [needsTheme, setNeedsTheme] = useState(false)
     const theme = useSelect((select) => select('core').getCurrentTheme())
+    const { Sentry } = useSentry()
     useDisableWelcomeGuide()
     useBodyScrollLock()
     useTelemetry()
@@ -76,17 +78,37 @@ export const Onboarding = () => {
         <SWRConfig
             value={{
                 errorRetryInterval: 1000,
-                onErrorRetry: (error, key) => {
-                    console.error(key, error)
+                onErrorRetry: (
+                    error,
+                    key,
+                    config,
+                    revalidate,
+                    { retryCount },
+                ) => {
                     if (error?.data?.status === 403) {
                         // if they are logged out, we can't recover
                         window.location.reload()
                         return
                     }
                     if (retrying) return
+
+                    if (retryCount >= 5) {
+                        console.error('Encountered unrecoverable error', error)
+                        throw new Error(error?.message ?? 'Unknown error')
+                    }
+                    console.error(key, error)
+                    Sentry.captureException(
+                        new Error(error?.message ?? 'Unknown error'),
+                        {
+                            tags: { retrying: true },
+                            extra: { cacheKey: key },
+                        },
+                    )
+
                     setRetrying(true)
                     setTimeout(() => {
                         setRetrying(false)
+                        revalidate({ retryCount })
                     }, 5000)
                 },
             }}>