@nitro/app 5.10.16 → 6.0.0-rc.1

package/app/core/config.js

@@ -118,7 +118,7 @@ const defaultConfig = {
 			 */
 			options: {
 				// defaultNS: 'translation',
-				// whitelist: ['en', 'de', 'default'],
+				// supportedLngs: ['en', 'de', 'default'],
 				fallbackLng: 'default',
 				backend: {
 					loadPath: 'project/locales/{{lng}}/{{ns}}.json',
@@ -129,7 +129,8 @@ const defaultConfig = {
 					// keys or params to lookup language from
 					lookupQuerystring: 'lang',
 				},
-				debug: false,
+				// compatibilityJSON: 'v3',
+				debug: false
 			},
 			middlewareOptions: {
 				ignoreRoutes: ['api/', 'assets/', 'dist/', 'proto/'],

package/app/core/i18n.js

@@ -2,7 +2,7 @@
 
 /**
  * Init Translation Library i18next
- * Documentation: https://www.npmjs.com/package/i18next-express-middleware
+ * Documentation: https://github.com/i18next/i18next-http-middleware
  *
  * Configuration in config package ('./config.js').
  *
@@ -11,7 +11,7 @@
 const i18next = require('i18next');
 const FilesystemBackend = require('i18next-node-fs-backend');
 const sprintf = require('i18next-sprintf-postprocessor');
-const i18nextMiddleware = require('i18next-express-middleware');
+const i18nextMiddleware = require('i18next-http-middleware');
 const config = require('config');
 const cloneDeep = require('lodash/cloneDeep');
 

package/app/scripts/validate-pattern-data.js

@@ -26,9 +26,8 @@ const chalk = require('chalk');
 const fs = require('fs');
 const globby = require('globby');
 const Ajv = require('ajv');
+const ajv = new Ajv({ allErrors: true });
 const config = require('config');
-const ajv = new Ajv({ schemaId: 'auto', allErrors: true });
-ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-04.json'));
 const wildcard = '*';
 const patternBasePaths = Object.keys(config.get('nitro.patterns')).map((key) => {
 	return config.get(`nitro.patterns.${key}.path`);
@@ -52,6 +51,21 @@ const logMissingSchemaAsWarning = config.has('code.validation.jsonSchema.logMiss
 let errorCouter = 0;
 let patternCouter = 0;
 
+// collect all schemas
+globby.sync(patternGlobs, { onlyFiles: false }).forEach((patternPath) => {
+	const schemaFilePath = `${patternPath}/schema.json`;
+
+	if (fs.existsSync(schemaFilePath)) {
+		// console.log(`Add ${schemaFilePath}`);
+		const schema = JSON.parse(fs.readFileSync(schemaFilePath, 'utf8'));
+		if (schema.$id) {
+			// ajv.addSchema(schema);
+			ajv.addMetaSchema(schema);
+		}
+	}
+});
+
+// validate pattern data
 globby.sync(patternGlobs, { onlyFiles: false }).forEach((patternPath) => {
 	const schemaFilePath = `${patternPath}/schema.json`;
 	patternCouter += 1;
@@ -72,7 +86,9 @@ globby.sync(patternGlobs, { onlyFiles: false }).forEach((patternPath) => {
 		const patternData = JSON.parse(fs.readFileSync(patternDataFilePath, 'utf8'));
 		const schema = JSON.parse(fs.readFileSync(schemaFilePath, 'utf8'));
 
-		const valid = ajv.validate(schema, patternData);
+		// console.log(`validate ${schemaFilePath} with ${patternDataFilePath}`);
+		const schemaToUse = schema.$id || schema;
+		const valid = ajv.validate(schemaToUse, patternData);
 		if (!valid) {
 			errorCouter += 1;
 			console.log(`${chalk.red('Error')} (${patternDataFilePath}): ${ajv.errorsText()}`);
@@ -83,5 +99,6 @@ globby.sync(patternGlobs, { onlyFiles: false }).forEach((patternPath) => {
 if (errorCouter <= 0) {
 	console.log(`${chalk.green('Success:')} all data from each of the ${patternCouter} patterns are valid!\n`);
 } else {
-	process.abort();
+	console.log(`${chalk.red('Error:')} we detected ${errorCouter} errors in your data.\n`);
+	process.exitCode = 1;
 }

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

@@ -21,8 +21,7 @@ const path = require('path');
 const extend = require('extend');
 const globby = require('globby');
 const Ajv = require('ajv');
-const ajv = new Ajv({ schemaId: 'auto', allErrors: true });
-ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-04.json'));
+const ajv = new Ajv({ allErrors: true });
 const config = require('config');
 const hbsUtils = require('../utils');
 const lint = require('../../../lib/lint');
@@ -185,16 +184,25 @@ module.exports = function () {
 					patternData.children = context.fn(this);
 				}
 
+
 				// Validate with JSON schema
+				/* eslint-disable max-depth */
 				if (!config.get('server.production') && config.get('code.validation.jsonSchema.live')) {
 					if (fs.existsSync(pattern.schemaFilePath)) {
 						const schema = JSON.parse(fs.readFileSync(pattern.schemaFilePath, 'utf8'));
+						if (schema.$id) {
+							// remove if already known to avoid collision
+							if (ajv.getSchema(schema.$id)) {
+								ajv.removeSchema(schema);
+							}
+						}
 						const valid = ajv.validate(schema, patternData);
 						if (!valid) {
 							throw new Error(`JSON Schema: ${ajv.errorsText()}`);
 						}
 					}
 				}
+				/* eslint-enable max-depth */
 
 				const html = hbs.handlebars.compile(fs.readFileSync(pattern.templateFilePath, 'utf8'))(
 					patternData,

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

@@ -13,8 +13,7 @@ const path = require('path');
 const extend = require('extend');
 const globby = require('globby');
 const Ajv = require('ajv');
-const ajv = new Ajv({ schemaId: 'auto', allErrors: true });
-ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-04.json'));
+const ajv = new Ajv({ allErrors: true });
 const config = require('config');
 const twigUtils = require('../utils');
 const lint = require('../../../lib/lint');
@@ -199,6 +198,12 @@ module.exports = function (Twig) {
 					if (!config.get('server.production') && config.get('code.validation.jsonSchema.live')) {
 						if (fs.existsSync(pattern.schemaFilePath)) {
 							const schema = JSON.parse(fs.readFileSync(pattern.schemaFilePath, 'utf8'));
+							if (schema.$id) {
+								// remove if already known to avoid collision
+								if (ajv.getSchema(schema.$id)) {
+									ajv.removeSchema(schema);
+								}
+							}
 							const valid = ajv.validate(schema, patternData);
 							if (!valid) {
 								return {

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

@@ -13,8 +13,7 @@ const path = require('path');
 const extend = require('extend');
 const globby = require('globby');
 const Ajv = require('ajv');
-const ajv = new Ajv({ schemaId: 'auto', allErrors: true });
-ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-04.json'));
+const ajv = new Ajv({ allErrors: true });
 const config = require('config');
 const twigUtils = require('../utils');
 const lint = require('../../../lib/lint');
@@ -199,6 +198,12 @@ module.exports = function (Twig) {
 					if (!config.get('server.production') && config.get('code.validation.jsonSchema.live')) {
 						if (fs.existsSync(pattern.schemaFilePath)) {
 							const schema = JSON.parse(fs.readFileSync(pattern.schemaFilePath, 'utf8'));
+							if (schema.$id) {
+								// remove if already known to avoid collision
+								if (ajv.getSchema(schema.$id)) {
+									ajv.removeSchema(schema);
+								}
+							}
 							const valid = ajv.validate(schema, patternData);
 							if (!valid) {
 								return {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nitro/app",
-  "version": "5.10.16",
+  "version": "6.0.0-rc.1",
   "description": "Nitro server",
   "license": "MIT",
   "repository": "merkle-open/generator-nitro",
   "author": "The Nitro Team",
   "engines": {
-    "node": ">=10.15.0 <15",
-    "npm": ">=6.4.1 <7"
+    "node": ">=12.13.0 <17",
+    "npm": ">=6.12.0 <9"
   },
   "bin": {
     "nitro-app-validate-pattern-data": "./bin/validate-pattern-data.js",
@@ -15,7 +15,7 @@
   },
   "scripts": {
     "lint": "eslint .",
-    "prepublishOnly": "npx pkg-ok@2.3.1",
+    "prepublishOnly": "npx -y pkg-ok@2.3.1",
     "pretest": "npm run lint",
     "test": "jasmine --config=./tests/jasmine/support/jasmine.json"
   },
@@ -29,7 +29,7 @@
     "nitro"
   ],
   "dependencies": {
-    "ajv": "6.12.6",
+    "ajv": "8.7.1",
     "body-parser": "1.19.0",
     "chalk": "4.1.2",
     "compression": "1.7.4",
@@ -42,23 +42,23 @@
     "hbs": "4.1.2",
     "hbs-utils": "0.0.4",
     "htmllint": "0.8.0",
-    "i18next": "20.6.1",
-    "i18next-express-middleware": "2.0.0",
+    "i18next": "21.4.2",
+    "i18next-http-middleware": "3.1.4",
     "i18next-node-fs-backend": "2.1.3",
     "i18next-sprintf-postprocessor": "0.2.2",
-    "jasmine": "3.9.0",
-    "jasmine-core": "3.9.0",
+    "jasmine": "3.10.0",
+    "jasmine-core": "3.10.1",
     "lodash": "4.17.21",
     "text-table": "0.2.0",
     "twig": "1.13.3",
     "webpack": "4.46.0",
-    "webpack-dev-middleware": "4.3.0",
+    "webpack-dev-middleware": "5.2.1",
     "webpack-hot-middleware": "2.25.1"
   },
   "devDependencies": {
     "@namics/eslint-config": "9.1.1",
     "eslint": "7.32.0",
-    "eslint-plugin-import": "2.25.2"
+    "eslint-plugin-import": "2.25.3"
   },
   "publishConfig": {
     "access": "public"