Create-plugin: Refactor getTemplateData to be used in generate command and update commands

packages/create-plugin/src/commands/generate.command.ts

@@ -7,7 +7,6 @@ import { DEFAULT_FEATURE_FLAGS, EXTRA_TEMPLATE_VARIABLES, IS_DEV, PLUGIN_TYPES,
 import { getConfig } from '../utils/utils.config.js';
 import { printError } from '../utils/utils.console.js';
 import { directoryExists, getExportFileName, isFile } from '../utils/utils.files.js';
-import { getPackageManagerFromUserAgent, getPackageManagerInstallCmd } from '../utils/utils.packageManager.js';
 import { getExportPath } from '../utils/utils.path.js';
 import { renderTemplateFromFile, getTemplateData } from '../utils/utils.templates.js';
 import { normalizeId } from '../utils/utils.handlebars.js';
@@ -20,9 +19,8 @@ import { CliArgs, TemplateData } from '../types.js';
 
 export const generate = async (argv: minimist.ParsedArgs) => {
   const answers = await promptUser(argv);
-  const { packageManagerName, packageManagerVersion } = getPackageManagerFromUserAgent();
   const pluginId = normalizeId(answers.pluginName, answers.orgName, answers.pluginType);
-  const templateData = getTemplateData({ ...answers, pluginId, packageManagerName, packageManagerVersion });
+  const templateData = getTemplateData({ ...answers, pluginId });
   const exportPath = getExportPath(templateData.pluginName, templateData.orgName, templateData.pluginType);
   const exportPathExists = await directoryExists(exportPath);
   const exportPathIsPopulated = exportPathExists ? (await readdir(exportPath)).length > 0 : false;

packages/create-plugin/src/utils/utils.templates.ts

@@ -96,10 +96,10 @@ export function renderTemplateFromFile(templateFile: string, data?: any) {
 export function getTemplateData(data?: Partial<TemplateData>): TemplateData {
   const { features } = getConfig();
   const currentVersion = getVersion();
-  const pluginJson = getPluginJson();
-  const pluginType = data?.pluginType ?? pluginJson.type;
-  const packageManagerInfo = getPackageManagerWithFallback();
-  const packageManagerName = data?.packageManagerName ?? packageManagerInfo.packageManagerName;
+  const pluginJson = data ? undefined : getPluginJson();
+  const pluginType = data?.pluginType ?? pluginJson?.type;
+  const packageManagerInfo = data ? getPackageManagerFromUserAgent() : getPackageManagerWithFallback();
+  const packageManagerName = packageManagerInfo.packageManagerName;
   const packageManagerInstallCmd = getPackageManagerInstallCmd(packageManagerName);
   const useReactRouterV6 = features.useReactRouterV6 === true && pluginType === PLUGIN_TYPES.app;
   const usePlaywright = features.usePlaywright === true || isFile(path.join(process.cwd(), 'playwright.config.ts'));
@@ -113,15 +113,15 @@ export function getTemplateData(data?: Partial<TemplateData>): TemplateData {
 
   const templateData = {
     ...EXTRA_TEMPLATE_VARIABLES,
-    pluginId: data?.pluginId ?? pluginJson.id,
-    pluginName: data?.pluginName ?? pluginJson.name,
-    pluginDescription: data?.pluginName ?? pluginJson.info?.description,
-    hasBackend: data?.hasBackend ?? pluginJson.backend,
-    orgName: data?.orgName ?? pluginJson.info?.author?.name,
+    pluginId: data?.pluginId ?? pluginJson?.id,
+    pluginName: data?.pluginName ?? pluginJson?.name,
+    pluginDescription: data?.pluginName ?? pluginJson?.info?.description,
+    hasBackend: data?.hasBackend ?? pluginJson?.backend,
+    orgName: data?.orgName ?? pluginJson?.info?.author?.name,
     pluginType,
     packageManagerName: packageManagerName,
     packageManagerInstallCmd: packageManagerInstallCmd,
-    packageManagerVersion: data?.packageManagerVersion ?? packageManagerInfo.packageManagerVersion,
+    packageManagerVersion: packageManagerInfo.packageManagerVersion,
     isAppType: pluginType === PLUGIN_TYPES.app || pluginType === PLUGIN_TYPES.scenes,
     isNPM: packageManagerName === 'npm',
     version: currentVersion,