From 4321d3b1881dfc24d303420eae367a70adf62f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Ka=CC=88gy?= Date: Fri, 24 Jan 2025 16:17:27 +0100 Subject: [PATCH 1/2] fix include viewStyle assets in dynamic version generation --- packages/toolkit/utils/blocks.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/toolkit/utils/blocks.js b/packages/toolkit/utils/blocks.js index 884cd59e..4e3666b6 100644 --- a/packages/toolkit/utils/blocks.js +++ b/packages/toolkit/utils/blocks.js @@ -58,9 +58,11 @@ const transformBlockJson = (content, absoluteFilename) => { return content; } const metadata = JSON.parse(rawMetadata); - const { version, style } = metadata; + const { version, style = [], viewStyle = [] } = metadata; const styleArray = Array.isArray(style) ? style : [style]; + const viewStyleArray = Array.isArray(viewStyle) ? viewStyle : [viewStyle]; + const combinedStylesArray = [...styleArray, ...viewStyleArray]; // check whether the style property is defined and a local file path const isFilePath = styleArray?.some((styleName) => styleName?.startsWith('file:')); @@ -71,7 +73,7 @@ const transformBlockJson = (content, absoluteFilename) => { let styleFileContentHash = ''; if (!hasVersion && isFilePath) { - styleArray.forEach((rawStylePath) => { + combinedStylesArray.forEach((rawStylePath) => { if (!rawStylePath.startsWith('file:')) { return; } From b7da8ffd4bcf1412e54a3090ff17f61f5fb6915a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20K=C3=A4gy?= Date: Fri, 24 Jan 2025 16:42:56 +0100 Subject: [PATCH 2/2] Create nervous-berries-speak.md --- .changeset/nervous-berries-speak.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/nervous-berries-speak.md diff --git a/.changeset/nervous-berries-speak.md b/.changeset/nervous-berries-speak.md new file mode 100644 index 00000000..2bf05b7c --- /dev/null +++ b/.changeset/nervous-berries-speak.md @@ -0,0 +1,5 @@ +--- +"10up-toolkit": patch +--- + +Fix include `viewStyle` assets in dynamic version generation