fix(dev-env): demo code is displayed as [demo-image]

Automattic · Jun 4, 2024 · 8825c6d · 8825c6d
1 parent b81101c
commit 8825c6d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/lib/dev-environment/dev-environment-cli.ts b/src/lib/dev-environment/dev-environment-cli.ts
@@ -231,7 +231,7 @@ interface LocalComponent {
 
 interface ImageComponent {
 	mode: 'image';
-	tag: string;
+	tag: string | undefined;
 }
 
 export function processComponentOptionInput(
@@ -258,7 +258,7 @@ export function processComponentOptionInput(
 
 	return {
 		mode: 'image',
-		tag: param,
+		tag: param === 'demo' ? undefined : param,
 	};
 }
 
@@ -412,10 +412,10 @@ async function processWordPress(
 	let result: WordPressConfig;
 	const allowLocal = false;
 	const defaultObject = defaultValue
-		? processComponentOptionInput( defaultValue, allowLocal )
+		? ( processComponentOptionInput( defaultValue, allowLocal ) as WordPressConfig )
 		: null;
 	if ( preselectedValue ) {
-		result = processComponentOptionInput( preselectedValue, allowLocal );
+		result = processComponentOptionInput( preselectedValue, allowLocal ) as WordPressConfig;
 	} else {
 		result = await promptForWordPress( defaultObject );
 	}

diff --git a/src/lib/dev-environment/dev-environment-core.ts b/src/lib/dev-environment/dev-environment-core.ts
@@ -305,6 +305,12 @@ function parseComponentForInfo( component: ComponentConfig | WordPressConfig ):
 	if ( component.mode === 'local' ) {
 		return component.dir ?? '';
 	}
+
+	// Environments created by the old code will have `component.tag` set to `demo` instead of `undefined`.
+	if ( component.tag === 'demo' ) {
+		component.tag = undefined;
+	}
+
 	return component.tag ?? '[demo-image]';
 }