From 1cb0915ab22ef36f57a768c968c510a1492e89f2 Mon Sep 17 00:00:00 2001 From: Florian Vogt Date: Mon, 23 May 2022 17:24:32 +0200 Subject: [PATCH 1/2] [INTERNAL] Task generateLibraryPreload: Exclude component preload artefacts from library preload --- lib/tasks/bundlers/generateLibraryPreload.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/bundlers/generateLibraryPreload.js b/lib/tasks/bundlers/generateLibraryPreload.js index b24c1b02e..458169365 100644 --- a/lib/tasks/bundlers/generateLibraryPreload.js +++ b/lib/tasks/bundlers/generateLibraryPreload.js @@ -7,7 +7,7 @@ function getDefaultLibraryPreloadFilters(namespace, excludes) { const filters = [ `${namespace}/`, `${namespace}/**/manifest.json`, - `!${namespace}/*-preload.js`, // exclude all bundles + `!${namespace}/**/*-preload.js`, // exclude all bundles `!${namespace}/designtime/`, `!${namespace}/**/*.designtime.js`, `!${namespace}/**/*.support.js` From 30880a1bbff99609da9240fd566d87fa635dc724 Mon Sep 17 00:00:00 2001 From: Florian Vogt Date: Tue, 14 Jun 2022 11:07:03 +0200 Subject: [PATCH 2/2] [INTERNAL] adjust tests --- .../lib/tasks/bundlers/generateLibraryPreload.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/lib/tasks/bundlers/generateLibraryPreload.js b/test/lib/tasks/bundlers/generateLibraryPreload.js index 464750e4e..7c9f72965 100644 --- a/test/lib/tasks/bundlers/generateLibraryPreload.js +++ b/test/lib/tasks/bundlers/generateLibraryPreload.js @@ -65,7 +65,7 @@ test.serial("generateLibraryPreload", async (t) => { filters: [ "my/lib/", "my/lib/**/manifest.json", - "!my/lib/*-preload.js", + "!my/lib/**/*-preload.js", "!my/lib/designtime/", "!my/lib/**/*.designtime.js", "!my/lib/**/*.support.js", @@ -354,7 +354,7 @@ test.serial("generateLibraryPreload for sap.ui.core (w/o ui5loader.js)", async ( filters: [ "sap/ui/core/", "sap/ui/core/**/manifest.json", - "!sap/ui/core/*-preload.js", + "!sap/ui/core/**/*-preload.js", "!sap/ui/core/designtime/", "!sap/ui/core/**/*.designtime.js", "!sap/ui/core/**/*.support.js", @@ -636,7 +636,7 @@ test.serial("generateLibraryPreload for sap.ui.core (/w ui5loader.js)", async (t filters: [ "sap/ui/core/", "sap/ui/core/**/manifest.json", - "!sap/ui/core/*-preload.js", + "!sap/ui/core/**/*-preload.js", "!sap/ui/core/designtime/", "!sap/ui/core/**/*.designtime.js", "!sap/ui/core/**/*.support.js", @@ -970,7 +970,7 @@ test.serial("generateLibraryPreload for sap.ui.core with old specVersion defined filters: [ "sap/ui/core/", "sap/ui/core/**/manifest.json", - "!sap/ui/core/*-preload.js", + "!sap/ui/core/**/*-preload.js", "!sap/ui/core/designtime/", "!sap/ui/core/**/*.designtime.js", "!sap/ui/core/**/*.support.js", @@ -1126,7 +1126,7 @@ test.serial("generateLibraryPreload for sap.ui.core with own bundle configuratio filters: [ "sap/ui/core/", "sap/ui/core/**/manifest.json", - "!sap/ui/core/*-preload.js", + "!sap/ui/core/**/*-preload.js", "!sap/ui/core/designtime/", "!sap/ui/core/**/*.designtime.js", "!sap/ui/core/**/*.support.js", @@ -1293,7 +1293,7 @@ test.serial("generateLibraryPreload for sap.ui.core with own bundle configuratio filters: [ "sap/ui/core/", "sap/ui/core/**/manifest.json", - "!sap/ui/core/*-preload.js", + "!sap/ui/core/**/*-preload.js", "!sap/ui/core/designtime/", "!sap/ui/core/**/*.designtime.js", "!sap/ui/core/**/*.support.js", @@ -1482,7 +1482,7 @@ test.serial("generateLibraryPreload with excludes", async (t) => { filters: [ "my/lib/", "my/lib/**/manifest.json", - "!my/lib/*-preload.js", + "!my/lib/**/*-preload.js", "!my/lib/designtime/", "!my/lib/**/*.designtime.js", "!my/lib/**/*.support.js", @@ -1553,7 +1553,7 @@ test.serial("generateLibraryPreload with invalid excludes", async (t) => { filters: [ "my/lib/", "my/lib/**/manifest.json", - "!my/lib/*-preload.js", + "!my/lib/**/*-preload.js", "!my/lib/designtime/", "!my/lib/**/*.designtime.js", "!my/lib/**/*.support.js"