generator-nitro 6.0.2 → 6.0.6

package/generators/app/index.js

@@ -33,6 +33,7 @@ module.exports = class extends Generator {
 
 		this._git = {
 			root: false,
+			projet: false,
 		}
 
 		this.option('name', {
@@ -102,17 +103,21 @@ module.exports = class extends Generator {
 			const dest = this.destinationPath();
 			const gitRoot = findGitRoot(dest).replace('.git', '');
 			let gitPath = false;
+			let projectPath = false;
 
 			if (gitRoot) {
-				const relative = path.relative(dest, gitRoot);
-				if (relative) {
-					gitPath = `${relative.replace(/\\/g, '/')}/`;
+				const relativeGitRoot = path.relative(dest, gitRoot);
+				const relativeProjectRoot = path.relative(gitRoot, dest);
+				if (relativeGitRoot) {
+					gitPath = `${relativeGitRoot.replace(/\\/g, '/')}/`;
+					projectPath = `./${relativeProjectRoot.replace(/\\/g, '/')}`;
 				} else {
 					gitPath = './';
 				}
 			}
 
 			this._git.root = gitPath;
+			this._git.project = projectPath;
 		} catch (e) {
 			this.log(chalk.red(e.message));
 		}
@@ -124,7 +129,7 @@ module.exports = class extends Generator {
 		// check whether there is already a nitro application in place and we only have to update the application
 		const json = this.fs.readJSON(this.destinationPath('.yo-rc.json'), { new: true });
 
-		if (!json.new) {
+		if (!json.new && json['generator-nitro']) {
 			// update existing application
 			return this.prompt([
 				{
@@ -279,6 +284,7 @@ module.exports = class extends Generator {
 
 		const tplFiles = [
 			// files to process with copyTpl
+			'.husky/pre-commit',
 			'config/default.js',
 			'config/default/exporter.js',
 			'config/default/gulp.js',
@@ -417,6 +423,7 @@ module.exports = class extends Generator {
 			options: this.options,
 			git: {
 				root: this._git.root,
+				project: this._git.project,
 			}
 		};
 

package/generators/app/templates/.husky/pre-commit

@@ -1,6 +1,7 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-# if husky config is not in git root
-# cd ./
+# if husky config is not in git root<% if (git.project) { %>
+cd <%= git.project %> || return<% } else { %>
+# cd ./... || return<% } %>
 npx lint-staged

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

@@ -1 +1 @@
-16.13.0
+16.13.2

package/generators/app/templates/CUTAWAYpackage.json

@@ -20,7 +20,7 @@
     "nitro:update": "npm uninstall generator-nitro && npm install generator-nitro@latest --save-dev --save-exact && yo nitro",
     "update-dependencies": "npm-check-updates -u",
     "\n# MISC ------- ": "",
-    "postinstall": "<% if (git.root) { %>cd <%= git.root %> && husky install && <% } %><% if (options.themes) { %>npm rebuild node-sass && <% } %>env-linter<% if (git.root) { %> --hooksInstalled<% } %> --saveExact --dependenciesExactVersion --lts",
+    "postinstall": "<% if (git.root) { %>cd <%= git.root %> && husky install <% if (git.project) { %><%= git.project %>/.husky <% } %>&& <% } %><% if (options.themes) { %>npm rebuild node-sass && <% } %>env-linter<% if (git.root) { %> --hooksInstalled<% } %> --saveExact --dependenciesExactVersion --lts",
     "\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",
@@ -85,7 +85,7 @@
     "@gondel/plugin-hot": "1.2.7",
     "@khanacademy/tota11y": "0.2.0",
     "bootstrap": "5.1.3",<% } %>
-    "core-js": "3.19.1"<% if (options.exampleCode) { %>,
+    "core-js": "3.20.2"<% if (options.exampleCode) { %>,
     "flatpickr": "4.6.9",
     "handlebars": "4.7.7",
     "jquery": "3.6.0",
@@ -96,7 +96,7 @@
     "svg4everybody": "2.1.9"<% } %>
   },
   "devDependencies": {<% if (options.jsCompiler === 'js') { %>
-    "@babel/eslint-parser": "7.16.3",<% } %>
+    "@babel/eslint-parser": "7.16.5",<% } %>
     "@namics/eslint-config": "9.1.1",
     "@namics/prettier-config": "2.0.1",
     "@namics/stylelint-config": "1.1.2",
@@ -105,35 +105,35 @@
     "@nitro/exporter": "<%= version %>",
     "@nitro/gulp": "<%= version %>",
     "@nitro/webpack": "<%= version %>",<% if (options.jsCompiler === 'ts') { %>
-    "@types/bootstrap": "5.1.6",<% if (options.exampleCode ) { %>
-    "@types/jquery": "3.5.9",<% } %>
+    "@types/bootstrap": "5.1.8",<% if (options.exampleCode ) { %>
+    "@types/jquery": "3.5.12",<% } %>
     "@types/svg4everybody": "2.1.2",
     "@types/webpack-env": "1.16.3",<% } %>
-    "backstopjs": "6.0.1",
+    "backstopjs": "6.0.4",
     "check-node-version": "4.2.1",
     "commitizen": "4.2.4",
     "config": "3.3.6",
     "cross-env": "7.0.3",
-    "cypress": "9.1.0",
+    "cypress": "9.2.1",
     "cz-conventional-changelog": "3.3.0",
     "env-linter": "0.5.1",
     "eslint": "7.32.0",
-    "eslint-plugin-import": "2.25.3",
+    "eslint-plugin-import": "2.25.4",
     "extend": "3.0.2",
     "generator-nitro": "<%= version %>",
     "gulp": "4.0.2",
     "husky": "7.0.4",
     "license-checker": "25.0.1",
-    "lighthouse": "9.1.0",
-    "lint-staged": "12.1.2",<% if (options.themes) { %>
+    "lighthouse": "9.2.0",
+    "lint-staged": "12.1.7",<% if (options.themes) { %>
     "node-sass": "6.0.1",<% } %>
-    "npm-check-updates": "12.0.2",
+    "npm-check-updates": "12.1.0",
     "npm-run-all": "4.1.5",
     "opener": "1.5.2",
-    "prettier": "2.4.1",
+    "prettier": "2.5.1",
     "rimraf": "3.0.2",
     "stylelint": "13.13.1",<% if (options.jsCompiler === 'ts') { %>
-    "typescript": "4.5.2",<% } %>
+    "typescript": "4.5.4",<% } %>
     "webpack-cli": "4.9.1",
     "yo": "4.3.0"
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-nitro",
-  "version": "6.0.2",
+  "version": "6.0.6",
   "description": "Yeoman generator for the nitro frontend framework",
   "license": "MIT",
   "repository": "merkle-open/generator-nitro",
@@ -40,16 +40,16 @@
     "glob": "7.2.0",
     "got": "11.8.3",
     "lodash": "4.17.21",
-    "yeoman-generator": "5.4.2",
+    "yeoman-generator": "5.5.2",
     "yosay": "2.0.2"
   },
   "devDependencies": {
     "@namics/eslint-config": "9.1.1",
     "ejs": "3.1.6",
     "eslint": "7.32.0",
-    "eslint-plugin-import": "2.25.3",
+    "eslint-plugin-import": "2.25.4",
     "fs-extra": "10.0.0",
-    "jasmine": "3.10.0",
+    "jasmine": "3.99.0",
     "yeoman-assert": "3.1.1",
     "yeoman-test": "6.2.0"
   }