@nitro/app 6.0.11 → 6.1.2

package/app/lib/lint.js

@@ -1,55 +1,31 @@
 'use strict';
 
-const fs = require('fs');
 const config = require('config');
-const htmllint = require('htmllint');
-const textTable = require('text-table');
+const { HtmlValidate, formatterFactory } = require('html-validate');
 
-function getHtmllintOptions(isSnippet) {
-	const configPath = '.htmllintrc';
-	let htmllintOptions = {};
-	if (fs.existsSync(configPath)) {
-		htmllintOptions = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-	}
-	if (isSnippet) {
-		htmllintOptions['doctype-first'] = false;
-	}
-
-	return htmllintOptions;
-}
-
-function htmllintReporter(filepath, issues) {
-	if (issues.length > 0) {
-		const filePath = filepath.toString().replace(config.get('nitro.basePath'), '');
-		const tableData = [];
+const htmlvalidate = new HtmlValidate();
+const format = formatterFactory('stylish');
 
-		issues.forEach((issue) => {
-			issue.msg = issue.msg || htmllint.messages.renderIssue(issue);
-			issue.cell = `${`    ${issue.line}`.slice(-4)}:${issue.column}`;
-			tableData.push([issue.cell, issue.msg, issue.rule]);
-		});
-
-		const table = textTable(tableData);
-
-		// output
-		console.log(`\n[htmllint] ${filePath}`);
-		console.log(table);
-		console.log('\n');
-
-		process.exitCode = 1;
+function _getHtmlvalidateConfig() {
+	try {
+		return require(`${config.get('nitro.basePath')}.htmlvalidate.js`);
+	} catch (e) {
+		return {};
 	}
 }
 
-function lintSnippet(templatePath, markup, options) {
-	const htmllintOptions = options || getHtmllintOptions(true);
-
-	return htmllint(markup, htmllintOptions).then((issues) => {
-		htmllintReporter(templatePath, issues);
-	});
+function lintSnippet(templatePath, markup) {
+	const report = htmlvalidate.validateString(markup, _getHtmlvalidateConfig());
+	const filePath = templatePath.replace(config.get('nitro.basePath'), '');
+	if (!report.valid) {
+		console.log(`\nMarkup error in: ${filePath}`);
+		console.log(format(report.results));
+	} else if (report.warningCount) {
+		console.log(`\nMarkup warning in: ${filePath}`);
+		console.log(format(report.results));
+	}
 }
 
 module.exports = {
-	getHtmllintOptions,
 	lintSnippet,
-	htmllintReporter,
 };

package/app/templating/hbs/helpers/pattern.js

@@ -25,7 +25,6 @@ const ajv = new Ajv({ allErrors: true });
 const config = require('config');
 const hbsUtils = require('../utils');
 const lint = require('../../../lib/lint');
-const htmllintOptions = lint.getHtmllintOptions(true);
 
 function getPatternBasePaths(type) {
 	let patternTypeKeys;
@@ -211,7 +210,7 @@ module.exports = function () {
 
 				// lint html snippet
 				if (!config.get('server.production') && config.get('code.validation.htmllint.live')) {
-					lint.lintSnippet(pattern.templateFilePath, html, htmllintOptions);
+					lint.lintSnippet(pattern.templateFilePath, html);
 				}
 
 				return new hbs.handlebars.SafeString(html);

package/app/templating/hbs/helpers/placeholder.js

@@ -7,7 +7,6 @@ const extend = require('extend');
 const config = require('config');
 const hbsUtils = require('../utils');
 const lint = require('../../../lib/lint');
-const htmllintOptions = lint.getHtmllintOptions(true);
 
 module.exports = function () {
 	try {
@@ -53,7 +52,7 @@ module.exports = function () {
 
 			// lint html snippet
 			if (!config.get('server.production') && config.get('code.validation.htmllint.live')) {
-				lint.lintSnippet(templatePath, html, htmllintOptions);
+				lint.lintSnippet(templatePath, html);
 			}
 			return new hbs.handlebars.SafeString(html);
 		}

package/app/templating/twig/helpers/component.js

@@ -17,7 +17,6 @@ const ajv = new Ajv({ allErrors: true });
 const config = require('config');
 const twigUtils = require('../utils');
 const lint = require('../../../lib/lint');
-const htmllintOptions = lint.getHtmllintOptions(true);
 
 const patternBasePaths = Object.keys(config.get('nitro.patterns')).map((key) => {
 	const configKey = `nitro.patterns.${key}.path`;
@@ -242,7 +241,7 @@ module.exports = function (Twig) {
 
 					// lint html snippet
 					if (!config.get('server.production') && config.get('code.validation.htmllint.live')) {
-						lint.lintSnippet(pattern.templateFilePath, html, htmllintOptions);
+						lint.lintSnippet(pattern.templateFilePath, html);
 					}
 
 					// return the rendered template

package/app/templating/twig/helpers/pattern.js

@@ -17,7 +17,6 @@ const ajv = new Ajv({ allErrors: true });
 const config = require('config');
 const twigUtils = require('../utils');
 const lint = require('../../../lib/lint');
-const htmllintOptions = lint.getHtmllintOptions(true);
 
 const patternBasePaths = Object.keys(config.get('nitro.patterns')).map((key) => {
 	const configKey = `nitro.patterns.${key}.path`;
@@ -242,7 +241,7 @@ module.exports = function (Twig) {
 
 					// lint html snippet
 					if (!config.get('server.production') && config.get('code.validation.htmllint.live')) {
-						lint.lintSnippet(pattern.templateFilePath, html, htmllintOptions);
+						lint.lintSnippet(pattern.templateFilePath, html);
 					}
 
 					// return the rendered template

package/app/templating/twig/helpers/placeholder.js

@@ -14,7 +14,6 @@ const extend = require('extend');
 const config = require('config');
 const twigUtils = require('../utils');
 const lint = require('../../../lib/lint');
-const htmllintOptions = lint.getHtmllintOptions(true);
 
 module.exports = function (Twig) {
 	return {
@@ -142,7 +141,7 @@ module.exports = function (Twig) {
 
 				// lint html snippet
 				if (!config.get('server.production') && config.get('code.validation.htmllint.live')) {
-					lint.lintSnippet(templateFilePath, html, htmllintOptions);
+					lint.lintSnippet(templateFilePath, html);
 				}
 
 				// return the rendered template

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nitro/app",
-  "version": "6.0.11",
+  "version": "6.1.2",
   "description": "Nitro server",
   "license": "MIT",
   "repository": "merkle-open/generator-nitro",
@@ -36,23 +36,22 @@
     "cookie-session": "2.0.0",
     "config": "3.3.7",
     "dot-object": "2.1.4",
-    "express": "4.17.3",
+    "express": "4.18.1",
     "extend": "3.0.2",
     "globby": "11.0.4",
     "hbs": "4.2.0",
     "hbs-utils": "0.0.4",
-    "htmllint": "0.8.0",
-    "i18next": "21.6.14",
+    "html-validate": "6.11.1",
+    "i18next": "21.8.3",
     "i18next-http-middleware": "3.2.0",
     "i18next-fs-backend": "1.1.4",
     "i18next-sprintf-postprocessor": "0.2.2",
-    "jasmine": "4.0.2",
-    "jasmine-core": "4.0.1",
+    "jasmine": "4.1.0",
+    "jasmine-core": "4.1.1",
     "lodash": "4.17.21",
-    "text-table": "0.2.0",
     "twig": "1.13.3",
     "webpack": "4.46.0",
-    "webpack-dev-middleware": "5.3.1",
+    "webpack-dev-middleware": "5.3.3",
     "webpack-hot-middleware": "2.25.1"
   },
   "devDependencies": {