Skip to content

Commit

Permalink
fix: declare webpackChunkName in more generated dynamic imports (#8029)
Browse files Browse the repository at this point in the history
  • Loading branch information
scameron authored Dec 20, 2023
1 parent 2443b8e commit c85fa23
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
4 changes: 2 additions & 2 deletions packages/icons-business-suite/src/json-imports/Icons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ const loadIconsBundle = async (collection: string): Promise<CollectionData> => {
let iconData: CollectionData;

if (collection === "business-suite-v1") {
iconData = (await import("../generated/assets/v1/SAP-icons-business-suite.json")).default;
iconData = (await import(/* webpackChunkName: "ui5-webcomponents-sap-icons-business-suite-v1" */ "../generated/assets/v1/SAP-icons-business-suite.json")).default;
} else {
iconData = (await import("../generated/assets/v2/SAP-icons-business-suite.json")).default;
iconData = (await import(/* webpackChunkName: "ui5-webcomponents-sap-icons-business-suite-v2" */ "../generated/assets/v2/SAP-icons-business-suite.json")).default;
}

if (typeof iconData === "string" && (iconData as string).endsWith(".json")) {
Expand Down
4 changes: 2 additions & 2 deletions packages/icons-tnt/src/json-imports/Icons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ const loadIconsBundle = async (collection: string): Promise<CollectionData> => {
let iconData: CollectionData;

if (collection === "tnt-v3") {
iconData = (await import("../generated/assets/v3/SAP-icons-TNT.json")).default;
iconData = (await import(/* webpackChunkName: "ui5-webcomponents-sap-icons-tnt-v3" */ "../generated/assets/v3/SAP-icons-TNT.json")).default;
} else {
iconData = (await import("../generated/assets/v2/SAP-icons-TNT.json")).default;
iconData = (await import(/* webpackChunkName: "ui5-webcomponents-sap-icons-tnt-v2" */ "../generated/assets/v2/SAP-icons-TNT.json")).default;
}

if (typeof iconData === "string" && (iconData as string).endsWith(".json")) {
Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/json-imports/Icons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ const loadIconsBundle = async (collection: string): Promise<CollectionData> => {
let iconData: CollectionData;

if (collection === "SAP-icons-v5") {
iconData = (await import("../generated/assets/v5/SAP-icons.json")).default;
iconData = (await import(/* webpackChunkName: "ui5-webcomponents-sap-icons-v5" */ "../generated/assets/v5/SAP-icons.json")).default;
} else {
iconData = (await import("../generated/assets/v4/SAP-icons.json")).default;
iconData = (await import(/* webpackChunkName: "ui5-webcomponents-sap-icons-v4" */ "../generated/assets/v4/SAP-icons.json")).default;
}

if (typeof iconData === "string" && (iconData as string).endsWith(".json")) {
Expand Down
10 changes: 6 additions & 4 deletions packages/tools/lib/generate-js-imports/illustrations.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
const fs = require("fs").promises;
const path = require("path");

const generateDynamicImportLines = (fileNames, location, exclusionPatterns = []) => {
const generateDynamicImportLines = async (fileNames, location, exclusionPatterns = []) => {
const packageName = JSON.parse(await fs.readFile("package.json")).name;
return fileNames
.filter((fileName) => !exclusionPatterns.some((pattern) => fileName.startsWith(pattern)))
.map((fileName) => {
const illustrationPath = `${location}/${fileName.replace(".js", "")}`;
return `\t\tcase "${fileName.replace('.js', '')}": return (await import("${illustrationPath}.js")).default;`;
const illustrationName = fileName.replace(".js", "");
const illustrationPath = `${location}/${illustrationName}`;
return `\t\tcase "${fileName.replace('.js', '')}": return (await import(/* webpackChunkName: "${packageName.replace("@", "").replace("/", "-")}-${illustrationName.toLowerCase()}" */ "${illustrationPath}.js")).default;`;
})
.join("\n");
};
Expand Down Expand Up @@ -57,7 +59,7 @@ const generateIllustrations = async (config) => {

const illustrations = await getMatchingFiles(normalizedInputFolder, /^.*\.js$/);

const dynamicImports = generateDynamicImportLines(illustrations, location, filterOut);
const dynamicImports = await generateDynamicImportLines(illustrations, location, filterOut);
const availableIllustrations = generateAvailableIllustrationsArray(illustrations, filterOut);

const contentDynamic = generateDynamicImportsFileContent(dynamicImports, availableIllustrations, collection, prefix);
Expand Down

0 comments on commit c85fa23

Please sign in to comment.