Move custom status code to use wp-scripts for build

Automattic · Jul 3, 2024 · 19ea35c · 19ea35c
1 parent 033671f
commit 19ea35c
Show file tree

Hide file tree

Showing 15 changed files with 722 additions and 117 deletions.
diff --git a/dist/custom-status.build.js b/dist/custom-status.build.js
diff --git a/dist/custom-status.editor.build.css → ...custom-status/custom-status-block-rtl.css b/dist/custom-status.editor.build.css → ...custom-status/custom-status-block-rtl.css
diff --git a/dist/modules/custom-status/custom-status-block.asset.php b/dist/modules/custom-status/custom-status-block.asset.php
@@ -0,0 +1 @@
+<?php return array('dependencies' => array('react'), 'version' => 'd499527222d690cb38d4');
diff --git a/dist/custom-status.style.build.css → ...les/custom-status/custom-status-block.css b/dist/custom-status.style.build.css → ...les/custom-status/custom-status-block.css
diff --git a/dist/modules/custom-status/custom-status-block.js b/dist/modules/custom-status/custom-status-block.js
diff --git a/dist/modules/custom-status/custom-status-configure.asset.php b/dist/modules/custom-status/custom-status-configure.asset.php
@@ -0,0 +1 @@
+<?php return array('dependencies' => array(), 'version' => '837699e101f2aeb6350d');
diff --git a/dist/modules/custom-status/custom-status-configure.js b/dist/modules/custom-status/custom-status-configure.js
diff --git a/dist/modules/custom-status/custom-status.asset.php b/dist/modules/custom-status/custom-status.asset.php
@@ -0,0 +1 @@
+<?php return array('dependencies' => array(), 'version' => '1c7a08568863b55d7808');
diff --git a/dist/modules/custom-status/custom-status.js b/dist/modules/custom-status/custom-status.js
diff --git a/modules/custom-status/custom-status.php b/modules/custom-status/custom-status.php
@@ -271,8 +271,9 @@ public function disable_custom_statuses_for_post_type( $post_type = null ) {
 		public function action_admin_enqueue_scripts() {
 			// Load Javascript we need to use on the configuration views (jQuery Sortable and Quick Edit)
 			if ( $this->is_whitelisted_settings_view( $this->module->name ) ) {
-				wp_enqueue_script( 'jquery-ui-sortable' );
-				wp_enqueue_script( 'vip-workflow-custom-status-configure', $this->module_url . 'lib/custom-status-configure.js', [ 'jquery', 'jquery-ui-sortable', 'vip-workflow-settings-js' ], VIP_WORKFLOW_VERSION, true );
+				$asset_file   = include VIP_WORKFLOW_ROOT . '/dist/modules/custom-status/custom-status-configure.asset.php';
+				$dependencies = [ ...$asset_file['dependencies'], 'jquery', 'jquery-ui-sortable', 'vip-workflow-settings-js' ];
+				wp_enqueue_script( 'vip-workflow-custom-status-configure', VIP_WORKFLOW_URL . 'dist/modules/custom-status/custom-status-configure.js', $dependencies, $asset_file['version'], true );
 
 				wp_localize_script( 'vip-workflow-custom-status-configure', '__vw_localize_custom_status_configure', [
 					'delete_status_string' => __( 'Are you sure you want to delete the post status? All posts with this status will be assigned to the default status.', 'vip-workflow' ),
@@ -281,7 +282,10 @@ public function action_admin_enqueue_scripts() {
 
 			// Custom javascript to modify the post status dropdown where it shows up
 			if ( $this->is_whitelisted_page() ) {
-				wp_enqueue_script( 'vip_workflow-custom_status', $this->module_url . 'lib/custom-status.js', [ 'jquery', 'post' ], VIP_WORKFLOW_VERSION, true );
+				$asset_file   = include VIP_WORKFLOW_ROOT . '/dist/modules/custom-status/custom-status.asset.php';
+				$dependencies = [ ...$asset_file['dependencies'], 'jquery', 'post' ];
+				wp_enqueue_script( 'vip_workflow-custom_status', VIP_WORKFLOW_URL . 'dist/modules/custom-status/custom-status.js', $dependencies, $asset_file['version'], true );
+
 				wp_localize_script('vip_workflow-custom_status', '__vw_localize_custom_status', [
 					'no_change' => esc_html__( '&mdash; No Change &mdash;', 'vip-workflow' ),
 					'published' => esc_html__( 'Published', 'vip-workflow' ),
@@ -297,15 +301,17 @@ public function action_admin_enqueue_scripts() {
 		public function load_scripts_for_block_editor() {
 			global $post;
 
-			wp_enqueue_script( 'vip-workflow-block-custom-status-script', VIP_WORKFLOW_URL . 'dist/custom-status.build.js', [ 'wp-blocks', 'wp-element', 'wp-edit-post', 'wp-plugins', 'wp-components' ], VIP_WORKFLOW_VERSION );
+			$asset_file   = include VIP_WORKFLOW_ROOT . '/dist/modules/custom-status/custom-status-block.asset.php';
+			$dependencies = [ ...$asset_file['dependencies'], 'wp-blocks', 'wp-element', 'wp-edit-post', 'wp-plugins', 'wp-components' ];
+			wp_enqueue_script( 'vip-workflow-block-custom-status-script', VIP_WORKFLOW_URL . 'dist/modules/custom-status/custom-status-block.js', $dependencies, $asset_file['version'], true );
 
 			$custom_statuses = apply_filters( 'vw_custom_status_list', $this->get_custom_statuses(), $post );
-
 			wp_localize_script( 'vip-workflow-block-custom-status-script', 'VipWorkflowCustomStatuses', array_values( $custom_statuses ) );
 		}
 
 		public function load_styles_for_block_editor() {
-			wp_enqueue_style( 'vip-workflow-block-custom-status-styles', VIP_WORKFLOW_URL . 'dist/custom-status.editor.build.css', false, VIP_WORKFLOW_VERSION );
+			$asset_file = include VIP_WORKFLOW_ROOT . '/dist/modules/custom-status/custom-status-block.asset.php';
+			wp_enqueue_style( 'edit-flow-workflow-manager-styles', VIP_WORKFLOW_URL . 'dist/modules/custom-status/custom-status-block.css', [ 'wp-components' ], $asset_file['version'] );
 		}
 
 		/**

diff --git a/modules/custom-status/lib/custom-status-block.js b/modules/custom-status/lib/custom-status-block.js
@@ -1,5 +1,4 @@
 import './editor.scss';
-import './style.scss';
 
 const { __ } = wp.i18n;
 const { PluginPostStatusInfo } = wp.editPost;

diff --git a/modules/custom-status/lib/style.scss b/modules/custom-status/lib/style.scss
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<?php return array('dependencies' => array('react'), 'version' => 'd499527222d690cb38d4');