feat: improve build process (#1039)

* feat: improve build process

* fix: fix script path

Author: HardeepAsrani

.distignore

@@ -18,10 +18,9 @@ composer.lock
 package-lock.json
 key.enc
 js/FeedzyBlock
-js/Onboarding/import-onboarding.js
-js/ActionPopup/action-popup.js
-js/ActionPopup/Actions.js
-js/ActionPopup/SortableItem.js
+js/Onboarding/
+js/ActionPopup/
+js/FeedBack/
 webpack.config.js
 dist
 cypress
@@ -39,5 +38,3 @@ docker-compose.travis.yml
 .nvmrc
 .releaserc.yml
 docker-compose.ci.yml
-FeedBack/feedback.js
-FeedBack/feedback-form.js

.gitignore

@@ -12,4 +12,5 @@ cypress/fixtures
 cypress.env.json
 .phpunit.result.cache
 js/build
+/build
 artifacts

includes/admin/feedzy-rss-feeds-admin.php

@@ -197,8 +197,8 @@ public function enqueue_styles_admin() {
 		$upsell_screens = array( 'feedzy-rss_page_feedzy-settings', 'feedzy-rss_page_feedzy-admin-menu-pro-upsell' );
 		if ( 'feedzy_imports' === $screen->post_type && 'edit' !== $screen->base ) {
 
-			$asset_file = include FEEDZY_ABSPATH . '/js/build/action-popup.asset.php';
-			wp_enqueue_script( $this->plugin_name . '_action_popup', FEEDZY_ABSURL . 'js/build/action-popup.js', array_merge( $asset_file['dependencies'], array( 'wp-editor', 'wp-api' ) ), $asset_file['version'], true );
+			$asset_file = include FEEDZY_ABSPATH . '/build/action-popup/index.asset.php';
+			wp_enqueue_script( $this->plugin_name . '_action_popup', FEEDZY_ABSURL . 'build/action-popup/index.js', array_merge( $asset_file['dependencies'], array( 'wp-editor', 'wp-api' ) ), $asset_file['version'], true );
 
 			wp_localize_script(
 				$this->plugin_name . '_action_popup',
@@ -217,8 +217,8 @@ public function enqueue_styles_admin() {
 			$this->register_survey();
 		}
 		if ( ! defined( 'TI_CYPRESS_TESTING' ) && ( 'edit' !== $screen->base && 'feedzy_imports' === $screen->post_type && feedzy_show_import_tour() ) ) {
-			$asset_file = include FEEDZY_ABSPATH . '/js/build/import-onboarding.asset.php';
-			wp_enqueue_script( $this->plugin_name . '_on_boarding', FEEDZY_ABSURL . 'js/build/import-onboarding.js', array_merge( $asset_file['dependencies'], array( 'wp-editor', 'wp-api' ) ), $asset_file['version'], true );
+			$asset_file = include FEEDZY_ABSPATH . '/build/onboarding/index.asset.php';
+			wp_enqueue_script( $this->plugin_name . '_on_boarding', FEEDZY_ABSURL . 'build/onboarding/index.js', array_merge( $asset_file['dependencies'], array( 'wp-editor', 'wp-api' ) ), $asset_file['version'], true );
 			wp_set_script_translations( $this->plugin_name . '_on_boarding', 'feedzy-rss-feeds' );
 		}
 
@@ -231,8 +231,8 @@ public function enqueue_styles_admin() {
 
 			$this->register_survey();
 
-			$asset_file = include FEEDZY_ABSPATH . '/js/build/feedback.asset.php';
-			wp_enqueue_script( $this->plugin_name . '_feedback', FEEDZY_ABSURL . 'js/build/feedback.js', array_merge( $asset_file['dependencies'], array( 'wp-editor', 'wp-api', 'lodash' ) ), $asset_file['version'], true );
+			$asset_file = include FEEDZY_ABSPATH . '/build/feedback/index.asset.php';
+			wp_enqueue_script( $this->plugin_name . '_feedback', FEEDZY_ABSURL . 'build/feedback/index.js', array_merge( $asset_file['dependencies'], array( 'wp-editor', 'wp-api', 'lodash' ) ), $asset_file['version'], true );
 			wp_enqueue_style( 'wp-block-editor' );
 
 			wp_localize_script(

includes/gutenberg/feedzy-rss-feeds-gutenberg-block.php

@@ -51,7 +51,7 @@ private function __construct() {
 	 */
 	public function feedzy_gutenberg_scripts() {
 		// Dependent WordPress core libraries.
-		$asset_file = include FEEDZY_ABSPATH . '/js/build/block.asset.php';
+		$asset_file = include FEEDZY_ABSPATH . '/build/block/index.asset.php';
 		$depends = array_merge( $asset_file['dependencies'], array( 'wp-i18n', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-editor', 'wp-api', 'lodash', 'wp-hooks', 'jquery-ui-autocomplete' ) );
 
 		// Remove "wp-editor" script for widget block.
@@ -63,7 +63,7 @@ public function feedzy_gutenberg_scripts() {
 		}
 
 		// Enqueue the bundled block JS file
-		wp_enqueue_script( 'feedzy-gutenberg-block-js', FEEDZY_ABSURL . 'js/build/block.js', $depends, $asset_file['version'], true );
+		wp_enqueue_script( 'feedzy-gutenberg-block-js', FEEDZY_ABSURL . 'build/block/index.js', $depends, $asset_file['version'], true );
 
 		wp_set_script_translations( 'feedzy-gutenberg-block-js', 'feedzy-rss-feeds' );
 
@@ -80,7 +80,7 @@ public function feedzy_gutenberg_scripts() {
 
 		// Enqueue editor block styles
 		wp_enqueue_style( 'feedzy-block-css', FEEDZY_ABSURL . 'css/feedzy-rss-feeds.css', array(), $this->version );
-		wp_enqueue_style( 'feedzy-gutenberg-block-css', FEEDZY_ABSURL . 'js/build/style-block.css', array(), $this->version );
+		wp_enqueue_style( 'feedzy-gutenberg-block-css', FEEDZY_ABSURL . 'build/block/style-index.css', array(), $this->version );
 	}
 
 	/**

js/ActionPopup/action-popup.js renamed to js/ActionPopup/index.js

@@ -4,7 +4,7 @@
  * Block dependencies
  */
 import './style.scss';
-import blockAttributes from './attributes';
+import blockAttributes from './attributes.js';
 import Editor from './Editor.js';
 
 /**
@@ -17,22 +17,22 @@ const { registerBlockType } = wp.blocks;
 /**
  * Register block
  */
-export default registerBlockType( 'feedzy-rss-feeds/feedzy-block', {
-	title: __( 'Feedzy RSS Feeds', 'feedzy-rss-feeds' ),
+export default registerBlockType('feedzy-rss-feeds/feedzy-block', {
+	title: __('Feedzy RSS Feeds', 'feedzy-rss-feeds'),
 	category: 'common',
 	icon: 'rss',
 	keywords: [
-		__( 'Feedzy RSS Feeds', 'feedzy-rss-feeds' ),
-		__( 'RSS', 'feedzy-rss-feeds' ),
-		__( 'Feeds', 'feedzy-rss-feeds' ),
+		__('Feedzy RSS Feeds', 'feedzy-rss-feeds'),
+		__('RSS', 'feedzy-rss-feeds'),
+		__('Feeds', 'feedzy-rss-feeds'),
 	],
 	supports: {
 		html: false,
 	},
 	attributes: blockAttributes,
 	edit: Editor,
 	save() {
-			// Rendering in PHP
-			return null;
+		// Rendering in PHP
+		return null;
 	},
 });