refactor: use typeink as default

Author: AlexD10S

crates/pop-cli/src/commands/new/frontend.rs

@@ -46,21 +46,22 @@ pub fn create_frontend(
 	ensure_node_v20()?;
 	ensure_npx()?;
 	let project_dir = target.canonicalize()?;
+	let command = template
+		.command()
+		.ok_or_else(|| anyhow::anyhow!("no command configured for {:?}", template))?;
 	match template {
 		// Inkathon requires Bun installed.
 		FrontendTemplate::Inkathon => {
 			let bun = ensure_bun(cli)?;
-			cmd(&bun, &["x", "create-inkathon-app@latest", "frontend", "-y"])
+			cmd(&bun, &["add", "polkadot-api"]).dir(&project_dir).unchecked().run()?;
+			cmd(&bun, &[command, "frontend", "--yes"])
 				.dir(&project_dir)
 				.env("SKIP_INSTALL_SIMPLE_GIT_HOOKS", "1")
 				.unchecked()
 				.run()?;
 		},
 		// Typeink we can specify the parameters directly
 		FrontendTemplate::Typink => {
-			let command = template
-				.command()
-				.ok_or_else(|| anyhow::anyhow!("no command configured for {:?}", template))?;
 			cmd(
 				"npx",
 				vec![
@@ -78,9 +79,6 @@ pub fn create_frontend(
 			.run()?;
 		},
 		_ => {
-			let command = template
-				.command()
-				.ok_or_else(|| anyhow::anyhow!("no command configured for {:?}", template))?;
 			cmd("npx", vec![command, "frontend"]).dir(&project_dir).run()?;
 		},
 	}
@@ -131,7 +129,7 @@ mod tests {
 		);
 
 		let user_input = prompt_frontend_template(&FrontendType::Contract, &mut cli)?;
-		assert_eq!(user_input, FrontendTemplate::Inkathon);
+		assert_eq!(user_input, FrontendTemplate::Typink);
 
 		cli.verify()
 	}

crates/pop-common/src/templates/frontend.rs

@@ -43,24 +43,24 @@ impl Type<FrontendTemplate> for FrontendType {
 	VariantArray,
 )]
 pub enum FrontendTemplate {
+	/// Typeink template: The ultimate toolkit for dApps development on Polkadot, powered by <https://dedot.dev>!.
+	#[default]
+	#[strum(
+		serialize = "typink",
+		message = "Typink",
+		detailed_message = "The ultimate toolkit for dApps development on Polkadot, powered by https://dedot.dev",
+		props(Command = "create-typink@latest", Type = "Contract",)
+	)]
+	Typink,
 	/// Inkathon template: Next generation full-stack boilerplate for ink! smart contracts running
 	/// on PolkaVM.
-	#[default]
 	#[strum(
 		serialize = "inkathon",
 		message = "Inkathon",
 		detailed_message = "Next generation full-stack boilerplate for ink! smart contracts running on PolkaVM.",
 		props(Command = "create-inkathon-app@latest", Type = "Contract",)
 	)]
 	Inkathon,
-	/// Typeink template: The ultimate toolkit for dApps development on Polkadot, powered by <https://dedot.dev>!.
-	#[strum(
-		serialize = "typink",
-		message = "Typink",
-		detailed_message = "The ultimate toolkit for dApps development on Polkadot, powered by https://dedot.dev",
-		props(Command = "create-typink@latest", Type = "Contract",)
-	)]
-	Typink,
 	/// Parity template: Create Polkadot DApp in one command.
 	#[strum(
 		serialize = "create-polkadot-dapp",
@@ -136,7 +136,7 @@ mod tests {
 	fn test_convert_string_to_template() {
 		let template_names = templates_names();
 		// Test the default
-		assert_eq!(FrontendTemplate::from_str("").unwrap_or_default(), Inkathon);
+		assert_eq!(FrontendTemplate::from_str("").unwrap_or_default(), Typink);
 		// Test the rest
 		for template in FrontendTemplate::VARIANTS {
 			assert_eq!(
@@ -168,7 +168,7 @@ mod tests {
 	#[test]
 	fn test_templates_of_type() {
 		let mut frontend_type = FrontendType::Contract;
-		assert_eq!(frontend_type.templates(), [&Inkathon, &Typink]);
+		assert_eq!(frontend_type.templates(), [&Typink, &Inkathon]);
 		frontend_type = FrontendType::Chain;
 		assert_eq!(frontend_type.templates(), [&CreatePolkadotDapp, &CreateDotApp]);
 	}