[FIX] Replace copyright and version strings in *.json and .library files

Currently only placeholders in *.js files are processed Fixes #76
SAP · Oct 9, 2018 · f305429 · f305429
1 parent 6ee52c3
commit f305429
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 23 deletions.
diff --git a/lib/types/application/ApplicationBuilder.js b/lib/types/application/ApplicationBuilder.js
@@ -18,7 +18,7 @@ class ApplicationBuilder extends AbstractBuilder {
 	constructor({resourceCollections, project, parentLogger}) {
 		super({project, parentLogger});
 
-		// All available library tasks in execution order
+		// All available application tasks in execution order
 		this.availableTasks = [
 			"replaceCopyright",
 			"replaceVersion",
@@ -37,7 +37,7 @@ class ApplicationBuilder extends AbstractBuilder {
 				workspace: resourceCollections.workspace,
 				options: {
 					copyright: project.metadata.copyright,
-					pattern: "/**/*.js"
+					pattern: "/**/*.{js,json}"
 				}
 			});
 		});
@@ -47,7 +47,7 @@ class ApplicationBuilder extends AbstractBuilder {
 				workspace: resourceCollections.workspace,
 				options: {
 					version: project.version,
-					pattern: "/**/*.js"
+					pattern: "/**/*.{js,json}"
 				}
 			});
 		});

diff --git a/lib/types/library/LibraryBuilder.js b/lib/types/library/LibraryBuilder.js
@@ -38,7 +38,7 @@ class LibraryBuilder extends AbstractBuilder {
 				workspace: resourceCollections.workspace,
 				options: {
 					copyright: project.metadata.copyright,
-					pattern: "/resources/**/*.js"
+					pattern: "/resources/**/*.{js,json,library}"
 				}
 			});
 		});
@@ -49,7 +49,7 @@ class LibraryBuilder extends AbstractBuilder {
 				workspace: resourceCollections.workspace,
 				options: {
 					version: project.version,
-					pattern: "/resources/**/*.js"
+					pattern: "/resources/**/*.{js,json,library}"
 				}
 			});
 		});

diff --git a/test/expected/build/application.b/dest/manifest.json b/test/expected/build/application.b/dest/manifest.json
@@ -10,4 +10,4 @@
         "embeds": ["embedded"],
         "title": "{{title}}"
     }
-}
+}
diff --git a/test/expected/build/application.g/dest/Component-preload.js b/test/expected/build/application.g/dest/Component-preload.js
@@ -3,5 +3,5 @@ jQuery.sap.registerPreloadedModules({
 "modules":{
 	"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}}"}}'
+	"application/g/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.g","type":"application","applicationVersion":{"version":"1.0.0"},"embeds":["embedded"],"title":"{{title}}"},"customCopyrightString":"Some fancy copyright"}'
 }});
diff --git a/test/expected/build/application.g/dest/manifest.json b/test/expected/build/application.g/dest/manifest.json
@@ -5,9 +5,10 @@
         "id": "application.g",
         "type": "application",
         "applicationVersion": {
-            "version": "1.2.2"
+            "version": "1.0.0"
         },
         "embeds": ["embedded"],
         "title": "{{title}}"
-    }
-}
+    },
+    "customCopyrightString": "Some fancy copyright"
+}
diff --git a/test/expected/build/library.d/dest/resources/library/d/.library b/test/expected/build/library.d/dest/resources/library/d/.library
@@ -4,7 +4,7 @@
 	<name>library.d</name>
 	<vendor>SAP SE</vendor>
 	<copyright>Some fancy copyright</copyright>
-	<version>${version}</version>
+	<version>1.0.0</version>
 
 	<documentation>Library D</documentation>
 

diff --git a/test/expected/build/library.e/dest/resources/library/e/.library b/test/expected/build/library.e/dest/resources/library/e/.library
@@ -3,8 +3,10 @@
 
 	<name>library.d</name>
 	<vendor>SAP SE</vendor>
-	<copyright>${copyright}</copyright>
-	<version>${version}</version>
+	<copyright>UI development toolkit for HTML5 (OpenUI5)
+ * (c) Copyright 2009-xxx SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
+	<version>1.0.0</version>
 
 	<documentation>Library E</documentation>
 

diff --git a/test/expected/build/library.h/dest/resources/library/h/.library b/test/expected/build/library.h/dest/resources/library/h/.library
@@ -4,7 +4,7 @@
 	<name>library.h</name>
 	<vendor>SAP SE</vendor>
 	<copyright>Some fancy copyright</copyright>
-	<version>${version}</version>
+	<version>1.0.0</version>
 
 	<documentation>Library D</documentation>
 

diff --git a/test/expected/build/library.i/dest/resources/library/i/.library b/test/expected/build/library.i/dest/resources/library/i/.library
@@ -4,7 +4,7 @@
 	<name>library.i</name>
 	<vendor>SAP SE</vendor>
 	<copyright>Some fancy copyright</copyright>
-	<version>${version}</version>
+	<version>1.0.0</version>
 
 	<title>{{title}}</title>
 	<documentation>{{description}}</documentation>

diff --git a/test/fixtures/application.b/webapp/manifest.json b/test/fixtures/application.b/webapp/manifest.json
@@ -10,4 +10,4 @@
         "embeds": ["embedded"],
         "title": "{{title}}"
     }
-}
+}
diff --git a/test/fixtures/application.g/webapp/manifest.json b/test/fixtures/application.g/webapp/manifest.json
@@ -5,9 +5,10 @@
         "id": "application.g",
         "type": "application",
         "applicationVersion": {
-            "version": "1.2.2"
+            "version": "${version}"
         },
         "embeds": ["embedded"],
         "title": "{{title}}"
-    }
-}
+    },
+    "customCopyrightString": "${copyright}"
+}
diff --git a/test/fixtures/library.i/main/src/library/i/.library b/test/fixtures/library.i/main/src/library/i/.library
@@ -3,7 +3,7 @@
 
 	<name>library.i</name>
 	<vendor>SAP SE</vendor>
-	<copyright>Some fancy copyright</copyright>
+	<copyright>${copyright}</copyright>
 	<version>${version}</version>
 
 	<title>{{title}}</title>

diff --git a/test/lib/builder/builder.js b/test/lib/builder/builder.js
@@ -112,7 +112,7 @@ test("Build application.g", (t) => {
 });
 
 test("Build application.g with component preload paths", (t) => {
-	const destPath = "./test/tmp/build/application.g/dest";
+	const destPath = "./test/tmp/build/application.g/dest2";
 	const expectedPath = "./test/expected/build/application.g/dest";
 
 	return builder.build({
@@ -387,7 +387,8 @@ const applicationGTree = {
 	"type": "application",
 	"metadata": {
 		"name": "application.g",
-		"namespace": "application/g"
+		"namespace": "application/g",
+		"copyright": "Some fancy copyright"
 	},
 	"dependencies": [],
 	"resources": {
@@ -420,7 +421,8 @@ const applicationGTreeComponentPreloadPaths = {
 	"type": "application",
 	"metadata": {
 		"name": "application.g",
-		"namespace": "application/g"
+		"namespace": "application/g",
+		"copyright": "Some fancy copyright"
 	},
 	"dependencies": [],
 	"resources": {