chore: Inline the remaining files (#1470)

Author: joe-yeager

commands/cms/lighthouseScore.ts

@@ -28,7 +28,7 @@ const DEFAULT_TABLE_HEADER = [
 ];
 
 exports.command = 'lighthouse-score [--theme]';
-exports.describe = false; // i18n(`${i18nKey}.describe`);
+exports.describe = false;
 
 const selectTheme = async accountId => {
   const { theme: selectedTheme } = await promptUser([

lib/buildAccount.ts

@@ -91,13 +91,11 @@ export async function buildDeveloperTestAccount(
   env: Environment,
   portalLimit: number
 ): Promise<number> {
-  const i18nKey = 'lib.developerTestAccount.create.loading';
-
   const id = getAccountIdentifier(parentAccountConfig);
   const parentAccountId = getAccountId(id);
 
   if (!parentAccountId) {
-    throw new Error(i18n(`${i18nKey}.fail`));
+    throw new Error(i18n(`lib.developerTestAccount.create.loading.fail`));
   }
 
   SpinniesManager.init({
@@ -106,7 +104,7 @@ export async function buildDeveloperTestAccount(
 
   logger.log('');
   SpinniesManager.add('buildDeveloperTestAccount', {
-    text: i18n(`${i18nKey}.add`, {
+    text: i18n(`lib.developerTestAccount.create.loading.add`, {
       accountName: testAccountName,
     }),
   });
@@ -124,7 +122,7 @@ export async function buildDeveloperTestAccount(
     developerTestAccountPersonalAccessKey = data.personalAccessKey;
 
     SpinniesManager.succeed('buildDeveloperTestAccount', {
-      text: i18n(`${i18nKey}.succeed`, {
+      text: i18n(`lib.developerTestAccount.create.loading.succeed`, {
         accountName: testAccountName,
         accountId: developerTestAccountId,
       }),
@@ -133,7 +131,7 @@ export async function buildDeveloperTestAccount(
     debugError(e);
 
     SpinniesManager.fail('buildDeveloperTestAccount', {
-      text: i18n(`${i18nKey}.fail`, {
+      text: i18n(`lib.developerTestAccount.create.loading.fail`, {
         accountName: testAccountName,
       }),
     });

lib/commonOpts.ts

@@ -21,14 +21,12 @@ import { debugError } from './errorHandlers';
 import { EXIT_CODES } from './enums/exitCodes';
 import { uiCommandReference } from './ui';
 
-const i18nKey = 'lib.commonOpts';
-
 export function addGlobalOptions(yargs: Argv) {
   yargs.version(false);
   yargs.option('debug', {
     alias: 'd',
     default: false,
-    describe: i18n(`${i18nKey}.options.debug.describe`),
+    describe: i18n(`lib.commonOpts.options.debug.describe`),
     type: 'boolean',
   });
   yargs.option('network-debug', {
@@ -42,23 +40,23 @@ export function addGlobalOptions(yargs: Argv) {
 export function addAccountOptions(yargs: Argv): Argv {
   return yargs.option('account', {
     alias: 'a',
-    describe: i18n(`${i18nKey}.options.account.describe`),
+    describe: i18n(`lib.commonOpts.options.account.describe`),
     type: 'string',
   });
 }
 
 export function addConfigOptions(yargs: Argv): Argv<ConfigArgs> {
   return yargs.option<keyof ConfigArgs, StringArgType>('config', {
     alias: 'c',
-    describe: i18n(`${i18nKey}.options.config.describe`),
+    describe: i18n(`lib.commonOpts.options.config.describe`),
     type: 'string',
   });
 }
 
 export function addOverwriteOptions(yargs: Argv): Argv {
   return yargs.option('overwrite', {
     alias: 'o',
-    describe: i18n(`${i18nKey}.options.overwrite.describe`),
+    describe: i18n(`lib.commonOpts.options.overwrite.describe`),
     type: 'boolean',
     default: false,
   });
@@ -73,7 +71,7 @@ export function addCmsPublishModeOptions(
   return yargs.option('cms-publish-mode', {
     alias: 'm',
     describe: i18n(
-      `${i18nKey}.options.modes.describe.${
+      `lib.commonOpts.options.modes.describe.${
         read ? 'read' : write ? 'write' : 'default'
       }`,
       { modes: cmsPublishModes }
@@ -84,7 +82,7 @@ export function addCmsPublishModeOptions(
 
 export function addTestingOptions(yargs: Argv): Argv {
   return yargs.option('qa', {
-    describe: i18n(`${i18nKey}.options.qa.describe`),
+    describe: i18n(`lib.commonOpts.options.qa.describe`),
     type: 'boolean',
     default: false,
     hidden: true,
@@ -93,7 +91,7 @@ export function addTestingOptions(yargs: Argv): Argv {
 
 export function addUseEnvironmentOptions(yargs: Argv): Argv {
   yargs.option('use-env', {
-    describe: i18n(`${i18nKey}.options.useEnv.describe`),
+    describe: i18n(`lib.commonOpts.options.useEnv.describe`),
     type: 'boolean',
   });
   yargs.conflicts('use-env', 'account');

lib/configOptions.ts

@@ -11,22 +11,26 @@ import { trackCommandUsage } from './usageTracking';
 import { promptUser } from './prompts/promptUtils';
 import { i18n } from '../lib/lang';
 
-const i18nKey = 'commands.config.subcommands.set.options';
-
 async function enableOrDisableUsageTracking(): Promise<boolean> {
   const { isEnabled } = await promptUser<{ isEnabled: boolean }>([
     {
       type: 'list',
       name: 'isEnabled',
       pageSize: 20,
-      message: i18n(`${i18nKey}.allowUsageTracking.promptMessage`),
+      message: i18n(
+        `commands.config.subcommands.set.options.allowUsageTracking.promptMessage`
+      ),
       choices: [
         {
-          name: i18n(`${i18nKey}.allowUsageTracking.labels.enabled`),
+          name: i18n(
+            `commands.config.subcommands.set.options.allowUsageTracking.labels.enabled`
+          ),
           value: true,
         },
         {
-          name: i18n(`${i18nKey}.allowUsageTracking.labels.disabled`),
+          name: i18n(
+            `commands.config.subcommands.set.options.allowUsageTracking.labels.disabled`
+          ),
           value: false,
         },
       ],
@@ -57,7 +61,7 @@ export async function setAllowUsageTracking({
   updateAllowUsageTracking(isEnabled);
 
   logger.success(
-    i18n(`${i18nKey}.allowUsageTracking.success`, {
+    i18n(`commands.config.subcommands.set.options.allowUsageTracking.success`, {
       isEnabled: isEnabled.toString(),
     })
   );
@@ -73,7 +77,9 @@ async function selectCmsPublishMode(): Promise<CmsPublishMode> {
       type: 'list',
       name: 'cmsPublishMode',
       pageSize: 20,
-      message: i18n(`${i18nKey}.defaultMode.promptMessage`),
+      message: i18n(
+        `commands.config.subcommands.set.options.defaultMode.promptMessage`
+      ),
       choices: ALL_CMS_PUBLISH_MODES,
       default: CMS_PUBLISH_MODE.publish,
     },
@@ -102,7 +108,7 @@ export async function setDefaultCmsPublishMode({
     newDefault = defaultCmsPublishMode;
   } else {
     logger.error(
-      i18n(`${i18nKey}.defaultMode.error`, {
+      i18n(`commands.config.subcommands.set.options.defaultMode.error`, {
         validModes: commaSeparatedValues(ALL_CMS_PUBLISH_MODES),
       })
     );
@@ -112,7 +118,7 @@ export async function setDefaultCmsPublishMode({
   updateDefaultCmsPublishMode(newDefault);
 
   logger.success(
-    i18n(`${i18nKey}.defaultMode.success`, {
+    i18n(`commands.config.subcommands.set.options.defaultMode.success`, {
       mode: newDefault,
     })
   );
@@ -122,7 +128,9 @@ async function enterTimeout(): Promise<string> {
   const { timeout } = await promptUser<{ timeout: string }>([
     {
       name: 'timeout',
-      message: i18n(`${i18nKey}.httpTimeout.promptMessage`),
+      message: i18n(
+        `commands.config.subcommands.set.options.httpTimeout.promptMessage`
+      ),
       type: 'input',
       default: 30000,
     },
@@ -151,6 +159,8 @@ export async function setHttpTimeout({
   updateHttpTimeout(newHttpTimeout);
 
   logger.success(
-    i18n(`${i18nKey}.httpTimeout.success`, { timeout: newHttpTimeout })
+    i18n(`commands.config.subcommands.set.options.httpTimeout.success`, {
+      timeout: newHttpTimeout,
+    })
   );
 }

lib/doctor/Diagnosis.ts

@@ -34,8 +34,6 @@ interface DiagnosisCategories {
   defaultAccountOverrideFile: DiagnosisCategory;
 }
 
-const i18nKey = `lib.doctor.diagnosis`;
-
 export class Diagnosis {
   private readonly prefixes: prefixes;
   private readonly diagnosis: DiagnosisCategories;
@@ -53,24 +51,24 @@ export class Diagnosis {
 
     this.diagnosis = {
       cli: {
-        header: i18n(`${i18nKey}.cli.header`),
+        header: i18n(`lib.doctor.diagnosis.cli.header`),
         sections: [],
       },
       cliConfig: {
-        header: i18n(`${i18nKey}.cliConfig.header`),
+        header: i18n(`lib.doctor.diagnosis.cliConfig.header`),
         sections: [],
       },
       defaultAccountOverrideFile: {
-        header: i18n(`${i18nKey}.defaultAccountOverrideFile.header`),
+        header: i18n(`lib.doctor.diagnosis.defaultAccountOverrideFile.header`),
         sections: [],
       },
       project: {
-        header: i18n(`${i18nKey}.projectConfig.header`),
+        header: i18n(`lib.doctor.diagnosis.projectConfig.header`),
         subheaders: [
-          i18n(`${i18nKey}.projectConfig.projectDirSubHeader`, {
+          i18n(`lib.doctor.diagnosis.projectConfig.projectDirSubHeader`, {
             projectDir: diagnosticInfo.project?.config?.projectDir,
           }),
-          i18n(`${i18nKey}.projectConfig.projectNameSubHeader`, {
+          i18n(`lib.doctor.diagnosis.projectConfig.projectNameSubHeader`, {
             projectName: diagnosticInfo.project?.config?.projectConfig?.name,
           }),
         ],
@@ -80,10 +78,10 @@ export class Diagnosis {
 
     if (diagnosticInfo.config) {
       this.diagnosis.cliConfig.subheaders = [
-        i18n(`${i18nKey}.cliConfig.configFileSubHeader`, {
+        i18n(`lib.doctor.diagnosis.cliConfig.configFileSubHeader`, {
           filename: diagnosticInfo.config,
         }),
-        i18n(`${i18nKey}.cliConfig.defaultAccountSubHeader`, {
+        i18n(`lib.doctor.diagnosis.cliConfig.defaultAccountSubHeader`, {
           accountDetails: uiAccountDescription(accountId!),
         }),
       ];
@@ -129,12 +127,12 @@ export class Diagnosis {
 
     output.push('');
     output.push(
-      i18n(`${i18nKey}.counts.errors`, {
+      i18n(`lib.doctor.diagnosis.counts.errors`, {
         count: this.errorCount,
       })
     );
     output.push(
-      i18n(`${i18nKey}.counts.warnings`, {
+      i18n(`lib.doctor.diagnosis.counts.warnings`, {
         count: this.warningCount,
       })
     );