huan-simple-html 1.1.0 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "huan-simple-html",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "一个简单的HTML项目，通过Webpack进行打包。请尽量使用pnpm处理此包。更多细节请查看\"README.md\"",
   "keywords": [
     "html",
@@ -38,6 +38,7 @@
     "file-loader": "^6.2.0",
     "html-loader": "^5.1.0",
     "html-webpack-plugin": "^5.6.3",
+    "huan-file-tool": "^1.0.5",
     "jquery": "^3.7.1",
     "mini-css-extract-plugin": "^2.9.2",
     "normalize.css": "^8.0.1",
@@ -54,8 +55,8 @@
   },
   "scripts": {
     "init": "npx pnpm install",
-    "lint": "eslint --ext .js,.mjs,.cjs,.ts --fix .",
-    "lint:debug": "eslint --ext .js,.mjs,.cjs,.ts --debug --fix .",
+    "lint": "eslint --ext .js,.mjs,.cjs --fix .",
+    "lint:debug": "eslint --ext .js,.mjs,.cjs --debug --fix .",
     "dev": "npx webpack server --config webpack_config_dev.js",
     "build:dev": "npx webpack --config webpack_config_dev.js",
     "build:dev:run": "npx pnpm build:dev && npx pnpm dev",

package/webpack_config_dev.js

@@ -2,7 +2,7 @@ import path from 'path'
 import HtmlWebpackPlugin from 'html-webpack-plugin'
 import MiniCssExtractPlugin from 'mini-css-extract-plugin'
 import CopyWebpackPlugin from 'copy-webpack-plugin'
-import filetool from './src/utils/file.js'
+import filetool from 'huan-file-tool'
 import { fileURLToPath } from 'url'
 
 const __filename = fileURLToPath(import.meta.url)
@@ -13,7 +13,9 @@ const dist_name = 'dist-dev'
 
 const HTMMLPlugin = []
 
-const { localPathResult: AllHTMLLocalFile4xx } = filetool.getAllFilePaths(path.resolve(__dirname, 'src/html/error/4xx'))
+const { localPathResult: AllHTMLLocalFile4xx } = filetool.filewaalk.getAllFilePaths(
+  path.resolve(__dirname, 'src/html/error/4xx')
+)
 AllHTMLLocalFile4xx.forEach((filePath) => {
   if (!filePath.endsWith('.html')) {
     return
@@ -56,7 +58,9 @@ AllHTMLLocalFile4xx.forEach((filePath) => {
   )
 })
 
-const { localPathResult: AllHTMLLocalFile5xx } = filetool.getAllFilePaths(path.resolve(__dirname, 'src/html/error/5xx'))
+const { localPathResult: AllHTMLLocalFile5xx } = filetool.filewaalk.getAllFilePaths(
+  path.resolve(__dirname, 'src/html/error/5xx')
+)
 AllHTMLLocalFile5xx.forEach((filePath) => {
   if (!filePath.endsWith('.html')) {
     return

package/webpack_config_github.js

@@ -3,7 +3,7 @@ import HtmlWebpackPlugin from 'html-webpack-plugin'
 import MiniCssExtractPlugin from 'mini-css-extract-plugin'
 import CopyWebpackPlugin from 'copy-webpack-plugin'
 import TerserPlugin from 'terser-webpack-plugin'
-import filetool from './src/utils/file.js'
+import filetool from 'huan-file-tool'
 import { fileURLToPath } from 'url'
 
 const __filename = fileURLToPath(import.meta.url)
@@ -27,7 +27,9 @@ const html_minify = {
 
 const HTMMLPlugin = []
 
-const { localPathResult: AllHTMLLocalFile4xx } = filetool.getAllFilePaths(path.resolve(__dirname, 'src/html/error/4xx'))
+const { localPathResult: AllHTMLLocalFile4xx } = filetool.filewaalk.getAllFilePaths(
+  path.resolve(__dirname, 'src/html/error/4xx')
+)
 AllHTMLLocalFile4xx.forEach((filePath) => {
   if (!filePath.endsWith('.html')) {
     return
@@ -70,7 +72,9 @@ AllHTMLLocalFile4xx.forEach((filePath) => {
   )
 })
 
-const { localPathResult: AllHTMLLocalFile5xx } = filetool.getAllFilePaths(path.resolve(__dirname, 'src/html/error/5xx'))
+const { localPathResult: AllHTMLLocalFile5xx } = filetool.filewaalk.getAllFilePaths(
+  path.resolve(__dirname, 'src/html/error/5xx')
+)
 AllHTMLLocalFile5xx.forEach((filePath) => {
   if (!filePath.endsWith('.html')) {
     return

package/webpack_config_prod.js

@@ -2,7 +2,7 @@ import path from 'path'
 import HtmlWebpackPlugin from 'html-webpack-plugin'
 import MiniCssExtractPlugin from 'mini-css-extract-plugin'
 import CopyWebpackPlugin from 'copy-webpack-plugin'
-import filetool from './src/utils/file.js'
+import filetool from 'huan-file-tool'
 import { fileURLToPath } from 'url'
 
 const __filename = fileURLToPath(import.meta.url)
@@ -26,7 +26,9 @@ const html_minify = {
 
 const HTMMLPlugin = []
 
-const { localPathResult: AllHTMLLocalFile4xx } = filetool.getAllFilePaths(path.resolve(__dirname, 'src/html/error/4xx'))
+const { localPathResult: AllHTMLLocalFile4xx } = filetool.filewaalk.getAllFilePaths(
+  path.resolve(__dirname, 'src/html/error/4xx')
+)
 AllHTMLLocalFile4xx.forEach((filePath) => {
   if (!filePath.endsWith('.html')) {
     return
@@ -69,7 +71,9 @@ AllHTMLLocalFile4xx.forEach((filePath) => {
   )
 })
 
-const { localPathResult: AllHTMLLocalFile5xx } = filetool.getAllFilePaths(path.resolve(__dirname, 'src/html/error/5xx'))
+const { localPathResult: AllHTMLLocalFile5xx } = filetool.filewaalk.getAllFilePaths(
+  path.resolve(__dirname, 'src/html/error/5xx')
+)
 AllHTMLLocalFile5xx.forEach((filePath) => {
   if (!filePath.endsWith('.html')) {
     return

package/src/utils/file.js

@@ -1,45 +0,0 @@
-import path from 'path'
-import fs from 'fs'
-
-export default {
-  getAllFilePaths
-}
-
-export function getAllFilePaths(dir) {
-  return _getAllFilePaths(dir, './', 5)
-}
-
-function _getAllFilePaths(filePath, localpath, deep) {
-  if (deep === 0) {
-    return [], []
-  }
-
-  let filePathResult = []
-  let localPathResult = []
-
-  // 读取目录中的所有文件和子目录
-  fs.readdirSync(filePath).forEach(function (file) {
-    const newFilePath = path.join(filePath, file)
-    const newLocalPath = path.join(localpath, file)
-
-    // 如果是目录，则递归读取该目录下的文件
-    if (fs.statSync(newFilePath).isDirectory()) {
-      const { filePathResult: _filrPath, localPathResult: _localPath } = _getAllFilePaths(
-        newFilePath,
-        newLocalPath,
-        deep - 1
-      )
-      filePathResult = filePathResult.concat(_filrPath)
-      localPathResult = localPathResult.concat(_localPath)
-    } else {
-      // 如果是文件，则直接加入结果数组
-      filePathResult.push(newFilePath)
-      localPathResult.push(newLocalPath)
-    }
-  })
-
-  return {
-    filePathResult,
-    localPathResult
-  }
-}