Browse Source

integrate formatHTML

Daniel 2 years ago
parent
commit
a28e4c0eb5
3 changed files with 457 additions and 220 deletions
  1. 7 0
      gulpfile.js
  2. 439 210
      package-lock.json
  3. 11 10
      package.json

+ 7 - 0
gulpfile.js

@@ -7,6 +7,7 @@ const { src, dest, lastRun, watch, series, parallel } = require('gulp')
 const cleanCss = require('gulp-clean-css')
 const gulpESLintNew = require('gulp-eslint-new')
 const fileinclude = require('gulp-file-include')
+const formatHTML = require('gulp-format-html')
 const validator = require('gulp-html')
 const gulpIf = require('gulp-if')
 const postcss = require('gulp-postcss')
@@ -134,6 +135,7 @@ const index = () => src([paths.src.base + '*.html'])
         environment: 'development'
       }
     }))
+    .pipe(formatHTML())
     .pipe(dest(paths.temp.base))
     .pipe(browserSync.stream())
 
@@ -145,6 +147,7 @@ const html = () => src([paths.src.html])
         environment: 'development'
       }
     }))
+    .pipe(formatHTML())
     .pipe(dest(paths.temp.html))
     .pipe(browserSync.stream())
 
@@ -242,6 +245,7 @@ const copyDistHtmlIndex = () => src([paths.src.base + '*.html'])
         environment: 'production'
       }
     }))
+    .pipe(formatHTML())
     .pipe(dest(paths.dist.base))
 
 // Copy Html
@@ -253,6 +257,7 @@ const copyDistHtml = () => src([paths.src.html])
         environment: 'production'
       }
     }))
+    .pipe(formatHTML())
     .pipe(dest(paths.dist.html))
 
 // HTML Lint
@@ -265,6 +270,7 @@ const copyDistHtmlIndexForLint = () => src([paths.src.base + '*.html'])
         environment: 'production'
       }
     }))
+    .pipe(formatHTML())
     .pipe(dest(paths.temp.base))
 // Copy Html for Lint
 const copyDistHtmlForLint = () => src([paths.src.html])
@@ -275,6 +281,7 @@ const copyDistHtmlForLint = () => src([paths.src.html])
         environment: 'production'
       }
     }))
+    .pipe(formatHTML())
     .pipe(dest(paths.temp.html))
 // Now Lint
 const lintDistHtmlCopied = () => src([paths.temp.html + '/**/*.html', paths.temp.base + '*.html'])

File diff suppressed because it is too large
+ 439 - 210
package-lock.json


+ 11 - 10
package.json

@@ -37,16 +37,16 @@
     "url": "https://github.com/ColorlibHQ/AdminLTE/issues"
   },
   "devDependencies": {
-    "@rollup/plugin-typescript": "^8.3.3",
-    "@ronilaukkarinen/gulp-stylelint": "^14.0.6",
+    "@rollup/plugin-typescript": "^11.0.0",
+    "@ronilaukkarinen/gulp-stylelint": "^14.0.9",
     "@typescript-eslint/eslint-plugin": "^5.49.0",
     "@typescript-eslint/parser": "^5.49.0",
-    "autoprefixer": "^10.4.7",
+    "autoprefixer": "^10.4.13",
     "bootstrap": "^5.3.0-alpha1",
-    "browser-sync": "^2.27.10",
+    "browser-sync": "^2.27.11",
     "bundlewatch": "^0.3.3",
     "del": "^6.1.1",
-    "eslint": "^8.32.0",
+    "eslint": "^8.33.0",
     "eslint-config-xo": "^0.43.1",
     "eslint-config-xo-typescript": "^0.55.1",
     "eslint-plugin-import": "^2.27.5",
@@ -55,7 +55,8 @@
     "gulp-clean-css": "^4.3.0",
     "gulp-eslint-new": "^1.7.1",
     "gulp-file-include": "^2.3.0",
-    "gulp-html": "^4.0.0",
+    "gulp-format-html": "^1.5.0",
+    "gulp-html": "^5.0.0",
     "gulp-if": "^3.0.0",
     "gulp-postcss": "^9.0.1",
     "gulp-rename": "^2.0.0",
@@ -63,12 +64,12 @@
     "gulp-terser": "^2.1.0",
     "lockfile-lint": "^4.10.0",
     "postcss": "^8.4.6",
-    "rollup": "^2.79.1",
-    "rtlcss": "^3.5.0",
+    "rollup": "^3.12.0",
+    "rtlcss": "^4.0.0",
     "sass": "^1.57.1",
     "stylelint": "^14.9.1",
     "stylelint-config-twbs-bootstrap": "^7.0.0",
-    "tslib": "^2.4.0",
-    "typescript": "^4.7.4"
+    "tslib": "^2.5.0",
+    "typescript": "^4.9.4"
   }
 }

Some files were not shown because too many files changed in this diff