generator-nitro 6.0.0-rc.3 → 6.0.3

package/generators/app/index.js

@@ -9,6 +9,7 @@ const got = require('got');
 const path = require('path');
 const fs = require('fs');
 const childProcess = require('child_process');
+const findGitRoot = require('find-git-root')
 const glob = require('glob');
 const _ = require('lodash');
 
@@ -30,6 +31,11 @@ module.exports = class extends Generator {
 			exporter: this.options.exporter,
 		};
 
+		this._git = {
+			root: false,
+			projet: false,
+		}
+
 		this.option('name', {
 			desc: 'the name of your app',
 			type: String,
@@ -91,7 +97,31 @@ module.exports = class extends Generator {
 		this._skipQuestions = this.options.skipQuestions;
 	}
 
-	// initializing() {}
+	initializing() {
+		// find git root
+		try {
+			const dest = this.destinationPath();
+			const gitRoot = findGitRoot(dest).replace('.git', '');
+			let gitPath = false;
+			let projectPath = false;
+
+			if (gitRoot) {
+				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));
+		}
+	}
 
 	prompting() {
 		this.log(yosay(`Welcome to the awe-inspiring ${chalk.cyan('Nitro')} generator!`));
@@ -254,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',
@@ -390,6 +421,10 @@ module.exports = class extends Generator {
 			name: this.options.name,
 			version: this._pkg.version,
 			options: this.options,
+			git: {
+				root: this._git.root,
+				project: this._git.project,
+			}
 		};
 
 		files.forEach((file) => {

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/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": "cd ./ && husky install &&<% if (options.themes) { %> npm rebuild node-sass && <% } %>env-linter --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",
@@ -90,7 +90,7 @@
     "handlebars": "4.7.7",
     "jquery": "3.6.0",
     "lazysizes": "5.3.2",
-    "lottie-web": "5.7.14",
+    "lottie-web": "5.8.1",
     "prevent-window-opener-attacks": "0.3.0"<% } %><% if (options.jsCompiler === 'js') { %>,
     "regenerator-runtime": "0.13.9"<% } %><% if (options.exampleCode) { %>,
     "svg4everybody": "2.1.9"<% } %>
@@ -106,7 +106,7 @@
     "@nitro/gulp": "<%= version %>",
     "@nitro/webpack": "<%= version %>",<% if (options.jsCompiler === 'ts') { %>
     "@types/bootstrap": "5.1.6",<% if (options.exampleCode ) { %>
-    "@types/jquery": "3.5.8",<% } %>
+    "@types/jquery": "3.5.9",<% } %>
     "@types/svg4everybody": "2.1.2",
     "@types/webpack-env": "1.16.3",<% } %>
     "backstopjs": "6.0.1",
@@ -114,26 +114,26 @@
     "commitizen": "4.2.4",
     "config": "3.3.6",
     "cross-env": "7.0.3",
-    "cypress": "9.0.0",
+    "cypress": "9.1.0",
     "cz-conventional-changelog": "3.3.0",
     "env-linter": "0.5.1",
     "eslint": "7.32.0",
-    "eslint-plugin-import": "2.25.1",
+    "eslint-plugin-import": "2.25.3",
     "extend": "3.0.2",
     "generator-nitro": "<%= version %>",
     "gulp": "4.0.2",
     "husky": "7.0.4",
     "license-checker": "25.0.1",
-    "lighthouse": "8.6.0",
-    "lint-staged": "12.0.3",<% if (options.themes) { %>
+    "lighthouse": "9.1.0",
+    "lint-staged": "12.1.2",<% if (options.themes) { %>
     "node-sass": "6.0.1",<% } %>
-    "npm-check-updates": "12.0.0",
+    "npm-check-updates": "12.0.2",
     "npm-run-all": "4.1.5",
     "opener": "1.5.2",
-    "prettier": "2.4.1",
+    "prettier": "2.5.0",
     "rimraf": "3.0.2",
     "stylelint": "13.13.1",<% if (options.jsCompiler === 'ts') { %>
-    "typescript": "4.4.3",<% } %>
+    "typescript": "4.5.2",<% } %>
     "webpack-cli": "4.9.1",
     "yo": "4.3.0"
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-nitro",
-  "version": "6.0.0-rc.3",
+  "version": "6.0.3",
   "description": "Yeoman generator for the nitro frontend framework",
   "license": "MIT",
   "repository": "merkle-open/generator-nitro",
@@ -35,6 +35,7 @@
   "dependencies": {
     "chalk": "4.1.2",
     "config": "3.3.6",
+    "find-git-root": "1.0.4",
     "git-config": "0.0.7",
     "glob": "7.2.0",
     "got": "11.8.3",