bfg-common 1.1.2 → 1.1.3

package/modules/fixContentBuild/index.ts

@@ -5,8 +5,7 @@ import {
   replaceFileContent,
   removeNonImageFiles,
   removeImagesFromContent,
-  updateImagesPath,
-  updateCustomComponents,
+  updateImagesPathAndCustomComponents,
 } from './utils/methods'
 
 // const npmDev = (): void => {
@@ -56,14 +55,11 @@ const npmGenerate = (): void => {
 
     // Удаляем картинки из папки content
     removeImagesFromContent(contentPath)
+
+    // Правим путь к картинкам и заменяем кастомные тэги
+    updateImagesPathAndCustomComponents(contentPath)
   })
   // End block
-
-  // Правим путь к картинкам
-  updateImagesPath(contentPath)
-
-  // Заменяем кастомные тэги
-  updateCustomComponents(contentPath)
 }
 
 export default defineNuxtModule({

package/modules/fixContentBuild/utils/methods.ts

@@ -49,16 +49,17 @@ export const removeImagesFromContent = (dirPath: string) => {
   })
 }
 
-export const updateImagesPath = (dirPath: string) => {
+export const updateImagesPathAndCustomComponents = (dirPath: string) => {
   fs.readdirSync(dirPath).forEach((file: string) => {
     const filePath = path.join(dirPath, file)
     const isDir = fs.lstatSync(filePath).isDirectory()
 
     if (isDir) {
-      updateImagesPath(filePath)
+      updateImagesPathAndCustomComponents(filePath)
     } else {
       if (isMdFile(file)) {
         // @ts-ignore
+        // Правим путь к картинкам
         const imagePath = filePath
           .replaceAll('\\', '/')
           .match(/\/content.+\//)[0]
@@ -67,51 +68,47 @@ export const updateImagesPath = (dirPath: string) => {
           filePath,
           /!\[(.*)\]\((.*?)\)/g,
           `![$1](${imagePath}$2)`
-        )
-      }
-    }
-  })
-}
-
-export const updateCustomComponents = (dirPath: string) => {
-  fs.readdirSync(dirPath).forEach((file: string) => {
-    const filePath = path.join(dirPath, file)
-    const isDir = fs.lstatSync(filePath).isDirectory()
-
-    if (isDir) {
-      updateCustomComponents(filePath)
-    } else {
-      if (isMdFile(file)) {
-        replaceFileContent(
-          filePath,
-          /\{\{ *< *hint *(info) *> *\}\}|\{\{ *< *\/hint *> *\}\}/g,
-          (_match: any, hintInfo: string) => {
-            return hintInfo ? '\n::hint\n' : '\n::\n'
-          }
-        )
+        ).then(() => {
+          // Заменяем кастомные тэги
+          replaceFileContent(
+            filePath,
+            /\{\{ *< *hint *(info) *> *\}\}|\{\{ *< *\/hint *> *\}\}/g,
+            (_match: any, hintInfo: string) => {
+              return hintInfo ? '\n::hint\n' : '\n::\n'
+            }
+          )
+        })
       }
     }
   })
 }
 
-export const replaceFileContent = (
+export const replaceFileContent = async (
   filePath: string,
   searchString: string | RegExp,
   replacementString: any
-) => {
-  fs.readFile(filePath, 'utf8', (err: any, data: string) => {
-    if (err) {
-      return console.log(err)
-    }
-
-    if (data.match(replacementString)) return
-
-    const updatedContent = data.replace(searchString, replacementString)
-
-    fs.writeFile(filePath, updatedContent, 'utf8', (err: any) => {
+): Promise<void> => {
+  return new Promise((resolve, reject) => {
+    fs.readFile(filePath, 'utf8', (err: any, data: string) => {
       if (err) {
+        reject()
         return console.log(err)
       }
+
+      if (data.match(replacementString)) {
+        resolve()
+        return
+      }
+
+      const updatedContent = data.replace(searchString, replacementString)
+
+      fs.writeFile(filePath, updatedContent, 'utf8', (err: any) => {
+        if (err) {
+          reject()
+          return console.log(err)
+        }
+        resolve()
+      })
     })
   })
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.1.2",
+  "version": "1.1.3",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",