generator-nitro 6.1.2 → 7.0.2

package/generators/app/index.js

@@ -312,7 +312,7 @@ module.exports = class extends Generator {
 			'src/ui.ts',
 			'src/proto.js',
 			'src/proto.ts',
-			'tests/cypress/cypress/integration/examples/index.spec.js',
+			'tests/cypress/cypress/e2e/examples/index.cy.js',
 			'.eslintrc.js',
 			'docker-compose.yml',
 			'docker-compose-dev.yml',
@@ -402,7 +402,7 @@ module.exports = class extends Generator {
 			'src/patterns/',
 			'src/proto/utils/',
 			'src/shared/',
-			'tests/cypress/cypress/integration/examples/',
+			'tests/cypress/cypress/e2e/examples/',
 		];
 		const exampleIncludeAnyway = [
 			// example file "parts" included for this.options.exampleCode===false

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

@@ -1 +1 @@
-16.15.0
+16.15.1

package/generators/app/templates/CUTAWAYpackage.json

@@ -6,8 +6,8 @@
   "private": true,
   "author": "The Nitro Team",
   "engines": {
-	  "node": ">=12.13.0 <17",
-	  "npm": ">=6.12.0 <9"
+	  "node": ">=14.15.0 <17",
+	  "npm": ">=6.14.8 <9"
   },
   "scripts": {
     "\n# PROJECT ------- ": "",
@@ -24,7 +24,7 @@
     "\n# LINT/TEST ------- ": "",
     "check-node-version": "check-node-version --print --package",
     "cypress-test": "npm run build && cross-env PORT=8888 NITRO_MODE=test npm-run-all --parallel --race test:cypress:serve cypress-test:open",
-    "cypress-test:open": "cypress open --project ./tests/cypress/",
+    "cypress-test:open": "cypress open --project ./tests/cypress/ --e2e --browser chrome",
     "lighthouse-test": "npm run build && cross-env PORT=8890 NITRO_MODE=test npm-run-all --parallel --race lighthouse-test:*",
     "lighthouse-test:serve": "npm run prod:serve",
     "lighthouse-test:run": "lighthouse http://localhost:8890/<% if (options.exampleCode) { %>example-patterns<% } else { %>index<% } %> --quiet --configPath=./tests/lighthouse/lighthouse.config.js --output-path=./public/reports/lighthouse/report.html --view",
@@ -84,7 +84,7 @@
     "@gondel/core": "1.2.7",
     "@gondel/plugin-hot": "1.2.7",
     "bootstrap": "5.1.3",<% } %>
-    "core-js": "3.22.4"<% if (options.exampleCode) { %>,
+    "core-js": "3.22.8"<% if (options.exampleCode) { %>,
     "flatpickr": "4.6.13",
     "handlebars": "4.7.7",
     "jquery": "3.6.0",
@@ -95,7 +95,7 @@
     "svg4everybody": "2.1.9"<% } %>
   },
   "devDependencies": {<% if (options.jsCompiler === 'js') { %>
-    "@babel/eslint-parser": "7.17.0",<% } %>
+    "@babel/eslint-parser": "7.18.2",<% } %>
     "@khanacademy/tota11y": "0.2.0",
     "@namics/eslint-config": "9.1.1",
     "@namics/prettier-config": "2.0.1",
@@ -108,31 +108,31 @@
     "@types/bootstrap": "5.1.11",<% if (options.exampleCode ) { %>
     "@types/jquery": "3.5.14",<% } %>
     "@types/svg4everybody": "2.1.2",
-    "@types/webpack-env": "1.16.4",<% } %>
-    "backstopjs": "6.0.4",
+    "@types/webpack-env": "1.17.0",<% } %>
+    "backstopjs": "6.1.0",
     "check-node-version": "4.2.1",
     "commitizen": "4.2.4",
     "config": "3.3.7",
     "cross-env": "7.0.3",
-    "cypress": "9.6.1",
+    "cypress": "10.0.3",
     "cz-conventional-changelog": "3.3.0",
-    "env-linter": "0.5.1",
+    "env-linter": "1.0.0",
     "eslint": "7.32.0",
     "eslint-plugin-import": "2.26.0",
     "extend": "3.0.2",
     "generator-nitro": "<%= version %>",
     "gulp": "4.0.2",
-    "husky": "7.0.4",
+    "husky": "8.0.1",
     "license-checker": "25.0.1",
-    "lighthouse": "9.6.1",
-    "lint-staged": "12.4.1",<% if (options.themes) { %>
+    "lighthouse": "9.6.2",
+    "lint-staged": "13.0.1",<% if (options.themes) { %>
     "node-sass": "6.0.1",<% } %>
-    "npm-check-updates": "12.5.11",
+    "npm-check-updates": "13.1.2",
     "npm-run-all": "4.1.5",
     "prettier": "2.6.2",
     "rimraf": "3.0.2",
     "stylelint": "13.13.1",<% if (options.jsCompiler === 'ts') { %>
-    "typescript": "4.6.4",<% } %>
+    "typescript": "4.7.3",<% } %>
     "webpack-cli": "4.9.2",
     "yo": "4.3.0"
   },

package/generators/app/templates/tests/cypress/cypress/support/commands.js

@@ -10,16 +10,16 @@
 //
 //
 // -- This is a parent command --
-// Cypress.Commands.add("login", (email, password) => { ... })
+// Cypress.Commands.add('login', (email, password) => { ... })
 //
 //
 // -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
 //
 //
 // -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
 //
 //
 // -- This will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
+// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })

package/generators/app/templates/tests/cypress/cypress/support/{index.js → e2e.js}

@@ -1,5 +1,5 @@
 // ***********************************************************
-// This example support/index.js is processed and
+// This example support/e2e.js is processed and
 // loaded automatically before your test files.
 //
 // This is a great place to put global configuration and
@@ -17,4 +17,4 @@
 import './commands';
 
 // Alternatively you can use CommonJS syntax:
-// require('./commands')
+// require('./commands');

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

@@ -0,0 +1,16 @@
+const { defineConfig } = require('cypress');
+
+module.exports = defineConfig({
+	e2e: {
+		// specPattern: 'cypress/e2e/**/*.cy.{js,jsx,ts,tsx}', // default specPattern
+		video: false,
+		setupNodeEvents(on, config) {
+			// modify config values
+			const port = process.env.PORT || 8888;
+			config.baseUrl = `http://localhost:${port}`;
+
+			// IMPORTANT return the updated config object
+			return config;
+		},
+	},
+});

package/generators/app/templates/tests/cypress/readme.md

@@ -6,9 +6,9 @@ End to end testing with cypress.
 
 ## Directories
 
-We use the [default configuration](https://docs.cypress.io/guides/core-concepts/writing-and-organizing-tests.html#Folder-Structure)
+We use the [default configuration](https://docs.cypress.io/guides/core-concepts/writing-and-organizing-tests)
 
-- `./cypress/integration` ist the place for your tests
+- `./cypress/e2e` ist the place for your tests
 - `./cypress/screenshots` and `./cypress/videos` directories are excluded from git
 
 ## Scripts
@@ -22,4 +22,4 @@ Use following npm scripts for your test workflow:
 
 Add `CI=true` as environment variable to avoid tons of log lines by installing cypress.
 
-More on [configuation for continous integration](https://docs.cypress.io/guides/guides/continuous-integration.html)
+More on [configuation for continous integration](https://docs.cypress.io/guides/continuous-integration/introduction)

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "generator-nitro",
-  "version": "6.1.2",
+  "version": "7.0.2",
   "description": "Yeoman generator for the nitro frontend framework",
   "license": "MIT",
   "repository": "merkle-open/generator-nitro",
   "author": "The Nitro Team",
   "engines": {
-    "node": ">=12.13.0 <17",
-    "npm": ">=6.12.0 <9"
+    "node": ">=14.15.0 <17",
+    "npm": ">=6.14.8 <9"
   },
   "main": "generators/app/index.js",
   "scripts": {

package/generators/app/templates/tests/cypress/cypress/plugins/index.js

@@ -1,28 +0,0 @@
-/// <reference types="cypress" />
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-/**
- * @type {Cypress.PluginConfig}
- */
-module.exports = (on, config) => {
-	// `on` is used to hook into various events Cypress emits
-	// `config` is the resolved Cypress config
-
-	const port = process.env.PORT || 8888;
-
-	// modify config values
-	config.baseUrl = `http://localhost:${port}`;
-
-	return config;
-};

package/generators/app/templates/tests/cypress/cypress.json

@@ -1,5 +0,0 @@
-{
-	"integrationFolder": "cypress/integration",
-	"reporter": "dot",
-	"video": false
-}