generator-nitro 7.0.8 → 7.1.0

package/generators/app/templates/.editorconfig

@@ -1,4 +1,4 @@
-# EditorConfig. Frontend. Default. Namics.
+# EditorConfig. Frontend. Default.
 # @see: http://EditorConfig.org
 # install a plugin to your editor: http://editorconfig.org/#download
 # mark: not all plugins supports the same EditorConfig properties

package/generators/app/templates/.eslintrc.js

@@ -9,6 +9,8 @@ module.exports = {
 		'no-restricted-syntax': ['error', 'LabeledStatement', 'WithStatement'],
 		'new-cap': [2, { capIsNew: false }],
 		'@typescript-eslint/member-ordering': 1,
+		// due to issues with outdated @typescript-eslint
+		'@typescript-eslint/no-unused-vars': 0,
 	},
 	parserOptions: {
 		project: './tsconfig.json',

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

@@ -1 +1 @@
-16.17.1
+16.18.0

package/generators/app/templates/CUTAWAYpackage.json

@@ -83,39 +83,39 @@
   "dependencies": {<% if (options.exampleCode) { %>
     "@gondel/core": "1.2.7",
     "@gondel/plugin-hot": "1.2.7",
-    "bootstrap": "5.2.1",<% } %>
-    "core-js": "3.25.2"<% if (options.exampleCode) { %>,
+    "bootstrap": "5.2.2",<% } %>
+    "core-js": "3.25.5"<% if (options.exampleCode) { %>,
     "flatpickr": "4.6.13",
     "handlebars": "4.7.7",
     "jquery": "3.6.1",
     "lazysizes": "5.3.2",
     "lottie-web": "5.9.6",
     "prevent-window-opener-attacks": "0.3.0"<% } %><% if (options.jsCompiler === 'js') { %>,
-    "regenerator-runtime": "0.13.9"<% } %><% if (options.exampleCode) { %>,
+    "regenerator-runtime": "0.13.10"<% } %><% if (options.exampleCode) { %>,
     "svg4everybody": "2.1.9"<% } %>
   },
   "devDependencies": {<% if (options.jsCompiler === 'js') { %>
     "@babel/eslint-parser": "7.19.1",<% } %>
     "@khanacademy/tota11y": "0.2.0",
-    "@merkle-open/html-validate-config": "0.1.0",
+    "@merkle-open/html-validate-config": "0.1.1",
     "@namics/eslint-config": "9.1.1",
-    "@namics/prettier-config": "2.0.1",
-    "@namics/stylelint-config": "1.1.2",
-    "@namics/ts-config": "1.1.1",
+    "@namics/prettier-config": "3.0.0",
+    "@namics/stylelint-config": "2.0.0",
+    "@namics/ts-config": "2.0.0",
     "@nitro/app": "<%= version %>",
     "@nitro/exporter": "<%= version %>",
     "@nitro/gulp": "<%= version %>",
     "@nitro/webpack": "<%= version %>",<% if (options.jsCompiler === 'ts') { %>
-    "@types/bootstrap": "5.2.4",<% if (options.exampleCode ) { %>
+    "@types/bootstrap": "5.2.5",<% if (options.exampleCode ) { %>
     "@types/jquery": "3.5.14",<% } %>
     "@types/svg4everybody": "2.1.2",
     "@types/webpack-env": "1.18.0",<% } %>
-    "backstopjs": "6.1.1",
+    "backstopjs": "6.1.3",
     "check-node-version": "4.2.1",
     "commitizen": "4.2.5",
     "config": "3.3.8",
     "cross-env": "7.0.3",
-    "cypress": "10.8.0",
+    "cypress": "10.10.0",
     "cz-conventional-changelog": "3.3.0",
     "env-linter": "1.0.0",
     "eslint": "7.32.0",
@@ -128,12 +128,12 @@
     "lighthouse": "9.6.7",
     "lint-staged": "13.0.3",<% if (options.themes) { %>
     "node-sass": "6.0.1",<% } %>
-    "npm-check-updates": "16.3.2",
+    "npm-check-updates": "16.3.15",
     "npm-run-all": "4.1.5",
     "prettier": "2.7.1",
     "rimraf": "3.0.2",
     "stylelint": "13.13.1",<% if (options.jsCompiler === 'ts') { %>
-    "typescript": "4.7.4",<% } %>
+    "typescript": "4.8.4",<% } %>
     "webpack-cli": "4.10.0",
     "yo": "4.3.0"
   },

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

@@ -31,6 +31,12 @@ Install the project dependencies in the project root:
 npm install
 ```
 
+On Mac you need to make sure that githooks are executable, e.g.
+
+```
+chmod +x .husky/pre-commit
+```
+
 ## Starting the app
 
 Use

package/generators/app/templates/readme.md

@@ -13,6 +13,12 @@ Run:
 npm install
 ```
 
+On Mac you need to make sure that githooks are executable:
+
+```
+chmod +x .husky/pre-commit
+```
+
 and start in development mode
 
 ```

package/generators/app/templates/src/patterns/atoms/lottie/js/lottie.ts

@@ -4,16 +4,16 @@ import { Component, EventListener, GondelBaseComponent } from '@gondel/core';
 export class Lottie extends GondelBaseComponent {
 	private _animation: any;
 
+	public start() {
+		this._initializeAnimation();
+	}
+
 	@EventListener('click')
 	private _handleClick(): void {
 		const action = this._animation.isPaused ? 'play' : 'pause';
 		this._animation[action]();
 	}
 
-	public start() {
-		this._initializeAnimation();
-	}
-
 	private _initializeAnimation(): void {
 		const jsonPath = this._ctx.dataset.jsonPath;
 

package/generators/app/templates/src/patterns/molecules/example/js/example.ts

@@ -22,7 +22,30 @@ enum Selectors {
 }<% } %>
 
 @Component('Example')
-export class Example extends GondelBaseComponent {<% if (options.clientTpl) { %>
+export class Example extends GondelBaseComponent {
+
+	public start() {
+		/* eslint-disable no-console */
+		console.warn('Example #start(): remove or implement component');
+		console.log(
+			'everything ok?'.startsWith('every')
+				? 'ES2015/ES6 startWith string method works'
+				: 'broken ES2015/ES6 startWith string method'
+		);
+		console.log(
+			[2, 4, 16, 256].includes(16)
+				? 'ES2016/ES7 includes array method works'
+				: 'broken ES2016/ES7 includes array method'
+		);
+		/* eslint-enable no-console */
+	}
+
+	public sync() {
+		/* eslint-disable no-console */
+		console.warn('Example #sync(): remove or implement component');
+		/* eslint-enable no-console */
+	}<% if (options.clientTpl) { %>
+
 	@EventListener('click', Selectors.Add)
 	private _handleAdd(e: MouseEvent) {
 		e.preventDefault();
@@ -75,25 +98,4 @@ export class Example extends GondelBaseComponent {<% if (options.clientTpl) { %>
 
 		$ctx.find(Selectors.List).append($links);
 	}<% } %>
-	public start() {
-		/* eslint-disable no-console */
-		console.warn('Example #start(): remove or implement component');
-		console.log(
-			'everything ok?'.startsWith('every')
-				? 'ES2015/ES6 startWith string method works'
-				: 'broken ES2015/ES6 startWith string method'
-		);
-		console.log(
-			[2, 4, 16, 256].includes(16)
-				? 'ES2016/ES7 includes array method works'
-				: 'broken ES2016/ES7 includes array method'
-		);
-		/* eslint-enable no-console */
-	}
-
-	public sync() {
-		/* eslint-disable no-console */
-		console.warn('Example #sync(): remove or implement component');
-		/* eslint-enable no-console */
-	}
 }

package/generators/app/templates/src/shared/assets/img/icon/site.webmanifest

@@ -3,12 +3,12 @@
     "short_name": "Nitro",
     "icons": [
         {
-            "src": "/assets/img/icon/icon-192x192.png",
+            "src": "icon-192x192.png",
             "sizes": "192x192",
             "type": "image/png"
         },
         {
-            "src": "/assets/img/icon/icon-512x512.png",
+            "src": "icon-512x512.png",
             "sizes": "512x512",
             "type": "image/png"
         }

package/generators/app/templates/tests/backstop/backstop.config.js

@@ -5,13 +5,15 @@
  * requires a build
  */
 
-const backstopConfig = require('./config/basic');
+const utils = require('./config/utils');
+
+const baseScenario = utils.getBaseScenario();
 
 const scenarios = [
 	{
-		...backstopConfig.baseScenario,
-		label: 'Homepage',
-		url: `${backstopConfig.host}/index`,
+		baseScenario,
+		label: 'Example',
+		url: 'index',
 		removeSelectors: ['.m-example--blue'],
 		selectors: ['.m-example'],
 		selectorExpansion: true,
@@ -19,6 +21,6 @@ const scenarios = [
 ];
 
 module.exports = {
-	...backstopConfig.baseConfig,
-	scenarios,
+	...utils.getBaseConfig(),
+	scenarios: utils.getFinalScenarios(scenarios),
 };

package/generators/app/templates/tests/backstop/config/basic.js

@@ -24,7 +24,7 @@ const viewports = [
 module.exports = {
 	host,
 	baseConfig: {
-		id: 'nitro_test',
+		id: 'Screen',
 		viewports,
 		onBeforeScript: 'puppet/onBefore.js',
 		onReadyScript: 'puppet/onReady.js',
@@ -66,7 +66,7 @@ module.exports = {
 		selectors: [],
 		selectorExpansion: false,
 		expect: 0,
-		misMatchThreshold: 0.1,
+		misMatchThreshold: 0.01,
 		requireSameDimensions: true,
 	},
 };

package/generators/app/templates/tests/backstop/config/utils.js

@@ -0,0 +1,44 @@
+'use strict';
+
+const config = require('config');
+
+const backstopConfig = require('./basic');
+const pkg = require('../../../package.json');
+
+const getBaseConfig = () => {
+	return backstopConfig.baseConfig;
+};
+
+const getBaseScenario = () => {
+	return backstopConfig.baseScenario;
+};
+
+const createScenarios = (scenarios) => {
+	// this default will take screenshots from all configured themes
+	const validThemes =
+		config.has('themes') && Array.isArray(config.get('themes'))
+			? config.get('themes')
+			: [{ id: 'default', name: pkg.name, isDefault: true }];
+
+	return validThemes.flatMap((theme) => {
+		return scenarios.map((scenario) => {
+			return {
+				...scenario,
+				label: `${theme.name} ${scenario.label}`,
+				url: theme.isDefault
+					? `${backstopConfig.host}/${scenario.url}`
+					: `${backstopConfig.host}/theme/${theme.id}?ref=/${scenario.url}`,
+			};
+		});
+	});
+};
+
+const getFinalScenarios = (scenarios) => {
+	return createScenarios(scenarios);
+};
+
+module.exports = {
+	getBaseConfig,
+	getBaseScenario,
+	getFinalScenarios,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-nitro",
-  "version": "7.0.8",
+  "version": "7.1.0",
   "description": "Yeoman generator for the nitro frontend framework",
   "license": "MIT",
   "repository": "merkle-open/generator-nitro",
@@ -38,7 +38,7 @@
     "find-git-root": "1.0.4",
     "git-config": "0.0.7",
     "glob": "8.0.3",
-    "got": "11.8.3",
+    "got": "11.8.5",
     "lodash": "4.17.21",
     "yeoman-generator": "5.7.0",
     "yosay": "2.0.2"