bfg-common 1.2.231 → 1.3.2

package/modules/fixContentBuild/index.ts

@@ -1,92 +1,92 @@
-import { defineNuxtModule } from '@nuxt/kit'
-const fs = require('fs')
-const path = require('path')
-import {
-  replaceFileContent,
-  removeNonImageFiles,
-  removeImagesFromContent,
-  updateImagesPathAndCustomComponents,
-} 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.js'
-  )
-  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)
-
-    // Правим путь к картинкам и заменяем кастомные тэги
-    updateImagesPathAndCustomComponents(contentPath)
-  })
-  // End block
-}
-
-// @ts-ignore
-export default defineNuxtModule(() => {
-  switch (process.env.npm_command) {
-    case 'run-script':
-      // npmDev()
-      break
-    case 'exec':
-      npmGenerate()
-      break
-  }
-})
-
-// 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
-//     }
-//   },
-// })
+import { defineNuxtModule } from '@nuxt/kit'
+const fs = require('fs')
+const path = require('path')
+import {
+  replaceFileContent,
+  removeNonImageFiles,
+  removeImagesFromContent,
+  updateImagesPathAndCustomComponents,
+} from './lib/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.js'
+  )
+  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)
+
+    // Правим путь к картинкам и заменяем кастомные тэги
+    updateImagesPathAndCustomComponents(contentPath)
+  })
+  // End block
+}
+
+// @ts-ignore
+export default defineNuxtModule(() => {
+  switch (process.env.npm_command) {
+    case 'run-script':
+      // npmDev()
+      break
+    case 'exec':
+      npmGenerate()
+      break
+  }
+})
+
+// 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/fixSpiceConsoleBuild/index.ts

@@ -1,28 +1,28 @@
-import { defineNuxtModule } from '@nuxt/kit'
-const fs = require('fs')
-const path = require('path')
-
-const npmGenerate = (): void => {
-  // Переносим весь контент и удаляем все файлы кроме картинок
-  const folderPath = path.join(
-    __dirname.replace('/modules/fixSpiceConsoleBuild', ''),
-    'public',
-    'spice-console'
-  )
-  if (!fs.existsSync(folderPath)) return
-
-  fs.rm(folderPath, { recursive: true }, (err: any) => {
-    if (err) {
-      console.error('Error while removing folder:', err);
-    }
-  });
-}
-
-// @ts-ignore
-export default defineNuxtModule(() => {
-  switch (process.env.npm_command) {
-    case 'exec':
-      npmGenerate()
-      break
-  }
-})
+import { defineNuxtModule } from '@nuxt/kit'
+const fs = require('fs')
+const path = require('path')
+
+const npmGenerate = (): void => {
+  // Переносим весь контент и удаляем все файлы кроме картинок
+  const folderPath = path.join(
+    __dirname.replace('/modules/fixSpiceConsoleBuild', ''),
+    'public',
+    'spice-console'
+  )
+  if (!fs.existsSync(folderPath)) return
+
+  fs.rm(folderPath, { recursive: true }, (err: any) => {
+    if (err) {
+      console.error('Error while removing folder:', err);
+    }
+  });
+}
+
+// @ts-ignore
+export default defineNuxtModule(() => {
+  switch (process.env.npm_command) {
+    case 'exec':
+      npmGenerate()
+      break
+  }
+})

package/modules/replaceEnv/index.ts

@@ -1,40 +1,40 @@
-import { defineNuxtModule } from '@nuxt/kit'
-const fs = require('fs')
-const path = require('path')
-
-const npmGenerate = (): void => {
-  // Переносим весь контент и удаляем все файлы кроме картинок
-  const filePath = path.join(
-    __dirname.replace('/node_modules/bfg-common/modules/replaceEnv', ''),
-    'assets',
-    'scss',
-    'common',
-    'normalize.scss'
-  )
-  if (!fs.existsSync(filePath)) return
-
-  const searchString = '//font-family: FONT'
-  const replacementString = `font-family: '${process.env.FONT}'` || ''
-  fs.readFile(filePath, 'utf8', (err: any, data: string) => {
-    if (err) {
-      return console.log(err)
-    }
-
-    const updatedContent = data.replace(searchString, replacementString)
-
-    fs.writeFile(filePath, updatedContent, 'utf8', (err: any) => {
-      if (err) {
-        return console.log(err)
-      }
-    })
-  })
-}
-
-// @ts-ignore
-export default defineNuxtModule(() => {
-  switch (process.env.npm_command) {
-    case 'exec':
-      npmGenerate()
-      break
-  }
-})
+import { defineNuxtModule } from '@nuxt/kit'
+const fs = require('fs')
+const path = require('path')
+
+const npmGenerate = (): void => {
+  // Переносим весь контент и удаляем все файлы кроме картинок
+  const filePath = path.join(
+    __dirname.replace('/node_modules/bfg-common/modules/replaceEnv', ''),
+    'assets',
+    'scss',
+    'common',
+    'normalize.scss'
+  )
+  if (!fs.existsSync(filePath)) return
+
+  const searchString = '//font-family: FONT'
+  const replacementString = `font-family: '${process.env.FONT}'` || ''
+  fs.readFile(filePath, 'utf8', (err: any, data: string) => {
+    if (err) {
+      return console.log(err)
+    }
+
+    const updatedContent = data.replace(searchString, replacementString)
+
+    fs.writeFile(filePath, updatedContent, 'utf8', (err: any) => {
+      if (err) {
+        return console.log(err)
+      }
+    })
+  })
+}
+
+// @ts-ignore
+export default defineNuxtModule(() => {
+  switch (process.env.npm_command) {
+    case 'exec':
+      npmGenerate()
+      break
+  }
+})

package/nuxt.config.ts

@@ -1,8 +1,8 @@
-import eslintPlugin from 'vite-plugin-eslint'
-export default defineNuxtConfig({
-  // @ts-ignore
-  vite: {
-    plugins: [eslintPlugin()],
-  },
-  css: ['~/assets/scss/main.scss'],
-})
+import eslintPlugin from 'vite-plugin-eslint'
+export default defineNuxtConfig({
+  // @ts-ignore
+  vite: {
+    plugins: [eslintPlugin()],
+  },
+  css: ['~/assets/scss/main.scss'],
+})

package/package.json

@@ -1,41 +1,41 @@
-{
-  "name": "bfg-common",
-  "private": false,
-  "version": "1.2.231",
-  "scripts": {
-    "build": "nuxt build",
-    "dev": "nuxt dev --port=3002",
-    "generate": "nuxt generate",
-    "preview": "nuxt preview",
-    "postinstall": "nuxt prepare",
-    "minify": "node minify.js",
-    "prepublishOnly": "node minify.js"
-  },
-  "devDependencies": {
-    "@novnc/novnc": "^1.4.0",
-    "@vueuse/core": "^10.1.2",
-    "@vueuse/nuxt": "^10.1.2",
-    "eslint-config-prettier": "^8.5.0",
-    "nuxt": "^3.1.2",
-    "prettier": "2.7.1",
-    "sass": "^1.54.9",
-    "sass-loader": "^10.3.1",
-    "terser": "^5.22.0",
-    "vite-plugin-eslint": "^1.8.1",
-    "xterm": "^5.1.0",
-    "xterm-addon-attach": "^0.8.0",
-    "xterm-addon-fit": "^0.7.0",
-    "xterm-addon-serialize": "^0.9.0",
-    "xterm-addon-unicode11": "^0.5.0",
-    "xterm-addon-web-links": "^0.8.0",
-    "eslint-plugin-myrules": "file:./eslint"
-  },
-  "dependencies": {
-    "@nuxtjs/eslint-config-typescript": "^12.0.0",
-    "@vueuse/components": "^10.1.2",
-    "date-fns": "^2.29.3",
-    "bfg-nuxt-3-graph": "^1.0.11",
-    "html2canvas": "^1.4.1",
-    "prettier-eslint": "^15.0.1"
-  }
-}
+{
+  "name": "bfg-common",
+  "private": false,
+  "version": "1.3.2",
+  "scripts": {
+    "build": "nuxt build",
+    "dev": "nuxt dev --port=3002",
+    "generate": "nuxt generate",
+    "preview": "nuxt preview",
+    "postinstall": "nuxt prepare",
+    "minify": "node minify.js",
+    "prepublishOnly": "node minify.js"
+  },
+  "devDependencies": {
+    "@novnc/novnc": "^1.4.0",
+    "@vueuse/core": "^10.1.2",
+    "@vueuse/nuxt": "^10.1.2",
+    "eslint-config-prettier": "^8.5.0",
+    "nuxt": "^3.1.2",
+    "prettier": "2.7.1",
+    "sass": "^1.54.9",
+    "sass-loader": "^10.3.1",
+    "terser": "^5.22.0",
+    "vite-plugin-eslint": "^1.8.1",
+    "xterm": "^5.1.0",
+    "xterm-addon-attach": "^0.8.0",
+    "xterm-addon-fit": "^0.7.0",
+    "xterm-addon-serialize": "^0.9.0",
+    "xterm-addon-unicode11": "^0.5.0",
+    "xterm-addon-web-links": "^0.8.0",
+    "eslint-plugin-myrules": "file:./eslint"
+  },
+  "dependencies": {
+    "@nuxtjs/eslint-config-typescript": "^12.0.0",
+    "@vueuse/components": "^10.1.2",
+    "date-fns": "^2.29.3",
+    "bfg-nuxt-3-graph": "^1.0.11",
+    "html2canvas": "^1.4.1",
+    "prettier-eslint": "^15.0.1"
+  }
+}

package/plugins/binary.ts

@@ -1,122 +1,122 @@
-export default defineNuxtPlugin(() => {
-  const binary = function () {
-    const self: any = {}
-    self.kbToGb = function (kb: number, fix = 2): number {
-      return +(kb / 1_048_576).toFixed(fix)
-    }
-
-    self.bToMb = function (b: number, fix = 2): number {
-      return +(b / 1_048_576).toFixed(fix)
-    }
-    self.bToGb = function (b: number, fix = 2): number {
-      return +(b / 1_073_741_824).toFixed(fix)
-    }
-
-    self.mbToKb = function (mb: number, fix = 2): number {
-      return +(mb * 1_024).toFixed(fix)
-    }
-    self.mbToGb = function (mb: number, fix = 2): number {
-      return +(mb / 1_024).toFixed(fix)
-    }
-    self.mbToTb = function (mb: number, fix = 2): number {
-      return +(mb / 1_048_576).toFixed(fix)
-    }
-
-    self.gbToMb = function (gb: number, fix = 2): number {
-      return +(gb * 1_024).toFixed(fix)
-    }
-    self.gbToTb = function (gb: number, fix = 2): number {
-      return +(gb / 1_024).toFixed(fix)
-    }
-
-    self.tbToMb = function (tb: number, fix = 2): number {
-      return +(tb * 1_048_576).toFixed(fix)
-    }
-    self.tbToGb = function (tb: number, fix = 2): number {
-      return +(tb * 1_024).toFixed(fix)
-    }
-
-    const sizeLabels:Record<string, { fromBytes: string[]; sizes: string[] }> = {
-      en: {
-        fromBytes: ['Bytes', 'KB'],
-        sizes: ['MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
-      },
-      ru: {
-        fromBytes: ['Байт', 'КБ'],
-        sizes: ['МБ', 'ГБ', 'ТБ', 'ПБ', 'ЭБ', 'ЗБ', 'ИБ'],
-      },
-    }
-
-    self.round = function (mb: number, byte = false, language = 'en'): string {
-      switch (language) {
-        case 'ru':
-          if (mb <= 0) return '0 Б';
-          if (mb < 1) return `${mb} МБ`;
-          break;
-        default:
-          if (mb <= 0) return '0 B';
-          if (mb < 1) return `${mb} MB`;
-          break;
-      }
-
-      const k = 1_024;
-      let { fromBytes, sizes } = sizeLabels[language] || sizeLabels.en;
-
-      if (byte) sizes = [...fromBytes, ...sizes]
-
-      const i = Math.floor(Math.log(mb) / Math.log(k));
-      const value =
-        (mb / Math.pow(k, i))
-          .toString()
-          .match(/^-?\d+(?:\.\d{0,2})?/)?.[0] || '0';
-
-      const sizeLabel = sizes[i];
-      return parseFloat(value) + ' ' + sizeLabel;
-    };
-
-
-    const hzLabels: {en: string[], ru: string[]} = {
-      en: ['MHz', 'GHz', 'THz', 'PHz', 'EHz'],
-      ru: ['МГц', 'ГГц', 'ТГц', 'ПГц', 'ИГц'],
-    };
-
-    self.roundHz = function (hz: number, lang = 'en') {
-      if (hz <= 0) return `0 ${lang === 'en' ? 'Hz' : 'Гц'}`;
-      const k = 1_000;
-      const dm = 2;
-      const size = lang === 'en' ? hzLabels.en : hzLabels.ru;
-      const i = Math.floor(Math.log(hz) / Math.log(k));
-      return parseFloat((hz / Math.pow(k, i)).toFixed(dm)) + ' ' + size[i];
-    }
-
-
-    self.mhzToGhz = function (mhz: number, fix = 2): number {
-      return +(mhz / 1_000).toFixed(fix)
-    }
-    self.ghzToMhz = function (mhz: number, fix = 2): number {
-      return +(mhz * 1_000).toFixed(fix)
-    }
-
-    self.universalFromTo = function (
-      val: number,
-      typeFrom: string,
-      typeTo: string,
-      fix = 2
-    ): number {
-      if (typeFrom === typeTo) return val
-
-      const from = typeFrom.toLowerCase()
-      const to = typeTo[0].toUpperCase() + typeTo.slice(1)
-      const methodName = `${from}To${to}`
-      return self[methodName](val, fix)
-    }
-
-    return self
-  }.call({})
-
-  return {
-    provide: {
-      binary,
-    },
-  }
-})
+export default defineNuxtPlugin(() => {
+  const binary = function () {
+    const self: any = {}
+    self.kbToGb = function (kb: number, fix = 2): number {
+      return +(kb / 1_048_576).toFixed(fix)
+    }
+
+    self.bToMb = function (b: number, fix = 2): number {
+      return +(b / 1_048_576).toFixed(fix)
+    }
+    self.bToGb = function (b: number, fix = 2): number {
+      return +(b / 1_073_741_824).toFixed(fix)
+    }
+
+    self.mbToKb = function (mb: number, fix = 2): number {
+      return +(mb * 1_024).toFixed(fix)
+    }
+    self.mbToGb = function (mb: number, fix = 2): number {
+      return +(mb / 1_024).toFixed(fix)
+    }
+    self.mbToTb = function (mb: number, fix = 2): number {
+      return +(mb / 1_048_576).toFixed(fix)
+    }
+
+    self.gbToMb = function (gb: number, fix = 2): number {
+      return +(gb * 1_024).toFixed(fix)
+    }
+    self.gbToTb = function (gb: number, fix = 2): number {
+      return +(gb / 1_024).toFixed(fix)
+    }
+
+    self.tbToMb = function (tb: number, fix = 2): number {
+      return +(tb * 1_048_576).toFixed(fix)
+    }
+    self.tbToGb = function (tb: number, fix = 2): number {
+      return +(tb * 1_024).toFixed(fix)
+    }
+
+    const sizeLabels:Record<string, { fromBytes: string[]; sizes: string[] }> = {
+      en: {
+        fromBytes: ['Bytes', 'KB'],
+        sizes: ['MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
+      },
+      ru: {
+        fromBytes: ['Байт', 'КБ'],
+        sizes: ['МБ', 'ГБ', 'ТБ', 'ПБ', 'ЭБ', 'ЗБ', 'ИБ'],
+      },
+    }
+
+    self.round = function (mb: number, byte = false, language = 'en'): string {
+      switch (language) {
+        case 'ru':
+          if (mb <= 0) return '0 Б';
+          if (mb < 1) return `${mb} МБ`;
+          break;
+        default:
+          if (mb <= 0) return '0 B';
+          if (mb < 1) return `${mb} MB`;
+          break;
+      }
+
+      const k = 1_024;
+      let { fromBytes, sizes } = sizeLabels[language] || sizeLabels.en;
+
+      if (byte) sizes = [...fromBytes, ...sizes]
+
+      const i = Math.floor(Math.log(mb) / Math.log(k));
+      const value =
+        (mb / Math.pow(k, i))
+          .toString()
+          .match(/^-?\d+(?:\.\d{0,2})?/)?.[0] || '0';
+
+      const sizeLabel = sizes[i];
+      return parseFloat(value) + ' ' + sizeLabel;
+    };
+
+
+    const hzLabels: {en: string[], ru: string[]} = {
+      en: ['MHz', 'GHz', 'THz', 'PHz', 'EHz'],
+      ru: ['МГц', 'ГГц', 'ТГц', 'ПГц', 'ИГц'],
+    };
+
+    self.roundHz = function (hz: number, lang = 'en') {
+      if (hz <= 0) return `0 ${lang === 'en' ? 'Hz' : 'Гц'}`;
+      const k = 1_000;
+      const dm = 2;
+      const size = lang === 'en' ? hzLabels.en : hzLabels.ru;
+      const i = Math.floor(Math.log(hz) / Math.log(k));
+      return parseFloat((hz / Math.pow(k, i)).toFixed(dm)) + ' ' + size[i];
+    }
+
+
+    self.mhzToGhz = function (mhz: number, fix = 2): number {
+      return +(mhz / 1_000).toFixed(fix)
+    }
+    self.ghzToMhz = function (mhz: number, fix = 2): number {
+      return +(mhz * 1_000).toFixed(fix)
+    }
+
+    self.universalFromTo = function (
+      val: number,
+      typeFrom: string,
+      typeTo: string,
+      fix = 2
+    ): number {
+      if (typeFrom === typeTo) return val
+
+      const from = typeFrom.toLowerCase()
+      const to = typeTo[0].toUpperCase() + typeTo.slice(1)
+      const methodName = `${from}To${to}`
+      return self[methodName](val, fix)
+    }
+
+    return self
+  }.call({})
+
+  return {
+    provide: {
+      binary,
+    },
+  }
+})