Merge branch 'master' into increasing-test-coverage

.travis.yml

@@ -18,7 +18,10 @@ matrix:
         - "8"
 
 after_script:
-- if [[ "$TRAVIS_OS_NAME" == 'linux' ]]; then npm run report-coveralls; fi
+- if [[ "$TRAVIS_OS_NAME" == "linux" &&
+    (( -n "$TRAVIS_PULL_REQUEST" && "$TRAVIS_PULL_REQUEST" != "false" ) || "$TRAVIS_BRANCH" == "master" ) ]]; then
+    npm run report-coveralls;
+  fi
 
 notifications:
   webhooks: https://coveralls.io/webhook

CHANGELOG.md

@@ -2,7 +2,21 @@
 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/v0.2.7...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-cli/compare/v0.2.9...HEAD).
+
+<a name="v0.2.9"></a>
+## [v0.2.9] - 2019-01-03
+### Internal Changes
+- **NOTICE:** Update copyright year to 2019 [`b236191`](https://github.com/SAP/ui5-cli/commit/b236191cbc04946887d22a5a5bd1058d02750297)
+
+
+<a name="v0.2.8"></a>
+## [v0.2.8] - 2018-12-19
+### Internal Changes
+- Apply UA review to CLI texts [`dcd1d63`](https://github.com/SAP/ui5-cli/commit/dcd1d631d923e6a8c21b785db433b2448dbd449d)
+- UA Review README.md [`e295121`](https://github.com/SAP/ui5-cli/commit/e295121dc92d5106cbf33c35052999fd611cd90f)
+- **ui5 tree:** Include deduped modules in output [`cce7f7a`](https://github.com/SAP/ui5-cli/commit/cce7f7a5bae2b92b20bfd964a7336f1f55a986ad)
+
 
 <a name="v0.2.7"></a>
 ## [v0.2.7] - 2018-12-06
@@ -94,6 +108,8 @@ A list of unreleased changes can be found [here](https://github.com/SAP/ui5-cli/
 - **Travis:** Add node.js 10 to test matrix [`7a94b52`](https://github.com/SAP/ui5-cli/commit/7a94b52f3878474697bc2e9c4c423432ca7d473c)
 
 
+[v0.2.9]: https://github.com/SAP/ui5-cli/compare/v0.2.8...v0.2.9
+[v0.2.8]: https://github.com/SAP/ui5-cli/compare/v0.2.7...v0.2.8
 [v0.2.7]: https://github.com/SAP/ui5-cli/compare/v0.2.6...v0.2.7
 [v0.2.6]: https://github.com/SAP/ui5-cli/compare/v0.2.5...v0.2.6
 [v0.2.5]: https://github.com/SAP/ui5-cli/compare/v0.2.4...v0.2.5

NOTICE.txt

@@ -1 +1 @@
-Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
+Copyright (c) 2018-2019 SAP SE or an SAP affiliate company. All rights reserved.

lib/cli/commands/tree.js

@@ -24,16 +24,17 @@ tree.handler = function(argv) {
 	const treeify = require("treeify");
 
 	let p;
+	const options = {
+		translator: argv.translator,
+		translatorOptions: {
+			includeDeduped: true
+		},
+		configPath: argv.config
+	};
 	if (argv.full) {
-		p = normalizer.generateProjectTree({
-			translator: argv.translator,
-			configPath: argv.config
-		});
+		p = normalizer.generateProjectTree(options);
 	} else {
-		p = normalizer.generateDependencyTree({
-			translator: argv.translator,
-			configPath: argv.config
-		});
+		p = normalizer.generateDependencyTree(options);
 	}
 
 	p.then(function(tree) {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/cli",
-	"version": "0.2.7",
+	"version": "0.2.9",
 	"description": "UI5 Build and Development Tooling - CLI",
 	"author": "SAP SE (https://www.sap.com)",
 	"license": "Apache-2.0",
@@ -26,7 +26,7 @@
 		"unit": "rimraf test/tmp && ava",
 		"unit-verbose": "rimraf test/tmp && cross-env UI5_LOG_LVL=verbose ava --verbose --serial",
 		"unit-watch": "rimraf test/tmp && ava --watch",
-		"unit-nyan": "npm run unit -- --tap | tnyan",
+		"unit-nyan": "rimraf test/tmp && ava --tap | tnyan",
 		"unit-inspect": "cross-env UI5_LOG_LVL=verbose node --inspect-brk node_modules/ava/profile.js",
 		"coverage": "nyc npm run unit",
 		"jsdoc": "npm run jsdoc-generate && opn jsdocs/index.html",
@@ -96,15 +96,15 @@
 		"url": "[email protected]:SAP/ui5-cli.git"
 	},
 	"dependencies": {
-		"@ui5/builder": "^0.2.6",
+		"@ui5/builder": "^0.2.9",
 		"@ui5/logger": "^0.2.2",
-		"@ui5/project": "^0.2.3",
+		"@ui5/project": "^0.2.5",
 		"@ui5/server": "^0.2.1",
 		"import-local": "^2.0.0",
 		"js-yaml": "^3.10.0",
 		"opn": "^5.1.0",
 		"semver": "^5.6.0",
-		"supports-color": "^5.1.0",
+		"supports-color": "^6.0.0",
 		"treeify": "^1.0.1",
 		"update-notifier": "^2.5.0",
 		"yargs": "^12.0.5"
@@ -113,8 +113,8 @@
 		"ava": "^0.25.0",
 		"coveralls": "^3.0.1",
 		"cross-env": "^5.1.1",
-		"docdash": "^1.0.1",
-		"eslint": "^5.10.0",
+		"docdash": "^1.0.2",
+		"eslint": "^5.11.1",
 		"eslint-config-google": "^0.11.0",
 		"execa": "^1.0.0",
 		"jsdoc": "^3.5.5",