generator-nitro 8.1.1 → 9.0.1

package/generators/app/index.js

@@ -343,6 +343,7 @@ module.exports = class extends Generator {
 			'config/default/themes.js',
 			'project/docs/nitro-themes.md',
 			'project/routes/_themes.js',
+			'project/viewData/_themes.js',
 			'src/patterns/molecules/example/css/theme/dark.scss',
 			'src/patterns/molecules/example/css/theme/light.scss',
 			'src/shared/utils/colors/css/theme/dark.scss',

package/generators/app/templates/.node-version

@@ -1 +1 @@
-18.18.2
+20.9.0

package/generators/app/templates/CUTAWAYpackage.json

@@ -6,8 +6,8 @@
   "private": true,
   "author": "The Nitro Team",
   "engines": {
-    "node": ">=16.13.0 <21",
-    "npm": ">=8.1.0 <11"
+    "node": ">=18.12.0 <21",
+    "npm": ">=8.19.2 <11"
   },
   "scripts": {
     "\n# PROJECT ------- ": "",
@@ -81,7 +81,7 @@
     "@gondel/core": "1.2.8",
     "@gondel/plugin-hot": "1.2.8",
     "bootstrap": "5.3.2",<% } %>
-    "core-js": "3.33.1"<% if (options.exampleCode) { %>,
+    "core-js": "3.33.2"<% if (options.exampleCode) { %>,
     "flatpickr": "4.6.13",
     "handlebars": "4.7.8",
     "jquery": "3.7.1",
@@ -92,7 +92,7 @@
     "svg4everybody": "2.1.9"<% } %>
   },
   "devDependencies": {<% if (options.jsCompiler === 'js') { %>
-    "@babel/eslint-parser": "7.22.15",<% } %>
+    "@babel/eslint-parser": "7.23.3",<% } %>
     "@merkle-open/eslint-config": "3.0.0",
     "@merkle-open/html-validate-config": "1.0.1",
     "@merkle-open/prettier-config": "1.2.0",
@@ -103,19 +103,19 @@
     "@nitro/gulp": "<%= version %>",
     "@nitro/webpack": "<%= version %>",
     "@playwright/test": "1.39.0",<% if (options.jsCompiler === 'ts') { %>
-    "@types/bootstrap": "5.2.8",<% if (options.exampleCode ) { %>
-    "@types/jquery": "3.5.24",<% } %>
-    "@types/svg4everybody": "2.1.4",
-    "@types/webpack-env": "1.18.3",<% } %>
+    "@types/bootstrap": "5.2.9",<% if (options.exampleCode ) { %>
+    "@types/jquery": "3.5.27",<% } %>
+    "@types/svg4everybody": "2.1.5",
+    "@types/webpack-env": "1.18.4",<% } %>
     "backstopjs": "6.2.2",
     "check-node-version": "4.2.1",
     "commitizen": "4.3.0",
     "config": "3.3.9",
     "cross-env": "7.0.3",
-    "cypress": "13.3.2",
+    "cypress": "13.5.0",
     "cz-conventional-changelog": "3.3.0",
     "env-linter": "1.0.0",
-    "eslint": "8.46.0",
+    "eslint": "8.53.0",
     "eslint-plugin-import": "2.29.0",
     "extend": "3.0.2",
     "generator-nitro": "<%= version %>",
@@ -123,8 +123,8 @@
     "html-validate": "7.18.1",
     "husky": "8.0.3",
     "license-checker": "25.0.1",
-    "lighthouse": "11.2.0",
-    "lint-staged": "14.0.1",<% if (options.themes) { %>
+    "lighthouse": "11.3.0",
+    "lint-staged": "15.0.2",<% if (options.themes) { %>
     "node-sass": "8.0.0",<% } %>
     "npm-check-updates": "16.14.6",
     "npm-run-all": "4.1.5",

package/generators/app/templates/babel.config.js

@@ -4,7 +4,7 @@ module.exports = {
 	presets: [[require.resolve('@babel/preset-env'), { useBuiltIns: 'usage', corejs: 3 }]],
 	plugins: [
 		[require.resolve('@babel/plugin-proposal-decorators'), { legacy: true }],
-		require.resolve('@babel/plugin-proposal-class-properties'),
 		require.resolve('@babel/plugin-syntax-dynamic-import'),
+		require.resolve('@babel/plugin-transform-class-properties'),
 	],
 };

package/generators/app/templates/config/webpack/options.js

@@ -6,9 +6,9 @@ const options = {
 		<% if (options.jsCompiler === 'ts') { %>js: false,
 		ts: true,<% } else { %>js: true,
 		ts: false,<% } %>
-		scss: {<% if (options.themes) { %>
-			implementation: require('node-sass'),<% } %>
-		},
+		scss: <% if (options.themes) { %>{
+			implementation: require('node-sass'),
+		}<% } else { %>true<% } %>,
 		hbs: <% if (options.clientTpl) { %>true<% } else { %>false<% } %>,
 		woff: true,
 		image: true,

package/generators/app/templates/project/docs/nitro-config.md

@@ -198,6 +198,14 @@ server: {
 
 If set to `true`, all requests through express will be compressed.
 
+### `server.loadViewDataBeforeRoutes`
+
+- Type: Boolean
+- Default: true
+
+If set to `true`, viewData is processed before all routes.  
+For backwards compatibility, you can set it to `false`, to get the loading behavior before Nitro version 9.
+
 ## Gulp
 
 ### `gulp.dumpViews`

package/generators/app/templates/project/routes/_themes.js

@@ -1,60 +1,16 @@
 'use strict';
 
-const extend = require('extend');
-const cookieSession = require('cookie-session');
-const config = require('config');
-const validThemes = config.has('themes') && Array.isArray(config.get('themes')) ? config.get('themes') : false;
+const utils = require('@nitro/app/app/lib/utils');
+
+const validThemes = utils.getValidThemes();
 
 /**
- * enrich result with theme info
- * stores value in session cookie
+ * check and handle theme session on production environments
  */
 
-function getValidatedThemeId(theme) {
-	if (theme && validThemes.find((t) => t.id === theme)) {
-		return theme;
-	}
-
-	return false;
-}
-
-function theme(req, res, next) {
-	// console.log('Enhancing view data with theme data');
-
-	const isPage =
-		!req.path.match(/^\/favicon.ico/) &&
-		!req.path.match(/^\/api\//) &&
-		!req.path.match(/^\/assets\//) &&
-		!req.path.match(/^\/content\//) &&
-		!req.path.match(/^\/proto\//) &&
-		!req.path.match(/^\/reports\//) &&
-		!req.path.match(/^\/static\//);
-
-	// enrich locals with theme data on all pages
-	if (isPage) {
-		const theme =
-			getValidatedThemeId(process.env.THEME) ||
-			(req.session && req.session.theme && getValidatedThemeId(req.session.theme)) ||
-			validThemes.find((theme) => theme.isDefault).id;
-		const themeData = validThemes.find((t) => t.id === theme);
-
-		extend(true, res.locals, { theme: themeData });
-	}
-
-	next();
-}
-
 module.exports = (app) => {
-	if (validThemes) {
-		// check and handle theme session on production environment
-		if (app.get('env') === 'production') {
-			app.use(
-				cookieSession({
-					name: 'theme',
-					keys: ['keeeeeeeeeeey', 'schlüssel'],
-				}),
-			);
-
+	if (app.get('env') === 'production') {
+		if (validThemes) {
 			for (const theme of validThemes) {
 				app.route(`/theme/${theme.id}`).get((req, res, next) => {
 					req.session.theme = theme.id;
@@ -67,7 +23,5 @@ module.exports = (app) => {
 				});
 			}
 		}
-
-		app.route('*').get(theme);
 	}
 };

package/generators/app/templates/project/viewData/_themes.js

@@ -0,0 +1,49 @@
+'use strict';
+
+const cookieSession = require('cookie-session');
+const extend = require('extend');
+const utils = require('@nitro/app/app/lib/utils');
+const view = require('@nitro/app/app/lib/view');
+
+const validThemes = utils.getValidThemes();
+
+/**
+ * enrich view data with theme info
+ */
+
+function getValidatedThemeById(theme) {
+	if (theme && validThemes.find((t) => t.id === theme)) {
+		return theme;
+	}
+
+	return false;
+}
+
+function theme(req, res, next) {
+	// enrich locals with theme data on all pages
+	if (view.isView(req)) {
+		const theme =
+			getValidatedThemeById(process.env.THEME) ||
+			(req.session && req.session.theme && getValidatedThemeById(req.session.theme)) ||
+			validThemes.find((theme) => theme.isDefault).id;
+		const themeData = validThemes.find((t) => t.id === theme);
+
+		extend(true, res.locals, { theme: themeData });
+	}
+
+	next();
+}
+
+module.exports = (app) => {
+	if (validThemes) {
+		if (app.get('env') === 'production') {
+			app.use(
+				cookieSession({
+					name: 'theme',
+					keys: ['keeeeeeeeeeey', 'schlüssel'],
+				}),
+			);
+		}
+		app.route('*').all(theme);
+	}
+};

package/package.json

@@ -1,13 +1,16 @@
 {
   "name": "generator-nitro",
-  "version": "8.1.1",
+  "version": "9.0.1",
   "description": "Yeoman generator for the nitro frontend framework",
   "license": "MIT",
-  "repository": "merkle-open/generator-nitro",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/merkle-open/generator-nitro.git"
+  },
   "author": "The Nitro Team",
   "engines": {
-    "node": ">=16.13.0 <21",
-    "npm": ">=8.1.0 <11"
+    "node": ">=18.12.0 <21",
+    "npm": ">=8.19.2 <11"
   },
   "main": "generators/app/index.js",
   "scripts": {
@@ -40,13 +43,13 @@
     "glob": "10.3.10",
     "got": "11.8.5",
     "lodash": "4.17.21",
-    "yeoman-generator": "5.9.0",
+    "yeoman-generator": "5.10.0",
     "yosay": "2.0.2"
   },
   "devDependencies": {
     "@merkle-open/eslint-config": "3.0.0",
     "ejs": "3.1.9",
-    "eslint": "8.46.0",
+    "eslint": "8.53.0",
     "eslint-plugin-import": "2.29.0",
     "fs-extra": "11.1.1",
     "jasmine": "5.1.0",