Move assets to includes so it builds correctly with plugin-zip.

GatherPress · Dec 23, 2024 · 2f56e1f · 2f56e1f
1 parent 544a262
commit 2f56e1f
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 5 deletions.
diff --git a/build/blocks/icon/index.asset.php b/build/blocks/icon/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => '1b4ece6e84f08bd51024');
+<?php return array('dependencies' => array('react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => 'bde5c36600fbb0593248');
diff --git a/build/blocks/icon/index.js b/build/blocks/icon/index.js
diff --git a/build/blocks/icon/render.php b/build/blocks/icon/render.php
@@ -11,7 +11,7 @@
 $gatherpress_icon         = ! empty( $attributes['icon'] ) ? $attributes['icon'] : 'nametag';
 $gatherpress_icon_color   = ! empty( $attributes['iconColor'] ) ? $attributes['iconColor'] : 'inherit';
 $gatherpress_icon_size    = ! empty( $attributes['iconSize'] ) ? $attributes['iconSize'] : 20;
-$gatherpress_svg_base_url = GATHERPRESS_CORE_URL . '/assets/svg/';
+$gatherpress_svg_base_url = GATHERPRESS_CORE_URL . '/includes/assets/svg/';
 $gatherpress_svg_url      = $gatherpress_svg_base_url . $gatherpress_icon . '.svg';
 $gatherpress_svg_content  = '<svg><text x="0" y="15">' . esc_html__( 'SVG Error', 'gatherpress' ) . '</text></svg>';
 $gatherpress_response     = wp_safe_remote_get( $gatherpress_svg_url );

diff --git a/assets/svg/calendar.svg → includes/assets/svg/calendar.svg b/assets/svg/calendar.svg → includes/assets/svg/calendar.svg
diff --git a/assets/svg/dismiss.svg → includes/assets/svg/dismiss.svg b/assets/svg/dismiss.svg → includes/assets/svg/dismiss.svg
diff --git a/assets/svg/editor-help.svg → includes/assets/svg/editor-help.svg b/assets/svg/editor-help.svg → includes/assets/svg/editor-help.svg
diff --git a/assets/svg/location.svg → includes/assets/svg/location.svg b/assets/svg/location.svg → includes/assets/svg/location.svg
diff --git a/assets/svg/nametag.svg → includes/assets/svg/nametag.svg b/assets/svg/nametag.svg → includes/assets/svg/nametag.svg
diff --git a/assets/svg/yes-alt.svg → includes/assets/svg/yes-alt.svg b/assets/svg/yes-alt.svg → includes/assets/svg/yes-alt.svg
diff --git a/src/blocks/icon/edit.js b/src/blocks/icon/edit.js
@@ -17,7 +17,7 @@ const Edit = ({ attributes, setAttributes }) => {
 	const blockProps = useBlockProps();
 	const { icon, iconColor, iconSize } = attributes;
 	const [svgContent, setSvgContent] = useState('');
-	const svgBaseUrl = `${getFromGlobal('urls.pluginUrl')}assets/svg/`;
+	const svgBaseUrl = `${getFromGlobal('urls.pluginUrl')}includes/assets/svg/`;
 
 	// Icon original source: https://github.com/WordPress/dashicons/tree/master/svg-min.
 	const ICON_OPTIONS = [

diff --git a/src/blocks/icon/render.php b/src/blocks/icon/render.php
@@ -11,7 +11,7 @@
 $gatherpress_icon         = ! empty( $attributes['icon'] ) ? $attributes['icon'] : 'nametag';
 $gatherpress_icon_color   = ! empty( $attributes['iconColor'] ) ? $attributes['iconColor'] : 'inherit';
 $gatherpress_icon_size    = ! empty( $attributes['iconSize'] ) ? $attributes['iconSize'] : 20;
-$gatherpress_svg_base_url = GATHERPRESS_CORE_URL . '/assets/svg/';
+$gatherpress_svg_base_url = GATHERPRESS_CORE_URL . '/includes/assets/svg/';
 $gatherpress_svg_url      = $gatherpress_svg_base_url . $gatherpress_icon . '.svg';
 $gatherpress_svg_content  = '<svg><text x="0" y="15">' . esc_html__( 'SVG Error', 'gatherpress' ) . '</text></svg>';
 $gatherpress_response     = wp_safe_remote_get( $gatherpress_svg_url );
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => '1b4ece6e84f08bd51024');
		<?php return array('dependencies' => array('react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => 'bde5c36600fbb0593248');