internal: wp-now POC

.github/scripts/update-latest-pull-requests.js

@@ -5,7 +5,7 @@ const updatePullRequests = async () => {
 	lastDays.setDate( lastDays.getDate() - DAYS_TO_UPDATE );
 	const lastDaysString = lastDays.toISOString().split( 'T' )[0];
 
-	const url = `https://api.github.com/search/issues?q=repo:${GITHUB_REPOSITORY}+type:pr+is:open+base:main+created:>=${lastDaysString}`;
+	const url = `https://api.github.com/search/issues?q=repo:${GITHUB_REPOSITORY}+type:pr+is:open+draft:false+base:main+created:>=${lastDaysString}`;
 	const headers = {
 		Authorization: `token ${GITHUB_TOKEN}`,
 		Accept: 'application/vnd.github.v3+json',

.github/workflows/playwright.yml

@@ -41,32 +41,17 @@ jobs:
     name: Build plugin
     uses: ./.github/workflows/build.yml
   Playwright:
-    name: Playwright test - ${{ matrix.testSuite }} on PHP 7.4
+    name: Playwright test - ${{ matrix.shardIndex }} on PHP 8.0
     runs-on: ubuntu-latest
     needs: [build-plugin]
     if: ${{ github.event.pull_request.title == null || needs.build-plugin.outputs.changelog_diff }}
     strategy:
-      fail-fast: ${{inputs.fail_fast || true}}
+      fail-fast: ${{ inputs.fail_fast || true }}
       matrix:
-        testSuite: [
-          'ai',
-          'onBoarding',
-          'video',
-          'elements-regression',
-          'default',
-          'nested-tabs',
-          'reverse-columns',
-          'container',
-          'nested-accordion',
-          'styleguide_image_link',
-          'rating',
-          'pluginTester1_containers',
-          'pluginTester2_containers',
-          'pluginTester1_sections',
-          'pluginTester2_sections',
-          'promotions',
-          'nested-atomic-repeaters',
-        ]
+        shardIndex: [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
+        shardTotal: [ 10 ]
+        include:
+        - shardIndex: "elements-regression"
     steps:
       - name: Checkout source code
         uses: actions/checkout@v4
@@ -101,25 +86,20 @@ jobs:
         run: |
           npx wp-env run cli wp core version
           npx wp-env run cli wp --info
-      - name: Activate performance experiments
-        run: |
-          npx wp-env run cli wp elementor experiments activate e_font_icon_svg,e_lazyload,e_optimized_css_loading,additional_custom_breakpoints
       - name: Install playwright/test
         run: |
           npx playwright install chromium
       - name: Run Playwright tests
-        if: ${{matrix.testSuite !='elements-regression'}}
-        env:
-          TEST_SUITE: "@${{matrix.testSuite}}"
-        run: npm run test:playwright -- --reporter=${{inputs.reporter || 'list,github'}}
+        if: ${{ matrix.shardIndex != 'elements-regression' }}
+        run: npm run test:playwright  -- --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --reporter=${{ inputs.reporter || 'list,github' }}
       - name: Run element regression tests
-        if: ${{matrix.testSuite =='elements-regression'}}
-        run: npm run test:playwright:elements-regression -- --reporter=${{inputs.reporter || 'list,github'}}
+        if: ${{ matrix.shardIndex == 'elements-regression' }}
+        run: npm run test:playwright:elements-regression -- --reporter=${{ inputs.reporter || 'list,github' }}
       - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: playwright-test-results-${{ matrix.testSuite }}
-          path: ${{inputs.path-to-results || 'test-results/'}}
+          name: playwright-test-results-${{ matrix.shardIndex }}
+          path: ${{ inputs.path-to-results || 'test-results/' }}
           if-no-files-found: ignore
           retention-days: 2
 

.github/workflows/pwwpnow.yml

@@ -0,0 +1,118 @@
+name: Playwright wp-now
+
+on:
+  workflow_dispatch:
+    inputs:
+      core_branch:
+        description: 'Elementor Core Branch'
+        required: true
+
+# This allows a subsequently queued workflow run to interrupt previous runs
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  build-plugin:
+    name: Build plugin
+    runs-on: ubuntu-latest
+    outputs:
+      changelog_diff: ${{ steps.changelog_diff_files.outputs.diff }}
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Check if this is only a changelog PR
+        id: changelog_diff_files
+        uses: technote-space/get-diff-action@v6
+        with:
+          PATTERNS: |
+            **/*
+            .*/**/*
+            !readme.txt
+            !changelog.txt
+      - name: Install Node.js 18.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
+      - name: Restore NPM Cache
+        uses: actions/cache/restore@v3
+        with:
+          path: ~/.npm
+          key: npm-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+      - name: Install dependencies
+        run: npm i
+      - name: Build
+        run: npx grunt build
+      - name: Cache node modules
+        uses: actions/cache/save@v3
+        with:
+          path: ~/.npm
+          key: npm-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+      - name: Save build to cache
+        uses: actions/cache/save@v3
+        with:
+          path: ./build/*
+          key: playwright-build-${{ github.sha }}
+
+  Playwright:
+    name: Playwright test - ${{ matrix.testSuite }} on PHP 8.0
+    runs-on: ubuntu-latest
+    needs: [build-plugin]
+    strategy:
+      matrix:
+        testSuite: [
+          'video',
+        ]
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Install Node.js 20.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20.x
+      - name: Restore NPM from cache
+        uses: actions/cache/restore@v3
+        id: restore-npm
+        with:
+          path: ~/.npm
+          key: npm-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+      - name: Restore build from cache
+        uses: actions/cache/restore@v3
+        id: restore-build
+        with:
+          path: ./build/*
+          key: playwright-build-${{ github.sha }}
+      - name: Install dependencies
+        run: npm i
+      - name: Install WordPress environment
+        run: |
+          npx wp-now start --php=8.0 --port=8888 --blueprint=./blueprint.json &
+      - name: Run wp-now CLI commands
+        run: |
+          wp-now cli "wp elementor experiments activate e_optimized_css_loading"
+      - name: Install playwright/test
+        run: |
+          npm run test:setup:playwright
+          npx playwright install chromium
+      - name: Run Playwright tests
+        env:
+          TEST_SUITE: "@${{matrix.testSuite}}"
+        run: npm run test:playwright
+      - uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+         name: playwright-test-results-${{ matrix.testSuite }}
+         path: test-results/
+         retention-days: 3
+
+  test-result:
+    needs: Playwright
+    if: ${{ always() }} # Will be run even if 'Playwright' matrix will be skipped
+    runs-on: ubuntu-22.04
+    name: Playwright - Test Results
+    steps:
+      - name: Test status
+        run: echo "Test status is - ${{ needs.Playwright.result }}"
+      - name: Check Playwright matrix status
+        if: ${{ needs.Playwright.result != 'success' && needs.Playwright.result != 'skipped' }}
+        run: exit 1

.gitignore

@@ -29,10 +29,11 @@ Thumbs.db
 *.DS_Store
 coverage/
 .zimud.json
+.phpunit.result.cache
 
 # playwright
 test-results/
-**/storageState.json
+**/storageState-*.json
 tests/playwright/config/local.config.js
 playwright-report
 tests/playwright/blob-report

app/modules/import-export/assets/js/pages/import/import-complete/import-complete.js

@@ -69,7 +69,7 @@ export default function ImportComplete() {
 	return (
 		<Layout type="import" footer={ <ImportCompleteFooter seeItLiveUrl={ seeItLiveUrl } referrer={ referrer } /> }>
 			<WizardStep
-				image={ elementorAppConfig.assets_url + 'images/go-pro.svg' }
+				image={ elementorAppConfig.assets_url + 'images/kit-is-live.svg' }
 				heading={ __( 'Your kit is now live on your site!', 'elementor' ) }
 				description={ __( 'You’ve imported and applied the following to your site:', 'elementor' ) }
 				notice={ (

app/modules/import-export/utils.php

@@ -4,7 +4,7 @@
 
 use Elementor\Core\Utils\Str;
 use Elementor\Modules\LandingPages\Module as Landing_Pages_Module;
-use Elementor\Modules\ConversionCenter\Module as Conversion_Center_Module;
+use \Elementor\Modules\FloatingButtons\Module as Floating_Buttons_Module;
 use Elementor\TemplateLibrary\Source_Local;
 use Elementor\Utils as ElementorUtils;
 
@@ -81,7 +81,7 @@ public static function get_registered_cpt_names() {
 		unset(
 			$post_types[ Landing_Pages_Module::CPT ],
 			$post_types[ Source_Local::CPT ],
-			$post_types[ Conversion_Center_Module::CPT_CONTACT_PAGES ]
+			$post_types[ Floating_Buttons_Module::CPT_FLOATING_BUTTONS ]
 		);
 
 		return array_keys( $post_types );

app/modules/onboarding/assets/js/pages/account.js

@@ -30,7 +30,7 @@ export default function Account() {
 			listItems: elementorAppConfig.onboarding.experiment
 				? [
 					__( 'Set your site\'s theme', 'elementor' ),
-					__( 'Chose additional features', 'elementor' ),
+					__( 'Choose additional features', 'elementor' ),
 					__( 'Choose how to start creating', 'elementor' ),
 				] : [
 					__( 'Set your site\'s theme', 'elementor' ),

assets/dev/js/admin/admin.js

@@ -5,7 +5,7 @@ import Events from 'elementor-utils/events';
 import FilesUploadHandler from '../editor/utils/files-upload-handler';
 import TemplateControls from './new-template/template-controls.js';
 import { showJsonUploadWarningMessageIfNeeded } from 'elementor-utils/json-upload-warning-message';
-import LinksPagesModule from 'elementor/modules/conversion-center/assets/js/admin/module';
+import FloatingButtonsHandler from 'elementor/modules/floating-buttons/assets/js/admin/module';
 
 ( function( $ ) {
 	var ElementorAdmin = elementorModules.ViewModule.extend( {
@@ -316,13 +316,6 @@ import LinksPagesModule from 'elementor/modules/conversion-center/assets/js/admi
 				} ).show();
 			} );
 
-			$( '.elementor_css_print_method select' ).on( 'change', function() {
-				var $descriptions = $( '.elementor-css-print-method-description' );
-
-				$descriptions.hide();
-				$descriptions.filter( '[data-value="' + $( this ).val() + '"]' ).show();
-			} ).trigger( 'change' );
-
 			$( '.elementor_google_font select' ).on( 'change', function() {
 				$( '.elementor_font_display' ).toggle( '1' === $( this ).val() );
 			} ).trigger( 'change' );
@@ -347,8 +340,8 @@ import LinksPagesModule from 'elementor/modules/conversion-center/assets/js/admi
 				new LandingPagesModule();
 			}
 
-			if ( elementorCommon.config.experimentalFeatures[ 'conversion-center' ] ) {
-				new LinksPagesModule();
+			if ( elementorCommon.config.experimentalFeatures[ 'floating-buttons' ] ) {
+				new FloatingButtonsHandler();
 			}
 
 			this.templateControls = new TemplateControls();

assets/dev/js/admin/hints/media.js

@@ -54,8 +54,8 @@
 		events: {
 			...wp.media.view.Attachment.Details.prototype.events,
 			'click .elementor-control-notice-dismiss': 'dismiss',
-			'click .e-hint__container .e-btn-1': 'onHintAction',
-			'click .e-hint__container a': 'onHintAction',
+			'click .e-hint__container a': 'onHintAnchorClick',
+			'click .e-hint__container button.e-btn-1': 'onHintAction',
 		},
 
 		shouldDisplayHint( view ) {
@@ -98,6 +98,10 @@
 			this.dismiss( event );
 		},
 
+		onHintAnchorClick( event ) {
+			this.dismiss( event );
+		},
+
 		dismiss( event ) {
 			elementorCommon.ajax.addRequest( 'dismissed_editor_notices', {
 				data: {

assets/dev/js/editor/components/template-library/manager.js

@@ -314,10 +314,12 @@ TemplateLibraryManager = function() {
 		}
 
 		$e.data.get( 'library/templates', query, options ).then( ( result ) => {
-			templatesCollection = new TemplateLibraryCollection( result.data.templates );
+			templatesCollection = new TemplateLibraryCollection(
+				this.filterOutInactiveExperiments( result.data.templates ),
+			);
 
 			if ( result.data.config ) {
-				config = result.data.config;
+				config = this.filterOutExperimentsCategories( result.data.config );
 			}
 
 			self.layout.hideLoadingView();
@@ -328,6 +330,30 @@ TemplateLibraryManager = function() {
 		} );
 	};
 
+	this.filterOutExperimentsCategories = function( configData ) {
+		if ( elementorCommon.config.experimentalFeatures[ 'link-in-bio' ] ) {
+			return configData;
+		}
+
+		const dataToReturn = { ...configData };
+
+		dataToReturn.block.categories = configData?.block?.categories.filter( function( category ) {
+			return category !== 'Link in Bio';
+		} );
+
+		return dataToReturn;
+	};
+
+	this.filterOutInactiveExperiments = function( templates ) {
+		if ( elementorCommon.config.experimentalFeatures[ 'link-in-bio' ] ) {
+			return templates;
+		}
+		return templates.filter( function( template ) {
+			const { subtype } = template;
+			return subtype !== 'Link in Bio';
+		} );
+	};
+
 	this.showTemplates = function() {
 		// The tabs should exist in DOM on loading.
 		self.layout.setHeaderDefaultParts();

assets/dev/js/editor/components/template-library/views/library-layout.js

@@ -45,10 +45,26 @@ module.exports = elementorModules.common.views.modal.Layout.extend( {
 		const subscriptionPlan = subscriptionPlans[ templateAccessTier ];
 		const promotionText = elementorAppConfig.hasPro ? 'Upgrade' : `Go ${ subscriptionPlan.label }`;
 
-		return Marionette.Renderer.render( template, {
-			promotionText,
-			promotionLink: subscriptionPlan.promotion_url,
-		} );
+		try {
+			const promotionUrlPieces = new URL( subscriptionPlan.promotion_url );
+			const queryString = promotionUrlPieces.searchParams.toString();
+
+			const promotionLinkQueryString = elementor.hooks.applyFilters(
+				'elementor/editor/template-library/template/promotion-link-search-params',
+				queryString,
+				templateData,
+			);
+
+			return Marionette.Renderer.render( template, {
+				promotionText,
+				promotionLink: `${ promotionUrlPieces.origin }${ promotionUrlPieces.pathname }?${ promotionLinkQueryString }`,
+			} );
+		} catch ( e ) {
+			return Marionette.Renderer.render( template, {
+				promotionText,
+				promotionLink: subscriptionPlan.promotion_url,
+			} );
+		}
 	},
 
 	setHeaderDefaultParts() {