bfg-common 1.0.98 → 1.0.99

package/modules/fixContentBuild/index.ts

@@ -1,65 +1,84 @@
-import { defineNuxtModule } from '@nuxt/kit'
-const fs = require('fs')
-const path = require('path')
-import {
-  replaceFileContent,
-  removeNonImageFiles,
-  removeImagesFromContent,
-  updateImagesPath,
-} from './utils/methods'
-
-export default defineNuxtModule({
-  meta: {
-    name: 'fix-content-build',
-    configKey: 'fixContentBuild',
-  },
-  setup() {
-    if (
-      process.env.NODE_ENV === 'development' ||
-      process.env.npm_command !== 'exec'
-    )
-      return
-
-    // Правим путь к файлу
-    const filePath = path.join(
-      __dirname.replace('/bfg-common/modules/fixContentBuild', ''),
-      '@nuxt',
-      'content',
-      'dist',
-      'runtime',
-      'legacy',
-      'composables',
-      'query.mjs'
-    )
-    const searchString = '/query/${hash(params)}'
-    const replacementString = 'cache'
-    replaceFileContent(filePath, searchString, replacementString)
-    // End block
-
-    // Переносим весь контент и удаляем все файлы кроме картинок
-    const contentPath = path.join(
-      __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
-      'content',
-      'help'
-    )
-    if (!fs.existsSync(contentPath)) return
-
-    const publicPath = path.join(
-      __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
-      'public',
-      'help',
-      'images'
-    )
-    fs.cp(contentPath, publicPath, { recursive: true }, () => {
-      // Удаляем все файлы кроме картинок
-      removeNonImageFiles(publicPath)
-
-      // Удаляем картинки из папки content
-      removeImagesFromContent(contentPath)
-    })
-    // End block
-
-    // Правим путь к картинкам
-    updateImagesPath(contentPath)
-  },
-})
+import { defineNuxtModule } from '@nuxt/kit'
+const fs = require('fs')
+const path = require('path')
+import {
+  replaceFileContent,
+  removeNonImageFiles,
+  removeImagesFromContent,
+  updateImagesPath,
+  updateCustomComponents,
+} from './utils/methods'
+
+const npmDev = (): void => {
+  const contentPath = path.join(
+    __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
+    'content',
+    'help'
+  )
+  // Заменяем кастомные тэги
+  updateCustomComponents(contentPath)
+}
+
+const npmGenerate = (): void => {
+  // Правим путь к файлу
+  const filePath = path.join(
+    __dirname.replace('/bfg-common/modules/fixContentBuild', ''),
+    '@nuxt',
+    'content',
+    'dist',
+    'runtime',
+    'legacy',
+    'composables',
+    'query.mjs'
+  )
+  const searchString = '/query/${hash(params)}'
+  const replacementString = 'cache'
+  replaceFileContent(filePath, searchString, replacementString)
+  // End block
+
+  // Переносим весь контент и удаляем все файлы кроме картинок
+  const contentPath = path.join(
+    __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
+    'content',
+    'help'
+  )
+  if (!fs.existsSync(contentPath)) return
+
+  const publicPath = path.join(
+    __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
+    'public',
+    'help',
+    'images'
+  )
+  fs.cp(contentPath, publicPath, { recursive: true }, () => {
+    // Удаляем все файлы кроме картинок
+    removeNonImageFiles(publicPath)
+
+    // Удаляем картинки из папки content
+    removeImagesFromContent(contentPath)
+  })
+  // End block
+
+  // Правим путь к картинкам
+  updateImagesPath(contentPath)
+
+  // Заменяем кастомные тэги
+  updateCustomComponents(contentPath)
+}
+
+export default defineNuxtModule({
+  meta: {
+    name: 'fix-content-build',
+    configKey: 'fixContentBuild',
+  },
+  setup() {
+    switch (process.env.npm_command) {
+      case 'run-script':
+        npmDev()
+        break
+      case 'exec':
+        npmGenerate()
+        break
+    }
+  },
+})

package/modules/fixContentBuild/utils/methods.ts

@@ -1,5 +1,5 @@
-import path from 'path';
-import fs from 'fs';
+import path from 'path'
+import fs from 'fs'
 
 const isImage = (fileName: string) => {
   const imageExtensions = ['.png', '.jpeg', '.jpg']
@@ -41,9 +41,9 @@ export const removeImagesFromContent = (dirPath: string) => {
         const filePathWidthOutPrefix = filePath.replace('_index.md', 'index.md')
         fs.rename(filePath, filePathWidthOutPrefix, (err: any) => {
           if (err) {
-            console.error(`Error renaming file: ${err}`);
+            console.error(`Error renaming file: ${err}`)
           }
-        });
+        })
       }
     }
   })
@@ -59,10 +59,36 @@ export const updateImagesPath = (dirPath: string) => {
     } else {
       if (isMdFile(file)) {
         // @ts-ignore
-        const imagePath = filePath.replaceAll('\\', '/')
+        const imagePath = filePath
+          .replaceAll('\\', '/')
           .match(/\/content.+\//)[0]
-          .replace('\/content\/help', '\/help\/images')
-        replaceFileContent(filePath, /!\[(.*)\]\((.*?)\)/g, `![$1](${imagePath}$2)`)
+          .replace('/content/help', '/help/images')
+        replaceFileContent(
+          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 ? '::hint' : '::'
+          }
+        )
       }
     }
   })
@@ -71,14 +97,15 @@ export const updateImagesPath = (dirPath: string) => {
 export const replaceFileContent = (
   filePath: string,
   searchString: string | RegExp,
-  replacementString: string
+  replacementString: any
 ) => {
   fs.readFile(filePath, 'utf8', (err: any, data: string) => {
     if (err) {
       return console.log(err)
     }
 
-    if (data.match(replacementString)) return
+    if (typeof replacementString === 'string' && data.match(replacementString))
+      return
 
     const updatedContent = data.replace(searchString, replacementString)
 

package/package.json

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