Comment prerelease

.github/workflows/one-click-hosting-release.yml

@@ -69,9 +69,9 @@ jobs:
             elementor-*.zip
             ${{ env.CHANGELOG_FILE }}
           # Will be removed once we see that the release is working
-          prerelease: true
+          # prerelease: true
           body_path: ${{ env.CHANGELOG_FILE }}
-      - name: Post To Slack Created Cloud daily automated Release
+      - name: Post To Slack Created Cloud one click Release
         uses : ./.github/workflows/post-to-slack
         with:
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_TOKEN }}

.grunt-config/sass.js

@@ -16,7 +16,7 @@ const sass = {
 			},
 			{
 				expand: true,
-				cwd: 'core/editor/assets/scss',
+				cwd: 'core/editor/loader/v2/scss',
 				src: '*.scss',
 				dest: 'assets/css',
 				ext: '.css'
@@ -70,6 +70,13 @@ const sass = {
 				dest: 'assets/css/modules/ai',
 				ext: '.css',
 			},
+			{
+				expand: true,
+				cwd: 'modules/apps/assets/scss',
+				src: 'admin.scss',
+				dest: 'assets/css/modules/apps',
+				ext: '.css',
+			},
 		]
 	}
 };

.grunt-config/webpack.js

@@ -144,8 +144,8 @@ const externals = {
 	'@elementor/hooks': 'elementorAppPackages.hooks',
 	'@elementor/site-editor': 'elementorAppPackages.siteEditor',
 	'@elementor/router': 'elementorAppPackages.router',
-	'@elementor/ui': '__UNSTABLE__elementorPackages.ui',
-	'@elementor/icons': '__UNSTABLE__elementorPackages.icons',
+	'@elementor/ui': 'elementorV2.ui',
+	'@elementor/icons': 'elementorV2.icons',
 };
 
 const plugins = [

.grunt-config/webpack.packages.js

@@ -31,18 +31,18 @@ const common = {
 	),
 	plugins: [
 		new GenerateWordPressAssetFileWebpackPlugin( {
-			handle: ( entryName ) => `elementor-packages-${entryName}`,
+			handle: ( entryName ) => `elementor-v2-${entryName}`,
 			map: [
-				{ request: /^@elementor\/(.+)$/, handle: 'elementor-packages-$1' },
+				{ request: /^@elementor\/(.+)$/, handle: 'elementor-v2-$1' },
 				{ request: /^@wordpress\/(.+)$/, handle: 'wp-$1' },
 				{ request: 'react', handle: 'react' },
 				{ request: 'react-dom', handle: 'react-dom' },
 			]
 		} ),
 		new ExternalizeWordPressAssetsWebpackPlugin( {
-			global: ( entryName ) => [ '__UNSTABLE__elementorPackages', entryName ],
+			global: ( entryName ) => [ 'elementorV2', entryName ],
 			map: [
-				{ request: /^@elementor\/(.+)$/, global: [ '__UNSTABLE__elementorPackages', '$1' ] },
+				{ request: /^@elementor\/(.+)$/, global: [ 'elementorV2', '$1' ] },
 				{ request: /^@wordpress\/(.+)$/, global: [ 'wp', '$1' ] },
 				{ request: 'react', global: 'React' },
 				{ request: 'react-dom', global: 'ReactDOM' },

app/modules/import-export/module.php

@@ -540,6 +540,10 @@ private function maybe_handle_ajax() {
 					break;
 			}
 		} catch ( \Error $e ) {
+			if ( isset( $this->import ) ) {
+				$this->import->finalize_import_session_option();
+			}
+
 			Plugin::$instance->logger->get_logger()->error( $e->getMessage(), [
 				'meta' => [
 					'trace' => $e->getTraceAsString(),

app/modules/import-export/processes/import.php

@@ -224,7 +224,7 @@ private function set_import_object( array $instance ) {
 	 * @throws \Exception
 	 */
 	public static function from_session( string $session_id ): Import {
-		$import_sessions = get_option( Module::OPTION_KEY_ELEMENTOR_IMPORT_SESSIONS );
+		$import_sessions = Utils::get_import_sessions();
 
 		if ( ! $import_sessions || ! isset( $import_sessions[ $session_id ] ) ) {
 			throw new \Exception( 'Couldn’t execute the import process because the import session does not exist.' );
@@ -397,7 +397,7 @@ public function run_runner( string $runner_name ): array {
 	 * @return void
 	 */
 	public function init_import_session( $save_instance_data = false ) {
-		$import_sessions = get_option( Module::OPTION_KEY_ELEMENTOR_IMPORT_SESSIONS );
+		$import_sessions = Utils::get_import_sessions( true );
 
 		$import_sessions[ $this->session_id ] = [
 			'session_id' => $this->session_id,
@@ -765,7 +765,7 @@ private function save_elements_of_imported_posts() {
 	}
 
 	private function update_instance_data_in_import_session_option() {
-		$import_sessions = get_option( Module::OPTION_KEY_ELEMENTOR_IMPORT_SESSIONS );
+		$import_sessions = Utils::get_import_sessions();
 
 		$import_sessions[ $this->session_id ]['instance_data']['documents_data'] = $this->documents_data;
 		$import_sessions[ $this->session_id ]['instance_data']['imported_data'] = $this->imported_data;
@@ -774,8 +774,12 @@ private function update_instance_data_in_import_session_option() {
 		update_option( Module::OPTION_KEY_ELEMENTOR_IMPORT_SESSIONS, $import_sessions, false );
 	}
 
-	private function finalize_import_session_option() {
-		$import_sessions = get_option( Module::OPTION_KEY_ELEMENTOR_IMPORT_SESSIONS );
+	public function finalize_import_session_option() {
+		$import_sessions = Utils::get_import_sessions();
+
+		if ( ! isset( $import_sessions[ $this->session_id ] ) ) {
+			return;
+		}
 
 		unset( $import_sessions[ $this->session_id ]['instance_data'] );
 

app/modules/import-export/processes/revert.php

@@ -9,6 +9,7 @@
 use Elementor\App\Modules\ImportExport\Runners\Revert\Taxonomies;
 use Elementor\App\Modules\ImportExport\Runners\Revert\Templates;
 use Elementor\App\Modules\ImportExport\Runners\Revert\Wp_Content;
+use Elementor\App\Modules\ImportExport\Utils;
 
 class Revert {
 
@@ -57,25 +58,30 @@ public function run() {
 			throw new \Exception( 'Couldn’t execute the revert process because no revert runners have been specified. Try again by specifying revert runners.' );
 		}
 
-		$data = $this->get_last_import_session();
+		$import_session = $this->get_last_import_session();
 
-		if ( empty( $data ) ) {
+		if ( empty( $import_session ) ) {
 			throw new \Exception( 'Couldn’t execute the revert process because there are no import sessions to revert.' );
 		}
 
+		// fallback if the import session failed and doesn't have the runners metadata
+		if ( ! isset( $import_session['runners'] ) && isset( $import_session['instance_data'] ) ) {
+			$import_session['runners'] = $import_session['instance_data']['runners_import_metadata'] ?? [];
+		}
+
 		foreach ( $this->runners as $runner ) {
-			if ( $runner->should_revert( $data ) ) {
-				$runner->revert( $data );
+			if ( $runner->should_revert( $import_session ) ) {
+				$runner->revert( $import_session );
 			}
 		}
 
-		$this->revert_attachments( $data );
+		$this->revert_attachments( $import_session );
 
 		$this->delete_last_import_data();
 	}
 
 	public static function get_import_sessions() {
-		$import_sessions = get_option( Module::OPTION_KEY_ELEMENTOR_IMPORT_SESSIONS );
+		$import_sessions = Utils::get_import_sessions();
 
 		if ( ! $import_sessions ) {
 			return [];

app/modules/import-export/utils.php

@@ -97,4 +97,22 @@ public static function transform_name_to_title( $name ): string {
 
 		return ucwords( $title );
 	}
+
+	public static function get_import_sessions( $should_run_cleanup = false ) {
+		$import_sessions = get_option( Module::OPTION_KEY_ELEMENTOR_IMPORT_SESSIONS, [] );
+
+		if ( $should_run_cleanup ) {
+			foreach ( $import_sessions as $session_id => $import_session ) {
+				if ( ! isset( $import_session['runners'] ) && isset( $import_session['instance_data'] ) ) {
+					$import_sessions[ $session_id ]['runners'] = $import_session['instance_data']['runners_import_metadata'] ?? [];
+
+					unset( $import_sessions[ $session_id ]['instance_data'] );
+				}
+			}
+
+			update_option( Module::OPTION_KEY_ELEMENTOR_IMPORT_SESSIONS, $import_sessions );
+		}
+
+		return $import_sessions;
+	}
 }

assets/dev/js/editor/utils/container-helper.js

@@ -175,7 +175,6 @@ export class ContainerHelper {
 				case 'c100-c50-50': {
 					settings = {
 						flex_direction: ContainerHelper.DIRECTION_ROW,
-						flex_wrap: 'wrap',
 						flex_gap: {
 							unit: 'px',
 							size: 0, // Set the gap to 0 to override the default inherited from `Site Settings`.

assets/dev/js/frontend/handlers/base-carousel.js

@@ -140,15 +140,20 @@ export default class CarouselHandlerBase extends SwiperHandlerBase {
 		return swiperOptions;
 	}
 
+	getOffsetWidth() {
+		const currentDevice = elementorFrontend.getCurrentDeviceMode();
+		return elementorFrontend.utils.controls.getResponsiveControlValue( this.getElementSettings(), 'offset_width', 'size', currentDevice ) || 0;
+	}
+
 	applyOffsetSettings( elementSettings, swiperOptions, slidesToShow ) {
-		const offsetSide = elementSettings.offset_sides;
-		const isNestedCarouselInEditMode = elementorFrontend.isEditMode() && 'NestedCarousel' === this.constructor.name;
+		const offsetSide = elementSettings.offset_sides,
+			isNestedCarouselInEditMode = elementorFrontend.isEditMode() && 'NestedCarousel' === this.constructor.name;
 
 		if ( isNestedCarouselInEditMode || ! offsetSide || 'none' === offsetSide ) {
 			return;
 		}
 
-		const offset = elementSettings.offset_width.size;
+		const offset = this.getOffsetWidth();
 
 		switch ( offsetSide ) {
 			case 'right':
@@ -207,13 +212,15 @@ export default class CarouselHandlerBase extends SwiperHandlerBase {
 		this.elements.$paginationWrapper.on( 'keydown', '.swiper-pagination-bullet', this.onDirectionArrowKeydown.bind( this ) );
 		this.elements.$swiperContainer.on( 'keydown', '.swiper-slide', this.onDirectionArrowKeydown.bind( this ) );
 		this.$element.find( ':focusable' ).on( 'focus', this.onFocusDisableAutoplay.bind( this ) );
+		elementorFrontend.elements.$window.on( 'resize', this.getSwiperSettings.bind( this ) );
 	}
 
 	unbindEvents() {
 		this.elements.$swiperArrows.off();
 		this.elements.$paginationWrapper.off();
 		this.elements.$swiperContainer.off();
 		this.$element.find( ':focusable' ).off();
+		elementorFrontend.elements.$window.off( 'resize' );
 	}
 
 	onDirectionArrowKeydown( event ) {

assets/dev/scss/admin/_beta-tester.scss

@@ -56,15 +56,21 @@
 		margin-block-start: 30px;
 
 		.elementor-button {
-			border-radius: getValueByDirection(0 3px 3px 0, 3px 0 0 3px);
+			border-start-start-radius: 0;
+			border-start-end-radius: 3px;
+			border-end-start-radius: 0;
+			border-end-end-radius: 3px;
 		}
 	}
 
 	&__email {
 		flex-grow: 1;
 		border: var(--e-a-border);
 		border-inline-end: 0;
-		border-radius: getValueByDirection(3px 0 0 3px, 0 3px 3px 0);
+		border-start-start-radius: 3px;
+		border-start-end-radius: 0;
+		border-end-start-radius: 3px;
+		border-end-end-radius: 0;
 		margin: 0;
 		padding: 10px;
 		height: 50px;

assets/dev/scss/admin/_feedback.scss

@@ -34,7 +34,6 @@
 	}
 
 	.elementor-deactivate-feedback-dialog-input {
-		float: $start;
 		margin-block: 0;
 		margin-inline: 0 15px;
 		box-shadow: none;
@@ -125,11 +124,13 @@
 
 	&-form-body {
 		padding-block-start: 30px;
+		padding-block-end: 15px;
 	}
 }
 
 .elementor-deactivate-feedback-dialog-input-wrapper {
-	line-height: 1;
+	display: flex;
+	align-items: center;
+	line-height: 2;
 	overflow: hidden;
-	margin-block-end: 15px;
 }

assets/dev/scss/admin/_system_info.scss

@@ -8,11 +8,6 @@
 	.elementor-system-info-section {
 		margin-block-end: 10px;
 
-		& > .elementor-system-info-report-name {
-			padding-inline-start: 10px;
-			border-block-end: 1px solid #e1e1e1;
-		}
-
 		.widefat {
 			white-space: pre;
 		}
@@ -29,32 +24,11 @@
 		}
 	}
 
-	.elementor-system-info-report-name {
-		text-transform: uppercase;
-		font-size: 14px;
-		margin: 0;
-		line-height: 2;
-	}
-
-	.elementor-system-info-report-row {
-		overflow: hidden;
-		padding: 5px 0;
-
-		> * {
-			float: $start;
-		}
-	}
-
-	.elementor-system-info-report-field,
 	.elementor-system-info-field-recommendation {
 		padding-inline-start: 10px;
 		color: #7F7F7F;
 	}
 
-	.elementor-system-info-report-fields {
-		padding-inline-start: 20px;
-	}
-
 	.elementor-system-info-plugin-name {
 		color: #000;
 	}

assets/dev/scss/common/_dialog-templates.scss

@@ -125,8 +125,7 @@
 				font-size: 11px;
 				font-weight: normal;
 				line-height: 1;
-				text-transform: uppercase;
-				border-radius: 2px;
+				border-radius: var(--e-a-border-radius);
 				cursor: pointer;
 
 				> i {

assets/dev/scss/common/_notifications.scss

@@ -28,7 +28,6 @@
 		font-size: 12px;
 		font-weight: 500;
 		line-height: 1.2;
-		text-transform: uppercase;
 		padding: 8px 16px;
 		@include margin-end(10px);
 		color: var(--e-a-dark-color-txt);

assets/dev/scss/editor/_notice-bar.scss

@@ -23,7 +23,6 @@
 
 	&__primary_action {
 		margin-inline: 12px;
-		text-transform: uppercase;
 
 		a {
 			background: $white;

assets/dev/scss/editor/_templates-modal.scss

@@ -502,11 +502,17 @@ label.elementor-template-library-order-label {
 	}
 
 	&:first-child {
-		border-radius: 3px 3px 0 0;
+		border-start-start-radius: 3px;
+		border-start-end-radius: 3px;
+		border-end-start-radius: 0;
+		border-end-end-radius: 0;
 	}
 
 	&:last-child {
-		border-radius: 0 0 3px 3px;
+		border-start-start-radius: 0;
+		border-start-end-radius: 0;
+		border-end-start-radius: 3px;
+		border-end-end-radius: 3px;
 	}
 
 	.elementor-template-library-template-name {
@@ -665,12 +671,18 @@ label.elementor-template-library-order-label {
 #elementor-template-library-save-template-name {
 	width: 500px;
 	padding-inline-start: 25px;
-	border-radius: getValueByDirection(3px 0 0 3px, 0 3px 3px 0);
+	border-start-start-radius: 3px;
+	border-start-end-radius: 0;
+	border-end-start-radius: 3px;
+	border-end-end-radius: 0;
 }
 
 #elementor-template-library-save-template-submit {
 	width: 150px;
-	border-radius: getValueByDirection(0 3px 3px 0, 3px 0 0 3px);
+	border-start-start-radius: 0;
+	border-start-end-radius: 3px;
+	border-end-start-radius: 0;
+	border-end-end-radius: 3px;
 }
 
 #elementor-template-library-import {