From d1e66bc1a529892503d29f679676df48b7221451 Mon Sep 17 00:00:00 2001
From: Paulo Castro <paulo@balena.io>
Date: Sat, 8 Jan 2022 01:16:45 +0000
Subject: [PATCH] v14 preparations: Fix TypeError produced by 'npx oclif
 manifest'

Change-type: patch
---
 lib/commands/config/inject.ts      |  2 +-
 lib/commands/config/read.ts        |  2 +-
 lib/commands/config/reconfigure.ts |  2 +-
 lib/commands/config/write.ts       |  2 +-
 lib/utils/common-flags.ts          | 20 ++++++++++++--------
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/lib/commands/config/inject.ts b/lib/commands/config/inject.ts
index 72f1687e..c262077a 100644
--- a/lib/commands/config/inject.ts
+++ b/lib/commands/config/inject.ts
@@ -57,7 +57,7 @@ export default class ConfigInjectCmd extends Command {
 	public static usage = 'config inject <file>';
 
 	public static flags: flags.Input<FlagsDef> = {
-		type: cf.deviceTypeIgnored,
+		...cf.deviceTypeIgnored,
 		drive: cf.driveOrImg,
 		help: cf.help,
 	};
diff --git a/lib/commands/config/read.ts b/lib/commands/config/read.ts
index f637b176..d16d88ef 100644
--- a/lib/commands/config/read.ts
+++ b/lib/commands/config/read.ts
@@ -47,7 +47,7 @@ export default class ConfigReadCmd extends Command {
 	public static usage = 'config read';
 
 	public static flags: flags.Input<FlagsDef> = {
-		type: cf.deviceTypeIgnored,
+		...cf.deviceTypeIgnored,
 		drive: cf.driveOrImg,
 		help: cf.help,
 		json: cf.json,
diff --git a/lib/commands/config/reconfigure.ts b/lib/commands/config/reconfigure.ts
index 7f0252af..3f4fe097 100644
--- a/lib/commands/config/reconfigure.ts
+++ b/lib/commands/config/reconfigure.ts
@@ -50,7 +50,7 @@ export default class ConfigReconfigureCmd extends Command {
 	public static usage = 'config reconfigure';
 
 	public static flags: flags.Input<FlagsDef> = {
-		type: cf.deviceTypeIgnored,
+		...cf.deviceTypeIgnored,
 		drive: cf.driveOrImg,
 		advanced: flags.boolean({
 			description: 'show advanced commands',
diff --git a/lib/commands/config/write.ts b/lib/commands/config/write.ts
index 964d97ca..f9e3dc5b 100644
--- a/lib/commands/config/write.ts
+++ b/lib/commands/config/write.ts
@@ -64,7 +64,7 @@ export default class ConfigWriteCmd extends Command {
 	public static usage = 'config write <key> <value>';
 
 	public static flags: flags.Input<FlagsDef> = {
-		type: cf.deviceTypeIgnored,
+		...cf.deviceTypeIgnored,
 		drive: cf.driveOrImg,
 		help: cf.help,
 	};
diff --git a/lib/utils/common-flags.ts b/lib/utils/common-flags.ts
index 9213674e..3046d233 100644
--- a/lib/utils/common-flags.ts
+++ b/lib/utils/common-flags.ts
@@ -97,14 +97,18 @@ export const deviceType = flags.string({
 	required: true,
 });
 
-export const deviceTypeIgnored = isV14()
-	? undefined
-	: flags.string({
-			description: 'ignored - no longer required',
-			char: 't',
-			required: false,
-			hidden: true,
-	  });
+export const deviceTypeIgnored = {
+	...(isV14()
+		? {}
+		: {
+				type: flags.string({
+					description: 'ignored - no longer required',
+					char: 't',
+					required: false,
+					hidden: true,
+				}),
+		  }),
+};
 
 export const json: IBooleanFlag<boolean> = flags.boolean({
 	char: 'j',