Final version bump to v2.1.0 for public release

Author: iamprazol

CHANGELOG.txt

@@ -1,5 +1,5 @@
 == Changelog ==
-= 2.1.0 - 26-06-2026 =
+= 2.1.0 - 30-06-2026 =
 * Enhance - Batch media import to prevent server timeouts,
 * Dev - Added data validation to prevent PHP warnings during content import.
 * Dev - Improved widget import to handle missing plugin data.

gulpfile.mjs

@@ -1,9 +1,19 @@
 import chalk from 'chalk';
 import { spawn } from 'child_process';
+import { rm } from 'fs/promises';
 import { dest, parallel, series, src } from 'gulp';
 import _zip from 'gulp-zip';
 import path from 'path';
 
+async function removeDir(dir) {
+	try {
+		await rm(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 500 });
+		console.log(chalk.green(`✓ Removed: ${dir}`));
+	} catch (err) {
+		console.warn(chalk.yellow(`⚠ Could not fully remove ${dir}: ${err.message}`));
+	}
+}
+
 function exec(command) {
 	console.log(`Executing: ${command}`);
 
@@ -84,7 +94,7 @@ const copy = parallel(...copyTasks);
 
 const release = series(
 	function clean() {
-		return exec(`rm -rf release/ build/`);
+		return Promise.all([removeDir('release'), removeDir('build')]);
 	},
 	function build() {
 		return exec(`pnpm build`);
@@ -104,7 +114,7 @@ const release = series(
 			.pipe(dest('release'));
 	},
 	function cleanBuild() {
-		return exec(`rm -rf build/`);
+		return removeDir('build');
 	},
 );
 export { release };

readme.txt

@@ -33,7 +33,7 @@ Bugs can be reported either in our support forum or preferably on the [GitHub re
 Yes you can! Join in on our [GitHub repository](https://github.com/themegrill/themegrill-demo-importer/) :)
 
 == Changelog ==
-= 2.1.0 - 26-06-2026 =
+= 2.1.0 - 30-06-2026 =
 * Enhance - Batch media import to prevent server timeouts,
 * Dev - Added data validation to prevent PHP warnings during content import.
 * Dev - Improved widget import to handle missing plugin data.

resources/onboarding/components/features/sites/components/detail/import/Import.tsx

@@ -259,7 +259,11 @@ const Import = () => {
 				)
 			)}
 			{pageImport === 'all' ? (
-				<Content demo={demo} iframeRef={iframeRef} device={device} />
+				<Content
+					demo={demo}
+					iframeRef={iframeRef}
+					device={device}
+				/>
 			) : (
 				<Pages pages={allPages} setAllPages={setAllPages} demo={demo} />
 			)}

resources/onboarding/components/features/sites/components/listing/demos/Demo.tsx

@@ -12,6 +12,7 @@ const Demo = ({ demo }: DemoProps) => {
 	const isPremium = demo?.categories?.find((c) => c === 'premium');
 
 	const skeletonSrc = require(`../../../../../../assets/images/demo-skeleton.jpg`);
+	const githubSrc = demo?.githubImage ?? '';
 
 	return (
 		<Link
@@ -27,9 +28,15 @@ const Demo = ({ demo }: DemoProps) => {
 							alt=""
 							onError={(e) => {
 								const img = e.currentTarget;
-								img.onerror = null;
-								img.src = skeletonSrc;
-								img.className = 'w-full h-full rounded-[2px]';
+								if (img.src !== githubSrc) {
+									// Primary URL failed — try GitHub raw.
+									img.src = githubSrc;
+								} else {
+									// GitHub also failed — show skeleton.
+									img.onerror = null;
+									img.src = skeletonSrc;
+									img.className = 'w-full h-full rounded-[2px]';
+								}
 							}}
 							className={`w-full h-full rounded-t-md ${
 								demo?.previewImage.includes('themegrilldemos') ||

resources/onboarding/lib/types.ts

@@ -34,6 +34,7 @@ export type DemoType = {
 	slug: string;
 	theme_slug: string;
 	previewImage: string;
+	githubImage?: string;
 	new: boolean;
 };
 

src/Admin.php

@@ -213,7 +213,7 @@ public static function get_demo_packages( $force = false ) {
 		if ( $force ) {
 			delete_transient( 'themegrill_demo_importer_demos' );
 		}
-		$demos = get_transient( 'themegrill_demo_importer_demos', array() );
+		$demos = get_transient( 'themegrill_demo_importer_demos' );
 		if ( empty( $demos ) ) {
 			$need_fetch = true;
 		}
@@ -250,8 +250,10 @@ function ( $a, $b ) {
 			set_transient( 'themegrill_demo_importer_demos', $demos, WEEK_IN_SECONDS );
 
 		} else {
-			// Transient was cached before apply_thumbnail_fallbacks existed; patch in-memory.
+			// Apply any thumbnail URL migrations to cached data and persist so
+			// subsequent requests don't need to re-apply.
 			$demos = static::apply_thumbnail_fallbacks( $demos );
+			set_transient( 'themegrill_demo_importer_demos', $demos, WEEK_IN_SECONDS );
 		}
 		$data = static::get_filtered_data( $demos, $template );
 		return apply_filters(
@@ -418,16 +420,30 @@ public static function apply_thumbnail_fallbacks( $demos ) {
 				'online-shop-v2'  => 'zakra-online-shop',
 				'restro-v2'       => 'zakra-restro',
 			),
-			'colormag' => array(),
+			'colormag' => array(
+				'colormag'    => 'colormag-free',
+				'colormag-01' => 'colormag-free-01',
+				'colormag-02' => 'colormag-free-02',
+			),
 		);
 
 		foreach ( $demos as $demo ) {
-			if ( ! empty( $demo->previewImage ) ) {
+			$theme  = $demo->theme_slug;
+			$folder = $overrides[ $theme ][ $demo->slug ] ?? $demo->slug;
+			$gh_url = $new_base . '/resources/' . $theme . '/' . $folder . '/screenshot.jpg';
+
+			// Always expose the correct GitHub URL so the frontend can use it as a fallback.
+			$demo->githubImage = $gh_url;
+
+			if ( empty( $demo->previewImage ) ) {
+				$demo->previewImage = $gh_url;
+			} elseif ( false !== strpos( $demo->previewImage, $old_base ) ) {
+				// Discontinued CloudFront CDN — swap base, keep path.
 				$demo->previewImage = str_replace( $old_base, $new_base, $demo->previewImage );
-			} else {
-				$theme  = $demo->theme_slug;
-				$folder = $overrides[ $theme ][ $demo->slug ] ?? $demo->slug;
-				$demo->previewImage = $new_base . '/resources/' . $theme . '/' . $folder . '/screenshot.jpg';
+			} elseif ( false !== strpos( $demo->previewImage, 'themegrilldemos.com' ) ) {
+				// Use GitHub directly; letting the browser try themegrilldemos.com first
+				// causes a slow timeout on every image before the fallback kicks in.
+				$demo->previewImage = $gh_url;
 			}
 		}