generator-easy-ui5 3.8.2 → 3.9.0

package/README.md

@@ -14,7 +14,7 @@ This generator has been created to simplify the creation of your UI5 prototypes.
 
 The purpose of the (preinstalled) `project generator` is to guide you on your first steps with [SAPUI5](https://sapui5.hana.ondemand.com/) and [SAP BTP](https://www.sap.com/products/business-technology-platform.html) deployments. Once you are familiar with those technologies, you might want to tweak the projects to adapt them for productive use-cases (such as continuous deployment pipelines and full i18n).
 
-> :warning: Starting with easy-ui5 v3, all templates will be outsource to repositories in the [UI5 Community](https://github.com/ui5-community/). This project is from now on a shell that will offer all generators hosted on that GitHub org. easy-ui5 will download and install these repositories when needed.
+> Note: This project was formerly located at the [SAP GitHub organization](https://github.com/SAP). Starting with easy-ui5 v3, all templates were outsourced to repositories in the [UI5 Community](https://github.com/ui5-community/). To highlight easy-ui5 is also a fully community driven project, the project was moved to the [UI5 Community](https://github.com/ui5-community/), too. Still SAP employees take care of managing incoming feature requests and bug reports.
 >
 > By default, it will download the repository [generator-ui5-project](https://github.com/ui5-community/generator-ui5-project/) which contains the templates that were previously integrated in easy-ui5 < 3.
 
@@ -139,15 +139,15 @@ Please use the GitHub bug tracking system to post questions, bug reports or to c
 
 We welcome any type of contribution (code contributions, pull requests, issues) to this project equally.
 
-Please follow our instructions if you would like to [contribute](https://github.com/SAP/generator-easy-ui5/blob/master/CONTRIBUTING.md).
+Please follow our instructions if you would like to [contribute](https://github.com/ui5-community/generator-easy-ui5/blob/master/CONTRIBUTING.md).
 
 [npm-image]: https://img.shields.io/npm/v/generator-easy-ui5.svg
 [npm-url]: https://www.npmjs.com/package/generator-easy-ui5
-[test-image]: https://github.com/SAP/generator-easy-ui5/actions/workflows/main.yml/badge.svg
-[test-url]: https://github.com/SAP/generator-easy-ui5/actions/workflows/main.yml
-[librariesio-image]: https://img.shields.io/librariesio/github/SAP/generator-easy-ui5
-[repo-url]: https://github.com/SAP/generator-easy-ui5
+[test-image]: https://github.com/ui5-community/generator-easy-ui5/actions/workflows/main.yml/badge.svg
+[test-url]: https://github.com/ui5-community/generator-easy-ui5/actions/workflows/main.yml
+[librariesio-image]: https://img.shields.io/librariesio/github/ui5-community/generator-easy-ui5
+[repo-url]: https://github.com/ui5-community/generator-easy-ui5
 [license-image]: https://img.shields.io/npm/l/generator-easy-ui5.svg
-[license-url]: https://github.com/SAP/generator-easy-ui5/blob/master/LICENSE
-[reuse-image]: https://api.reuse.software/badge/github.com/SAP/generator-easy-ui5/
-[reuse-url]: https://api.reuse.software/info/github.com/SAP/generator-easy-ui5/
+[license-url]: https://github.com/ui5-community/generator-easy-ui5/blob/master/LICENSE
+[reuse-image]: https://api.reuse.software/badge/github.com/ui5-community/generator-easy-ui5/
+[reuse-url]: https://api.reuse.software/info/github.com/ui5-community/generator-easy-ui5/

package/generators/app/defineGeneratorArguments.js

@@ -0,0 +1,19 @@
+export const generatorArguments = {
+	generator: {
+		type: String,
+		required: false,
+		description: "Name of the generator to invoke (without the \x1b[33mgenerator-ui5-\x1b[0m prefix)",
+	},
+	subcommand: {
+		type: String,
+		required: false,
+		description: "Name of the subcommand to invoke (without the \x1b[33>mgenerator:\x1b[0m prefix)",
+	},
+};
+
+export default function defineGeneratorArguments(generator) {
+	Object.keys(generatorArguments).forEach((argName) => {
+		// register the argument for being displayed in the help
+		generator.argument(argName, generatorArguments[argName]);
+	});
+}

package/generators/app/defineGeneratorOptions.js

@@ -0,0 +1,119 @@
+import path from "path";
+import os from "os";
+import getNPMConfig from "./getNPMConfig.js";
+
+// the command line options of the generator
+export const generatorOptions = {
+	pluginsHome: {
+		type: String,
+		description: "Home directory of the plugin generators",
+		default: path.join(os.homedir(), ".npm", "_generator-easy-ui5", "plugin-generators"),
+		hide: true, // shouldn't be needed
+		npmConfig: true,
+	},
+	plugins: {
+		type: Boolean,
+		alias: "p",
+		description: "List detailed information about installed plugin generators",
+	},
+	pluginsWithDevDeps: {
+		type: Boolean,
+		alias: "dev",
+		description: "Installs the plugin generators with dev dependencies (compat mode)",
+	},
+	ghBaseUrl: {
+		type: String,
+		description: "Base URL for the Octokit API (defaults to https://api.github.com if undefined)",
+		hide: true, // shouldn't be needed
+		npmConfig: true,
+	},
+	ghAuthToken: {
+		type: String,
+		description: "GitHub authToken to optionally access private generator repositories",
+		npmConfig: true,
+	},
+	ghOrg: {
+		type: String,
+		description: "GitHub organization to lookup for available generators",
+		default: "ui5-community",
+		hide: true, // we don't want to recommend to use this option
+	},
+	ghThreshold: {
+		type: Number,
+		default: 100,
+		hide: true, // shouldn't be needed
+	},
+	subGeneratorPrefix: {
+		type: String,
+		description: "Prefix used for the lookup of the available generators",
+		default: "generator-ui5-",
+		hide: true, // we don't want to recommend to use this option
+	},
+	addGhBaseUrl: {
+		type: String,
+		description: "Base URL for the Octokit API for the additional generators (defaults to https://api.github.com if undefined)",
+		hide: true, // shouldn't be needed
+		npmConfig: true,
+	},
+	addGhOrg: {
+		type: String,
+		description: "GitHub organization to lookup for additional available generators",
+		hide: true, // we don't want to recommend to use this option
+		npmConfig: true,
+	},
+	addSubGeneratorPrefix: {
+		type: String,
+		description: "Prefix used for the lookup of the additional available generators",
+		default: "generator-",
+		hide: true, // we don't want to recommend to use this option
+		npmConfig: true,
+	},
+	embed: {
+		type: Boolean,
+		description: "Embeds the selected plugin generator",
+		hide: true, // shouldn't be needed
+	},
+	list: {
+		type: Boolean,
+		description: "List the available subcommands of the generator",
+	},
+	skipUpdate: {
+		type: Boolean,
+		description: "Skip the update of the plugin generator",
+	},
+	forceUpdate: {
+		type: Boolean,
+		description: "Force the update of the plugin generator",
+	},
+	offline: {
+		type: Boolean,
+		alias: "o",
+		description: "Running easy-ui5 in offline mode",
+	},
+	verbose: {
+		type: Boolean,
+		description: "Enable detailed logging",
+	},
+	next: {
+		type: Boolean,
+		description: "Preview the next mode to consume subgenerators from bestofui5.org",
+	},
+	skipNested: {
+		type: Boolean,
+		description: "Skips the nested generators and runs only the first subgenerator",
+	},
+};
+
+export default function defineGeneratorOptions(generator) {
+	Object.keys(generatorOptions).forEach((optionName) => {
+		const initialValue = generator.options[optionName];
+		// register the option for being displayed in the help
+		generator.option(optionName, generatorOptions[optionName]);
+		const defaultedValue = generator.options[optionName];
+		if (generatorOptions[optionName].npmConfig) {
+			// if a value is set, use the set value (parameter has higher precedence than npm config)
+			// => generator.option(...) applies the default value to generator.options[...] used as last resort
+			generator.options[optionName] = initialValue || getNPMConfig(optionName) || defaultedValue;
+		}
+	});
+}

package/generators/app/detectProxySettings.js

@@ -0,0 +1,16 @@
+import getNPMConfig from "./getNPMConfig.js";
+
+// apply proxy settings to GLOBAL_AGENT to support the proxy configuration for node-fetch using the GLOBAL_AGENT
+// ==> the configuration is derived from the environment variables ([GLOBAL_AGENT_](HTTP|HTTPS|NO)_PROXY) and the npm config ((http|https|no)-proxy)
+// ==> empty values will allow to override the more general proxy settings and make the proxy value undefined
+let HTTP_PROXY, HTTPS_PROXY, NO_PROXY;
+if (global?.GLOBAL_AGENT) {
+	HTTP_PROXY = process.env.GLOBAL_AGENT_HTTP_PROXY ?? process.env.HTTP_PROXY ?? process.env.http_proxy ?? getNPMConfig("http-proxy", "") ?? getNPMConfig("proxy", "");
+	global.GLOBAL_AGENT.HTTP_PROXY = HTTP_PROXY = HTTP_PROXY || global.GLOBAL_AGENT.HTTP_PROXY;
+	HTTPS_PROXY = process.env.GLOBAL_AGENT_HTTPS_PROXY ?? process.env.HTTPS_PROXY ?? process.env.https_proxy ?? getNPMConfig("https-proxy", "") ?? getNPMConfig("proxy", "");
+	global.GLOBAL_AGENT.HTTPS_PROXY = HTTPS_PROXY = HTTPS_PROXY || global.GLOBAL_AGENT.HTTPS_PROXY;
+	NO_PROXY = process.env.GLOBAL_AGENT_NO_PROXY ?? process.env.NO_PROXY ?? process.env.no_proxy ?? getNPMConfig("no-proxy", "");
+	global.GLOBAL_AGENT.NO_PROXY = NO_PROXY = NO_PROXY || global.GLOBAL_AGENT.NO_PROXY;
+}
+
+export { HTTP_PROXY, HTTPS_PROXY, NO_PROXY };

package/generators/app/getNPMConfig.js

@@ -0,0 +1,12 @@
+import libnpmconfig from "libnpmconfig";
+
+// helper to retrieve config entries from npm
+//   --> npm config set easy-ui5_addGhOrg XYZ
+let npmConfig;
+
+export default function getNPMConfig(configName, prefix = "easy-ui5_") {
+	if (!npmConfig) {
+		npmConfig = libnpmconfig.read();
+	}
+	return npmConfig && npmConfig[`${prefix}${configName}`];
+}

package/generators/app/index.js

@@ -1,186 +1,36 @@
 import Generator from "yeoman-generator";
 
+import defineGeneratorArguments from "./defineGeneratorArguments.js";
+import defineGeneratorOptions, { generatorOptions } from "./defineGeneratorOptions.js";
+import { HTTP_PROXY, HTTPS_PROXY, NO_PROXY } from "./detectProxySettings.js";
+
 import path from "path";
 import fs from "fs";
-import os from "os";
 import url from "url";
 
 import { glob } from "glob";
 import chalk from "chalk";
 import yosay from "yosay";
-import libnpmconfig from "libnpmconfig";
+import nodeFetch from "node-fetch";
 import AdmZip from "adm-zip";
+
 import { request } from "@octokit/request";
 import { Octokit } from "@octokit/rest";
 import { throttling } from "@octokit/plugin-throttling";
 const MyOctokit = Octokit.plugin(throttling);
-import spawn from "cross-spawn";
-import nodeFetch from "node-fetch";
 
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 
-// helper to retrieve config entries from npm
-//   --> npm config set easy-ui5_addGhOrg XYZ
-let npmConfig;
-const getNPMConfig = (configName, prefix = "easy-ui5_") => {
-	if (!npmConfig) {
-		npmConfig = libnpmconfig.read();
-	}
-	return npmConfig && npmConfig[`${prefix}${configName}`];
-};
-
-// apply proxy settings to GLOBAL_AGENT to support the proxy configuration for node-fetch using the GLOBAL_AGENT
-// ==> the configuration is derived from the environment variables ([GLOBAL_AGENT_](HTTP|HTTPS|NO)_PROXY) and the npm config ((http|https|no)-proxy)
-// ==> empty values will allow to override the more general proxy settings and make the proxy value undefined
-let HTTP_PROXY, HTTPS_PROXY, NO_PROXY;
-if (global?.GLOBAL_AGENT) {
-	HTTP_PROXY = process.env.GLOBAL_AGENT_HTTP_PROXY ?? process.env.HTTP_PROXY ?? process.env.http_proxy ?? getNPMConfig("http-proxy", "") ?? getNPMConfig("proxy", "");
-	global.GLOBAL_AGENT.HTTP_PROXY = HTTP_PROXY = HTTP_PROXY || global.GLOBAL_AGENT.HTTP_PROXY;
-	HTTPS_PROXY = process.env.GLOBAL_AGENT_HTTPS_PROXY ?? process.env.HTTPS_PROXY ?? process.env.https_proxy ?? getNPMConfig("https-proxy", "") ?? getNPMConfig("proxy", "");
-	global.GLOBAL_AGENT.HTTPS_PROXY = HTTPS_PROXY = HTTPS_PROXY || global.GLOBAL_AGENT.HTTPS_PROXY;
-	NO_PROXY = process.env.GLOBAL_AGENT_NO_PROXY ?? process.env.NO_PROXY ?? process.env.no_proxy ?? getNPMConfig("no-proxy", "");
-	global.GLOBAL_AGENT.NO_PROXY = NO_PROXY = NO_PROXY || global.GLOBAL_AGENT.NO_PROXY;
-}
-
-// the command line options of the generator
-const generatorOptions = {
-	pluginsHome: {
-		type: String,
-		description: "Home directory of the plugin generators",
-		default: path.join(os.homedir(), ".npm", "_generator-easy-ui5", "plugin-generators"),
-		hide: true, // shouldn't be needed
-		npmConfig: true,
-	},
-	plugins: {
-		type: Boolean,
-		alias: "p",
-		description: "List detailed information about installed plugin generators",
-	},
-	pluginsWithDevDeps: {
-		type: Boolean,
-		alias: "dev",
-		description: "Installs the plugin generators with dev dependencies (compat mode)",
-	},
-	ghBaseUrl: {
-		type: String,
-		description: "Base URL for the Octokit API (defaults to https://api.github.com if undefined)",
-		hide: true, // shouldn't be needed
-		npmConfig: true,
-	},
-	ghAuthToken: {
-		type: String,
-		description: "GitHub authToken to optionally access private generator repositories",
-		npmConfig: true,
-	},
-	ghOrg: {
-		type: String,
-		description: "GitHub organization to lookup for available generators",
-		default: "ui5-community",
-		hide: true, // we don't want to recommend to use this option
-	},
-	ghThreshold: {
-		type: Number,
-		default: 100,
-		hide: true, // shouldn't be needed
-	},
-	subGeneratorPrefix: {
-		type: String,
-		description: "Prefix used for the lookup of the available generators",
-		default: "generator-ui5-",
-		hide: true, // we don't want to recommend to use this option
-	},
-	addGhBaseUrl: {
-		type: String,
-		description: "Base URL for the Octokit API for the additional generators (defaults to https://api.github.com if undefined)",
-		hide: true, // shouldn't be needed
-		npmConfig: true,
-	},
-	addGhOrg: {
-		type: String,
-		description: "GitHub organization to lookup for additional available generators",
-		hide: true, // we don't want to recommend to use this option
-		npmConfig: true,
-	},
-	addSubGeneratorPrefix: {
-		type: String,
-		description: "Prefix used for the lookup of the additional available generators",
-		default: "generator-",
-		hide: true, // we don't want to recommend to use this option
-		npmConfig: true,
-	},
-	embed: {
-		type: Boolean,
-		description: "Embeds the selected plugin generator",
-		hide: true, // shouldn't be needed
-	},
-	list: {
-		type: Boolean,
-		description: "List the available subcommands of the generator",
-	},
-	skipUpdate: {
-		type: Boolean,
-		description: "Skip the update of the plugin generator",
-	},
-	forceUpdate: {
-		type: Boolean,
-		description: "Force the update of the plugin generator",
-	},
-	offline: {
-		type: Boolean,
-		alias: "o",
-		description: "Running easy-ui5 in offline mode",
-	},
-	verbose: {
-		type: Boolean,
-		description: "Enable detailed logging",
-	},
-	next: {
-		type: Boolean,
-		description: "Preview the next mode to consume subgenerators from bestofui5.org",
-	},
-	skipNested: {
-		type: Boolean,
-		description: "Skips the nested generators and runs only the first subgenerator",
-	},
-};
-
-const generatorArgs = {
-	generator: {
-		type: String,
-		required: false,
-		description: `Name of the generator to invoke (without the ${chalk.yellow("generator-ui5-")} prefix)`,
-	},
-	subcommand: {
-		type: String,
-		required: false,
-		description: `Name of the subcommand to invoke (without the ${chalk.yellow("generator:")} prefix)`,
-	},
-};
-
 // The Easy UI5 Generator!
-export default class extends Generator {
+export default class EasyUI5Generator extends Generator {
 	constructor(args, opts) {
 		super(args, opts, {
 			// disable the Yeoman 5 package-manager logic (auto install)!
 			customInstallTask: "disabled",
 		});
 
-		Object.keys(generatorArgs).forEach((argName) => {
-			// register the argument for being displayed in the help
-			this.argument(argName, generatorArgs[argName]);
-		});
-
-		Object.keys(generatorOptions).forEach((optionName) => {
-			const initialValue = this.options[optionName];
-			// register the option for being displayed in the help
-			this.option(optionName, generatorOptions[optionName]);
-			const defaultedValue = this.options[optionName];
-			if (generatorOptions[optionName].npmConfig) {
-				// if a value is set, use the set value (parameter has higher precedence than npm config)
-				// => this.option(...) applies the default value to this.options[...] used as last resort
-				this.options[optionName] = initialValue || getNPMConfig(optionName) || defaultedValue;
-			}
-		});
+		defineGeneratorArguments(this);
+		defineGeneratorOptions(this);
 	}
 
 	_showBusy(statusText) {
@@ -206,32 +56,30 @@ export default class extends Generator {
 	}
 
 	async _npmInstall(dir, withDevDeps) {
-		return new Promise(
-			function (resolve, reject) {
-				spawn("npm", ["install", "--no-progress", "--ignore-engines", "--ignore-scripts"], {
-					stdio: this.config.verbose ? "inherit" : "ignore",
-					cwd: dir,
-					env: {
-						...process.env,
-						NO_UPDATE_NOTIFIER: true,
-						NODE_ENV: withDevDeps ? undefined : "production", // do not install devDependencies!
-					},
+		return new Promise((resolve, reject) => {
+			this.spawnCommand("npm", ["install", "--no-progress", "--ignore-engines", "--ignore-scripts"], {
+				stdio: this.config.verbose ? "inherit" : "ignore",
+				cwd: dir,
+				env: {
+					...process.env,
+					NO_UPDATE_NOTIFIER: true,
+					NODE_ENV: withDevDeps ? undefined : "production", // do not install devDependencies!
+				},
+			})
+				.on("exit", (code) => {
+					resolve(code);
 				})
-					.on("exit", function (code) {
-						resolve(code);
-					})
-					.on("error", function (err) {
-						reject(err);
-					});
-			}.bind(this)
-		);
+				.on("error", (err) => {
+					reject(err);
+				});
+		});
 	}
 
 	_unzip(pathOrBuffer, targetPath, zipInternalPath /* used for plugin generators from GitHub (e.g. TS tutorial) */) {
 		const zip = new AdmZip(pathOrBuffer);
 		const zipEntries = zip.getEntries();
 		zipEntries.forEach((entry) => {
-			const match = !entry.isDirectory && entry.entryName.match(/[^\/]+(\/.+)/);
+			const match = !entry.isDirectory && entry.entryName.match(/[^/]+(\/.+)/);
 			let entryPath;
 			if (zipInternalPath && match && match[1].startsWith(zipInternalPath)) {
 				entryPath = path.dirname(match[1].substring(zipInternalPath.length));
@@ -262,10 +110,11 @@ export default class extends Generator {
 	async _installGenerator({ octokit, generator, generatorPath }) {
 		// lookup the default path of the generator if not set
 		if (!generator.branch) {
+			const { org: owner, name: repo, dir, branch } = generator;
 			try {
 				const repoInfo = await octokit.repos.get({
-					owner: generator.org,
-					repo: generator.name,
+					owner,
+					repo,
 				});
 				generator.branch = repoInfo.data.default_branch;
 			} catch (e) {
@@ -288,7 +137,7 @@ export default class extends Generator {
 			commitSHA = reqBranch.data.commit.sha;
 		} catch (ex) {
 			console.error(
-				chalk.red(`Failed to retrieve the branch "${generator.branch}" for repository "${generator.name}" for "${generator.org}" organization! Run with --verbose for details!\n(Hint: ${e.message})`)
+				chalk.red(`Failed to retrieve the branch "${generator.branch}" for repository "${generator.name}" for "${generator.org}" organization! Run with --verbose for details!\n(Hint: ${ex.message})`),
 			);
 			if (this.options.verbose) {
 				console.error(chalk.red(ex.message));
@@ -426,7 +275,7 @@ export default class extends Generator {
 						if (options.request.retryCount === 0) {
 							// only retries once
 							this.log(
-								`Retrying after ${retryAfter} seconds. Alternatively, you can cancel this operation and supply an auth token with the \`--ghAuthToken\` option. For more details, run \`yo easy-ui5 --help\`. `
+								`Retrying after ${retryAfter} seconds. Alternatively, you can cancel this operation and supply an auth token with the \`--ghAuthToken\` option. For more details, run \`yo easy-ui5 --help\`. `,
 							);
 							return true;
 						}
@@ -470,7 +319,7 @@ export default class extends Generator {
 		};
 
 		// helper to retrieve the available repositories for a GH user
-		const listGeneratorsForUser = async (ghUser, subGeneratorPrefix) => {
+		const listGeneratorsForUser = async (ghUser, subGeneratorPrefix, threshold) => {
 			const response = await octokit.repos.listForUser({
 				username: ghUser,
 				sort: "name",
@@ -488,13 +337,13 @@ export default class extends Generator {
 		//   > yo easy-ui5 SAP-samples/ui5-typescript-tutorial#1.0
 		//   > yo easy-ui5 SAP-samples/ui5-typescript-tutorial\!/generator
 		//   > yo easy-ui5 SAP-samples/ui5-typescript-tutorial\!/generator#1.0
-		const reGenerator = /([^\/]+)\/([^\!\#]+)(?:\!([^\#]+))?(?:\#(.+))?/;
+		const reGenerator = /([^/]+)\/([^!#]+)(?:!([^#]+))?(?:#(.+))?/;
 		const matchGenerator = reGenerator.exec(this.options.generator);
 		if (matchGenerator) {
 			// derive and path the generator information from command line
 			const [owner, repo, dir = "/generator", branch] = matchGenerator.slice(1);
 			// the plugin path is derived from the owner, repo, dir and branch
-			const pluginPath = `_/${owner}/${repo}${dir.replace(/[\/\\]/g, "_")}${branch ? `#${branch.replace(/[\/\\]/g, "_")}` : ""}`;
+			const pluginPath = `_/${owner}/${repo}${dir.replace(/[/\\]/g, "_")}${branch ? `#${branch.replace(/[/\\]/g, "_")}` : ""}`;
 			generator = {
 				org: owner,
 				name: repo,
@@ -647,7 +496,7 @@ export default class extends Generator {
 		// do not execute the plugin generator during the setup/embed mode
 		if (!this.options.embed) {
 			// filter the local options and the help command
-			const opts = Object.keys(this._options).filter((optionName) => !(generatorOptions.hasOwnProperty(optionName) || optionName === "help"));
+			const opts = Object.keys(this._options).filter((optionName) => !(Object.prototype.hasOwnProperty.call(generatorOptions, optionName) || optionName === "help"));
 
 			// create the env for the plugin generator
 			let env = this.env; // in case of Yeoman UI the env is injected!
@@ -660,16 +509,16 @@ export default class extends Generator {
 			let subGenerators = await this._getGeneratorMetadata({ env, generatorPath });
 
 			// helper to derive the generator from the namespace
-			function deriveGenerator(namespace, defaultValue) {
+			const deriveGenerator = (namespace, defaultValue) => {
 				const match = namespace.match(/([^:]+):.+/);
 				return match ? match[1] : defaultValue === undefined ? namespace : defaultValue;
-			}
+			};
 
 			// helper to derive the subcommand from the namespace
-			function deriveSubcommand(namespace, defaultValue) {
+			const deriveSubcommand = (namespace, defaultValue) => {
 				const match = namespace.match(/^[^:]+:(.+)$/);
 				return match ? match[1] : defaultValue === undefined ? namespace : defaultValue;
-			}
+			};
 
 			// list the available subgenerators in the console (as help)
 			if (this.options.list) {
@@ -688,7 +537,7 @@ export default class extends Generator {
 								line += ` # ${subGenerator.displayName}`;
 							}
 							return `${output}\n${line}`;
-						}, `Subcommands (${subGenerators.length}):`)
+						}, `Subcommands (${subGenerators.length}):`),
 				);
 				return;
 			}
@@ -783,7 +632,7 @@ export default class extends Generator {
 									this.log(`The nested generator "${nestedGeneratorInfo.org}/${nestedGeneratorInfo.name}" has no subgenerator "${subcommand || "default"}"! Ignoring execution...`);
 								}
 							}
-						}) || []
+						}) || [],
 					);
 				};
 
@@ -808,26 +657,38 @@ export default class extends Generator {
 					});
 				};
 
+				if (this.options.verbose) {
+					this.log(`Running generators in "${generatorPath}"...`);
+				}
+
 				// chain the execution of the generators
 				let chain = Promise.resolve();
 				for (const subGen of subGensToRun) {
-					chain = chain.then(
-						function () {
-							// we need to use env.run and not composeWith
-							// to ensure that subgenerators can have different
-							// dependencies than the root generator
-							return env.run(subGen, {
-								verbose: this.options.verbose,
-								embedded: true,
-								destinationRoot: this.destinationRoot(),
-							});
-						}.bind(this)
-					);
+					chain = chain.then(() => {
+						// we need to use env.run and not composeWith
+						// to ensure that subgenerators can have different
+						// dependencies than the root generator
+						return env.run(subGen, {
+							verbose: this.options.verbose,
+							embedded: true,
+							destinationRoot: this.destinationRoot(),
+						});
+					});
 				}
 
-				if (this.options.verbose) {
-					this.log(`Running generators in "${generatorPath}"...`);
-				}
+				// check whether repo should be initialized or not
+				/* TODO
+				chain.then(async () => {
+					this.initrepo = await this.prompt([
+						{
+							type: "confirm",
+							name: "initrepo",
+							message: "Would you like to initialize a local git repository for this project?",
+							default: true,
+						},
+					]);
+				});
+				*/
 			} else {
 				this.log(`The generator ${chalk.red(this.options.generator)} has no visible subgenerators!`);
 			}
@@ -854,4 +715,18 @@ export default class extends Generator {
 			}
 		}
 	}
+
+	end() {
+		if (this.config.get("initrepo")) {
+			this.spawnCommandSync("git", ["init", "--quiet"], {
+				cwd: this.destinationPath(),
+			});
+			this.spawnCommandSync("git", ["add", "."], {
+				cwd: this.destinationPath(),
+			});
+			this.spawnCommandSync("git", ["commit", "--quiet", "--allow-empty", "-m", "Initial commit"], {
+				cwd: this.destinationPath(),
+			});
+		}
+	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-easy-ui5",
-  "version": "3.8.2",
+  "version": "3.9.0",
   "description": "Generator for UI5-based project",
   "main": "generators/app/index.js",
   "type": "module",
@@ -24,13 +24,13 @@
     "lint:staged": "lint-staged",
     "format": "prettier --write .",
     "format:staged": "pretty-quick --staged --verbose",
-    "prepare": "node ./.husky/skip.js || husky install",
+    "prepare": "node ./.husky/skip.js || husky",
     "hooks:commit-msg": "commitlint -e",
-    "hooks:pre-commit": "npm-run-all --sequential format:staged lint:staged"
+    "hooks:pre-commit": "npm run format:staged && npm run lint:staged"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/SAP/generator-easy-ui5.git"
+    "url": "git+https://github.com/ui5-community/generator-easy-ui5.git"
   },
   "keywords": [
     "yeoman-generator",
@@ -44,38 +44,38 @@
   "author": "SAP",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/SAP/generator-easy-ui5/issues"
+    "url": "https://github.com/ui5-community/generator-easy-ui5/issues"
   },
-  "homepage": "https://github.com/SAP/generator-easy-ui5#readme",
+  "homepage": "https://github.com/ui5-community/generator-easy-ui5#readme",
   "dependencies": {
-    "@octokit/plugin-throttling": "^11.0.1",
-    "@octokit/rest": "^22.0.0",
+    "@octokit/plugin-throttling": "^11.0.3",
+    "@octokit/rest": "^22.0.1",
     "adm-zip": "^0.5.16",
-    "chalk": "^5.4.1",
+    "chalk": "^5.6.2",
     "colors": "^1.4.0",
-    "glob": "^11.0.3",
+    "glob": "^13.0.0",
     "libnpmconfig": "^1.2.1",
     "node-fetch": "^3.3.2",
-    "rimraf": "^5.0.5",
-    "yeoman-environment": "^4.4.3",
+    "rimraf": "^6.1.2",
+    "yeoman-environment": "^5.1.2",
     "yeoman-generator": "^7.5.1",
-    "yosay": "^2.0.2"
+    "yosay": "^3.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^18.4.3",
-    "@commitlint/config-conventional": "^18.4.3",
-    "conventional-changelog-cli": "^4.1.0",
+    "@commitlint/cli": "^20.2.0",
+    "@commitlint/config-conventional": "^20.2.0",
+    "conventional-changelog-cli": "^5.0.0",
     "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^8.54.0",
-    "fs-extra": "^11.3.0",
-    "husky": "^8.0.3",
-    "lint-staged": "^15.1.0",
-    "mocha": "^10.2.0",
+    "eslint": "^9.39.2",
+    "fs-extra": "^11.3.3",
+    "husky": "^9.1.7",
+    "lint-staged": "^16.2.7",
+    "mocha": "^11.7.5",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.8.8",
-    "pretty-quick": "^3.1.3",
+    "prettier": "^3.7.4",
+    "pretty-quick": "^4.2.2",
     "yeoman-assert": "^3.1.1",
-    "yeoman-test": "^10.1.1"
+    "yeoman-test": "^11.2.0"
   },
   "config": {
     "commitizen": {