Merge branch 'develop'

.config/rules.js

@@ -54,7 +54,7 @@ module.exports = [
 	},
 	// Help video snippets
 	{
-		test: /help\/videos\/[\w\d-_]+\.(mp4)$/,
+		test: /videos\/[\w\d-_]+\.(mp4)$/,
 		use: [
 			{
 				loader: 'file-loader',
@@ -69,7 +69,7 @@ module.exports = [
 	},
 	{
 		test: /\.(mp4)$/,
-		exclude: /(help\/videos)/,
+		exclude: /(help\/videos|help-tooltip\/videos)/,
 		use: [
 			{
 				loader: 'file-loader',

.config/webpack.config.dev.js

@@ -166,9 +166,11 @@ module.exports = [
 	target: [ 'web', 'es2017' ],
 
 	entry: {
+		'frontend_image_lightbox': path.resolve( __dirname, '../src/lightbox/frontend-image-lightbox.js' ),
 		'frontend_blocks': path.resolve( __dirname, '../src/block-frontend.js' ),
 		'frontend_block_accordion': path.resolve( __dirname, '../src/block/accordion/frontend-accordion.js' ),
 		'frontend_block_accordion_polyfill': path.resolve( __dirname, '../src/block/accordion/frontend-accordion-polyfill.js' ),
+		'frontend_block_carousel': path.resolve( __dirname, '../src/block/carousel/frontend-carousel.js' ),
 		'frontend_block_count_up': path.resolve( __dirname, '../src/block/count-up/frontend-count-up.js' ),
 		'frontend_block_countdown': path.resolve( __dirname, '../src/block/countdown/frontend-countdown.js' ),
 		'frontend_block_expand': path.resolve( __dirname, '../src/block/expand/frontend-expand.js' ),
@@ -178,6 +180,8 @@ module.exports = [
 		'frontend_block_progress_circle': path.resolve( __dirname, '../src/block/progress-circle/frontend-progress-circle.js' ),
 		'frontend_block_progress_bar': path.resolve( __dirname, '../src/block/progress-bar/frontend-progress-bar.js' ),
 		'frontend_block_horizontal_scroller': path.resolve( __dirname, '../src/block/horizontal-scroller/frontend-horizontal-scroller.js' ),
+		'frontend_block_tabs': path.resolve( __dirname, '../src/block/tabs/frontend-tabs.js' ),
+		'frontend_block_components_alignment_has_polyfill': path.resolve( __dirname, '../src/block-components/alignment/frontend-has-polyfill.js' ),
 	},
 
 	output: {

.config/webpack.config.prod.js

@@ -151,9 +151,11 @@ module.exports = [
 	target: [ 'web', 'es2017' ],
 
 	entry: {
+		'frontend_image_lightbox': path.resolve( __dirname, '../src/lightbox/frontend-image-lightbox.js' ),
 		'frontend_blocks': path.resolve( __dirname, '../src/block-frontend.js' ),
 		'frontend_block_accordion': path.resolve( __dirname, '../src/block/accordion/frontend-accordion.js' ),
 		'frontend_block_accordion_polyfill': path.resolve( __dirname, '../src/block/accordion/frontend-accordion-polyfill.js' ),
+		'frontend_block_carousel': path.resolve( __dirname, '../src/block/carousel/frontend-carousel.js' ),
 		'frontend_block_count_up': path.resolve( __dirname, '../src/block/count-up/frontend-count-up.js' ),
 		'frontend_block_countdown': path.resolve( __dirname, '../src/block/countdown/frontend-countdown.js' ),
 		'frontend_block_expand': path.resolve( __dirname, '../src/block/expand/frontend-expand.js' ),
@@ -163,6 +165,8 @@ module.exports = [
 		'frontend_block_progress_circle': path.resolve( __dirname, '../src/block/progress-circle/frontend-progress-circle.js' ),
 		'frontend_block_progress_bar': path.resolve( __dirname, '../src/block/progress-bar/frontend-progress-bar.js' ),
 		'frontend_block_horizontal_scroller': path.resolve( __dirname, '../src/block/horizontal-scroller/frontend-horizontal-scroller.js' ),
+		'frontend_block_tabs': path.resolve( __dirname, '../src/block/tabs/frontend-tabs.js' ),
+		'frontend_block_components_alignment_has_polyfill': path.resolve( __dirname, '../src/block-components/alignment/frontend-has-polyfill.js' ),
 	},
 
 	output: {

.eslintrc.js

@@ -97,6 +97,9 @@ module.exports = {
 
 		// Require tabbed indentation in jsx.
 		'react/jsx-indent': [ 2, 'tab', { indentLogicalExpressions: true } ],
+
+		// Disallow unnecessary JSX expressions when literals alone are sufficient.
+		'react/jsx-curly-brace-presence': [ 'error', { props: 'never', children: 'never' } ],
 	},
 	globals: {
 		localStorage: true,

.github/workflows/php-5.6.39.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        wp-versions: ['5.8.5', '5.9.4', '6.0.2']
+        wp-versions: ['6.0.2']
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/php-7.3.5.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        wp-versions: ['5.8.5', '5.9.4', '6.0.2']
+        wp-versions: ['6.0.2']
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/php-8.0.0.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        wp-versions: ['5.8.5', '5.9.4', '6.0.2']
+        wp-versions: ['6.0.2']
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/plugin-build.yml

@@ -46,3 +46,10 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         artifacts: stackable-${{ env.VERSION_SUFFIX }}.zip
         artifacts-branch: artifacts
+
+    - name: Comment WordPress playground link
+      if: ${{ github.event_name == 'pull_request' }}
+      uses: dannyskoog/[email protected]
+      with:
+        message: 'Try this Pull Request in the WordPress playground: https://playground.wordpress.net/?mode=seamless#{"landingPage":"/wp-admin/post-new.php?post_type=page","preferredVersions":{"php":"latest","wp":"latest"},"steps":[{"step":"login","username":"admin","password":"password"},{"step":"installPlugin","pluginZipFile":{"resource":"url","url":"https://raw.githubusercontent.com/gambitph/Stackable/artifacts/pr${{ github.event.number }}-stackable-${{ github.event.number }}-merge.zip"}}]}'
+        marker: <!-- wp-playground-link -->

freemius.php

@@ -53,6 +53,14 @@ function sugb_fs() {
 	sugb_fs()->add_filter( 'hide_freemius_powered_by', '__return_true' );
 	sugb_fs()->add_filter( 'permission_diagnostic_default', '__return_false' ); // Disable opt-in option by default
 	sugb_fs()->add_filter( 'permission_extensions_default', '__return_false' ); // Disable opt-in option by default
+	// Hide Freemius notices that can easily annoy users.
+	sugb_fs()->add_filter( 'show_admin_notice', function( $show, $message ) {
+		if ( in_array( $message['id'], array( 'license_activated', 'premium_activated', 'connect_account' ) ) ) {
+			return false;
+		}
+        return $show;
+	}, 10, 2 );
+
 
 	// Signal that SDK was initiated.
 	do_action( 'sugb_fs_loaded' );