feat: wip

Author: pedromtec

packages/cli/src/utils/createNextjsPage.ts

@@ -4,36 +4,70 @@ import fs from 'fs'
 import { withBasePath } from './directory'
 import { myAccountPageTemplate } from './templates/myAccountPage'
 
-const processExternalPages = (
-  externalPagesPath: string,
-  corePagesPath: string
-) => {
-  fs.readdirSync(externalPagesPath).forEach((file) => {
-    const filePath = path.join(externalPagesPath, file)
-    const destinationPath = path.join(corePagesPath, file)
+const ALLOWED_PREFIX_PAGES = ['/account']
 
+const createExternalPages = (
+  customizationPagesDir: string,
+  corePagesDir: string,
+  baseCustomizationPagesDir: string,
+  template: (pagePath: string) => string
+) => {
+  fs.readdirSync(customizationPagesDir).forEach((file) => {
+    console.log(customizationPagesDir)
+    const filePath = path.join(customizationPagesDir, file)
+    const destinationPath = path.join(corePagesDir, file)
+    console.log({ filePath, destinationPath })
     if (fs.statSync(filePath).isDirectory()) {
-      // nested pages are not allowed
-      throw new Error('Nested pages are not allowed')
+      if (!fs.existsSync(destinationPath)) {
+        fs.mkdirSync(destinationPath, { recursive: true })
+      }
+      return createExternalPages(
+        filePath,
+        destinationPath,
+        baseCustomizationPagesDir,
+        template
+      )
     }
 
-    const externalPagePath = `customizations/src/${filePath.replace(externalPagesPath, '')}`
-    console.log({ externalPagePath })
-    const content = myAccountPageTemplate(externalPagePath)
-    fs.writeFileSync(destinationPath, content)
+    if (file.endsWith('.tsx')) {
+      const externalPagePath = `src/customizations/src/pages${filePath.replace(baseCustomizationPagesDir, '')}`
+      console.log({ externalPagePath })
+      const content = template(externalPagePath)
+      fs.writeFileSync(destinationPath, content)
+    }
   })
 }
 
+function isAllowedPrefixPage(file: string) {
+  console.log({ file })
+  return ALLOWED_PREFIX_PAGES.some((prefix) => file.startsWith(prefix))
+}
+
 export function createNextJsPages(basePath: string) {
   const { tmpDir } = withBasePath(basePath)
 
-  const corePagesDir = path.join(tmpDir, 'src/pages')
+  const corePagesDir = path.join(tmpDir, 'src/pages') // .faststore/src/pages
   const customizationPagesDir = path.join(
     tmpDir,
     'src/customizations/src/pages'
-  )
+  ) // .faststore/src/customizations/src/pages
+
+  const allPagesAreAllowed = fs
+    .readdirSync(customizationPagesDir)
+    .every((filePath) => isAllowedPrefixPage(path.join('/', filePath)))
+
+  if (!allPagesAreAllowed) {
+    throw new Error(
+      `Only these prefix pages: (${ALLOWED_PREFIX_PAGES.join(', ')}) are allowed`
+    )
+  }
 
   console.log({ corePagesDir, customizationPagesDir })
 
-  processExternalPages(customizationPagesDir, corePagesDir)
+  createExternalPages(
+    customizationPagesDir,
+    corePagesDir,
+    customizationPagesDir,
+    myAccountPageTemplate
+  )
 }

packages/cli/src/utils/generate.ts

@@ -210,6 +210,7 @@ function copyUserStarterToCustomizations(basePath: string) {
   try {
     if (existsSync(userSrcDir) && readdirSync(userSrcDir).length > 0) {
       copySync(userSrcDir, tmpCustomizationsSrcDir, { dereference: true })
+      createNextJsPages(basePath)
     }
 
     if (existsSync(userStoreConfigFile)) {
@@ -532,7 +533,6 @@ export async function generate(options: GenerateOptions) {
 
   await Promise.all([
     setupPromise,
-    createNextJsPages(basePath),
     checkDependencies(basePath, ['typescript']),
     enableSearchSSR(basePath),
     updateBuildTime(basePath),

packages/cli/src/utils/templates/myAccountPage.ts

@@ -9,7 +9,7 @@ export const myAccountPageTemplate = (pagePath: string) => `
   import RenderSections from 'src/components/cms/RenderSections'
   import { default as GLOBAL_COMPONENTS } from 'src/components/cms/global/Components'
   import CUSTOM_COMPONENTS from 'src/customizations/src/components'
-  import dynamicPage from '${pagePath}';
+  import DynamicPage from '${pagePath}';
   type Props = {
     globalSections: GlobalSectionsData
   }
@@ -24,7 +24,7 @@ export const myAccountPageTemplate = (pagePath: string) => `
         globalSections={globalSections.sections}
         components={COMPONENTS}
       >
-      {dynamicPage()}
+        <DynamicPage />
       </RenderSections>
     )
   }

packages/core/src/pages/account.tsx packages/core/src/pages/account/index.tsx

@@ -11,7 +11,7 @@ import RenderSections from 'src/components/cms/RenderSections'
 import { default as GLOBAL_COMPONENTS } from 'src/components/cms/global/Components'
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 import { injectGlobalSections } from 'src/server/cms/global'
-import storeConfig from '../../discovery.config'
+import storeConfig from 'discovery.config'
 
 type Props = {
   globalSections: GlobalSectionsData