feat: apply adjusts in hcms

packages/cli/src/utils/hcms.ts

@@ -128,12 +128,12 @@ export async function mergeCMSFile(fileName: string, basePath: string) {
 
   const plugins = await getPluginsList(basePath)
 
-  const pluginPaths = plugins.map((plugin) =>
-    getPackagePath(getPluginName(plugin), 'src', 'cms', fileName)
+  const pluginCMSFilePaths = plugins.map((plugin) =>
+    getPackagePath(getPluginName(plugin), 'cms', 'faststore', fileName)
   )
 
-  const customizations = [...pluginPaths, customFilePath].filter((pluginPath) =>
-    existsSync(pluginPath)
+  const customizations = [...pluginCMSFilePaths, customFilePath].filter(
+    (pluginCMSFilePath) => existsSync(pluginCMSFilePath)
   )
 
   // TODO: create a validation when the CMS files exist but don't have a component for them

packages/cli/src/utils/plugins.ts

@@ -59,9 +59,14 @@ const getPluginSrcPath = async (basePath: string, pluginName: string) => {
 export const getPluginsList = async (basePath: string): Promise<Plugin[]> => {
   const { tmpStoreConfigFile } = withBasePath(basePath)
 
-  const { plugins = [] } = await import(tmpStoreConfigFile)
+  try {
+    const { plugins } = await import(tmpStoreConfigFile)
+    return plugins
+  } catch (error) {
+    logger.error(`Could not load plugins from store config`)
+  }
 
-  return plugins
+  return []
 }
 
 const copyPluginsSrc = async (basePath: string, plugins: Plugin[]) => {
@@ -94,7 +99,7 @@ const getPluginPageFileContent = (
 import * as page from 'src/plugins/${pluginName}/pages/${pageName}';
 ${appLayout ? `import GlobalSections, { getGlobalSectionsData } from 'src/components/cms/GlobalSections'` : ``}
 
-export async function getStaticProps({previewData}) {
+export async function getStaticProps(${appLayout ? '{previewData}' : ''}) {
   const noop = async function() {}
   const loaderData = await (page.loader || noop)()
 ${appLayout ? `const globalSections = await getGlobalSectionsData(previewData)` : ``}