From 7b885833d0398d0f2a00bfae5bfd5efde6a7baf4 Mon Sep 17 00:00:00 2001 From: Florian Vogt Date: Fri, 17 May 2024 10:01:46 +0200 Subject: [PATCH] [BREAKING] Bundling: Enforce usage of 'sap.ui.predefine' instead function wrappers --- lib/lbt/bundle/Builder.js | 74 +++++++++---------- lib/processors/bundlers/moduleBundler.js | 2 - lib/tasks/bundlers/generateLibraryPreload.js | 6 +- .../dest-depself/resources/sap-ui-custom.js | 16 ++-- .../resources/sap-ui-custom.js.map | 2 +- .../dest-self/resources/sap-ui-custom.js | 18 ++--- .../dest-self/resources/sap-ui-custom.js.map | 2 +- .../cachebuster/Component-preload.js | 12 +-- .../cachebuster/Component-preload.js.map | 2 +- .../cachebuster/sap-ui-cachebuster-info.json | 28 +++---- .../cachebuster_hash/Component-preload.js | 12 +-- .../cachebuster_hash/Component-preload.js.map | 2 +- .../cachebuster_hash/Component.js.map | 2 +- .../sap-ui-cachebuster-info.json | 16 ++-- .../subcomponentA/Component.js.map | 2 +- .../subcomponentB/Component.js.map | 2 +- .../application.g/dest/Component-preload.js | 4 +- .../dest/Component-preload.js.map | 2 +- .../dest/subcomponentA/Component-preload.js | 4 +- .../subcomponentA/Component-preload.js.map | 2 +- .../dest/subcomponentB/Component-preload.js | 4 +- .../subcomponentB/Component-preload.js.map | 2 +- .../application.g/dest2/Component-preload.js | 4 +- .../dest2/Component-preload.js.map | 2 +- .../application.g/dest2/Component.js.map | 2 +- .../dest2/subcomponentA/Component-preload.js | 4 +- .../subcomponentA/Component-preload.js.map | 2 +- .../dest2/subcomponentA/Component.js.map | 2 +- .../dest2/subcomponentB/Component-preload.js | 4 +- .../subcomponentB/Component-preload.js.map | 2 +- .../dest2/subcomponentB/Component.js.map | 2 +- .../dest/sectionsA/customBundle.js | 10 +-- .../dest/sectionsA/customBundle.js.map | 2 +- .../dest/sectionsB/customBundle.js | 14 +--- .../dest/sectionsB/customBundle.js.map | 2 +- .../no-minify/sectionsA/customBundle.js | 10 +-- .../no-minify/sectionsA/customBundle.js.map | 2 +- .../no-minify/sectionsB/customBundle.js | 14 +--- .../no-minify/sectionsB/customBundle.js.map | 2 +- .../application.i/dest/Component-preload.js | 8 +- .../dest/Component-preload.js.map | 2 +- .../dest-resources-json/Component-preload.js | 8 +- .../Component-preload.js.map | 2 +- .../dest-resources-json/resources.json | 4 +- .../application.j/dest/Component-preload.js | 8 +- .../dest/Component-preload.js.map | 2 +- .../Component-preload.js | 18 ++--- .../Component-preload.js.map | 2 +- .../application.k/dest/Component-preload.js | 6 +- .../dest/Component-preload.js.map | 2 +- .../dest/subcomponentA/Component-preload.js | 6 +- .../subcomponentA/Component-preload.js.map | 2 +- .../dest/subcomponentB/Component-preload.js | 6 +- .../subcomponentB/Component-preload.js.map | 2 +- .../dest/Component-preload.js" | 4 +- .../dest/Component-preload.js.map" | 2 +- .../library/h/components/Component-preload.js | 4 +- .../h/components/Component-preload.js.map | 2 +- .../library/h/components/resources.json | 16 ++-- .../subcomponent1/Component-preload.js | 6 +- .../subcomponent1/Component-preload.js.map | 2 +- .../h/components/subcomponent1/resources.json | 4 +- .../subcomponent2/Component-preload.js | 6 +- .../subcomponent2/Component-preload.js.map | 2 +- .../h/components/subcomponent2/resources.json | 4 +- .../subcomponent3/Component-preload.js | 6 +- .../subcomponent3/Component-preload.js.map | 2 +- .../h/components/subcomponent3/resources.json | 4 +- .../resources/library/h/resources.json | 16 ++-- .../library/h/components/Component-preload.js | 4 +- .../h/components/Component-preload.js.map | 2 +- .../subcomponent1/Component-preload.js | 6 +- .../subcomponent1/Component-preload.js.map | 2 +- .../subcomponent2/Component-preload.js | 6 +- .../subcomponent2/Component-preload.js.map | 2 +- .../subcomponent3/Component-preload.js | 6 +- .../subcomponent3/Component-preload.js.map | 2 +- .../library/h/components/Component-preload.js | 6 +- .../h/components/Component-preload.js.map | 2 +- .../subcomponent1/Component-preload.js | 6 +- .../subcomponent1/Component-preload.js.map | 2 +- .../subcomponent2/Component-preload.js | 6 +- .../subcomponent2/Component-preload.js.map | 2 +- .../subcomponent3/Component-preload.js | 6 +- .../subcomponent3/Component-preload.js.map | 2 +- test/lib/builder/sourceMaps.js | 9 ++- test/lib/lbt/bundle/Builder.js | 38 ++-------- test/lib/processors/bundlers/moduleBundler.js | 7 -- .../tasks/bundlers/generateLibraryPreload.js | 54 +++----------- 89 files changed, 212 insertions(+), 412 deletions(-) diff --git a/lib/lbt/bundle/Builder.js b/lib/lbt/bundle/Builder.js index 3fc71dbcc..2cec86d2f 100644 --- a/lib/lbt/bundle/Builder.js +++ b/lib/lbt/bundle/Builder.js @@ -375,52 +375,50 @@ class BundleBuilder { } async rewriteAMDModules(sequence) { - if ( this.options.usePredefineCalls ) { - const outW = this.outW; - - const remaining = []; - for ( const moduleName of sequence ) { - if ( /\.js$/.test(moduleName) ) { - // console.log("Processing " + moduleName); - const resource = await this.pool.findResourceWithInfo(moduleName); - let moduleContent = (await resource.buffer()).toString(); - let moduleSourceMap; - if (this.options.sourceMap) { - ({moduleContent, moduleSourceMap} = - await this.getSourceMapForModule({ - moduleName, - moduleContent, - resourcePath: resource.getPath() - })); - } + const outW = this.outW; - const rewriteRes = await rewriteDefine({ - moduleName, moduleContent, moduleSourceMap - }); - if (rewriteRes) { - const {moduleContent, moduleSourceMap} = rewriteRes; - outW.startSegment(moduleName); - outW.ensureNewLine(); - if (moduleSourceMap) { - this.addSourceMap(moduleName, moduleSourceMap); - } - outW.write(moduleContent); - outW.ensureNewLine(); - const compressedSize = outW.endSegment(); - log.verbose( - ` ${moduleName} (${resource.info != null ? resource.info.size : -1},${compressedSize})`); - } else { - // keep unprocessed modules - remaining.push(moduleName); + const remaining = []; + for ( const moduleName of sequence ) { + if ( /\.js$/.test(moduleName) ) { + // console.log("Processing " + moduleName); + const resource = await this.pool.findResourceWithInfo(moduleName); + let moduleContent = (await resource.buffer()).toString(); + let moduleSourceMap; + if (this.options.sourceMap) { + ({moduleContent, moduleSourceMap} = + await this.getSourceMapForModule({ + moduleName, + moduleContent, + resourcePath: resource.getPath() + })); + } + + const rewriteRes = await rewriteDefine({ + moduleName, moduleContent, moduleSourceMap + }); + if (rewriteRes) { + const {moduleContent, moduleSourceMap} = rewriteRes; + outW.startSegment(moduleName); + outW.ensureNewLine(); + if (moduleSourceMap) { + this.addSourceMap(moduleName, moduleSourceMap); } + outW.write(moduleContent); + outW.ensureNewLine(); + const compressedSize = outW.endSegment(); + log.verbose( + ` ${moduleName} (${resource.info != null ? resource.info.size : -1},${compressedSize})`); } else { // keep unprocessed modules remaining.push(moduleName); } + } else { + // keep unprocessed modules + remaining.push(moduleName); } - - Array.prototype.splice.apply(sequence, [0, sequence.length].concat(remaining)); } + + Array.prototype.splice.apply(sequence, [0, sequence.length].concat(remaining)); } afterWriteFunctionPreloadSection() { diff --git a/lib/processors/bundlers/moduleBundler.js b/lib/processors/bundlers/moduleBundler.js index fbb8aa57f..a314cd704 100644 --- a/lib/processors/bundlers/moduleBundler.js +++ b/lib/processors/bundlers/moduleBundler.js @@ -101,7 +101,6 @@ const log = getLogger("builder:processors:bundlers:moduleBundler"); * with an optimization marker * @property {boolean} [addTryCatchRestartWrapper=false] Whether to wrap bootable bundles with * a try/catch to filter out "Restart" errors - * @property {boolean} [usePredefineCalls=false] If set to 'true', sap.ui.predefine is used for UI5 modules * @property {number} [numberOfParts=1] The number of parts the module bundle should be splitted * @property {boolean} [ignoreMissingModules=false] When searching for modules which are optional for further * processing, do not throw in case they are missing @@ -144,7 +143,6 @@ export default function({resources, options: {bundleDefinition, bundleOptions, m sourceMap: true, decorateBootstrapModule: false, addTryCatchRestartWrapper: false, - usePredefineCalls: false, numberOfParts: 1, ignoreMissingModules: false }, bundleOptions); diff --git a/lib/tasks/bundlers/generateLibraryPreload.js b/lib/tasks/bundlers/generateLibraryPreload.js index fd6b6b685..e2584dbad 100644 --- a/lib/tasks/bundlers/generateLibraryPreload.js +++ b/lib/tasks/bundlers/generateLibraryPreload.js @@ -164,8 +164,7 @@ function getModuleBundlerOptions(config) { moduleBundlerOptions.bundleOptions = { optimize: config.preload, decorateBootstrapModule: config.preload, - addTryCatchRestartWrapper: config.preload, - usePredefineCalls: config.preload + addTryCatchRestartWrapper: config.preload }; moduleBundlerOptions.bundleDefinition = getSapUiCoreBunDef(config.name, config.filters, config.preload); @@ -390,7 +389,6 @@ export default async function({workspace, taskUtil, options: {skipBundles = [], bundleDefinition: getBundleDefinition(libraryNamespace, excludes), bundleOptions: { optimize: true, - usePredefineCalls: true, ignoreMissingModules: true } }, @@ -401,7 +399,6 @@ export default async function({workspace, taskUtil, options: {skipBundles = [], bundleDefinition: getDesigntimeBundleDefinition(libraryNamespace), bundleOptions: { optimize: true, - usePredefineCalls: true, ignoreMissingModules: true, skipIfEmpty: true } @@ -413,7 +410,6 @@ export default async function({workspace, taskUtil, options: {skipBundles = [], bundleDefinition: getSupportFilesBundleDefinition(libraryNamespace), bundleOptions: { optimize: false, - usePredefineCalls: true, ignoreMissingModules: true, skipIfEmpty: true } diff --git a/test/expected/build/application.a/dest-depself/resources/sap-ui-custom.js b/test/expected/build/application.a/dest-depself/resources/sap-ui-custom.js index f6077a315..caa962298 100644 --- a/test/expected/build/application.a/dest-depself/resources/sap-ui-custom.js +++ b/test/expected/build/application.a/dest-depself/resources/sap-ui-custom.js @@ -1,20 +1,14 @@ //@ui5-bundle sap-ui-custom.js -sap.ui.require.preload({ - "id1/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"id1","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"}}', - "id1/test.js":function(){ -sap.ui.define(["library/d/some"],function(n){function o(n){var o=n;console.log(o)}o()}); -}, - "library/d/library.js":function(){ +sap.ui.predefine("id1/test", ["library/d/some"],function(n){function o(n){var o=n;console.log(o)}o()}); /* * Some fancy copyright */ -sap.ui.define(["sap/ui/core/Lib","sap/ui/core/library"],function(e){"use strict";return e.init({name:"library.d",version:"1.0.0",dependencies:["sap.ui.core"],types:[],interfaces:[],controls:[],elements:[],noLibraryCSS:true})}); -}, - "library/d/some.js":function(){ +sap.ui.predefine("library/d/library", ["sap/ui/core/Lib","sap/ui/core/library"],function(e){"use strict";return e.init({name:"library.d",version:"1.0.0",dependencies:["sap.ui.core"],types:[],interfaces:[],controls:[],elements:[],noLibraryCSS:true})}); /*! * Some fancy copyright */ -sap.ui.define(["./library"],l=>{var o="World";console.log("Hello "+o)}); -} +sap.ui.predefine("library/d/some", ["./library"],l=>{var o="World";console.log("Hello "+o)}); +sap.ui.require.preload({ + "id1/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"id1","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"}}' }); //# sourceMappingURL=sap-ui-custom.js.map diff --git a/test/expected/build/application.a/dest-depself/resources/sap-ui-custom.js.map b/test/expected/build/application.a/dest-depself/resources/sap-ui-custom.js.map index 1ac4b324f..d9bca72c8 100644 --- a/test/expected/build/application.a/dest-depself/resources/sap-ui-custom.js.map +++ b/test/expected/build/application.a/dest-depself/resources/sap-ui-custom.js.map @@ -1 +1 @@ -{"version":3,"file":"sap-ui-custom.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["sap-ui-custom.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":4,"column":0},"map":{"version":3,"file":"test.js","names":["sap","ui","define","someObject","test","paramA","variableA","console","log"],"sources":["test-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CACV,kBACD,SAASC,GACX,SAASC,EAAKC,GACb,IAAIC,EAAYD,EAChBE,QAAQC,IAAIF,EACb,CACAF,GACD","ignoreList":[],"sourceRoot":"id1"}},{"offset":{"line":7,"column":0},"map":{"version":3,"file":"library.js","names":["sap","ui","define","Library","init","name","version","dependencies","types","interfaces","controls","elements","noLibraryCSS"],"sources":["library-dbg.js"],"mappings":"AAAA;;;AAIAA,IAAIC,GAAGC,OAAO,CACb,kBACA,uBACE,SAAUC,GACZ,aAEA,OAAOA,EAAQC,KAAK,CACnBC,KAAM,YACNC,QAAS,QACTC,aAAc,CACb,eAEDC,MAAO,GACPC,WAAY,GACZC,SAAU,GACVC,SAAU,GACVC,aAAc,MAEhB","ignoreList":[],"sourceRoot":"library/d"}},{"offset":{"line":13,"column":0},"map":{"version":3,"file":"some.js","names":["sap","ui","define","_library","someNonUglifiedVariable","console","log"],"sources":["some-dbg.js"],"mappings":"AAAA;;;AAIAA,IAAIC,GAAGC,OAAO,CAAC,aAAeC,IAC7B,IAAIC,EAA0B,QAC9BC,QAAQC,IAAI,SAAWF,EAAwB","ignoreList":[],"sourceRoot":"library/d"}}]} \ No newline at end of file +{"version":3,"file":"sap-ui-custom.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","someObject","test","paramA","variableA","console","log"],"sources":["test-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,sBAAO,CACV,kBACD,SAASC,GACX,SAASC,EAAKC,GACb,IAAIC,EAAYD,EAChBE,QAAQC,IAAIF,EACb,CACAF,GACD","ignoreList":[],"sourceRoot":"id1"}},{"offset":{"line":2,"column":0},"map":{"version":3,"names":["sap","ui","define","Library","init","name","version","dependencies","types","interfaces","controls","elements","noLibraryCSS"],"sources":["library-dbg.js"],"mappings":"AAAA;;;AAIAA,IAAIC,GAAGC,+BAAO,CACb,kBACA,uBACE,SAAUC,GACZ,aAEA,OAAOA,EAAQC,KAAK,CACnBC,KAAM,YACNC,QAAS,QACTC,aAAc,CACb,eAEDC,MAAO,GACPC,WAAY,GACZC,SAAU,GACVC,SAAU,GACVC,aAAc,MAEhB","ignoreList":[],"sourceRoot":"library/d"}},{"offset":{"line":6,"column":0},"map":{"version":3,"names":["sap","ui","define","_library","someNonUglifiedVariable","console","log"],"sources":["some-dbg.js"],"mappings":"AAAA;;;AAIAA,IAAIC,GAAGC,4BAAO,CAAC,aAAeC,IAC7B,IAAIC,EAA0B,QAC9BC,QAAQC,IAAI,SAAWF,EAAwB","ignoreList":[],"sourceRoot":"library/d"}},{"offset":{"line":10,"column":0},"map":{"version":3,"names":[],"sources":["sap-ui-custom.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.a/dest-self/resources/sap-ui-custom.js b/test/expected/build/application.a/dest-self/resources/sap-ui-custom.js index 33109b69c..bfabf2685 100644 --- a/test/expected/build/application.a/dest-self/resources/sap-ui-custom.js +++ b/test/expected/build/application.a/dest-self/resources/sap-ui-custom.js @@ -1,21 +1,15 @@ //@ui5-bundle sap-ui-custom.js -sap.ui.require.preload({ - "id1/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"id1","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"}}', - "id1/test.js":function(){ -sap.ui.define(["library/d/some"],function(n){function o(n){var o=n;console.log(o)}o()}); -}, - "library/d/library.js":function(){ +sap.ui.predefine("id1/test", ["library/d/some"],function(n){function o(n){var o=n;console.log(o)}o()}); /* * Some fancy copyright */ -sap.ui.define(["sap/ui/core/Lib","sap/ui/core/library"],function(e){"use strict";return e.init({name:"library.d",version:"1.0.0",dependencies:["sap.ui.core"],types:[],interfaces:[],controls:[],elements:[],noLibraryCSS:true})}); -}, - "library/d/manifest.json":'{"_version":"1.21.0","sap.app":{"id":"library.d","type":"library","embeds":[],"applicationVersion":{"version":"1.0.0"},"title":"Library D","description":"Library D","resources":"resources.json","offline":true},"sap.ui":{"technology":"UI5","supportedThemes":[]},"sap.ui5":{"dependencies":{"minUI5Version":"1.0","libs":{}},"library":{"i18n":false,"css":false,"content":{"controls":[],"elements":[],"types":[],"interfaces":[]}}}}', - "library/d/some.js":function(){ +sap.ui.predefine("library/d/library", ["sap/ui/core/Lib","sap/ui/core/library"],function(e){"use strict";return e.init({name:"library.d",version:"1.0.0",dependencies:["sap.ui.core"],types:[],interfaces:[],controls:[],elements:[],noLibraryCSS:true})}); /*! * Some fancy copyright */ -sap.ui.define(["./library"],l=>{var o="World";console.log("Hello "+o)}); -} +sap.ui.predefine("library/d/some", ["./library"],l=>{var o="World";console.log("Hello "+o)}); +sap.ui.require.preload({ + "id1/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"id1","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"}}', + "library/d/manifest.json":'{"_version":"1.21.0","sap.app":{"id":"library.d","type":"library","embeds":[],"applicationVersion":{"version":"1.0.0"},"title":"Library D","description":"Library D","resources":"resources.json","offline":true},"sap.ui":{"technology":"UI5","supportedThemes":[]},"sap.ui5":{"dependencies":{"minUI5Version":"1.0","libs":{}},"library":{"i18n":false,"css":false,"content":{"controls":[],"elements":[],"types":[],"interfaces":[]}}}}' }); //# sourceMappingURL=sap-ui-custom.js.map diff --git a/test/expected/build/application.a/dest-self/resources/sap-ui-custom.js.map b/test/expected/build/application.a/dest-self/resources/sap-ui-custom.js.map index 21d00fe6d..d9bca72c8 100644 --- a/test/expected/build/application.a/dest-self/resources/sap-ui-custom.js.map +++ b/test/expected/build/application.a/dest-self/resources/sap-ui-custom.js.map @@ -1 +1 @@ -{"version":3,"file":"sap-ui-custom.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["sap-ui-custom.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":4,"column":0},"map":{"version":3,"file":"test.js","names":["sap","ui","define","someObject","test","paramA","variableA","console","log"],"sources":["test-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CACV,kBACD,SAASC,GACX,SAASC,EAAKC,GACb,IAAIC,EAAYD,EAChBE,QAAQC,IAAIF,EACb,CACAF,GACD","ignoreList":[],"sourceRoot":"id1"}},{"offset":{"line":7,"column":0},"map":{"version":3,"file":"library.js","names":["sap","ui","define","Library","init","name","version","dependencies","types","interfaces","controls","elements","noLibraryCSS"],"sources":["library-dbg.js"],"mappings":"AAAA;;;AAIAA,IAAIC,GAAGC,OAAO,CACb,kBACA,uBACE,SAAUC,GACZ,aAEA,OAAOA,EAAQC,KAAK,CACnBC,KAAM,YACNC,QAAS,QACTC,aAAc,CACb,eAEDC,MAAO,GACPC,WAAY,GACZC,SAAU,GACVC,SAAU,GACVC,aAAc,MAEhB","ignoreList":[],"sourceRoot":"library/d"}},{"offset":{"line":14,"column":0},"map":{"version":3,"file":"some.js","names":["sap","ui","define","_library","someNonUglifiedVariable","console","log"],"sources":["some-dbg.js"],"mappings":"AAAA;;;AAIAA,IAAIC,GAAGC,OAAO,CAAC,aAAeC,IAC7B,IAAIC,EAA0B,QAC9BC,QAAQC,IAAI,SAAWF,EAAwB","ignoreList":[],"sourceRoot":"library/d"}}]} \ No newline at end of file +{"version":3,"file":"sap-ui-custom.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","someObject","test","paramA","variableA","console","log"],"sources":["test-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,sBAAO,CACV,kBACD,SAASC,GACX,SAASC,EAAKC,GACb,IAAIC,EAAYD,EAChBE,QAAQC,IAAIF,EACb,CACAF,GACD","ignoreList":[],"sourceRoot":"id1"}},{"offset":{"line":2,"column":0},"map":{"version":3,"names":["sap","ui","define","Library","init","name","version","dependencies","types","interfaces","controls","elements","noLibraryCSS"],"sources":["library-dbg.js"],"mappings":"AAAA;;;AAIAA,IAAIC,GAAGC,+BAAO,CACb,kBACA,uBACE,SAAUC,GACZ,aAEA,OAAOA,EAAQC,KAAK,CACnBC,KAAM,YACNC,QAAS,QACTC,aAAc,CACb,eAEDC,MAAO,GACPC,WAAY,GACZC,SAAU,GACVC,SAAU,GACVC,aAAc,MAEhB","ignoreList":[],"sourceRoot":"library/d"}},{"offset":{"line":6,"column":0},"map":{"version":3,"names":["sap","ui","define","_library","someNonUglifiedVariable","console","log"],"sources":["some-dbg.js"],"mappings":"AAAA;;;AAIAA,IAAIC,GAAGC,4BAAO,CAAC,aAAeC,IAC7B,IAAIC,EAA0B,QAC9BC,QAAQC,IAAI,SAAWF,EAAwB","ignoreList":[],"sourceRoot":"library/d"}},{"offset":{"line":10,"column":0},"map":{"version":3,"names":[],"sources":["sap-ui-custom.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.g/cachebuster/Component-preload.js b/test/expected/build/application.g/cachebuster/Component-preload.js index 2834902bd..18f436dcb 100644 --- a/test/expected/build/application.g/cachebuster/Component-preload.js +++ b/test/expected/build/application.g/cachebuster/Component-preload.js @@ -1,16 +1,10 @@ //@ui5-bundle application/g/Component-preload.js +sap.ui.predefine("application/g/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{metadata:{manifest:"json"}})}); +sap.ui.predefine("application/g/subcomponentA/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.subcomponentA.Component",{metadata:{manifest:"json"}})}); +sap.ui.predefine("application/g/subcomponentB/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.subcomponentB.Component",{metadata:{manifest:"json"}})}); sap.ui.require.preload({ - "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.0.0"},"embeds":["embedded"],"title":"{{title}}"},"customCopyrightString":"Some fancy copyright"}', - "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}}"}}', - "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}}"}}' }); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/application.g/cachebuster/Component-preload.js.map b/test/expected/build/application.g/cachebuster/Component-preload.js.map index af6e5ead1..2fc5c0b38 100644 --- a/test/expected/build/application.g/cachebuster/Component-preload.js.map +++ b/test/expected/build/application.g/cachebuster/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":7,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":"subcomponentA"}},{"offset":{"line":11,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":"subcomponentB"}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,qCAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":2,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,mDAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":"subcomponentA"}},{"offset":{"line":3,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,mDAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":"subcomponentB"}},{"offset":{"line":4,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.g/cachebuster/sap-ui-cachebuster-info.json b/test/expected/build/application.g/cachebuster/sap-ui-cachebuster-info.json index 9816c6122..84b5b3467 100644 --- a/test/expected/build/application.g/cachebuster/sap-ui-cachebuster-info.json +++ b/test/expected/build/application.g/cachebuster/sap-ui-cachebuster-info.json @@ -1,16 +1,16 @@ { - "subcomponentA/Component-dbg.js": 1657901214883, - "subcomponentA/manifest.json": 1657901214883, - "manifest.json": 1657901214883, - "subcomponentB/Component.js": 1657901214883, - "subcomponentA/Component.js": 1657901214883, - "Component.js": 1657901214883, - "subcomponentB/manifest.json": 1657901214883, - "subcomponentA/Component.js.map": 1658915303066, - "subcomponentB/Component-dbg.js": 1657901214883, - "subcomponentB/Component.js.map": 1658915303066, - "Component-dbg.js": 1657901214883, - "Component.js.map": 1658915303066, - "Component-preload.js": 1658915303178, - "Component-preload.js.map": 1658915303179 + "Component-dbg.js": 1710766618901, + "subcomponentA/Component.js": 1710766618902, + "subcomponentB/manifest.json": 1710766618902, + "subcomponentB/Component.js": 1710766618902, + "subcomponentA/manifest.json": 1710766618902, + "Component.js": 1710766618901, + "manifest.json": 1710766618901, + "Component.js.map": 1716293079735, + "subcomponentB/Component-dbg.js": 1710766618902, + "subcomponentB/Component.js.map": 1716293079737, + "subcomponentA/Component-dbg.js": 1710766618902, + "subcomponentA/Component.js.map": 1716293079735, + "Component-preload.js": 1716293079931, + "Component-preload.js.map": 1716293079931 } \ No newline at end of file diff --git a/test/expected/build/application.g/cachebuster_hash/Component-preload.js b/test/expected/build/application.g/cachebuster_hash/Component-preload.js index 2834902bd..18f436dcb 100644 --- a/test/expected/build/application.g/cachebuster_hash/Component-preload.js +++ b/test/expected/build/application.g/cachebuster_hash/Component-preload.js @@ -1,16 +1,10 @@ //@ui5-bundle application/g/Component-preload.js +sap.ui.predefine("application/g/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{metadata:{manifest:"json"}})}); +sap.ui.predefine("application/g/subcomponentA/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.subcomponentA.Component",{metadata:{manifest:"json"}})}); +sap.ui.predefine("application/g/subcomponentB/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.subcomponentB.Component",{metadata:{manifest:"json"}})}); sap.ui.require.preload({ - "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.0.0"},"embeds":["embedded"],"title":"{{title}}"},"customCopyrightString":"Some fancy copyright"}', - "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}}"}}', - "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}}"}}' }); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/application.g/cachebuster_hash/Component-preload.js.map b/test/expected/build/application.g/cachebuster_hash/Component-preload.js.map index 8d63bd623..2fc5c0b38 100644 --- a/test/expected/build/application.g/cachebuster_hash/Component-preload.js.map +++ b/test/expected/build/application.g/cachebuster_hash/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","sourceRoot":""}},{"offset":{"line":7,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","sourceRoot":"subcomponentA"}},{"offset":{"line":11,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","sourceRoot":"subcomponentB"}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,qCAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":2,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,mDAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":"subcomponentA"}},{"offset":{"line":3,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,mDAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":"subcomponentB"}},{"offset":{"line":4,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.g/cachebuster_hash/Component.js.map b/test/expected/build/application.g/cachebuster_hash/Component.js.map index 2991070ab..54de04b1e 100644 --- a/test/expected/build/application.g/cachebuster_hash/Component.js.map +++ b/test/expected/build/application.g/cachebuster_hash/Component.js.map @@ -1 +1 @@ -{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb"} \ No newline at end of file +{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","ignoreList":[]} \ No newline at end of file diff --git a/test/expected/build/application.g/cachebuster_hash/sap-ui-cachebuster-info.json b/test/expected/build/application.g/cachebuster_hash/sap-ui-cachebuster-info.json index bbc5218d9..8af67c58c 100644 --- a/test/expected/build/application.g/cachebuster_hash/sap-ui-cachebuster-info.json +++ b/test/expected/build/application.g/cachebuster_hash/sap-ui-cachebuster-info.json @@ -1,16 +1,16 @@ { + "Component-preload.js": "77489dcf574cf1a2253a15d2cf6cfa68f4f25464", "subcomponentA/Component.js": "37e2d3c99ddf728313ceaddd087c6d547fcbdf8f", - "subcomponentB/manifest.json": "3a08d0555e3e49fe683e01205090eed3182b4a9f", - "manifest.json": "a867583cff8c3a5135bfbdd97dcb7a9cad4948bd", "subcomponentA/manifest.json": "7dfcdf568dcfb47c74d309e2f00193688b112fb7", "subcomponentB/Component.js": "d2a467cc8d05c693b22dbef82c2bff4610611d81", + "manifest.json": "a867583cff8c3a5135bfbdd97dcb7a9cad4948bd", "Component.js": "174e92417f0fa7889c2bdb8a243c4d748d66a4da", - "subcomponentB/Component-dbg.js": "c03da2c5ff162c1d9d5e5c4a3edc2cebcda6b0a1", - "subcomponentB/Component.js.map": "03f57fa13b37175d2ebda02e67443f32ce45a643", "subcomponentA/Component-dbg.js": "fef3a5814776e5575302f814e96ae31a13df12b7", - "subcomponentA/Component.js.map": "03f57fa13b37175d2ebda02e67443f32ce45a643", + "subcomponentA/Component.js.map": "13121aa3fc198d95365b5f68befaf16ff0672e18", + "subcomponentB/Component-dbg.js": "c03da2c5ff162c1d9d5e5c4a3edc2cebcda6b0a1", + "subcomponentB/Component.js.map": "13121aa3fc198d95365b5f68befaf16ff0672e18", "Component-dbg.js": "874c35543ae850262d1552b6c2d00cecaae205a7", - "Component.js.map": "f20221563528aeb044a47fc8a3787e7a7a0636a7", - "Component-preload.js": "300e005e16a9a3d641ca6b02e9cd5135f4a2bc7c", - "Component-preload.js.map": "46b2eb04f4d7707bab262e54d258ad414eaf909b" + "Component.js.map": "44cc85428ecef8cd2bb90c991e91144081360803", + "subcomponentB/manifest.json": "3a08d0555e3e49fe683e01205090eed3182b4a9f", + "Component-preload.js.map": "ff7ae83ab12cc0744db9f77093bf1c3055cb67d9" } \ No newline at end of file diff --git a/test/expected/build/application.g/cachebuster_hash/subcomponentA/Component.js.map b/test/expected/build/application.g/cachebuster_hash/subcomponentA/Component.js.map index cc3764eef..221398d54 100644 --- a/test/expected/build/application.g/cachebuster_hash/subcomponentA/Component.js.map +++ b/test/expected/build/application.g/cachebuster_hash/subcomponentA/Component.js.map @@ -1 +1 @@ -{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb"} \ No newline at end of file +{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","ignoreList":[]} \ No newline at end of file diff --git a/test/expected/build/application.g/cachebuster_hash/subcomponentB/Component.js.map b/test/expected/build/application.g/cachebuster_hash/subcomponentB/Component.js.map index cc3764eef..221398d54 100644 --- a/test/expected/build/application.g/cachebuster_hash/subcomponentB/Component.js.map +++ b/test/expected/build/application.g/cachebuster_hash/subcomponentB/Component.js.map @@ -1 +1 @@ -{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb"} \ No newline at end of file +{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","ignoreList":[]} \ No newline at end of file diff --git a/test/expected/build/application.g/dest/Component-preload.js b/test/expected/build/application.g/dest/Component-preload.js index 54dc2a0cb..762c8c333 100644 --- a/test/expected/build/application.g/dest/Component-preload.js +++ b/test/expected/build/application.g/dest/Component-preload.js @@ -1,8 +1,6 @@ //@ui5-bundle application/g/Component-preload.js +sap.ui.predefine("application/g/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{metadata:{manifest:"json"}})}); sap.ui.require.preload({ - "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.0.0"},"embeds":["embedded"],"title":"{{title}}"},"customCopyrightString":"Some fancy copyright"}' }); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/application.g/dest/Component-preload.js.map b/test/expected/build/application.g/dest/Component-preload.js.map index a4bf6d4dd..c1c1fa62a 100644 --- a/test/expected/build/application.g/dest/Component-preload.js.map +++ b/test/expected/build/application.g/dest/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,qCAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":2,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.g/dest/subcomponentA/Component-preload.js b/test/expected/build/application.g/dest/subcomponentA/Component-preload.js index d3064774c..8897b8d6a 100644 --- a/test/expected/build/application.g/dest/subcomponentA/Component-preload.js +++ b/test/expected/build/application.g/dest/subcomponentA/Component-preload.js @@ -1,8 +1,6 @@ //@ui5-bundle application/g/subcomponentA/Component-preload.js +sap.ui.predefine("application/g/subcomponentA/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.subcomponentA.Component",{metadata:{manifest:"json"}})}); sap.ui.require.preload({ - "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}}"}}' }); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/application.g/dest/subcomponentA/Component-preload.js.map b/test/expected/build/application.g/dest/subcomponentA/Component-preload.js.map index bc0317111..40574da57 100644 --- a/test/expected/build/application.g/dest/subcomponentA/Component-preload.js.map +++ b/test/expected/build/application.g/dest/subcomponentA/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,mDAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":2,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.g/dest/subcomponentB/Component-preload.js b/test/expected/build/application.g/dest/subcomponentB/Component-preload.js index 058cabe75..6503ee8a4 100644 --- a/test/expected/build/application.g/dest/subcomponentB/Component-preload.js +++ b/test/expected/build/application.g/dest/subcomponentB/Component-preload.js @@ -1,8 +1,6 @@ //@ui5-bundle application/g/subcomponentB/Component-preload.js +sap.ui.predefine("application/g/subcomponentB/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.subcomponentB.Component",{metadata:{manifest:"json"}})}); sap.ui.require.preload({ - "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}}"}}' }); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/application.g/dest/subcomponentB/Component-preload.js.map b/test/expected/build/application.g/dest/subcomponentB/Component-preload.js.map index bc0317111..40574da57 100644 --- a/test/expected/build/application.g/dest/subcomponentB/Component-preload.js.map +++ b/test/expected/build/application.g/dest/subcomponentB/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,mDAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":2,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.g/dest2/Component-preload.js b/test/expected/build/application.g/dest2/Component-preload.js index 54dc2a0cb..762c8c333 100644 --- a/test/expected/build/application.g/dest2/Component-preload.js +++ b/test/expected/build/application.g/dest2/Component-preload.js @@ -1,8 +1,6 @@ //@ui5-bundle application/g/Component-preload.js +sap.ui.predefine("application/g/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{metadata:{manifest:"json"}})}); sap.ui.require.preload({ - "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.0.0"},"embeds":["embedded"],"title":"{{title}}"},"customCopyrightString":"Some fancy copyright"}' }); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/application.g/dest2/Component-preload.js.map b/test/expected/build/application.g/dest2/Component-preload.js.map index 64a2009dc..c1c1fa62a 100644 --- a/test/expected/build/application.g/dest2/Component-preload.js.map +++ b/test/expected/build/application.g/dest2/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,qCAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":2,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.g/dest2/Component.js.map b/test/expected/build/application.g/dest2/Component.js.map index 2991070ab..54de04b1e 100644 --- a/test/expected/build/application.g/dest2/Component.js.map +++ b/test/expected/build/application.g/dest2/Component.js.map @@ -1 +1 @@ -{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb"} \ No newline at end of file +{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","ignoreList":[]} \ No newline at end of file diff --git a/test/expected/build/application.g/dest2/subcomponentA/Component-preload.js b/test/expected/build/application.g/dest2/subcomponentA/Component-preload.js index d3064774c..8897b8d6a 100644 --- a/test/expected/build/application.g/dest2/subcomponentA/Component-preload.js +++ b/test/expected/build/application.g/dest2/subcomponentA/Component-preload.js @@ -1,8 +1,6 @@ //@ui5-bundle application/g/subcomponentA/Component-preload.js +sap.ui.predefine("application/g/subcomponentA/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.subcomponentA.Component",{metadata:{manifest:"json"}})}); sap.ui.require.preload({ - "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}}"}}' }); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/application.g/dest2/subcomponentA/Component-preload.js.map b/test/expected/build/application.g/dest2/subcomponentA/Component-preload.js.map index fb5915e88..40574da57 100644 --- a/test/expected/build/application.g/dest2/subcomponentA/Component-preload.js.map +++ b/test/expected/build/application.g/dest2/subcomponentA/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,mDAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":2,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.g/dest2/subcomponentA/Component.js.map b/test/expected/build/application.g/dest2/subcomponentA/Component.js.map index cc3764eef..221398d54 100644 --- a/test/expected/build/application.g/dest2/subcomponentA/Component.js.map +++ b/test/expected/build/application.g/dest2/subcomponentA/Component.js.map @@ -1 +1 @@ -{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb"} \ No newline at end of file +{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","ignoreList":[]} \ No newline at end of file diff --git a/test/expected/build/application.g/dest2/subcomponentB/Component-preload.js b/test/expected/build/application.g/dest2/subcomponentB/Component-preload.js index 058cabe75..6503ee8a4 100644 --- a/test/expected/build/application.g/dest2/subcomponentB/Component-preload.js +++ b/test/expected/build/application.g/dest2/subcomponentB/Component-preload.js @@ -1,8 +1,6 @@ //@ui5-bundle application/g/subcomponentB/Component-preload.js +sap.ui.predefine("application/g/subcomponentB/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.subcomponentB.Component",{metadata:{manifest:"json"}})}); sap.ui.require.preload({ - "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}}"}}' }); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/application.g/dest2/subcomponentB/Component-preload.js.map b/test/expected/build/application.g/dest2/subcomponentB/Component-preload.js.map index fb5915e88..40574da57 100644 --- a/test/expected/build/application.g/dest2/subcomponentB/Component-preload.js.map +++ b/test/expected/build/application.g/dest2/subcomponentB/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,mDAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":2,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.g/dest2/subcomponentB/Component.js.map b/test/expected/build/application.g/dest2/subcomponentB/Component.js.map index cc3764eef..221398d54 100644 --- a/test/expected/build/application.g/dest2/subcomponentB/Component.js.map +++ b/test/expected/build/application.g/dest2/subcomponentB/Component.js.map @@ -1 +1 @@ -{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb"} \ No newline at end of file +{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,wCAAyC,CAClEC,SAAU,CACTC,SAAU,SAGb","ignoreList":[]} \ No newline at end of file diff --git a/test/expected/build/application.h/dest/sectionsA/customBundle.js b/test/expected/build/application.h/dest/sectionsA/customBundle.js index 8bac1d2ad..5036a1964 100644 --- a/test/expected/build/application.h/dest/sectionsA/customBundle.js +++ b/test/expected/build/application.h/dest/sectionsA/customBundle.js @@ -1,10 +1,4 @@ //@ui5-bundle application/h/sectionsA/customBundle.js -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")}); -} -}); +sap.ui.predefine("application/h/sectionsA/section1", ["sap/m/Button"],function(n){console.log("Section 1 included")}); +sap.ui.predefine("application/h/sectionsA/section3", ["sap/m/Button"],function(n){console.log("Section 3 included")}); //# sourceMappingURL=customBundle.js.map diff --git a/test/expected/build/application.h/dest/sectionsA/customBundle.js.map b/test/expected/build/application.h/dest/sectionsA/customBundle.js.map index 529a2e263..6e464712d 100644 --- a/test/expected/build/application.h/dest/sectionsA/customBundle.js.map +++ b/test/expected/build/application.h/dest/sectionsA/customBundle.js.map @@ -1 +1 @@ -{"version":3,"file":"customBundle.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["customBundle.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"section1.js","names":["sap","ui","define","Button","console","log"],"sources":["section1-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,gBAAiB,SAASC,GACxCC,QAAQC,IAAI,qBACb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":6,"column":0},"map":{"version":3,"file":"section3.js","names":["sap","ui","define","Button","console","log"],"sources":["section3-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,gBAAiB,SAASC,GACxCC,QAAQC,IAAI,qBACb","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"customBundle.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","Button","console","log"],"sources":["section1-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,8CAAO,CAAC,gBAAiB,SAASC,GACxCC,QAAQC,IAAI,qBACb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":2,"column":0},"map":{"version":3,"names":["sap","ui","define","Button","console","log"],"sources":["section3-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,8CAAO,CAAC,gBAAiB,SAASC,GACxCC,QAAQC,IAAI,qBACb","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.h/dest/sectionsB/customBundle.js b/test/expected/build/application.h/dest/sectionsB/customBundle.js index 0966b8950..545f0451b 100644 --- a/test/expected/build/application.h/dest/sectionsB/customBundle.js +++ b/test/expected/build/application.h/dest/sectionsB/customBundle.js @@ -1,19 +1,11 @@ //@ui5-bundle application/h/sectionsB/customBundle.js -sap.ui.require.preload({ - "application/h/sectionsB/section1.js":function(){ -sap.ui.define(["sap/m/Button"], function(Button) { +sap.ui.predefine("application/h/sectionsB/section1", ["sap/m/Button"], function(Button) { console.log("Section 1 included"); }); -}, - "application/h/sectionsB/section2.js":function(){ -sap.ui.define(["sap/m/Button"], function(Button) { +sap.ui.predefine("application/h/sectionsB/section2", ["sap/m/Button"], function(Button) { console.log("Section 2 included"); }); -}, - "application/h/sectionsB/section3.js":function(){ -sap.ui.define(["sap/m/Button"], function(Button) { +sap.ui.predefine("application/h/sectionsB/section3", ["sap/m/Button"], function(Button) { console.log("Section 3 included"); }); -} -}); //# sourceMappingURL=customBundle.js.map diff --git a/test/expected/build/application.h/dest/sectionsB/customBundle.js.map b/test/expected/build/application.h/dest/sectionsB/customBundle.js.map index f2a180725..6dff1304f 100644 --- a/test/expected/build/application.h/dest/sectionsB/customBundle.js.map +++ b/test/expected/build/application.h/dest/sectionsB/customBundle.js.map @@ -1 +1 @@ -{"version":3,"file":"customBundle.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["customBundle.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"names":[],"sources":["section1-dbg.js"],"mappings":"AAAA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":8,"column":0},"map":{"version":3,"names":[],"sources":["section2-dbg.js"],"mappings":"AAAA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":13,"column":0},"map":{"version":3,"names":[],"sources":["section3-dbg.js"],"mappings":"AAAA;AACA;AACA;AACA","sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"customBundle.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["section1-dbg.js"],"mappings":"AAAA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":4,"column":0},"map":{"version":3,"names":[],"sources":["section2-dbg.js"],"mappings":"AAAA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":7,"column":0},"map":{"version":3,"names":[],"sources":["section3-dbg.js"],"mappings":"AAAA;AACA;AACA;AACA","sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.h/no-minify/sectionsA/customBundle.js b/test/expected/build/application.h/no-minify/sectionsA/customBundle.js index d2e9ee83a..0934f10ae 100644 --- a/test/expected/build/application.h/no-minify/sectionsA/customBundle.js +++ b/test/expected/build/application.h/no-minify/sectionsA/customBundle.js @@ -1,14 +1,8 @@ //@ui5-bundle application/h/sectionsA/customBundle.js -sap.ui.require.preload({ - "application/h/sectionsA/section1.js":function(){ -sap.ui.define(["sap/m/Button"], function(Button) { +sap.ui.predefine("application/h/sectionsA/section1", ["sap/m/Button"], function(Button) { console.log("Section 1 included"); }); -}, - "application/h/sectionsA/section3.js":function(){ -sap.ui.define(["sap/m/Button"], function(Button) { +sap.ui.predefine("application/h/sectionsA/section3", ["sap/m/Button"], function(Button) { console.log("Section 3 included"); }); -} -}); //# sourceMappingURL=customBundle.js.map diff --git a/test/expected/build/application.h/no-minify/sectionsA/customBundle.js.map b/test/expected/build/application.h/no-minify/sectionsA/customBundle.js.map index 7f0ee1656..a71546ff5 100644 --- a/test/expected/build/application.h/no-minify/sectionsA/customBundle.js.map +++ b/test/expected/build/application.h/no-minify/sectionsA/customBundle.js.map @@ -1 +1 @@ -{"version":3,"file":"customBundle.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["customBundle.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"names":[],"sources":["section1.js"],"mappings":"AAAA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":8,"column":0},"map":{"version":3,"names":[],"sources":["section3.js"],"mappings":"AAAA;AACA;AACA;AACA","sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"customBundle.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["section1.js"],"mappings":"AAAA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":4,"column":0},"map":{"version":3,"names":[],"sources":["section3.js"],"mappings":"AAAA;AACA;AACA;AACA","sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.h/no-minify/sectionsB/customBundle.js b/test/expected/build/application.h/no-minify/sectionsB/customBundle.js index 0966b8950..545f0451b 100644 --- a/test/expected/build/application.h/no-minify/sectionsB/customBundle.js +++ b/test/expected/build/application.h/no-minify/sectionsB/customBundle.js @@ -1,19 +1,11 @@ //@ui5-bundle application/h/sectionsB/customBundle.js -sap.ui.require.preload({ - "application/h/sectionsB/section1.js":function(){ -sap.ui.define(["sap/m/Button"], function(Button) { +sap.ui.predefine("application/h/sectionsB/section1", ["sap/m/Button"], function(Button) { console.log("Section 1 included"); }); -}, - "application/h/sectionsB/section2.js":function(){ -sap.ui.define(["sap/m/Button"], function(Button) { +sap.ui.predefine("application/h/sectionsB/section2", ["sap/m/Button"], function(Button) { console.log("Section 2 included"); }); -}, - "application/h/sectionsB/section3.js":function(){ -sap.ui.define(["sap/m/Button"], function(Button) { +sap.ui.predefine("application/h/sectionsB/section3", ["sap/m/Button"], function(Button) { console.log("Section 3 included"); }); -} -}); //# sourceMappingURL=customBundle.js.map diff --git a/test/expected/build/application.h/no-minify/sectionsB/customBundle.js.map b/test/expected/build/application.h/no-minify/sectionsB/customBundle.js.map index 89f88acfd..a772b090b 100644 --- a/test/expected/build/application.h/no-minify/sectionsB/customBundle.js.map +++ b/test/expected/build/application.h/no-minify/sectionsB/customBundle.js.map @@ -1 +1 @@ -{"version":3,"file":"customBundle.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["customBundle.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"names":[],"sources":["section1.js"],"mappings":"AAAA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":8,"column":0},"map":{"version":3,"names":[],"sources":["section2.js"],"mappings":"AAAA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":13,"column":0},"map":{"version":3,"names":[],"sources":["section3.js"],"mappings":"AAAA;AACA;AACA;AACA","sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"customBundle.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["section1.js"],"mappings":"AAAA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":4,"column":0},"map":{"version":3,"names":[],"sources":["section2.js"],"mappings":"AAAA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":7,"column":0},"map":{"version":3,"names":[],"sources":["section3.js"],"mappings":"AAAA;AACA;AACA;AACA","sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.i/dest/Component-preload.js b/test/expected/build/application.i/dest/Component-preload.js index 3faa565a4..c75c4d908 100644 --- a/test/expected/build/application.i/dest/Component-preload.js +++ b/test/expected/build/application.i/dest/Component-preload.js @@ -1,12 +1,8 @@ //@ui5-bundle application/i/Component-preload.js +sap.ui.predefine("application/i/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.i.Component",{metadata:{manifest:"json"}})}); +sap.ui.predefine("application/i/changes/coding/MyExtension", [],function(){return{}}); sap.ui.require.preload({ - "application/i/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.i.Component",{metadata:{manifest:"json"}})}); -}, "application/i/changes/changes-bundle.json":'[{"fileName":"id_456_addField","fileType":"change","changeType":"hideControl","component":"application.i.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.i.Component/changes","creation":"2023-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"}},{"fileName":"id_123_addField","fileType":"change","changeType":"hideControl","component":"application.i.Component","content":{},"selector":{"id":"control1"},"layer":"CUSTOMER","texts":{},"namespace":"apps/application.i.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"Max Mustermann"}}]', - "application/i/changes/coding/MyExtension.js":function(){ -sap.ui.define([],function(){return{}}); -}, "application/i/changes/fragments/MyFragment.fragment.xml":'', "application/i/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.i","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"},"sap.ui5":{"dependencies":{"minUI5Version":"1.72","libs":{"sap.ui.layout":{},"sap.ui.core":{},"sap.m":{},"sap.ui.fl":{}}}}}' }); diff --git a/test/expected/build/application.i/dest/Component-preload.js.map b/test/expected/build/application.i/dest/Component-preload.js.map index ccc16ba47..5e0f3bc48 100644 --- a/test/expected/build/application.i/dest/Component-preload.js.map +++ b/test/expected/build/application.i/dest/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":7,"column":0},"map":{"version":3,"file":"MyExtension.js","names":["sap","ui","define"],"sources":["MyExtension-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,GAAG,WAChB,MAAO,CAAC,CACT","ignoreList":[],"sourceRoot":"changes/coding"}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,qCAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":2,"column":0},"map":{"version":3,"names":["sap","ui","define"],"sources":["MyExtension-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,sDAAO,GAAG,WAChB,MAAO,CAAC,CACT","ignoreList":[],"sourceRoot":"changes/coding"}},{"offset":{"line":3,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.j/dest-resources-json/Component-preload.js b/test/expected/build/application.j/dest-resources-json/Component-preload.js index 7e4eadce0..58f6a5a47 100644 --- a/test/expected/build/application.j/dest-resources-json/Component-preload.js +++ b/test/expected/build/application.j/dest-resources-json/Component-preload.js @@ -1,11 +1,7 @@ //@ui5-bundle application/j/Component-preload.js +sap.ui.predefine("application/j/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.j.Component",{metadata:{manifest:"json"}})}); +sap.ui.predefine("application/j/changes/coding/MyExtension", [],function(){return{}}); sap.ui.require.preload({ - "application/j/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.j.Component",{metadata:{manifest:"json"}})}); -}, - "application/j/changes/coding/MyExtension.js":function(){ -sap.ui.define([],function(){return{}}); -}, "application/j/changes/flexibility-bundle.json":'{"changes":[{"fileName":"id_456_addField","fileType":"change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2023-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"}},{"fileName":"id_123_addField","fileType":"change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"CUSTOMER","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"Max Mustermann"}}],"compVariants":[{"fileName":"id_111_compVariants","fileType":"variant","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"},"appDescriptorChange":false}],"variants":[{"fileName":"id_111_test","fileType":"ctrl_variant","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"}}],"variantChanges":[{"fileName":"id_111_test","fileType":"ctrl_variant_change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"}}],"variantDependentControlChanges":[{"fileName":"id_111_variantDependentControlChange","fileType":"change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"},"variantReference":"someting here"}],"variantManagementChanges":[{"fileName":"id_111_test","fileType":"ctrl_variant_management_change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"}}]}', "application/j/changes/fragments/MyFragment.fragment.xml":'', "application/j/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.j","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"},"sap.ui5":{"dependencies":{"minUI5Version":"1.100.2","libs":{"sap.ui.layout":{},"sap.ui.core":{},"sap.m":{},"sap.ui.fl":{"lazy":false}}}}}' diff --git a/test/expected/build/application.j/dest-resources-json/Component-preload.js.map b/test/expected/build/application.j/dest-resources-json/Component-preload.js.map index b6c996b4e..5e0f3bc48 100644 --- a/test/expected/build/application.j/dest-resources-json/Component-preload.js.map +++ b/test/expected/build/application.j/dest-resources-json/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":6,"column":0},"map":{"version":3,"file":"MyExtension.js","names":["sap","ui","define"],"sources":["MyExtension-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,GAAG,WAChB,MAAO,CAAC,CACT","ignoreList":[],"sourceRoot":"changes/coding"}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,qCAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":2,"column":0},"map":{"version":3,"names":["sap","ui","define"],"sources":["MyExtension-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,sDAAO,GAAG,WAChB,MAAO,CAAC,CACT","ignoreList":[],"sourceRoot":"changes/coding"}},{"offset":{"line":3,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.j/dest-resources-json/resources.json b/test/expected/build/application.j/dest-resources-json/resources.json index b76e6cc15..291f07a2f 100644 --- a/test/expected/build/application.j/dest-resources-json/resources.json +++ b/test/expected/build/application.j/dest-resources-json/resources.json @@ -17,7 +17,7 @@ { "name": "Component-preload.js", "module": "application/j/Component-preload.js", - "size": 3688, + "size": 3658, "merged": true, "required": [ "sap/m/library.js", @@ -36,7 +36,7 @@ }, { "name": "Component-preload.js.map", - "size": 834, + "size": 790, "isDebug": true }, { diff --git a/test/expected/build/application.j/dest/Component-preload.js b/test/expected/build/application.j/dest/Component-preload.js index 7e4eadce0..58f6a5a47 100644 --- a/test/expected/build/application.j/dest/Component-preload.js +++ b/test/expected/build/application.j/dest/Component-preload.js @@ -1,11 +1,7 @@ //@ui5-bundle application/j/Component-preload.js +sap.ui.predefine("application/j/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.j.Component",{metadata:{manifest:"json"}})}); +sap.ui.predefine("application/j/changes/coding/MyExtension", [],function(){return{}}); sap.ui.require.preload({ - "application/j/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.j.Component",{metadata:{manifest:"json"}})}); -}, - "application/j/changes/coding/MyExtension.js":function(){ -sap.ui.define([],function(){return{}}); -}, "application/j/changes/flexibility-bundle.json":'{"changes":[{"fileName":"id_456_addField","fileType":"change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2023-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"}},{"fileName":"id_123_addField","fileType":"change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"CUSTOMER","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"Max Mustermann"}}],"compVariants":[{"fileName":"id_111_compVariants","fileType":"variant","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"},"appDescriptorChange":false}],"variants":[{"fileName":"id_111_test","fileType":"ctrl_variant","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"}}],"variantChanges":[{"fileName":"id_111_test","fileType":"ctrl_variant_change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"}}],"variantDependentControlChanges":[{"fileName":"id_111_variantDependentControlChange","fileType":"change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"},"variantReference":"someting here"}],"variantManagementChanges":[{"fileName":"id_111_test","fileType":"ctrl_variant_management_change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"}}]}', "application/j/changes/fragments/MyFragment.fragment.xml":'', "application/j/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.j","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"},"sap.ui5":{"dependencies":{"minUI5Version":"1.100.2","libs":{"sap.ui.layout":{},"sap.ui.core":{},"sap.m":{},"sap.ui.fl":{"lazy":false}}}}}' diff --git a/test/expected/build/application.j/dest/Component-preload.js.map b/test/expected/build/application.j/dest/Component-preload.js.map index b6c996b4e..5e0f3bc48 100644 --- a/test/expected/build/application.j/dest/Component-preload.js.map +++ b/test/expected/build/application.j/dest/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":6,"column":0},"map":{"version":3,"file":"MyExtension.js","names":["sap","ui","define"],"sources":["MyExtension-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,GAAG,WAChB,MAAO,CAAC,CACT","ignoreList":[],"sourceRoot":"changes/coding"}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,qCAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":2,"column":0},"map":{"version":3,"names":["sap","ui","define"],"sources":["MyExtension-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,sDAAO,GAAG,WAChB,MAAO,CAAC,CACT","ignoreList":[],"sourceRoot":"changes/coding"}},{"offset":{"line":3,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.k/dest-package-subcomponents/Component-preload.js b/test/expected/build/application.k/dest-package-subcomponents/Component-preload.js index 35422ab9a..2f991f6c4 100644 --- a/test/expected/build/application.k/dest-package-subcomponents/Component-preload.js +++ b/test/expected/build/application.k/dest-package-subcomponents/Component-preload.js @@ -1,7 +1,5 @@ //@ui5-bundle application/k/Component-preload.js -sap.ui.require.preload({ - "application/k/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent){ +sap.ui.predefine("application/k/Component", ["sap/ui/core/UIComponent"], function(UIComponent){ "use strict"; return UIComponent.extend('application.k.Component', { metadata: { @@ -9,10 +7,7 @@ sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent){ } }); }); -}, - "application/k/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.k","type":"application","applicationVersion":{"version":"${version}"},"embeds":["embedded"],"title":"{{title}}"},"customCopyrightString":"${copyright}"}', - "application/k/subcomponentA/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent){ +sap.ui.predefine("application/k/subcomponentA/Component", ["sap/ui/core/UIComponent"], function(UIComponent){ "use strict"; return UIComponent.extend('application.k.subcomponentA.Component', { metadata: { @@ -20,10 +15,7 @@ sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent){ } }); }); -}, - "application/k/subcomponentA/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.k.subcomponentA","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"}}', - "application/k/subcomponentB/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent){ +sap.ui.predefine("application/k/subcomponentB/Component", ["sap/ui/core/UIComponent"], function(UIComponent){ "use strict"; return UIComponent.extend('application.k.subcomponentB.Component', { metadata: { @@ -31,7 +23,9 @@ sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent){ } }); }); -}, +sap.ui.require.preload({ + "application/k/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.k","type":"application","applicationVersion":{"version":"${version}"},"embeds":["embedded"],"title":"{{title}}"},"customCopyrightString":"${copyright}"}', + "application/k/subcomponentA/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.k.subcomponentA","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"}}', "application/k/subcomponentB/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.k.subcomponentB","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"}}', "application/k/subcomponentB/thirdparty/lib.js":function(){ console.log("subcomponentB/thirdparty/lib.js"); diff --git a/test/expected/build/application.k/dest-package-subcomponents/Component-preload.js.map b/test/expected/build/application.k/dest-package-subcomponents/Component-preload.js.map index 025bee13f..f746f9c94 100644 --- a/test/expected/build/application.k/dest-package-subcomponents/Component-preload.js.map +++ b/test/expected/build/application.k/dest-package-subcomponents/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":14,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","sourceRoot":"subcomponentA"}},{"offset":{"line":25,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","sourceRoot":"subcomponentB"}},{"offset":{"line":36,"column":0},"map":{"version":3,"names":[],"sources":["lib.js"],"mappings":"AAAA;AACA","sourceRoot":"subcomponentB/thirdparty"}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":9,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","sourceRoot":"subcomponentA"}},{"offset":{"line":17,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","sourceRoot":"subcomponentB"}},{"offset":{"line":25,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":30,"column":0},"map":{"version":3,"names":[],"sources":["lib.js"],"mappings":"AAAA;AACA","sourceRoot":"subcomponentB/thirdparty"}}]} \ No newline at end of file diff --git a/test/expected/build/application.k/dest/Component-preload.js b/test/expected/build/application.k/dest/Component-preload.js index 619739027..d1e7e96e0 100644 --- a/test/expected/build/application.k/dest/Component-preload.js +++ b/test/expected/build/application.k/dest/Component-preload.js @@ -1,7 +1,5 @@ //@ui5-bundle application/k/Component-preload.js -sap.ui.require.preload({ - "application/k/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent){ +sap.ui.predefine("application/k/Component", ["sap/ui/core/UIComponent"], function(UIComponent){ "use strict"; return UIComponent.extend('application.k.Component', { metadata: { @@ -9,7 +7,7 @@ sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent){ } }); }); -}, +sap.ui.require.preload({ "application/k/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.k","type":"application","applicationVersion":{"version":"${version}"},"embeds":["embedded"],"title":"{{title}}"},"customCopyrightString":"${copyright}"}' }); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/application.k/dest/Component-preload.js.map b/test/expected/build/application.k/dest/Component-preload.js.map index 9affb6b4a..1c495111b 100644 --- a/test/expected/build/application.k/dest/Component-preload.js.map +++ b/test/expected/build/application.k/dest/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":9,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.k/dest/subcomponentA/Component-preload.js b/test/expected/build/application.k/dest/subcomponentA/Component-preload.js index a096cb54d..ccbf87d9a 100644 --- a/test/expected/build/application.k/dest/subcomponentA/Component-preload.js +++ b/test/expected/build/application.k/dest/subcomponentA/Component-preload.js @@ -1,7 +1,5 @@ //@ui5-bundle application/k/subcomponentA/Component-preload.js -sap.ui.require.preload({ - "application/k/subcomponentA/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent){ +sap.ui.predefine("application/k/subcomponentA/Component", ["sap/ui/core/UIComponent"], function(UIComponent){ "use strict"; return UIComponent.extend('application.k.subcomponentA.Component', { metadata: { @@ -9,7 +7,7 @@ sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent){ } }); }); -}, +sap.ui.require.preload({ "application/k/subcomponentA/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.k.subcomponentA","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"}}' }); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/application.k/dest/subcomponentA/Component-preload.js.map b/test/expected/build/application.k/dest/subcomponentA/Component-preload.js.map index 9affb6b4a..1c495111b 100644 --- a/test/expected/build/application.k/dest/subcomponentA/Component-preload.js.map +++ b/test/expected/build/application.k/dest/subcomponentA/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":9,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/application.k/dest/subcomponentB/Component-preload.js b/test/expected/build/application.k/dest/subcomponentB/Component-preload.js index 7af57880b..dce1ce7d7 100644 --- a/test/expected/build/application.k/dest/subcomponentB/Component-preload.js +++ b/test/expected/build/application.k/dest/subcomponentB/Component-preload.js @@ -1,7 +1,5 @@ //@ui5-bundle application/k/subcomponentB/Component-preload.js -sap.ui.require.preload({ - "application/k/subcomponentB/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent){ +sap.ui.predefine("application/k/subcomponentB/Component", ["sap/ui/core/UIComponent"], function(UIComponent){ "use strict"; return UIComponent.extend('application.k.subcomponentB.Component', { metadata: { @@ -9,7 +7,7 @@ sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent){ } }); }); -}, +sap.ui.require.preload({ "application/k/subcomponentB/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.k.subcomponentB","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"}}', "application/k/subcomponentB/thirdparty/lib.js":function(){ console.log("subcomponentB/thirdparty/lib.js"); diff --git a/test/expected/build/application.k/dest/subcomponentB/Component-preload.js.map b/test/expected/build/application.k/dest/subcomponentB/Component-preload.js.map index 6929c7d88..31e360e89 100644 --- a/test/expected/build/application.k/dest/subcomponentB/Component-preload.js.map +++ b/test/expected/build/application.k/dest/subcomponentB/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":14,"column":0},"map":{"version":3,"names":[],"sources":["lib.js"],"mappings":"AAAA;AACA","sourceRoot":"thirdparty"}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":9,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":12,"column":0},"map":{"version":3,"names":[],"sources":["lib.js"],"mappings":"AAAA;AACA","sourceRoot":"thirdparty"}}]} \ No newline at end of file diff --git "a/test/expected/build/application.\303\270/dest/Component-preload.js" "b/test/expected/build/application.\303\270/dest/Component-preload.js" index eba461cf0..b813d8e3f 100644 --- "a/test/expected/build/application.\303\270/dest/Component-preload.js" +++ "b/test/expected/build/application.\303\270/dest/Component-preload.js" @@ -1,8 +1,6 @@ //@ui5-bundle application/ø/Component-preload.js +sap.ui.predefine("application/ø/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.ø.Component",{metadata:{manifest:"json"}})}); sap.ui.require.preload({ - "application/ø/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.ø.Component",{metadata:{manifest:"json"}})}); -}, "application/ø/manifest.json":'{"_version":"1.1.0","sap.app":{"_version":"1.1.0","id":"application.ø","type":"application","applicationVersion":{"version":"1.2.2"},"embeds":["embedded"],"title":"{{title}}"},"sap.ui5":{"dependencies":{"minUI5Version":"1.73.2","libs":{"sap.ui.core":{}}}}}' }); //# sourceMappingURL=Component-preload.js.map diff --git "a/test/expected/build/application.\303\270/dest/Component-preload.js.map" "b/test/expected/build/application.\303\270/dest/Component-preload.js.map" index a4bf6d4dd..c1c1fa62a 100644 --- "a/test/expected/build/application.\303\270/dest/Component-preload.js.map" +++ "b/test/expected/build/application.\303\270/dest/Component-preload.js.map" @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend","metadata","manifest"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,qCAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACpDC,SAAU,CACTC,SAAU,SAGb","ignoreList":[],"sourceRoot":""}},{"offset":{"line":2,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/Component-preload.js b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/Component-preload.js index 416739324..72f30397e 100644 --- a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/Component-preload.js +++ b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/Component-preload.js @@ -1,8 +1,6 @@ //@ui5-bundle library/h/components/Component-preload.js +sap.ui.predefine("library/h/components/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})}); sap.ui.require.preload({ - "library/h/components/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})}); -}, "library/h/components/TodoComponent.js":function(){ /*! * Some fancy copyright diff --git a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/Component-preload.js.map b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/Component-preload.js.map index 9fd668c9e..b1837ff2e 100644 --- a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/Component-preload.js.map +++ b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACrD,EACD","ignoreList":[],"sourceRoot":""}},{"offset":{"line":6,"column":0},"map":{"version":3,"file":"TodoComponent.js","names":["console","log"],"sources":["TodoComponent-dbg.js"],"mappings":"AAAA;;;AAGAA,QAAQC,IAAI","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,4CAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACrD,EACD","ignoreList":[],"sourceRoot":""}},{"offset":{"line":2,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":4,"column":0},"map":{"version":3,"file":"TodoComponent.js","names":["console","log"],"sources":["TodoComponent-dbg.js"],"mappings":"AAAA;;;AAGAA,QAAQC,IAAI","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/resources.json b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/resources.json index 7c6526570..b204e77ae 100644 --- a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/resources.json +++ b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/resources.json @@ -13,7 +13,7 @@ { "name": "Component-preload.js", "module": "library/h/components/Component-preload.js", - "size": 409, + "size": 394, "merged": true, "required": [ "sap/ui/core/UIComponent.js" @@ -25,7 +25,7 @@ }, { "name": "Component-preload.js.map", - "size": 756, + "size": 735, "isDebug": true }, { @@ -75,7 +75,7 @@ { "name": "subcomponent1/Component-preload.js", "module": "library/h/components/subcomponent1/Component-preload.js", - "size": 326, + "size": 283, "merged": true, "required": [ "sap/ui/core/UIComponent.js" @@ -86,7 +86,7 @@ }, { "name": "subcomponent1/Component-preload.js.map", - "size": 547, + "size": 326, "isDebug": true }, { @@ -114,7 +114,7 @@ { "name": "subcomponent2/Component-preload.js", "module": "library/h/components/subcomponent2/Component-preload.js", - "size": 326, + "size": 283, "merged": true, "required": [ "sap/ui/core/UIComponent.js" @@ -125,7 +125,7 @@ }, { "name": "subcomponent2/Component-preload.js.map", - "size": 547, + "size": 326, "isDebug": true }, { @@ -153,7 +153,7 @@ { "name": "subcomponent3/Component-preload.js", "module": "library/h/components/subcomponent3/Component-preload.js", - "size": 326, + "size": 283, "merged": true, "required": [ "sap/ui/core/UIComponent.js" @@ -164,7 +164,7 @@ }, { "name": "subcomponent3/Component-preload.js.map", - "size": 547, + "size": 326, "isDebug": true }, { diff --git a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent1/Component-preload.js b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent1/Component-preload.js index 4e08fd2af..b048cbf6c 100644 --- a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent1/Component-preload.js +++ b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent1/Component-preload.js @@ -1,7 +1,3 @@ //@ui5-bundle library/h/components/subcomponent1/Component-preload.js -sap.ui.require.preload({ - "library/h/components/subcomponent1/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})}); -} -}); +sap.ui.predefine("library/h/components/subcomponent1/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})}); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent1/Component-preload.js.map b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent1/Component-preload.js.map index 45832a2fb..57e8e0b4f 100644 --- a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent1/Component-preload.js.map +++ b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent1/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACrD,EACD","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,0DAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACrD,EACD","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent1/resources.json b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent1/resources.json index cae6b1082..919c1a562 100644 --- a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent1/resources.json +++ b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent1/resources.json @@ -13,7 +13,7 @@ { "name": "Component-preload.js", "module": "library/h/components/subcomponent1/Component-preload.js", - "size": 326, + "size": 283, "merged": true, "required": [ "sap/ui/core/UIComponent.js" @@ -24,7 +24,7 @@ }, { "name": "Component-preload.js.map", - "size": 547, + "size": 326, "isDebug": true }, { diff --git a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent2/Component-preload.js b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent2/Component-preload.js index 854db6f10..af9495974 100644 --- a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent2/Component-preload.js +++ b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent2/Component-preload.js @@ -1,7 +1,3 @@ //@ui5-bundle library/h/components/subcomponent2/Component-preload.js -sap.ui.require.preload({ - "library/h/components/subcomponent2/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})}); -} -}); +sap.ui.predefine("library/h/components/subcomponent2/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})}); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent2/Component-preload.js.map b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent2/Component-preload.js.map index 45832a2fb..57e8e0b4f 100644 --- a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent2/Component-preload.js.map +++ b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent2/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACrD,EACD","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,0DAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACrD,EACD","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent2/resources.json b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent2/resources.json index 8a1e9ddfe..5481bb78d 100644 --- a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent2/resources.json +++ b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent2/resources.json @@ -13,7 +13,7 @@ { "name": "Component-preload.js", "module": "library/h/components/subcomponent2/Component-preload.js", - "size": 326, + "size": 283, "merged": true, "required": [ "sap/ui/core/UIComponent.js" @@ -24,7 +24,7 @@ }, { "name": "Component-preload.js.map", - "size": 547, + "size": 326, "isDebug": true }, { diff --git a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent3/Component-preload.js b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent3/Component-preload.js index b37a05f21..daa48b615 100644 --- a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent3/Component-preload.js +++ b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent3/Component-preload.js @@ -1,7 +1,3 @@ //@ui5-bundle library/h/components/subcomponent3/Component-preload.js -sap.ui.require.preload({ - "library/h/components/subcomponent3/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})}); -} -}); +sap.ui.predefine("library/h/components/subcomponent3/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})}); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent3/Component-preload.js.map b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent3/Component-preload.js.map index 45832a2fb..57e8e0b4f 100644 --- a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent3/Component-preload.js.map +++ b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent3/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACrD,EACD","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,0DAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACrD,EACD","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent3/resources.json b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent3/resources.json index 7855b5a5e..fbf6bce6a 100644 --- a/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent3/resources.json +++ b/test/expected/build/library.h/dest-resources-json/resources/library/h/components/subcomponent3/resources.json @@ -13,7 +13,7 @@ { "name": "Component-preload.js", "module": "library/h/components/subcomponent3/Component-preload.js", - "size": 326, + "size": 283, "merged": true, "required": [ "sap/ui/core/UIComponent.js" @@ -24,7 +24,7 @@ }, { "name": "Component-preload.js.map", - "size": 547, + "size": 326, "isDebug": true }, { diff --git a/test/expected/build/library.h/dest-resources-json/resources/library/h/resources.json b/test/expected/build/library.h/dest-resources-json/resources/library/h/resources.json index f8d142cef..5895e04d4 100644 --- a/test/expected/build/library.h/dest-resources-json/resources/library/h/resources.json +++ b/test/expected/build/library.h/dest-resources-json/resources/library/h/resources.json @@ -17,7 +17,7 @@ { "name": "components/Component-preload.js", "module": "library/h/components/Component-preload.js", - "size": 409, + "size": 394, "merged": true, "required": [ "sap/ui/core/UIComponent.js" @@ -29,7 +29,7 @@ }, { "name": "components/Component-preload.js.map", - "size": 756, + "size": 735, "isDebug": true }, { @@ -75,7 +75,7 @@ { "name": "components/subcomponent1/Component-preload.js", "module": "library/h/components/subcomponent1/Component-preload.js", - "size": 326, + "size": 283, "merged": true, "required": [ "sap/ui/core/UIComponent.js" @@ -86,7 +86,7 @@ }, { "name": "components/subcomponent1/Component-preload.js.map", - "size": 547, + "size": 326, "isDebug": true }, { @@ -114,7 +114,7 @@ { "name": "components/subcomponent2/Component-preload.js", "module": "library/h/components/subcomponent2/Component-preload.js", - "size": 326, + "size": 283, "merged": true, "required": [ "sap/ui/core/UIComponent.js" @@ -125,7 +125,7 @@ }, { "name": "components/subcomponent2/Component-preload.js.map", - "size": 547, + "size": 326, "isDebug": true }, { @@ -153,7 +153,7 @@ { "name": "components/subcomponent3/Component-preload.js", "module": "library/h/components/subcomponent3/Component-preload.js", - "size": 326, + "size": 283, "merged": true, "required": [ "sap/ui/core/UIComponent.js" @@ -164,7 +164,7 @@ }, { "name": "components/subcomponent3/Component-preload.js.map", - "size": 547, + "size": 326, "isDebug": true }, { diff --git a/test/expected/build/library.h/dest/resources/library/h/components/Component-preload.js b/test/expected/build/library.h/dest/resources/library/h/components/Component-preload.js index 416739324..72f30397e 100644 --- a/test/expected/build/library.h/dest/resources/library/h/components/Component-preload.js +++ b/test/expected/build/library.h/dest/resources/library/h/components/Component-preload.js @@ -1,8 +1,6 @@ //@ui5-bundle library/h/components/Component-preload.js +sap.ui.predefine("library/h/components/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})}); sap.ui.require.preload({ - "library/h/components/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})}); -}, "library/h/components/TodoComponent.js":function(){ /*! * Some fancy copyright diff --git a/test/expected/build/library.h/dest/resources/library/h/components/Component-preload.js.map b/test/expected/build/library.h/dest/resources/library/h/components/Component-preload.js.map index 9fd668c9e..b1837ff2e 100644 --- a/test/expected/build/library.h/dest/resources/library/h/components/Component-preload.js.map +++ b/test/expected/build/library.h/dest/resources/library/h/components/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACrD,EACD","ignoreList":[],"sourceRoot":""}},{"offset":{"line":6,"column":0},"map":{"version":3,"file":"TodoComponent.js","names":["console","log"],"sources":["TodoComponent-dbg.js"],"mappings":"AAAA;;;AAGAA,QAAQC,IAAI","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,4CAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACrD,EACD","ignoreList":[],"sourceRoot":""}},{"offset":{"line":2,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":4,"column":0},"map":{"version":3,"file":"TodoComponent.js","names":["console","log"],"sources":["TodoComponent-dbg.js"],"mappings":"AAAA;;;AAGAA,QAAQC,IAAI","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/library.h/dest/resources/library/h/components/subcomponent1/Component-preload.js b/test/expected/build/library.h/dest/resources/library/h/components/subcomponent1/Component-preload.js index 4e08fd2af..b048cbf6c 100644 --- a/test/expected/build/library.h/dest/resources/library/h/components/subcomponent1/Component-preload.js +++ b/test/expected/build/library.h/dest/resources/library/h/components/subcomponent1/Component-preload.js @@ -1,7 +1,3 @@ //@ui5-bundle library/h/components/subcomponent1/Component-preload.js -sap.ui.require.preload({ - "library/h/components/subcomponent1/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})}); -} -}); +sap.ui.predefine("library/h/components/subcomponent1/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})}); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/library.h/dest/resources/library/h/components/subcomponent1/Component-preload.js.map b/test/expected/build/library.h/dest/resources/library/h/components/subcomponent1/Component-preload.js.map index 45832a2fb..57e8e0b4f 100644 --- a/test/expected/build/library.h/dest/resources/library/h/components/subcomponent1/Component-preload.js.map +++ b/test/expected/build/library.h/dest/resources/library/h/components/subcomponent1/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACrD,EACD","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,0DAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACrD,EACD","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/library.h/dest/resources/library/h/components/subcomponent2/Component-preload.js b/test/expected/build/library.h/dest/resources/library/h/components/subcomponent2/Component-preload.js index 854db6f10..af9495974 100644 --- a/test/expected/build/library.h/dest/resources/library/h/components/subcomponent2/Component-preload.js +++ b/test/expected/build/library.h/dest/resources/library/h/components/subcomponent2/Component-preload.js @@ -1,7 +1,3 @@ //@ui5-bundle library/h/components/subcomponent2/Component-preload.js -sap.ui.require.preload({ - "library/h/components/subcomponent2/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})}); -} -}); +sap.ui.predefine("library/h/components/subcomponent2/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})}); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/library.h/dest/resources/library/h/components/subcomponent2/Component-preload.js.map b/test/expected/build/library.h/dest/resources/library/h/components/subcomponent2/Component-preload.js.map index 45832a2fb..57e8e0b4f 100644 --- a/test/expected/build/library.h/dest/resources/library/h/components/subcomponent2/Component-preload.js.map +++ b/test/expected/build/library.h/dest/resources/library/h/components/subcomponent2/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACrD,EACD","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,0DAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACrD,EACD","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/library.h/dest/resources/library/h/components/subcomponent3/Component-preload.js b/test/expected/build/library.h/dest/resources/library/h/components/subcomponent3/Component-preload.js index b37a05f21..daa48b615 100644 --- a/test/expected/build/library.h/dest/resources/library/h/components/subcomponent3/Component-preload.js +++ b/test/expected/build/library.h/dest/resources/library/h/components/subcomponent3/Component-preload.js @@ -1,7 +1,3 @@ //@ui5-bundle library/h/components/subcomponent3/Component-preload.js -sap.ui.require.preload({ - "library/h/components/subcomponent3/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})}); -} -}); +sap.ui.predefine("library/h/components/subcomponent3/Component", ["sap/ui/core/UIComponent"],function(n){"use strict";return n.extend("application.g.Component",{})}); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/library.h/dest/resources/library/h/components/subcomponent3/Component-preload.js.map b/test/expected/build/library.h/dest/resources/library/h/components/subcomponent3/Component-preload.js.map index 45832a2fb..57e8e0b4f 100644 --- a/test/expected/build/library.h/dest/resources/library/h/components/subcomponent3/Component-preload.js.map +++ b/test/expected/build/library.h/dest/resources/library/h/components/subcomponent3/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"file":"Component.js","names":["sap","ui","define","UIComponent","extend"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,OAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACrD,EACD","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":["sap","ui","define","UIComponent","extend"],"sources":["Component-dbg.js"],"mappings":"AAAAA,IAAIC,GAAGC,0DAAO,CAAC,2BAA4B,SAASC,GACnD,aACA,OAAOA,EAAYC,OAAO,0BAA2B,CACrD,EACD","ignoreList":[],"sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/library.h/no-minify/resources/library/h/components/Component-preload.js b/test/expected/build/library.h/no-minify/resources/library/h/components/Component-preload.js index c2ba18606..f036cd6d7 100644 --- a/test/expected/build/library.h/no-minify/resources/library/h/components/Component-preload.js +++ b/test/expected/build/library.h/no-minify/resources/library/h/components/Component-preload.js @@ -1,12 +1,10 @@ //@ui5-bundle library/h/components/Component-preload.js -sap.ui.require.preload({ - "library/h/components/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent){ +sap.ui.predefine("library/h/components/Component", ["sap/ui/core/UIComponent"], function(UIComponent){ "use strict"; return UIComponent.extend('application.g.Component', { }); }); -}, +sap.ui.require.preload({ "library/h/components/TodoComponent.js":function(){ /*! * Some fancy copyright diff --git a/test/expected/build/library.h/no-minify/resources/library/h/components/Component-preload.js.map b/test/expected/build/library.h/no-minify/resources/library/h/components/Component-preload.js.map index 5fed222a8..eea8b77e0 100644 --- a/test/expected/build/library.h/no-minify/resources/library/h/components/Component-preload.js.map +++ b/test/expected/build/library.h/no-minify/resources/library/h/components/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":10,"column":0},"map":{"version":3,"names":[],"sources":["TodoComponent.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA","sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA","sourceRoot":""}},{"offset":{"line":6,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":8,"column":0},"map":{"version":3,"names":[],"sources":["TodoComponent.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA","sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent1/Component-preload.js b/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent1/Component-preload.js index d2aff44c1..3e7256d36 100644 --- a/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent1/Component-preload.js +++ b/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent1/Component-preload.js @@ -1,11 +1,7 @@ //@ui5-bundle library/h/components/subcomponent1/Component-preload.js -sap.ui.require.preload({ - "library/h/components/subcomponent1/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent){ +sap.ui.predefine("library/h/components/subcomponent1/Component", ["sap/ui/core/UIComponent"], function(UIComponent){ "use strict"; return UIComponent.extend('application.g.Component', { }); }); -} -}); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent1/Component-preload.js.map b/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent1/Component-preload.js.map index 2bf02b808..7743e6a2d 100644 --- a/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent1/Component-preload.js.map +++ b/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent1/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA","sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA","sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent2/Component-preload.js b/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent2/Component-preload.js index 03abae7d8..750667068 100644 --- a/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent2/Component-preload.js +++ b/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent2/Component-preload.js @@ -1,11 +1,7 @@ //@ui5-bundle library/h/components/subcomponent2/Component-preload.js -sap.ui.require.preload({ - "library/h/components/subcomponent2/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent){ +sap.ui.predefine("library/h/components/subcomponent2/Component", ["sap/ui/core/UIComponent"], function(UIComponent){ "use strict"; return UIComponent.extend('application.g.Component', { }); }); -} -}); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent2/Component-preload.js.map b/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent2/Component-preload.js.map index 2bf02b808..7743e6a2d 100644 --- a/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent2/Component-preload.js.map +++ b/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent2/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA","sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA","sourceRoot":""}}]} \ No newline at end of file diff --git a/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent3/Component-preload.js b/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent3/Component-preload.js index f6c0783c0..3e05261fe 100644 --- a/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent3/Component-preload.js +++ b/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent3/Component-preload.js @@ -1,11 +1,7 @@ //@ui5-bundle library/h/components/subcomponent3/Component-preload.js -sap.ui.require.preload({ - "library/h/components/subcomponent3/Component.js":function(){ -sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent){ +sap.ui.predefine("library/h/components/subcomponent3/Component", ["sap/ui/core/UIComponent"], function(UIComponent){ "use strict"; return UIComponent.extend('application.g.Component', { }); }); -} -}); //# sourceMappingURL=Component-preload.js.map diff --git a/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent3/Component-preload.js.map b/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent3/Component-preload.js.map index 2bf02b808..7743e6a2d 100644 --- a/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent3/Component-preload.js.map +++ b/test/expected/build/library.h/no-minify/resources/library/h/components/subcomponent3/Component-preload.js.map @@ -1 +1 @@ -{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component-preload.js?bundle-code-0"],"mappings":"AAAA;AACA","sourcesContent":["sap.ui.require.preload({\n"],"sourceRoot":""}},{"offset":{"line":3,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA","sourceRoot":""}}]} \ No newline at end of file +{"version":3,"file":"Component-preload.js","sections":[{"offset":{"line":1,"column":0},"map":{"version":3,"names":[],"sources":["Component.js"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA","sourceRoot":""}}]} \ No newline at end of file diff --git a/test/lib/builder/sourceMaps.js b/test/lib/builder/sourceMaps.js index 40626deef..0ba21c712 100644 --- a/test/lib/builder/sourceMaps.js +++ b/test/lib/builder/sourceMaps.js @@ -21,6 +21,7 @@ test.beforeEach((t) => { generatedFilePath, sourceFilePath, code, + generatedCode = code, tracedName = undefined }) { const generatedFile = await readDestFile(generatedFilePath); @@ -28,8 +29,9 @@ test.beforeEach((t) => { const sourceMap = JSON.parse(await readDestFile(generatedFilePath + ".map")); const tracer = new AnyMap(sourceMap); - const generatedCodeIndex = generatedFile.indexOf(code); - t.not(generatedCodeIndex, -1, `Code '${code}' must be present in generated code file '${generatedFilePath}'`); + const generatedCodeIndex = generatedFile.indexOf(generatedCode); + t.not(generatedCodeIndex, -1, + `Code '${generatedCode}' must be present in generated code file '${generatedFilePath}'`); const codeLineColumn = lineColumn(generatedFile).fromIndex(generatedCodeIndex); @@ -44,7 +46,7 @@ test.beforeEach((t) => { if (tracedName) { t.is(tracedCode.name, tracedName); } - + // TODO: in case of bundles (sap.ui.predefine), the code below has to be adjusted const sourceCodeIndex = lineColumn(sourceFile).toIndex(tracedCode.line, tracedCode.column + 1); t.is( sourceFile.substring(sourceCodeIndex, sourceCodeIndex + code.length), code, @@ -115,6 +117,7 @@ test.serial("Verify source maps (test.application)", async (t) => { generatedFilePath: "Component-preload.js", sourceFilePath: "JavaScriptSourceWithCopyrightPlaceholder-dbg.js", code: "sap.ui.define(", + generatedCode: "sap.ui.predefine(", tracedName: "sap" }); await t.context.assertSourceMapping(t, { diff --git a/test/lib/lbt/bundle/Builder.js b/test/lib/lbt/bundle/Builder.js index b28e4597b..d7bd33c26 100644 --- a/test/lib/lbt/bundle/Builder.js +++ b/test/lib/lbt/bundle/Builder.js @@ -181,11 +181,7 @@ test("integration: createBundle EVOBundleFormat (ui5loader.js)", async (t) => { t.is(oResult.name, "Component-preload.js"); const expectedContent = `//@ui5-bundle Component-preload.js window["sap-ui-optimized"] = true; -sap.ui.require.preload({ - "jquery.sap.global-dbg.js":function(){ -sap.ui.define([], function(){return {};}); -} -},"preload-section"); +sap.ui.predefine("jquery.sap.global-dbg", [], function(){return {};}); //@ui5-bundle-raw-include myModule.js (function(){window.mine = {};}()); sap.ui.requireSync("ui5loader"); @@ -289,7 +285,6 @@ test("integration: createBundle EVOBundleFormat, using predefine calls", async ( const builder = new Builder(pool); const oResult = await builder.createBundle(bundleDefinition, { - usePredefineCalls: true, numberOfParts: 1, decorateBootstrapModule: true, optimize: true @@ -415,7 +410,6 @@ test("integration: createBundle EVOBundleFormat, using predefine calls, no optim const builder = new Builder(pool); const oResult = await builder.createBundle(bundleDefinition, { - usePredefineCalls: true, numberOfParts: 1, decorateBootstrapModule: true, optimize: false @@ -496,8 +490,7 @@ test("integration: createBundle (bootstrap bundle)", async (t) => { numberOfParts: 1, decorateBootstrapModule: true, addTryCatchRestartWrapper: true, - optimize: true, - usePredefineCalls: true + optimize: true }); t.is(oResult.name, "bootstrap.js"); const expectedContent = `//@ui5-bundle bootstrap.js @@ -574,11 +567,7 @@ test("integration: Legacy test: createBundle without ui5loader.js presence also const oResult = await builder.createBundle(bundleDefinition, {numberOfParts: 1, decorateBootstrapModule: true}); t.is(oResult.name, "Component-preload.js"); const expectedContent = `//@ui5-bundle Component-preload.js -sap.ui.require.preload({ - "jquery.sap.global-dbg.js":function(){ -sap.ui.define([], function(){/* comment */ return {};}); -} -},"preload-section"); +sap.ui.predefine("jquery.sap.global-dbg", [], function(){/* comment */ return {};}); //@ui5-bundle-raw-include myModule.js (function(){window.mine = {};}()); sap.ui.requireSync("sap-ui-core"); @@ -645,8 +634,7 @@ test("integration: createBundle (bootstrap bundle, UI5BundleFormat)", async (t) numberOfParts: 1, decorateBootstrapModule: true, addTryCatchRestartWrapper: true, - optimize: true, - usePredefineCalls: true + optimize: true }); t.is(oResult.name, "bootstrap.js"); const expectedContent = `//@ui5-bundle bootstrap.js @@ -894,11 +882,7 @@ test.serial("integration: createBundle with depCache", async (t) => { const oResult = await builder.createBundle(bundleDefinition, {}); t.is(oResult.name, "library-depCache-preload.js"); const expectedContent = `//@ui5-bundle library-depCache-preload.js -sap.ui.require.preload({ - "a.js":function(){ -sap.ui.define(["./b", "./c2"],function(b, c){return {};}); -} -},"preload-section"); +sap.ui.predefine("a", ["./b", "./c2"],function(b, c){return {};}); sap.ui.loader.config({depCacheUI5:{ "a.js": ["b.js","c2.js"], "c2.js": ["c1.js","c3.js"], @@ -1052,11 +1036,7 @@ test.serial("integration: createBundle with depCache with NO dependencies", asyn const oResult = await builder.createBundle(bundleDefinition, {}); t.is(oResult.name, "library-depCache-preload.js"); const expectedContent = `//@ui5-bundle library-depCache-preload.js -sap.ui.require.preload({ - "a.js":function(){ -sap.ui.define([],function(){return {};}); -} -},"preload-section"); +sap.ui.predefine("a", [],function(){return {};}); ${SOURCE_MAPPING_URL}=library-depCache-preload.js.map `; t.deepEqual(oResult.content, expectedContent, "EVOBundleFormat " + @@ -1122,7 +1102,6 @@ ${SOURCE_MAPPING_URL}=jquery.sap.global.js.map` const builder = new Builder(pool); const oResult = await builder.createBundle(bundleDefinition, { - usePredefineCalls: true, optimize: false }); t.is(oResult.name, "Component-preload.js"); @@ -1221,7 +1200,6 @@ ${SOURCE_MAPPING_URL}=jquery.sap.global.js.map` const builder = new Builder(pool); const oResult = await builder.createBundle(bundleDefinition, { - usePredefineCalls: true, numberOfParts: 1, decorateBootstrapModule: true, optimize: false @@ -1336,7 +1314,6 @@ ${SOURCE_MAPPING_URL}=jquery.sap.global.js.map` const builder = new Builder(pool); const oResult = await builder.createBundle(bundleDefinition, { - usePredefineCalls: true, numberOfParts: 1, decorateBootstrapModule: true, optimize: false @@ -1556,7 +1533,6 @@ ${SOURCE_MAPPING_URL}=jquery.sap.dom.js.map` const builder = new Builder(pool); const oResult = await builder.createBundle(bundleDefinition, { - usePredefineCalls: true, numberOfParts: 1, decorateBootstrapModule: true, optimize: false @@ -1736,7 +1712,6 @@ sap.ui.define(function() { const builder = new Builder(pool); const oResult = await builder.createBundle(bundleDefinition, { - usePredefineCalls: true, numberOfParts: 1, decorateBootstrapModule: true, optimize: false @@ -1860,7 +1835,6 @@ ${SOURCE_MAPPING_URL}=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjo const builder = new Builder(pool); const oResult = await builder.createBundle(bundleDefinition, { - usePredefineCalls: true, numberOfParts: 1, decorateBootstrapModule: true, optimize: false diff --git a/test/lib/processors/bundlers/moduleBundler.js b/test/lib/processors/bundlers/moduleBundler.js index 6fdb7b451..f250a8b5a 100644 --- a/test/lib/processors/bundlers/moduleBundler.js +++ b/test/lib/processors/bundlers/moduleBundler.js @@ -100,7 +100,6 @@ test.serial("Builder returns single bundle", async (t) => { sourceMap: true, decorateBootstrapModule: false, addTryCatchRestartWrapper: false, - usePredefineCalls: false, numberOfParts: 1, ignoreMissingModules: false, @@ -212,7 +211,6 @@ test.serial("Builder returns multiple bundles", async (t) => { sourceMap: true, decorateBootstrapModule: false, addTryCatchRestartWrapper: false, - usePredefineCalls: false, numberOfParts: 1, ignoreMissingModules: false, @@ -301,7 +299,6 @@ test.serial("bundleOptions default (no options passed)", async (t) => { sourceMap: true, decorateBootstrapModule: false, addTryCatchRestartWrapper: false, - usePredefineCalls: false, numberOfParts: 1, ignoreMissingModules: false }, @@ -366,7 +363,6 @@ test.serial("bundleOptions default (empty options passed)", async (t) => { sourceMap: true, decorateBootstrapModule: false, addTryCatchRestartWrapper: false, - usePredefineCalls: false, numberOfParts: 1, ignoreMissingModules: false }, @@ -389,7 +385,6 @@ test.serial("bundleOptions (all options passed)", async (t) => { sourceMap: false, decorateBootstrapModule: true, addTryCatchRestartWrapper: true, - usePredefineCalls: true, numberOfParts: 7, ignoreMissingModules: true }; @@ -447,7 +442,6 @@ test.serial("Passes ignoreMissingModules bundleOption to LocatorResourcePool", a "sourceMap": true, "decorateBootstrapModule": false, "addTryCatchRestartWrapper": false, - "usePredefineCalls": false, "numberOfParts": 1, "ignoreMissingModules": "foo" @@ -535,7 +529,6 @@ test.serial("Verbose Logging", async (t) => { "sourceMap": true, "decorateBootstrapModule": false, "addTryCatchRestartWrapper": false, - "usePredefineCalls": false, "numberOfParts": 1, "ignoreMissingModules": false, diff --git a/test/lib/tasks/bundlers/generateLibraryPreload.js b/test/lib/tasks/bundlers/generateLibraryPreload.js index 7b7901be7..08013f02c 100644 --- a/test/lib/tasks/bundlers/generateLibraryPreload.js +++ b/test/lib/tasks/bundlers/generateLibraryPreload.js @@ -79,7 +79,6 @@ test.serial("generateLibraryPreload", async (t) => { }, bundleOptions: { optimize: true, - usePredefineCalls: true, ignoreMissingModules: true } }, @@ -108,7 +107,6 @@ test.serial("generateLibraryPreload", async (t) => { }, bundleOptions: { optimize: true, - usePredefineCalls: true, ignoreMissingModules: true, skipIfEmpty: true } @@ -134,7 +132,6 @@ test.serial("generateLibraryPreload", async (t) => { }, bundleOptions: { optimize: false, - usePredefineCalls: true, ignoreMissingModules: true, skipIfEmpty: true } @@ -209,8 +206,7 @@ test.serial("generateLibraryPreload for sap.ui.core (w/o ui5loader.js)", async ( bundleOptions: { optimize: true, decorateBootstrapModule: true, - addTryCatchRestartWrapper: true, - usePredefineCalls: true + addTryCatchRestartWrapper: true } }, resources @@ -240,8 +236,7 @@ test.serial("generateLibraryPreload for sap.ui.core (w/o ui5loader.js)", async ( bundleOptions: { optimize: false, decorateBootstrapModule: false, - addTryCatchRestartWrapper: false, - usePredefineCalls: false + addTryCatchRestartWrapper: false } }, resources @@ -289,8 +284,7 @@ test.serial("generateLibraryPreload for sap.ui.core (w/o ui5loader.js)", async ( bundleOptions: { optimize: true, decorateBootstrapModule: true, - addTryCatchRestartWrapper: true, - usePredefineCalls: true + addTryCatchRestartWrapper: true } }, resources @@ -331,8 +325,7 @@ test.serial("generateLibraryPreload for sap.ui.core (w/o ui5loader.js)", async ( bundleOptions: { optimize: false, decorateBootstrapModule: false, - addTryCatchRestartWrapper: false, - usePredefineCalls: false + addTryCatchRestartWrapper: false } }, resources @@ -390,7 +383,6 @@ test.serial("generateLibraryPreload for sap.ui.core (w/o ui5loader.js)", async ( }, bundleOptions: { optimize: true, - usePredefineCalls: true, ignoreMissingModules: true } }, @@ -507,8 +499,7 @@ test.serial("generateLibraryPreload for sap.ui.core (/w ui5loader.js)", async (t bundleOptions: { optimize: true, decorateBootstrapModule: true, - addTryCatchRestartWrapper: true, - usePredefineCalls: true + addTryCatchRestartWrapper: true } }, resources @@ -538,8 +529,7 @@ test.serial("generateLibraryPreload for sap.ui.core (/w ui5loader.js)", async (t bundleOptions: { optimize: false, decorateBootstrapModule: false, - addTryCatchRestartWrapper: false, - usePredefineCalls: false + addTryCatchRestartWrapper: false }, moduleNameMapping: {} }, @@ -588,8 +578,7 @@ test.serial("generateLibraryPreload for sap.ui.core (/w ui5loader.js)", async (t bundleOptions: { optimize: true, decorateBootstrapModule: true, - addTryCatchRestartWrapper: true, - usePredefineCalls: true + addTryCatchRestartWrapper: true } }, resources @@ -630,8 +619,7 @@ test.serial("generateLibraryPreload for sap.ui.core (/w ui5loader.js)", async (t bundleOptions: { optimize: false, decorateBootstrapModule: false, - addTryCatchRestartWrapper: false, - usePredefineCalls: false + addTryCatchRestartWrapper: false }, moduleNameMapping: {} }, @@ -690,7 +678,6 @@ test.serial("generateLibraryPreload for sap.ui.core (/w ui5loader.js)", async (t }, bundleOptions: { optimize: true, - usePredefineCalls: true, ignoreMissingModules: true } }, @@ -719,7 +706,6 @@ test.serial("generateLibraryPreload for sap.ui.core (/w ui5loader.js)", async (t }, bundleOptions: { optimize: true, - usePredefineCalls: true, ignoreMissingModules: true, skipIfEmpty: true } @@ -745,7 +731,6 @@ test.serial("generateLibraryPreload for sap.ui.core (/w ui5loader.js)", async (t }, bundleOptions: { optimize: false, - usePredefineCalls: true, ignoreMissingModules: true, skipIfEmpty: true } @@ -849,8 +834,7 @@ test.serial("generateLibraryPreload for sap.ui.core with old specVersion defined bundleOptions: { optimize: true, decorateBootstrapModule: true, - addTryCatchRestartWrapper: true, - usePredefineCalls: true + addTryCatchRestartWrapper: true } }, resources @@ -880,8 +864,7 @@ test.serial("generateLibraryPreload for sap.ui.core with old specVersion defined bundleOptions: { optimize: false, decorateBootstrapModule: false, - addTryCatchRestartWrapper: false, - usePredefineCalls: false + addTryCatchRestartWrapper: false }, moduleNameMapping: {} }, @@ -930,8 +913,7 @@ test.serial("generateLibraryPreload for sap.ui.core with old specVersion defined bundleOptions: { optimize: true, decorateBootstrapModule: true, - addTryCatchRestartWrapper: true, - usePredefineCalls: true + addTryCatchRestartWrapper: true } }, resources @@ -972,8 +954,7 @@ test.serial("generateLibraryPreload for sap.ui.core with old specVersion defined bundleOptions: { optimize: false, decorateBootstrapModule: false, - addTryCatchRestartWrapper: false, - usePredefineCalls: false + addTryCatchRestartWrapper: false }, moduleNameMapping: {} }, @@ -1032,7 +1013,6 @@ test.serial("generateLibraryPreload for sap.ui.core with old specVersion defined }, bundleOptions: { optimize: true, - usePredefineCalls: true, ignoreMissingModules: true } }, @@ -1061,7 +1041,6 @@ test.serial("generateLibraryPreload for sap.ui.core with old specVersion defined }, bundleOptions: { optimize: true, - usePredefineCalls: true, ignoreMissingModules: true, skipIfEmpty: true } @@ -1087,7 +1066,6 @@ test.serial("generateLibraryPreload for sap.ui.core with old specVersion defined }, bundleOptions: { optimize: false, - usePredefineCalls: true, ignoreMissingModules: true, skipIfEmpty: true } @@ -1196,7 +1174,6 @@ test.serial("generateLibraryPreload for sap.ui.core with own bundle configuratio }, bundleOptions: { optimize: true, - usePredefineCalls: true, ignoreMissingModules: true } }, @@ -1225,7 +1202,6 @@ test.serial("generateLibraryPreload for sap.ui.core with own bundle configuratio }, bundleOptions: { optimize: true, - usePredefineCalls: true, ignoreMissingModules: true, skipIfEmpty: true } @@ -1251,7 +1227,6 @@ test.serial("generateLibraryPreload for sap.ui.core with own bundle configuratio }, bundleOptions: { optimize: false, - usePredefineCalls: true, ignoreMissingModules: true, skipIfEmpty: true } @@ -1371,7 +1346,6 @@ test.serial("generateLibraryPreload for sap.ui.core with own bundle configuratio }, bundleOptions: { optimize: true, - usePredefineCalls: true, ignoreMissingModules: true } }, @@ -1400,7 +1374,6 @@ test.serial("generateLibraryPreload for sap.ui.core with own bundle configuratio }, bundleOptions: { optimize: true, - usePredefineCalls: true, ignoreMissingModules: true, skipIfEmpty: true } @@ -1426,7 +1399,6 @@ test.serial("generateLibraryPreload for sap.ui.core with own bundle configuratio }, bundleOptions: { optimize: false, - usePredefineCalls: true, ignoreMissingModules: true, skipIfEmpty: true } @@ -1550,7 +1522,6 @@ test.serial("generateLibraryPreload with excludes", async (t) => { }, bundleOptions: { optimize: true, - usePredefineCalls: true, ignoreMissingModules: true } }, @@ -1617,7 +1588,6 @@ test.serial("generateLibraryPreload with invalid excludes", async (t) => { }, bundleOptions: { optimize: true, - usePredefineCalls: true, ignoreMissingModules: true } },