Add h2-preload files to expected test results, enfore evo bundle format

codeworrior · codeworrior · commit 0d00d2f4219a · 2018-06-18T17:59:12.000+02:00
diff --git a/test/expected/build/application.g/dest/Component-h2-preload.js b/test/expected/build/application.g/dest/Component-h2-preload.js
@@ -0,0 +1,7 @@
+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"]
+}});
diff --git a/test/expected/build/application.g/dest/Component-preload.js b/test/expected/build/application.g/dest/Component-preload.js
@@ -1,9 +1,7 @@
-jQuery.sap.registerPreloadedModules({
-"version":"2.0",
-"modules":{
+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}}"}}'
-}});
+});
diff --git a/test/expected/build/application.g/dest/subcomponentA/Component-h2-preload.js b/test/expected/build/application.g/dest/subcomponentA/Component-h2-preload.js
@@ -0,0 +1,7 @@
+sap.ui.require.preload({
+	"application/g/subcomponentA/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.g.subcomponentA","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"}}'
+});
+sap.ui.loader.config({depCacheUI5:{
+"application/g/subcomponentA/Component-dbg.js": ["sap/ui/core/UIComponent.js"],
+"application/g/subcomponentA/Component.js": ["sap/ui/core/UIComponent.js"]
+}});
diff --git a/test/expected/build/application.g/dest/subcomponentA/Component-preload.js b/test/expected/build/application.g/dest/subcomponentA/Component-preload.js
@@ -1,9 +1,7 @@
-jQuery.sap.registerPreloadedModules({
-"version":"2.0",
-"modules":{
+sap.ui.require.preload({
 	"application/g/subcomponentA/Component-dbg.js":function(){sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.subcomponentA.Component",{metadata:{manifest:"json"}})});
 },
 	"application/g/subcomponentA/Component.js":function(){sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.subcomponentA.Component",{metadata:{manifest:"json"}})});
 },
 	"application/g/subcomponentA/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.g.subcomponentA","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"}}'
-}});
+});
diff --git a/test/expected/build/application.g/dest/subcomponentB/Component-h2-preload.js b/test/expected/build/application.g/dest/subcomponentB/Component-h2-preload.js
@@ -0,0 +1,7 @@
+sap.ui.require.preload({
+	"application/g/subcomponentB/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.g.subcomponentB","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"}}'
+});
+sap.ui.loader.config({depCacheUI5:{
+"application/g/subcomponentB/Component-dbg.js": ["sap/ui/core/UIComponent.js"],
+"application/g/subcomponentB/Component.js": ["sap/ui/core/UIComponent.js"]
+}});
diff --git a/test/expected/build/application.g/dest/subcomponentB/Component-preload.js b/test/expected/build/application.g/dest/subcomponentB/Component-preload.js
@@ -1,9 +1,7 @@
-jQuery.sap.registerPreloadedModules({
-"version":"2.0",
-"modules":{
+sap.ui.require.preload({
 	"application/g/subcomponentB/Component-dbg.js":function(){sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.subcomponentB.Component",{metadata:{manifest:"json"}})});
 },
 	"application/g/subcomponentB/Component.js":function(){sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.subcomponentB.Component",{metadata:{manifest:"json"}})});
 },
 	"application/g/subcomponentB/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.g.subcomponentB","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"}}'
-}});
+});
diff --git a/test/expected/build/application.h/dest/sectionsA/customBundle.js b/test/expected/build/application.h/dest/sectionsA/customBundle.js
@@ -1,8 +1,6 @@
-jQuery.sap.registerPreloadedModules({
-"version":"2.0",
-"modules":{
+sap.ui.require.preload({
 	"application/h/sectionsA/section1.js":function(){sap.ui.define(["sap/m/Button"],function(n){console.log("Section 1 included")});
 },
 	"application/h/sectionsA/section3.js":function(){sap.ui.define(["sap/m/Button"],function(n){console.log("Section 3 included")});
 }
-}});
+});
diff --git a/test/expected/build/application.h/dest/sectionsB/customBundle.js b/test/expected/build/application.h/dest/sectionsB/customBundle.js
@@ -1,10 +1,8 @@
-jQuery.sap.registerPreloadedModules({
-"version":"2.0",
-"modules":{
+sap.ui.require.preload({
 	"application/h/sectionsB/section1.js":function(){sap.ui.define(["sap/m/Button"],function(n){console.log("Section 1 included")});
 },
 	"application/h/sectionsB/section2.js":function(){sap.ui.define(["sap/m/Button"],function(n){console.log("Section 2 included")});
 },
 	"application/h/sectionsB/section3.js":function(){sap.ui.define(["sap/m/Button"],function(n){console.log("Section 3 included")});
 }
-}});
+});
diff --git a/test/expected/build/library.h/dest/resources/components/Component-h2-preload.js b/test/expected/build/library.h/dest/resources/components/Component-h2-preload.js
@@ -0,0 +1,3 @@
+sap.ui.loader.config({depCacheUI5:{
+"components/Component.js": ["sap/ui/core/UIComponent.js"]
+}});
diff --git a/test/expected/build/library.h/dest/resources/components/Component-preload.js b/test/expected/build/library.h/dest/resources/components/Component-preload.js
@@ -1,6 +1,4 @@
-jQuery.sap.registerPreloadedModules({
-"version":"2.0",
-"modules":{
+sap.ui.require.preload({
 	"components/Component.js":function(){sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})});
 }
-}});
+});
diff --git a/test/expected/build/library.h/dest/resources/components/subcomponent1/Component-h2-preload.js b/test/expected/build/library.h/dest/resources/components/subcomponent1/Component-h2-preload.js
@@ -0,0 +1,3 @@
+sap.ui.loader.config({depCacheUI5:{
+"components/subcomponent1/Component.js": ["sap/ui/core/UIComponent.js"]
+}});
diff --git a/test/expected/build/library.h/dest/resources/components/subcomponent1/Component-preload.js b/test/expected/build/library.h/dest/resources/components/subcomponent1/Component-preload.js
@@ -1,6 +1,4 @@
-jQuery.sap.registerPreloadedModules({
-"version":"2.0",
-"modules":{
+sap.ui.require.preload({
 	"components/subcomponent1/Component.js":function(){sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})});
 }
-}});
+});
diff --git a/test/expected/build/library.h/dest/resources/components/subcomponent2/Component-h2-preload.js b/test/expected/build/library.h/dest/resources/components/subcomponent2/Component-h2-preload.js
@@ -0,0 +1,3 @@
+sap.ui.loader.config({depCacheUI5:{
+"components/subcomponent2/Component.js": ["sap/ui/core/UIComponent.js"]
+}});
diff --git a/test/expected/build/library.h/dest/resources/components/subcomponent2/Component-preload.js b/test/expected/build/library.h/dest/resources/components/subcomponent2/Component-preload.js
@@ -1,6 +1,4 @@
-jQuery.sap.registerPreloadedModules({
-"version":"2.0",
-"modules":{
+sap.ui.require.preload({
 	"components/subcomponent2/Component.js":function(){sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})});
 }
-}});
+});
diff --git a/test/expected/build/library.h/dest/resources/components/subcomponent3/Component-h2-preload.js b/test/expected/build/library.h/dest/resources/components/subcomponent3/Component-h2-preload.js
@@ -0,0 +1,3 @@
+sap.ui.loader.config({depCacheUI5:{
+"components/subcomponent3/Component.js": ["sap/ui/core/UIComponent.js"]
+}});
diff --git a/test/expected/build/library.h/dest/resources/components/subcomponent3/Component-preload.js b/test/expected/build/library.h/dest/resources/components/subcomponent3/Component-preload.js
@@ -1,6 +1,4 @@
-jQuery.sap.registerPreloadedModules({
-"version":"2.0",
-"modules":{
+sap.ui.require.preload({
 	"components/subcomponent3/Component.js":function(){sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})});
 }
-}});
+});
diff --git a/test/expected/build/library.h/dest/resources/library/h/customBundle.js b/test/expected/build/library.h/dest/resources/library/h/customBundle.js
@@ -1,6 +1,4 @@
-jQuery.sap.registerPreloadedModules({
-"version":"2.0",
-"modules":{
+sap.ui.require.preload({
 	"library/h/file.js":function(){/*!
  * Some fancy copyright
  */
@@ -16,4 +14,4 @@ console.log(" Library ");
  */
 console.log(" Some ");
 }
-}});
+});
diff --git a/test/fixtures/core-evo/main/src/ui5loader.js b/test/fixtures/core-evo/main/src/ui5loader.js
@@ -0,0 +1 @@
+// this is just a marker file to enable the EVO bundle format
diff --git a/test/fixtures/core-evo/package.json b/test/fixtures/core-evo/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "core-evo",
+  "version": "1.0.0",
+  "description": "Simple SAPUI5 based library",
+  "dependencies": {},
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  }
+}
diff --git a/test/fixtures/core-evo/ui5.yaml b/test/fixtures/core-evo/ui5.yaml
@@ -0,0 +1,10 @@
+---
+specVersion: "0.1"
+type: library
+metadata:
+  name: core-evo
+resources:
+  configuration:
+    paths:
+      src: main/src
+      test: main/test
diff --git a/test/lib/builder/builder.js b/test/lib/builder/builder.js
@@ -9,6 +9,7 @@ const builder = ui5Builder.builder;
 const applicationAPath = path.join(__dirname, "..", "..", "fixtures", "application.a");
 const applicationGPath = path.join(__dirname, "..", "..", "fixtures", "application.g");
 const applicationHPath = path.join(__dirname, "..", "..", "fixtures", "application.h");
+const libraryCore = path.join(__dirname, "..", "..", "fixtures", "core-evo");
 const libraryDPath = path.join(__dirname, "..", "..", "fixtures", "library.d");
 const libraryHPath = path.join(__dirname, "..", "..", "fixtures", "library.h");
 const libraryEPath = path.join(__dirname, "..", "..", "fixtures", "library.e");
@@ -351,7 +352,31 @@ const applicationGTree = {
 		"name": "application.g",
 		"namespace": "application/g"
 	},
-	"dependencies": [],
+	"dependencies": [
+		{
+			"id": "core-evo",
+			"version": "1.0.0",
+			"path": libraryCore,
+			"dependencies": [],
+			"_level": 1,
+			"specVersion": "0.1",
+			"type": "library",
+			"metadata": {
+				"name": "core-evo",
+				"copyright": "Some fancy copyright"
+			},
+			"resources": {
+				"configuration": {
+					"paths": {
+						"src": "main/src"
+					}
+				},
+				"pathMappings": {
+					"/resources/": "main/src"
+				}
+			}
+		}
+	],
 	"resources": {
 		"configuration": {
 			"paths": {
@@ -384,7 +409,31 @@ const applicationGTreeComponentPreloadPaths = {
 		"name": "application.g",
 		"namespace": "application/g"
 	},
-	"dependencies": [],
+	"dependencies": [
+		{
+			"id": "core-evo",
+			"version": "1.0.0",
+			"path": libraryCore,
+			"dependencies": [],
+			"_level": 1,
+			"specVersion": "0.1",
+			"type": "library",
+			"metadata": {
+				"name": "core-evo",
+				"copyright": "Some fancy copyright"
+			},
+			"resources": {
+				"configuration": {
+					"paths": {
+						"src": "main/src"
+					}
+				},
+				"pathMappings": {
+					"/resources/": "main/src"
+				}
+			}
+		}
+	],
 	"resources": {
 		"configuration": {
 			"paths": {
@@ -415,7 +464,31 @@ const applicationHTree = {
 		"name": "application.h",
 		"namespace": "application/h"
 	},
-	"dependencies": [],
+	"dependencies": [
+		{
+			"id": "core-evo",
+			"version": "1.0.0",
+			"path": libraryCore,
+			"dependencies": [],
+			"_level": 1,
+			"specVersion": "0.1",
+			"type": "library",
+			"metadata": {
+				"name": "core-evo",
+				"copyright": "Some fancy copyright"
+			},
+			"resources": {
+				"configuration": {
+					"paths": {
+						"src": "main/src"
+					}
+				},
+				"pathMappings": {
+					"/resources/": "main/src"
+				}
+			}
+		}
+	],
 	"resources": {
 		"configuration": {
 			"paths": {
@@ -494,7 +567,31 @@ const libraryHTree = {
 	"id": "library.h",
 	"version": "1.0.0",
 	"path": libraryHPath,
-	"dependencies": [],
+	"dependencies": [
+		{
+			"id": "core-evo",
+			"version": "1.0.0",
+			"path": libraryCore,
+			"dependencies": [],
+			"_level": 1,
+			"specVersion": "0.1",
+			"type": "library",
+			"metadata": {
+				"name": "core-evo",
+				"copyright": "Some fancy copyright"
+			},
+			"resources": {
+				"configuration": {
+					"paths": {
+						"src": "main/src"
+					}
+				},
+				"pathMappings": {
+					"/resources/": "main/src"
+				}
+			}
+		}
+	],
 	"_level": 0,
 	"specVersion": "0.1",
 	"type": "library",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+sap.ui.loader.config({depCacheUI5:{`
	`2`	`+"components/Component.js": ["sap/ui/core/UIComponent.js"]`
	`3`	`+}});`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-jQuery.sap.registerPreloadedModules({`
`2`		`-"version":"2.0",`
`3`		`-"modules":{`
	`1`	`+sap.ui.require.preload({`
`4`	`2`	`"components/Component.js":function(){sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})});`
`5`	`3`	`}`
`6`		`-}});`
	`4`	`+});`