Merge 'origin/master' into generate-h2-depcache-files

Author: codeworrior

.chglog/RELEASE.tpl.md

@@ -24,11 +24,10 @@
 
 {{ if .Tag.Previous }}
 ### All changes
-<a name="{{ .Tag.Previous.Name }}...{{ .Tag.Name }}"></a>
-`[{{ .Tag.Previous.Name }}...{{ .Tag.Name }}]``
+[`{{ .Tag.Previous.Name }}...{{ .Tag.Name }}`]
 {{ end }}
 
 {{ if .Tag.Previous -}}
-[{{ .Tag.Previous.Name }}...{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}
+[`{{ .Tag.Previous.Name }}...{{ .Tag.Name }}`]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}
 {{ end -}}
 {{ end -}}

CHANGELOG.md

@@ -2,7 +2,22 @@
 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-builder/compare/v0.0.1...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v0.0.2...HEAD).
+
+<a name="v0.0.2"></a>
+## [v0.0.2] - 2018-06-21
+### Bug Fixes
+- **Builders:** Do not bundle debug files [`19800a1`](https://github.com/SAP/ui5-builder/commit/19800a16689210c13495bc1bd0949896500cfc52)
+
+### Internal Changes
+- Add coveralls [`434b675`](https://github.com/SAP/ui5-builder/commit/434b67512444f279288359bf990895b607254075)
+- Add and update badges [`9c33b04`](https://github.com/SAP/ui5-builder/commit/9c33b047d9211e59f23e5fcbc76e66e5fd143150)
+- Have greenkeeper-lockfile amend any greenkeeper commit [`641817b`](https://github.com/SAP/ui5-builder/commit/641817b4e4f618aab6bbe3bde55ae01a942b93f8)
+- Prepare Greenkeeper installation [`fe9cbbf`](https://github.com/SAP/ui5-builder/commit/fe9cbbf0fbe3dd5bd8748adece8137797ae46795)
+- **Greenkeeper:** Add badge [`167cca9`](https://github.com/SAP/ui5-builder/commit/167cca9d038b4403fd282897b353db796fc0f7d9)
+- **Greenkeeper:** Add config file [`891339e`](https://github.com/SAP/ui5-builder/commit/891339e9493e8d0e609483891c476dea9c041d4e)
+- **README:** Pre-Alpha -> Alpha [`33c8190`](https://github.com/SAP/ui5-builder/commit/33c81906358d38b634099acbf8aafa234cc504db)
+
 
 <a name="v0.0.1"></a>
 ## v0.0.1 - 2018-06-06
@@ -26,3 +41,4 @@ A list of unreleased changes can be found [here](https://github.com/SAP/ui5-buil
 - **Travis:** Add node.js 10 to test matrix [`ce91dd1`](https://github.com/SAP/ui5-builder/commit/ce91dd17e4e28932a838ec743a489ff6495d21a9)
 
 
+[v0.0.2]: https://github.com/SAP/ui5-builder/compare/v0.0.1...v0.0.2

lib/lbt/bundle/Builder.js

@@ -152,7 +152,8 @@ class BundleBuilder {
 		// when decorateBootstrapModule is set to false, we don't write the optimized flag
 		// and don't write the try catch wrapper
 		this.shouldDecorate = this.options.decorateBootstrapModule &&
-			(((this.optimizedSources && !this.options.debugMode) || this.optimize) && resolvedModule.containsGlobal);
+			(((this.optimizedSources && !this.options.debugMode) || this.optimize) &&
+				this.targetBundleFormat.shouldDecorate(resolvedModule));
 		// TODO is the following condition ok or should the availability of jquery.sap.global.js be configurable?
 		this.jqglobalAvailable = !resolvedModule.containsGlobal;
 		this.openModule(resolvedModule.name);

lib/tasks/createDebugFiles.js

@@ -10,16 +10,18 @@ const dbg = require("../processors/debugFileCreator");
  * @param {string} [parameters.options.pattern] Pattern to locate the files to be processed
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
-module.exports = function({workspace, options}) {
-	return workspace.byGlob(options.pattern)
-		.then((allResources) => {
-			return dbg({
-				resources: allResources
-			});
-		})
-		.then((processedResources) => {
-			return Promise.all(processedResources.map((resource) => {
-				return workspace.write(resource);
-			}));
-		});
+module.exports = async function({workspace, options}) {
+	let allResources;
+	if (workspace.byGlobSource) { // API only available on duplex collections
+		allResources = await workspace.byGlobSource(options.pattern);
+	} else {
+		allResources = await workspace.byGlob(options.pattern);
+	}
+	return dbg({
+		resources: allResources
+	}).then((processedResources) => {
+		return Promise.all(processedResources.map((resource) => {
+			return workspace.write(resource);
+		}));
+	});
 };

lib/types/application/ApplicationBuilder.js

@@ -22,12 +22,12 @@ class ApplicationBuilder extends AbstractBuilder {
 		this.availableTasks = [
 			"replaceCopyright",
 			"replaceVersion",
-			"createDebugFiles",
 			"generateFlexChangesBundle",
 			"generateManifestBundle",
 			"generateComponentPreload",
 			"generateStandaloneAppBundle",
 			"generateBundle",
+			"createDebugFiles",
 			"uglify",
 			"generateVersionInfo"
 		];
@@ -52,16 +52,6 @@ class ApplicationBuilder extends AbstractBuilder {
 			});
 		});
 
-		this.addTask("createDebugFiles", () => {
-			const createDebugFiles = tasks.createDebugFiles;
-			return createDebugFiles({
-				workspace: resourceCollections.workspace,
-				options: {
-					pattern: "/**/*.js"
-				}
-			});
-		});
-
 		this.addTask("generateFlexChangesBundle", () => {
 			const generateFlexChangesBundle = tasks.generateFlexChangesBundle;
 			return generateFlexChangesBundle({
@@ -137,6 +127,16 @@ class ApplicationBuilder extends AbstractBuilder {
 			});
 		}
 
+		this.addTask("createDebugFiles", () => {
+			const createDebugFiles = tasks.createDebugFiles;
+			return createDebugFiles({
+				workspace: resourceCollections.workspace,
+				options: {
+					pattern: "/**/*.js"
+				}
+			});
+		});
+
 		this.addTask("uglify", () => {
 			const uglify = tasks.uglify;
 			return uglify({

lib/types/library/LibraryBuilder.js

@@ -22,11 +22,11 @@ class LibraryBuilder extends AbstractBuilder {
 		this.availableTasks = [
 			"replaceCopyright",
 			"replaceVersion",
-			"createDebugFiles",
 			"generateComponentPreload",
 			"generateBundle",
 			"generateLibraryPreload",
 			"buildThemes",
+			"createDebugFiles",
 			"uglify"
 		];
 
@@ -52,16 +52,6 @@ class LibraryBuilder extends AbstractBuilder {
 			});
 		});
 
-		this.addTask("createDebugFiles", () => {
-			const createDebugFiles = tasks.createDebugFiles;
-			return createDebugFiles({
-				workspace: resourceCollections.workspace,
-				options: {
-					pattern: "/resources/**/*.js"
-				}
-			});
-		});
-
 		const componentPreload = project.builder && project.builder.componentPreload;
 		if (componentPreload) {
 			const generateComponentPreload = tasks.generateComponentPreload;
@@ -120,6 +110,16 @@ class LibraryBuilder extends AbstractBuilder {
 			});
 		});
 
+		this.addTask("createDebugFiles", () => {
+			const createDebugFiles = tasks.createDebugFiles;
+			return createDebugFiles({
+				workspace: resourceCollections.workspace,
+				options: {
+					pattern: "/resources/**/*.js"
+				}
+			});
+		});
+
 		this.addTask("uglify", () => {
 			const uglify = tasks.uglify;
 			return uglify({

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/builder",
-	"version": "0.0.1",
+	"version": "0.0.2",
 	"description": "UI5 Build and Development Tooling - Builder",
 	"author": "SAP SE (https://www.sap.com)",
 	"license": "Apache-2.0",

package.json

@@ -2,6 +2,5 @@ sap.ui.require.preload({
 	"application/g/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.g","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"}}'
 });
 sap.ui.loader.config({depCacheUI5:{
-"application/g/Component-dbg.js": ["sap/ui/core/UIComponent.js"],
 "application/g/Component.js": ["sap/ui/core/UIComponent.js"]
 }});

test/expected/build/application.g/dest/Component-h2-preload.js

@@ -1,6 +1,4 @@
 sap.ui.require.preload({
-	"application/g/Component-dbg.js":function(){sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{metadata:{manifest:"json"}})});
-},
 	"application/g/Component.js":function(){sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{metadata:{manifest:"json"}})});
 },
 	"application/g/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.g","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"}}'