@ui5/cli 3.0.0-alpha.5 → 3.0.0-alpha.8

package/CHANGELOG.md

@@ -2,7 +2,33 @@
 All notable changes to this project will be documented in this file.  
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-A list of unreleased changes can be found [here](https://github.com/SAP/ui5-cli/compare/v3.0.0-alpha.5...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-cli/compare/v3.0.0-alpha.8...HEAD).
+
+<a name="v3.0.0-alpha.8"></a>
+## [v3.0.0-alpha.8] - 2022-06-14
+### Breaking Changes
+- Adapt to Project Graph APIs ([#413](https://github.com/SAP/ui5-cli/issues/413)) [`945b82b`](https://github.com/SAP/ui5-cli/commit/945b82bc775dc0a711529057908e9f36d8fadb62)
+
+### Dependency Updates
+- Bump [@ui5](https://github.com/ui5)/server from 3.0.0-alpha.1 to 3.0.0-alpha.2 [`5b959b3`](https://github.com/SAP/ui5-cli/commit/5b959b3903b93b0c7c693f2785d26532c8e78d53)
+- Bump [@ui5](https://github.com/ui5)/project from 3.0.0-alpha.2 to 3.0.0-alpha.3 [`780b1c1`](https://github.com/SAP/ui5-cli/commit/780b1c17b9a6b23397b74ef52fbe707aabf21edb)
+- Bump [@ui5](https://github.com/ui5)/builder from 3.0.0-alpha.6 to 3.0.0-alpha.7 [`37a7062`](https://github.com/SAP/ui5-cli/commit/37a7062521e08085560ea96a27d15e5f4c5d5574)
+- Bump [@ui5](https://github.com/ui5)/fs from 3.0.0-alpha.3 to 3.0.0-alpha.4 [`ae07607`](https://github.com/SAP/ui5-cli/commit/ae076071ccf4dd9d6a58933d7d6aa0a1fdb9d283)
+
+
+<a name="v3.0.0-alpha.7"></a>
+## [v3.0.0-alpha.7] - 2022-04-26
+### Dependency Updates
+- Bump [@ui5](https://github.com/ui5)/project from 3.0.0-alpha.1 to 3.0.0-alpha.2 [`aac8f7f`](https://github.com/SAP/ui5-cli/commit/aac8f7f5f204660010c42ed428542e01a988d5c6)
+- Bump [@ui5](https://github.com/ui5)/builder from 3.0.0-alpha.5 to 3.0.0-alpha.6 [`027e4df`](https://github.com/SAP/ui5-cli/commit/027e4dfba2bbbb9bcf209d82d85ecff7a2acb6a9)
+- Bump [@ui5](https://github.com/ui5)/fs from 3.0.0-alpha.2 to 3.0.0-alpha.3 [`1f43c4e`](https://github.com/SAP/ui5-cli/commit/1f43c4ed2699e66b0d6c50ca3738a6f61c060734)
+
+
+<a name="v3.0.0-alpha.6"></a>
+## [v3.0.0-alpha.6] - 2022-04-14
+### Dependency Updates
+- Bump [@ui5](https://github.com/ui5)/builder from 3.0.0-alpha.4 to 3.0.0-alpha.5 [`87c4136`](https://github.com/SAP/ui5-cli/commit/87c413627696365eb94de9fccdd7798a05543933)
+
 
 <a name="v3.0.0-alpha.5"></a>
 ## [v3.0.0-alpha.5] - 2022-04-05
@@ -757,6 +783,9 @@ Only Node.js v10 or higher is supported.
 <a name="v0.0.1"></a>
 ## v0.0.1 - 2018-06-06
 
+[v3.0.0-alpha.8]: https://github.com/SAP/ui5-cli/compare/v3.0.0-alpha.7...v3.0.0-alpha.8
+[v3.0.0-alpha.7]: https://github.com/SAP/ui5-cli/compare/v3.0.0-alpha.6...v3.0.0-alpha.7
+[v3.0.0-alpha.6]: https://github.com/SAP/ui5-cli/compare/v3.0.0-alpha.5...v3.0.0-alpha.6
 [v3.0.0-alpha.5]: https://github.com/SAP/ui5-cli/compare/v3.0.0-alpha.4...v3.0.0-alpha.5
 [v3.0.0-alpha.4]: https://github.com/SAP/ui5-cli/compare/v3.0.0-alpha.3...v3.0.0-alpha.4
 [v3.0.0-alpha.3]: https://github.com/SAP/ui5-cli/compare/v3.0.0-alpha.2...v3.0.0-alpha.3

package/lib/cli/commands/add.js

@@ -41,9 +41,9 @@ addCommand.handler = async function(argv) {
 		throw new Error("Options 'development' and 'optional' cannot be combined");
 	}
 
-	const normalizerOptions = {
-		translatorName: argv.translator,
-		configPath: argv.config
+	const projectGraphOptions = {
+		dependencyDefinition: argv.dependencyDefinition,
+		config: argv.config
 	};
 
 	const libraries = libraryNames.map((name) => {
@@ -57,7 +57,7 @@ addCommand.handler = async function(argv) {
 	});
 
 	const {yamlUpdated} = await require("../../framework/add")({
-		normalizerOptions,
+		projectGraphOptions,
 		libraries
 	});
 

package/lib/cli/commands/base.js

@@ -3,13 +3,12 @@ const cli = require("yargs");
 cli.usage("Usage: ui5 <command> [options]")
 	.demandCommand(1, "Command required! Please have a look at the help documentation above.")
 	.option("config", {
-		describe: "Path to configuration file",
+		describe: "Path to project configuration file in YAML format",
 		type: "string"
 	})
-	.option("translator", {
-		describe: "Translator to use. Including optional colon separated translator parameters.",
-		alias: "t8r",
-		default: "npm",
+	.option("dependency-definition", {
+		describe: "Path to a YAML file containing the project's dependency tree. " +
+			"This option will disable resolution of node package dependencies.",
 		type: "string"
 	})
 	.option("verbose", {
@@ -22,6 +21,11 @@ cli.usage("Usage: ui5 <command> [options]")
 		default: "info",
 		type: "string"
 	})
+	.option("x-perf", {
+		describe: "Outputs performance measurements",
+		default: false,
+		type: "boolean"
+	})
 	.showHelpOnFail(true)
 	.strict(true)
 	.alias("help", "h")

package/lib/cli/commands/build.js

@@ -1,7 +1,6 @@
 // Build
 
 const baseMiddleware = require("../middlewares/base.js");
-const buildHelper = require("../../utils/buildHelper");
 
 const build = {
 	command: "build",
@@ -12,11 +11,6 @@ const build = {
 
 build.builder = function(cli) {
 	return cli
-		.command("dev", "Dev build: Skips non-essential and time-intensive tasks during build", {
-			handler: handleBuild,
-			builder: noop,
-			middlewares: [baseMiddleware]
-		})
 		.command("jsdoc", "Build JSDoc resources", {
 			handler: handleBuild,
 			builder: noop,
@@ -29,46 +23,46 @@ build.builder = function(cli) {
 		})
 		.command("self-contained",
 			"Build project and create self-contained bundle. " +
-			"Recommended to be used in conjunction with --all", {
+			"Recommended to be used in conjunction with --include-dependencies", {
 				handler: handleBuild,
 				builder: noop,
 				middlewares: [baseMiddleware]
 			})
-		.option("all", {
-			describe: "Include all project dependencies into build process",
-			alias: "a",
+		.option("include-all-dependencies", {
+			describe: "Include all dependencies in the build result",
+			alias: ["all", "a"],
 			default: false,
 			type: "boolean"
 		})
 		.option("include-dependency", {
-			describe: "A list of dependencies to be included into the build process. You can use the asterisk '*' as" +
-				" an alias for including all dependencies into the build process. The listed dependencies cannot be" +
+			describe: "A list of dependencies to be included in the build result. You can use the asterisk '*' as" +
+				" an alias for including all dependencies in the build result. The listed dependencies cannot be" +
 				" overruled by dependencies defined in 'exclude-dependency'.",
 			type: "array"
 		})
 		.option("include-dependency-regexp", {
-			describe: "A list of regular expressions defining dependencies to be included into the build process." +
+			describe: "A list of regular expressions defining dependencies to be included in the build result." +
 				" This list is prioritized like 'include-dependency'.",
 			type: "array"
 		})
 		.option("include-dependency-tree", {
-			describe: "A list of dependencies to be included into the build process. Transitive dependencies are" +
+			describe: "A list of dependencies to be included in the build result. Transitive dependencies are" +
 				" implicitly included and do not need to be part of this list. These dependencies overrule" +
 				" the selection of 'exclude-dependency-tree' but can be overruled by 'exclude-dependency'.",
 			type: "array"
 		})
 		.option("exclude-dependency", {
-			describe: "A list of dependencies to be excluded from the build process. The listed dependencies can" +
+			describe: "A list of dependencies to be excluded from the build result. The listed dependencies can" +
 				" be overruled by dependencies defined in 'include-dependency'.",
 			type: "array"
 		})
 		.option("exclude-dependency-regexp", {
-			describe: "A list of regular expressions defining dependencies to be excluded from the build process." +
+			describe: "A list of regular expressions defining dependencies to be excluded from the build result." +
 				" This list is prioritized like 'exclude-dependency'.",
 			type: "array"
 		})
 		.option("exclude-dependency-tree", {
-			describe: "A list of dependencies to be excluded from the build process. Transitive dependencies are" +
+			describe: "A list of dependencies to be excluded from the build result. Transitive dependencies are" +
 				" implicitly included and do not need to be part of this list.",
 			type: "array"
 		})
@@ -82,18 +76,19 @@ build.builder = function(cli) {
 			default: false,
 			type: "boolean"
 		})
-		.option("dev-exclude-project", {
-			describe:
-				"A list of specific projects to be excluded from dev mode " +
-				"(dev mode must be active for this to be effective)",
-			type: "array"
+		.option("create-build-manifest", {
+			describe: "Store build metadata in a '.ui5' directory in the build destination, " +
+				"allowing reuse of the build result in other builds",
+			default: false,
+			type: "boolean"
 		})
 		.option("include-task", {
-			describe: "A list of specific tasks to be included to the default/dev set",
+			describe: "A list of tasks to be added to the default execution set. " +
+				"This option takes precedence over any excludes.",
 			type: "array"
 		})
 		.option("exclude-task", {
-			describe: "A list of specific tasks to be excluded from default/dev set",
+			describe: "A list of tasks to be excluded from the default task execution set",
 			type: "array"
 		})
 		.option("framework-version", {
@@ -102,12 +97,14 @@ build.builder = function(cli) {
 		})
 		.option("experimental-css-variables", {
 			describe:
-				"If present, the CSS variables (css-variables.css, css-variables.source.less) " +
-				"and the skeleton for a theme (library-skeleton.css, [library-skeleton-RTL.css]) are generated",
+				"Generate CSS variables (css-variables.css, css-variables.source.less)" +
+				" and skeleton (library-skeleton(-RTL).css) for all themes",
 			default: false,
 			type: "boolean"
 		})
 		.example("ui5 build", "Preload build for project without dependencies")
+
+		// TODO 3.0: Update examples
 		.example("ui5 build self-contained --all", "Self-contained build for project including dependencies")
 		.example("ui5 build --all --exclude-task=* --include-task=createDebugFiles generateAppPreload",
 			"Build project and dependencies but only apply the createDebugFiles- and generateAppPreload tasks")
@@ -120,56 +117,49 @@ build.builder = function(cli) {
 		.example("ui5 build dev",
 			"Build project and dependencies in dev mode. Only a set of essential tasks is executed.")
 		.example("ui5 build --experimental-css-variables",
-			"Preload build for project without dependencies but with CSS variable artefacts");
+			"Preload build for project without dependencies but with CSS variable artifacts");
 };
 
 async function handleBuild(argv) {
-	const normalizer = require("@ui5/project").normalizer;
-	const builder = require("@ui5/builder").builder;
 	const logger = require("@ui5/logger");
+	const {generateProjectGraph, builder} = require("@ui5/project");
 
 	const command = argv._[argv._.length - 1];
 	logger.setShowProgress(true);
 
-	const normalizerOptions = {
-		translatorName: argv.translator,
-		configPath: argv.config
-	};
-
-	if (argv.frameworkVersion) {
-		normalizerOptions.frameworkOptions = {
+	let graph;
+	if (argv.dependencyDefinition) {
+		graph = await generateProjectGraph.usingStaticFile({
+			filePath: argv.dependencyDefinition,
+			rootConfigPath: argv.config,
 			versionOverride: argv.frameworkVersion
-		};
+		});
+	} else {
+		graph = await generateProjectGraph.usingNodePackageDependencies({
+			rootConfigPath: argv.config,
+			versionOverride: argv.frameworkVersion
+		});
 	}
-
-	const tree = await normalizer.generateProjectTree(normalizerOptions);
-	const buildSettings = (tree.builder && tree.builder.settings) || {};
-
-	const {includedDependencies, excludedDependencies} = buildHelper.createDependencyLists({
-		tree: tree,
-		includeDependency: argv["include-dependency"],
-		includeDependencyRegExp: argv["include-dependency-regexp"],
-		includeDependencyTree: argv["include-dependency-tree"],
-		excludeDependency: argv["exclude-dependency"],
-		excludeDependencyRegExp: argv["exclude-dependency-regexp"],
-		excludeDependencyTree: argv["exclude-dependency-tree"],
-		defaultIncludeDependency: buildSettings.includeDependency,
-		defaultIncludeDependencyRegExp: buildSettings.includeDependencyRegExp,
-		defaultIncludeDependencyTree: buildSettings.includeDependencyTree
-	});
-	const buildAll = buildHelper.alignWithBuilderApi(argv.all, includedDependencies, excludedDependencies);
-
-	await builder.build({
-		tree: tree,
+	const buildSettings = graph.getRoot().getBuilderSettings() || {};
+	await builder({
+		graph,
 		destPath: argv.dest,
 		cleanDest: argv["clean-dest"],
-		buildDependencies: buildAll,
-		includedDependencies: includedDependencies,
-		excludedDependencies: excludedDependencies,
-		dev: command === "dev",
+		createBuildManifest: argv["create-build-manifest"],
+		complexDependencyIncludes: {
+			includeAllDependencies: argv["include-all-dependencies"],
+			includeDependency: argv["include-dependency"],
+			includeDependencyRegExp: argv["include-dependency-regexp"],
+			includeDependencyTree: argv["include-dependency-tree"],
+			excludeDependency: argv["exclude-dependency"],
+			excludeDependencyRegExp: argv["exclude-dependency-regexp"],
+			excludeDependencyTree: argv["exclude-dependency-tree"],
+			defaultIncludeDependency: buildSettings.includeDependency,
+			defaultIncludeDependencyRegExp: buildSettings.includeDependencyRegExp,
+			defaultIncludeDependencyTree: buildSettings.includeDependencyTree
+		},
 		selfContained: command === "self-contained",
 		jsdoc: command === "jsdoc",
-		devExcludeProject: argv["dev-exclude-project"],
 		includedTasks: argv["include-task"],
 		excludedTasks: argv["exclude-task"],
 		cssVariables: argv["experimental-css-variables"]

package/lib/cli/commands/remove.js

@@ -27,9 +27,9 @@ removeCommand.handler = async function(argv) {
 		return libraryNames.indexOf(libraryName) === index;
 	});
 
-	const normalizerOptions = {
-		translatorName: argv.translator,
-		configPath: argv.config
+	const projectGraphOptions = {
+		dependencyDefinition: argv.dependencyDefinition,
+		config: argv.config
 	};
 
 	const libraries = libraryNames.map((name) => {
@@ -38,7 +38,7 @@ removeCommand.handler = async function(argv) {
 	});
 
 	const {yamlUpdated} = await require("../../framework/remove")({
-		normalizerOptions,
+		projectGraphOptions,
 		libraries
 	});
 

package/lib/cli/commands/serve.js

@@ -73,30 +73,32 @@ serve.builder = function(cli) {
 };
 
 serve.handler = async function(argv) {
-	const normalizer = require("@ui5/project").normalizer;
+	const {generateProjectGraph} = require("@ui5/project");
 	const ui5Server = require("@ui5/server");
 	const server = ui5Server.server;
 
-	const normalizerOptions = {
-		translatorName: argv.translator,
-		configPath: argv.config
-	};
-
-	if (argv.frameworkVersion) {
-		normalizerOptions.frameworkOptions = {
+	let graph;
+	if (argv.dependencyDefinition) {
+		graph = await generateProjectGraph.usingStaticFile({
+			filePath: argv.dependencyDefinition,
+			versionOverride: argv.frameworkVersion
+		});
+	} else {
+		graph = await generateProjectGraph.usingNodePackageDependencies({
+			rootConfigPath: argv.config,
 			versionOverride: argv.frameworkVersion
-		};
+		});
 	}
 
-	const tree = await normalizer.generateProjectTree(normalizerOptions);
 	let port = argv.port;
 	let changePortIfInUse = false;
 
-	if (!port && tree.server && tree.server.settings) {
+	if (!port && graph.getRoot().getServerSettings()) {
+		const serverSettings = graph.getRoot().getServerSettings();
 		if (argv.h2) {
-			port = tree.server.settings.httpsPort;
+			port = serverSettings.httpsPort;
 		} else {
-			port = tree.server.settings.httpPort;
+			port = serverSettings.httpPort;
 		}
 	}
 
@@ -127,7 +129,7 @@ serve.handler = async function(argv) {
 		serverConfig.cert = cert;
 	}
 
-	const {h2, port: actualPort} = await server.serve(tree, serverConfig);
+	const {h2, port: actualPort} = await server.serve(graph, serverConfig);
 
 	const protocol = h2 ? "https" : "http";
 	let browserUrl = protocol + "://localhost:" + actualPort;

package/lib/cli/commands/tree.js

@@ -9,63 +9,98 @@ const tree = {
 
 tree.builder = function(cli) {
 	return cli
-		.option("full", {
-			describe: "Include more information (currently the project configuration)",
-			default: false,
-			type: "boolean"
-		})
-		.option("json", {
-			describe: "Output tree as formatted JSON string",
-			default: false,
-			type: "boolean"
-		})
-		.option("dedupe", {
-			describe: "Remove duplicate projects from project tree",
-			default: false,
-			type: "boolean"
-		})
 		.option("framework-version", {
 			describe:
-				"Overrides the framework version defined by the project. Only supported in combination with --full",
+				"Overrides the framework version defined by the project",
 			type: "string"
-		}).check((argv) => {
-			if (argv.frameworkVersion && !argv.full) {
-				throw new Error(`"framework-version" can only be used in combination with option "--full"`);
-			} else {
-				return true;
-			}
-		})
-		.example("ui5 tree > tree.txt", "Pipes the dependency tree into a new file \"tree.txt\"")
-		.example("ui5 tree --json > tree.json", "Pipes the dependency tree into a new file \"tree.json\"");
+		});
 };
 
 tree.handler = async function(argv) {
-	const normalizer = require("@ui5/project").normalizer;
-	const treeify = require("treeify");
-
-	const options = {
-		translatorName: argv.translator,
-		translatorOptions: {
-			includeDeduped: !argv.dedupe
-		},
-		configPath: argv.config
-	};
+	const chalk = require("chalk");
 
-	if (argv.frameworkVersion ) {
-		options.frameworkOptions = {
+	let startTime;
+	let elapsedTime;
+	if (argv.xPerf) {
+		startTime = process.hrtime();
+	}
+	const {generateProjectGraph} = require("@ui5/project");
+	let graph;
+	if (argv.dependencyDefinition) {
+		graph = await generateProjectGraph.usingStaticFile({
+			filePath: argv.dependencyDefinition,
 			versionOverride: argv.frameworkVersion
-		};
+		});
+	} else {
+		graph = await generateProjectGraph.usingNodePackageDependencies({
+			rootConfigPath: argv.config,
+			versionOverride: argv.frameworkVersion
+		});
 	}
 
-	let projectTree;
-	if (argv.full) {
-		projectTree = await normalizer.generateProjectTree(options);
-	} else {
-		projectTree = await normalizer.generateDependencyTree(options);
+	if (argv.xPerf) {
+		elapsedTime = getElapsedTime(startTime);
 	}
 
-	const output = argv.json ? JSON.stringify(projectTree, null, 4) : treeify.asTree(projectTree, true);
-	console.log(output);
+	const projects = {};
+	const indentWidth = 4;
+	await graph.traverseBreadthFirst(async ({project, getDependencies}) => {
+		const deps = getDependencies().map((dep) => {
+			return dep.getName();
+		});
+		projects[project.getName()] = {
+			render: function(indentation, connectorIndices, lastChild) {
+				let baseString = " ".repeat(indentation * indentWidth);
+				connectorIndices.forEach((idx) => {
+					baseString = `${baseString.slice(0, idx)}│${baseString.slice(idx + 1)}`;
+				});
+				const connectorString = lastChild ? "╰─" : "├─";
+				console.log(
+					`${baseString}${connectorString} ${chalk.bold(project.getName())} ` +
+					`${project.getNamespace ? chalk.inverse(project.getNamespace()) + " " : ""}` +
+					chalk.dim(`(${project.getVersion()}, ${project.getType()}) `) +
+					chalk.dim.italic(`${project.getPath()}`)
+				);
+
+				const lastIdx = deps.length -1;
+				const newConnectorIndices = [...connectorIndices];
+				if (!lastChild) {
+					newConnectorIndices.push(indentation * indentWidth);
+				}
+				deps.forEach((dep, i) => {
+					projects[dep].render(indentation + 1, newConnectorIndices, i === lastIdx);
+				});
+			}
+		};
+	});
+
+	const projectKeys = Object.keys(projects);
+	console.log(chalk.bold.underline(`Dependencies (${projectKeys.length}):`));
+	projects[projectKeys[0]].render(0, [], true);
+	console.log("");
+
+	const extensions = graph.getAllExtensions();
+	console.log(chalk.bold.underline(`Extensions (${extensions.length}):`));
+	if (extensions.length) {
+		extensions.forEach((extension) => {
+			console.log(
+				`├─ ${extension.getName()} ` +
+				chalk.dim(`(${extension.getVersion()}, ${extension.getType()}) `) +
+				chalk.dim.italic(`${extension.getPath()}`));
+		});
+	} else {
+		console.log(chalk.italic(`None`));
+	}
+	if (argv.xPerf) {
+		console.log("");
+		console.log(chalk.blue(
+			`Dependency graph generation took ${chalk.bold(elapsedTime)}`));
+	}
 };
 
+function getElapsedTime(startTime) {
+	const timeDiff = process.hrtime(startTime);
+	const prettyHrtime = require("pretty-hrtime");
+	return prettyHrtime(timeDiff);
+}
 module.exports = tree;

package/lib/cli/commands/use.js

@@ -55,13 +55,13 @@ function parseFrameworkInfo(frameworkInfo) {
 useCommand.handler = async function(argv) {
 	const frameworkOptions = parseFrameworkInfo(argv["framework-info"]);
 
-	const normalizerOptions = {
-		translatorName: argv.translator,
-		configPath: argv.config
+	const projectGraphOptions = {
+		dependencyDefinition: argv.dependencyDefinition,
+		config: argv.config
 	};
 
 	const {usedFramework, usedVersion, yamlUpdated} = await require("../../framework/use")({
-		normalizerOptions,
+		projectGraphOptions,
 		frameworkOptions
 	});
 

package/lib/framework/add.js

@@ -1,33 +1,40 @@
 const {getRootProjectConfiguration, getFrameworkResolver, isValidSpecVersion} = require("./utils");
 
-module.exports = async function({normalizerOptions, libraries}) {
-	const project = await getRootProjectConfiguration({normalizerOptions});
+/**
+ * Adds the given set of libraries to the framework libraries section in the ui5.yaml
+ *
+ * @param {object} parameters Parameters
+ * @param {object} parameters.projectGraphOptions
+ * @param {object} parameters.libraries
+ */
+module.exports = async function({projectGraphOptions, libraries}) {
+	const project = await getRootProjectConfiguration(projectGraphOptions);
 
-	if (!isValidSpecVersion(project.specVersion)) {
+	if (!isValidSpecVersion(project.getSpecVersion())) {
 		throw new Error(
 			`ui5 add command requires specVersion "2.0" or higher. ` +
-			`Project ${project.metadata.name} uses specVersion "${project.specVersion}"`
+			`Project ${project.getName()} uses specVersion "${project.getSpecVersion()}"`
 		);
 	}
 
-	if (!project.framework) {
+	if (!project.getFrameworkName()) {
 		throw new Error(
-			`Project ${project.metadata.name} is missing a framework configuration. ` +
+			`Project ${project.getName()} is missing a framework configuration. ` +
 			`Please use "ui5 use" to configure a framework and version.`
 		);
 	}
-	if (!project.framework.version) {
+	if (!project.getFrameworkVersion()) {
 		throw new Error(
-			`Project ${project.metadata.name} does not define a framework version configuration. ` +
+			`Project ${project.getName()} does not define a framework version configuration. ` +
 			`Please use "ui5 use" to configure a version.`
 		);
 	}
 
-	const Resolver = getFrameworkResolver(project.framework.name);
+	const Resolver = getFrameworkResolver(project.getFrameworkName());
 
 	const resolver = new Resolver({
-		cwd: project.path,
-		version: project.framework.version
+		cwd: project.getPath(),
+		version: project.getFrameworkVersion()
 	});
 
 	// Get metadata of all libraries to verify that they can be installed
@@ -35,21 +42,20 @@ module.exports = async function({normalizerOptions, libraries}) {
 		try {
 			await resolver.getLibraryMetadata(name);
 		} catch (err) {
-			throw new Error(`Failed to find ${project.framework.name} framework library ${name}: ` + err.message);
+			throw new Error(`Failed to find ${project.getFrameworkName()} framework library ${name}: ` + err.message);
 		}
 	}));
 
 	// Shallow copy of given libraries to not modify the input parameter when pushing other libraries
 	const allLibraries = [...libraries];
 
-	if (project.framework.libraries) {
-		project.framework.libraries.forEach((library) => {
-			// Don't add libraries twice!
-			if (allLibraries.findIndex(($) => $.name === library.name) === -1) {
-				allLibraries.push(library);
-			}
-		});
-	}
+	project.getFrameworkDependencies().forEach((library) => {
+		// Don't add libraries twice!
+		if (allLibraries.findIndex(($) => $.name === library.name) === -1) {
+			allLibraries.push(library);
+		}
+	});
+
 	allLibraries.sort((a, b) => {
 		return a.name.localeCompare(b.name);
 	});
@@ -59,6 +65,7 @@ module.exports = async function({normalizerOptions, libraries}) {
 	try {
 		await require("./updateYaml")({
 			project,
+			configPathOverride: projectGraphOptions.config,
 			data: {
 				framework: {
 					libraries: allLibraries