generator-chisel 2.0.0-alpha.1 → 2.0.0-alpha.3

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 <!-- INSERT-NEW-ENTRIES-HERE -->
 
+## 2.0.0-alpha.3 (2024-09-13)
+
+- refactor, adjustments, css spliting, comments, 3rd party integration classes ([e1fe3cd](https://github.com/xfiveco/generator-chisel/commit/e1fe3cd))
+- update blocks path, add action hooks ([e20d184](https://github.com/xfiveco/generator-chisel/commit/e20d184))
+
+## 2.0.0-alpha.2 (2024-09-10)
+
+- correct gitignore ([22542dc](https://github.com/xfiveco/generator-chisel/commit/22542dc))
+
 ## 2.0.0-alpha.1 (2024-09-10)
 
 - adjust commands ([b289bd8](https://github.com/xfiveco/generator-chisel/commit/b289bd8))

package/lib/commands/create/creators/app/chisel-starter-theme/.gitignore.chisel-tpl

@@ -0,0 +1 @@
+/build

package/lib/commands/create/creators/app/chisel-starter-theme/acf-json/group_666eb7f38d2ed.json

@@ -2,49 +2,49 @@
   "key": "group_666eb7f38d2ed",
   "title": "Page Title",
   "fields": [
-    {
-      "key": "field_666eb7f40c492",
-      "label": "Page Title",
-      "name": "page_title_display",
-      "aria-label": "",
-      "type": "select",
-      "instructions": "",
-      "required": 0,
-      "conditional_logic": 0,
-      "wrapper": {
-        "width": "",
-        "class": "",
-        "id": ""
-      },
-      "choices": {
-        "show": "Show",
-        "hide-visually": "Hide visually",
-        "hide": "Hide"
-      },
-      "default_value": "show",
-      "return_format": "value",
-      "multiple": 0,
-      "allow_null": 0,
-      "ui": 0,
-      "ajax": 0,
-      "placeholder": ""
-    }
-  ],
-  "location": [
-    [
-      {
-        "param": "post_type",
-        "operator": "==",
-        "value": "post"
-      }
-    ],
-    [
       {
-        "param": "post_type",
-        "operator": "==",
-        "value": "page"
+          "key": "field_666eb7f40c492",
+          "label": "Page Title",
+          "name": "page_title_display",
+          "aria-label": "",
+          "type": "select",
+          "instructions": "",
+          "required": 0,
+          "conditional_logic": 0,
+          "wrapper": {
+              "width": "",
+              "class": "",
+              "id": ""
+          },
+          "choices": {
+              "show": "Show",
+              "hide-visually": "Hide visually",
+              "hide": "Hide"
+          },
+          "default_value": "show",
+          "return_format": "value",
+          "multiple": 0,
+          "allow_null": 0,
+          "ui": 0,
+          "ajax": 0,
+          "placeholder": ""
       }
-    ]
+  ],
+  "location": [
+      [
+          {
+              "param": "post_type",
+              "operator": "==",
+              "value": "post"
+          }
+      ],
+      [
+          {
+              "param": "post_type",
+              "operator": "==",
+              "value": "page"
+          }
+      ]
   ],
   "menu_order": -10,
   "position": "side",
@@ -55,5 +55,5 @@
   "active": true,
   "description": "",
   "show_in_rest": 0,
-  "modified": 1723819074
+  "modified": 1725978564
 }

package/lib/commands/create/creators/app/chisel-starter-theme/acf-json/group_66d5a4ebb41cd.json

@@ -144,5 +144,5 @@
   "active": false,
   "description": "For cloning only",
   "show_in_rest": 0,
-  "modified": 1725978785
+  "modified": 1726064786
 }

package/lib/commands/create/creators/app/chisel-starter-theme/classes/Acf.php

@@ -61,16 +61,13 @@ class Acf implements Instance {
 	 * Set ACF options pages.
 	 */
 	public function set_options_pages() {
-		$this->acf_options_pages = apply_filters(
-			'chisel_acf_options_pages',
-			array(
-				// phpcs:disable
-				// array(
-				// 	'menu_slug'  => 'theme-settings',
-				// 	'page_title' => __( 'Theme Settings', 'chisel' ),
-				// ),
-				// phpcs:enable
-			)
+		$this->acf_options_pages = array(
+			// phpcs:disable
+			// array(
+			// 	'menu_slug'  => 'theme-settings',
+			// 	'page_title' => __( 'Theme Settings', 'chisel' ),
+			// ),
+			// phpcs:enable
 		);
 	}
 
@@ -78,18 +75,15 @@ class Acf implements Instance {
 	 * Set ACF options sub pages.
 	 */
 	public function set_options_sub_pages() {
-		$this->acf_options_sub_pages = apply_filters(
-			'chisel_acf_options_sub_pages',
-			array(
-				// phpcs:disable
-				// array(
-				// 	'menu_slug'   => 'theme-sub-settings',
-				// 	'page_title'  => __( 'Theme Sub settings', 'chisel' ),
-				// 	'menu_title'  => __( 'Theme Sub settings', 'chisel' ),
-				// 	'parent_slug' => 'theme-settings',
-				// ),
-				// phpcs:enable
-			)
+		$this->acf_options_sub_pages = array(
+			// phpcs:disable
+			// array(
+			// 	'menu_slug'   => 'theme-sub-settings',
+			// 	'page_title'  => __( 'Theme Sub settings', 'chisel' ),
+			// 	'menu_title'  => __( 'Theme Sub settings', 'chisel' ),
+			// 	'parent_slug' => 'theme-settings',
+			// ),
+			// phpcs:enable
 		);
 	}
 
@@ -97,6 +91,9 @@ class Acf implements Instance {
 	 * Register ACF options pages.
 	 */
 	public function options_pages() {
+		$this->acf_options_pages     = apply_filters( 'chisel_acf_options_pages', $this->acf_options_pages );
+		$this->acf_options_sub_pages = apply_filters( 'chisel_acf_options_sub_pages', $this->acf_options_sub_pages );
+
 		if ( $this->acf_options_pages && function_exists( 'acf_add_options_page' ) ) {
 			foreach ( $this->acf_options_pages as $data ) {
 				$this->register_options_page( $data, 'page' );

package/lib/commands/create/creators/app/chisel-starter-theme/classes/AcfBlocks.php

@@ -35,7 +35,7 @@ class AcfBlocks extends RegisterBlocks implements Instance {
 	 * Set properties.
 	 */
 	public function set_properties() {
-		$this->blocks_twig_base_path = 'src/blocks-acf/';
+		$this->blocks_twig_base_path = 'build/blocks-acf/';
 	}
 
 	/**

package/lib/commands/create/creators/app/chisel-starter-theme/classes/Ajax.php

@@ -45,11 +45,8 @@ class Ajax extends \WP_REST_Controller implements Instance {
 	 * Set properties.
 	 */
 	public function set_properties() {
-		$this->routes = apply_filters(
-			'chisel_ajax_routes',
-			array(
-				'load-more' => array(),
-			)
+		$this->routes = array(
+			'load-more' => array(),
 		);
 	}
 
@@ -71,20 +68,24 @@ class Ajax extends \WP_REST_Controller implements Instance {
 	 * @return void
 	 */
 	public function register_endpoints() {
-		foreach ( $this->routes as $route_name => $route_params ) {
-			$route   = sprintf( self::ROUTE_BASE . '/%s/', $route_name );
-			$methods = isset( $route_params['methods'] ) ? $route_params['methods'] : array( 'POST' );
-
-			register_rest_route(
-				self::ROUTE_NAMESPACE,
-				$route,
-				array(
-					'methods'             => $methods,
-					'callback'            => array( $this, 'callback' ),
-					'permission_callback' => array( $this, 'permissions_check' ),
-					'args'                => $this->get_endpoint_args_for_item_schema( true ),
-				)
-			);
+		$this->routes = apply_filters( 'chisel_ajax_routes', $this->routes );
+
+		if ( $this->routes ) {
+			foreach ( $this->routes as $route_name => $route_params ) {
+				$route   = sprintf( self::ROUTE_BASE . '/%s/', $route_name );
+				$methods = isset( $route_params['methods'] ) ? $route_params['methods'] : array( 'POST' );
+
+				register_rest_route(
+					self::ROUTE_NAMESPACE,
+					$route,
+					array(
+						'methods'             => $methods,
+						'callback'            => array( $this, 'callback' ),
+						'permission_callback' => array( $this, 'permissions_check' ),
+						'args'                => $this->get_endpoint_args_for_item_schema( true ),
+					)
+				);
+			}
 		}
 	}
 

package/lib/commands/create/creators/app/chisel-starter-theme/classes/Assets.php

@@ -96,93 +96,66 @@ class Assets implements Instance {
 		);
 
 		if ( ! is_admin() ) {
-			$this->frontend_styles = apply_filters(
-				'chisel_frontend_styles',
-				array(
-					'main'        => array(),
-					'woocommerce' => array(
-						'condition' => Woocommerce::is_woocommerce_active(),
-					),
-				)
+			$this->frontend_styles = array(
+				'main' => array(),
 			);
 
-			$this->frontend_scripts = apply_filters(
-				'chisel_frontend_scripts',
-				array(
-					'runtime' => $runtime_script,
-					'app'     => array(
-						'deps'     => array( 'wp-i18n' ),
-						'localize' => array(
-							'name' => 'chiselScripts',
-							'data' => array(
-								'ajax' => array(
-									'url'   => esc_url( Ajax::get_ajax_endpoint_url() ),
-									'nonce' => wp_create_nonce( 'wp_rest' ), // this (wp_rest) authenticates users and allows using get_current_user functions in rest api endpoints.
-								),
+			$this->frontend_scripts = array(
+				'runtime' => $runtime_script,
+				'app'     => array(
+					'deps'     => array( 'wp-i18n' ),
+					'localize' => array(
+						'name' => 'chiselScripts',
+						'data' => array(
+							'ajax' => array(
+								'url'   => esc_url( Ajax::get_ajax_endpoint_url() ),
+								'nonce' => wp_create_nonce( 'wp_rest' ), // this (wp_rest) authenticates users and allows using get_current_user functions in rest api endpoints.
 							),
 						),
 					),
-				)
+				),
 			);
 
 			if ( is_login() ) {
-				$this->login_styles = apply_filters(
-					'chisel_login_styles',
-					array(
-						'login' => array(),
-					)
+				$this->login_styles = array(
+					'login' => array(),
 				);
 
-				$this->login_scripts = apply_filters(
-					'chisel_login_scripts',
-					array(
-						'runtime' => $runtime_script,
-						'login'   => array(
-							'localize' => array(
-								'name' => 'chiselScripts',
-								'data' => array(
-									'logoUrl' => Helpers::get_login_page_logo_url(),
-								),
+				$this->login_scripts = array(
+					'runtime' => $runtime_script,
+					'login'   => array(
+						'localize' => array(
+							'name' => 'chiselScripts',
+							'data' => array(
+								'logoData' => Helpers::get_login_page_logo_url(),
 							),
 						),
-					)
+					),
 				);
 			}
 		} else {
-			$this->admin_styles = apply_filters(
-				'chisel_admin_styles',
-				array(
-					'admin' => array(),
-				)
+			$this->admin_styles = array(
+				'admin' => array(),
 			);
 
-			$this->admin_scripts = apply_filters(
-				'chisel_admin_scripts',
-				array(
-					'runtime' => $runtime_script,
-					'admin'   => array(
-						'localize' => array(
-							'name' => 'chiselAdminScripts',
-							'data' => array(
-								'acfColorPickerPalette' => Helpers::get_colors_palette( 'acf' ),
-							),
+			$this->admin_scripts = array(
+				'runtime' => $runtime_script,
+				'admin'   => array(
+					'localize' => array(
+						'name' => 'chiselAdminScripts',
+						'data' => array(
+							'acfColorPickerPalette' => Helpers::get_colors_palette( 'acf' ),
 						),
 					),
-				)
+				),
 			);
 
-			$this->editor_styles = apply_filters(
-				'chisel_editor_styles',
-				array(
-					'editor' => array(),
-				)
+			$this->editor_styles = array(
+				'editor' => array(),
 			);
 
-			$this->editor_scripts = apply_filters(
-				'chisel_editor_scripts',
-				array(
-					'editor' => array(),
-				)
+			$this->editor_scripts = array(
+				'editor' => array(),
 			);
 		}
 	}
@@ -212,11 +185,14 @@ class Assets implements Instance {
 	 * Register assets.
 	 */
 	public function register_assets() {
-		if ( $this->frontend_scripts ) {
-			foreach ( $this->frontend_scripts as $file_name => $args ) {
-				$this->register_script( self::get_final_handle( $file_name ), $file_name, $args );
-			}
-		}
+		$this->frontend_styles  = apply_filters( 'chisel_frontend_styles', $this->frontend_styles );
+		$this->frontend_scripts = apply_filters( 'chisel_frontend_scripts', $this->frontend_scripts );
+		$this->login_styles     = apply_filters( 'chisel_login_styles', $this->login_styles );
+		$this->login_scripts    = apply_filters( 'chisel_login_scripts', $this->login_scripts );
+		$this->admin_styles     = apply_filters( 'chisel_admin_styles', $this->admin_styles );
+		$this->admin_scripts    = apply_filters( 'chisel_admin_scripts', $this->admin_scripts );
+		$this->editor_styles    = apply_filters( 'chisel_editor_styles', $this->editor_styles );
+		$this->editor_scripts   = apply_filters( 'chisel_editor_scripts', $this->editor_scripts );
 
 		if ( $this->frontend_styles ) {
 			foreach ( $this->frontend_styles as $file_name => $args ) {
@@ -224,6 +200,12 @@ class Assets implements Instance {
 			}
 		}
 
+		if ( $this->frontend_scripts ) {
+			foreach ( $this->frontend_scripts as $file_name => $args ) {
+				$this->register_script( self::get_final_handle( $file_name ), $file_name, $args );
+			}
+		}
+
 		if ( $this->login_styles ) {
 			$login_styles_data = array();
 
@@ -242,20 +224,14 @@ class Assets implements Instance {
 			}
 		}
 
-		if ( $this->admin_scripts ) {
-			foreach ( $this->admin_scripts as $file_name => $args ) {
-				$this->register_script( self::get_final_handle( $file_name ), $file_name, $args );
-			}
-		}
-
 		if ( $this->admin_styles ) {
 			foreach ( $this->admin_styles as $file_name => $args ) {
 				$this->register_style( self::get_final_handle( $file_name ), $file_name, $args );
 			}
 		}
 
-		if ( $this->editor_scripts ) {
-			foreach ( $this->editor_scripts as $file_name => $args ) {
+		if ( $this->admin_scripts ) {
+			foreach ( $this->admin_scripts as $file_name => $args ) {
 				$this->register_script( self::get_final_handle( $file_name ), $file_name, $args );
 			}
 		}
@@ -265,25 +241,42 @@ class Assets implements Instance {
 				$this->register_style( self::get_final_handle( $file_name ), $file_name, $args );
 			}
 		}
+
+		if ( $this->editor_scripts ) {
+			foreach ( $this->editor_scripts as $file_name => $args ) {
+				$this->register_script( self::get_final_handle( $file_name ), $file_name, $args );
+			}
+		}
 	}
 
 	/**
 	 * Enqueue front-end assets.
 	 */
 	public function enqueue_frontend_assets() {
-		if ( $this->frontend_scripts ) {
-			foreach ( $this->frontend_scripts as $handle => $args ) {
-				wp_enqueue_script( self::get_final_handle( $handle ) );
-				$this->set_script_translations( $handle, $args );
-			}
-		}
+		$this->frontend_styles  = apply_filters( 'chisel_pre_enqueue_frontend_styles', $this->frontend_styles );
+		$this->frontend_scripts = apply_filters( 'chisel_pre_enqueue_frontend_scripts', $this->frontend_scripts );
 
 		if ( $this->frontend_styles ) {
 			foreach ( $this->frontend_styles as $handle => $args ) {
-				wp_enqueue_style( self::get_final_handle( $handle ) );
+				$enqueue_style = apply_filters( 'chisel_enqueue_frontend_style', true, $handle, $args );
+
+				if ( $enqueue_style ) {
+					wp_enqueue_style( self::get_final_handle( $handle ) );
+
+					// Enqueue js file for fast refresh of the css file.
+					$this->enqueue_style_js_for_dev( $handle );
+				}
+			}
+		}
+
+		if ( $this->frontend_scripts ) {
+			foreach ( $this->frontend_scripts as $handle => $args ) {
+				$enqueue_script = apply_filters( 'chisel_enqueue_frontend_script', true, $handle, $args );
 
-				// Enqueue js file for fast refresh of the css file.
-				$this->enqueue_style_js_for_dev( $handle );
+				if ( $enqueue_script ) {
+					wp_enqueue_script( self::get_final_handle( $handle ) );
+					$this->set_script_translations( $handle, $args );
+				}
 			}
 		}
 	}
@@ -292,19 +285,30 @@ class Assets implements Instance {
 	 * Enqueue admin assets.
 	 */
 	public function enqueue_admin_assets() {
-		if ( $this->admin_scripts ) {
-			foreach ( $this->admin_scripts as $handle => $args ) {
-				wp_enqueue_script( self::get_final_handle( $handle ) );
-				$this->set_script_translations( $handle, $args );
-			}
-		}
+		$this->admin_styles  = apply_filters( 'chisel_pre_enqueue_admin_styles', $this->admin_styles );
+		$this->admin_scripts = apply_filters( 'chisel_pre_enqueue_admin_scripts', $this->admin_scripts );
 
 		if ( $this->admin_styles ) {
 			foreach ( $this->admin_styles as $handle => $args ) {
-				wp_enqueue_style( self::get_final_handle( $handle ) );
+				$enqueue_style = apply_filters( 'chisel_enqueue_admin_style', true, $handle, $args );
+
+				if ( $enqueue_style ) {
+					wp_enqueue_style( self::get_final_handle( $handle ) );
+
+					// Enqueue js file for fast refresh of the css file.
+					$this->enqueue_style_js_for_dev( $handle );
+				}
+			}
+		}
+
+		if ( $this->admin_scripts ) {
+			foreach ( $this->admin_scripts as $handle => $args ) {
+				$enqueue_script = apply_filters( 'chisel_enqueue_admin_script', true, $handle, $args );
 
-				// Enqueue js file for fast refresh of the css file.
-				$this->enqueue_style_js_for_dev( $handle );
+				if ( $enqueue_script ) {
+					wp_enqueue_script( self::get_final_handle( $handle ) );
+					$this->set_script_translations( $handle, $args );
+				}
 			}
 		}
 	}
@@ -313,19 +317,30 @@ class Assets implements Instance {
 	 * Enqueue editor scripts.
 	 */
 	public function enqueue_editor_scripts() {
-		if ( $this->editor_scripts ) {
-			foreach ( $this->editor_scripts as $handle => $args ) {
-				wp_enqueue_script( self::get_final_handle( $handle ) );
-				$this->set_script_translations( $handle, $args );
-			}
-		}
+		$this->editor_styles  = apply_filters( 'chisel_pre_enqueue_editor_styles', $this->editor_styles );
+		$this->editor_scripts = apply_filters( 'chisel_pre_enqueue_editor_scripts', $this->editor_scripts );
 
 		if ( $this->editor_styles ) {
 			foreach ( $this->editor_styles as $handle => $args ) {
-				wp_enqueue_style( self::get_final_handle( $handle ) );
+				$enqueue_style = apply_filters( 'chisel_enqueue_editor_style', true, $handle, $args );
+
+				if ( $enqueue_style ) {
+					wp_enqueue_style( self::get_final_handle( $handle ) );
+
+					// Enqueue js file for fast refresh of the css file.
+					$this->enqueue_style_js_for_dev( $handle );
+				}
+			}
+		}
+
+		if ( $this->editor_scripts ) {
+			foreach ( $this->editor_scripts as $handle => $args ) {
+				$enqueue_script = apply_filters( 'chisel_enqueue_editor_script', true, $handle, $args );
 
-				// Enqueue js file for fast refresh of the css file.
-				$this->enqueue_style_js_for_dev( $handle );
+				if ( $enqueue_script ) {
+					wp_enqueue_script( self::get_final_handle( $handle ) );
+					$this->set_script_translations( $handle, $args );
+				}
 			}
 		}
 	}
@@ -340,19 +355,33 @@ class Assets implements Instance {
 			return;
 		}
 
+		$this->login_styles  = apply_filters( 'chisel_pre_enqueue_login_styles', $this->login_styles );
+		$this->login_scripts = apply_filters( 'chisel_pre_enqueue_login_scripts', $this->login_scripts );
+
 		wp_add_inline_style( 'global-styles', $stylesheet );
 		wp_enqueue_style( 'global-styles' );
 
-		if ( $this->login_scripts ) {
-			foreach ( $this->login_scripts as $handle => $args ) {
-				wp_enqueue_script( self::get_final_handle( $handle ) );
-				$this->set_script_translations( $handle, $args );
+		if ( $this->login_styles ) {
+			foreach ( $this->login_styles as $handle => $args ) {
+				$enqueue_style = apply_filters( 'chisel_enqueue_login_style', true, $handle, $args );
+
+				if ( $enqueue_style ) {
+					wp_enqueue_style( self::get_final_handle( $handle ) );
+
+					// Enqueue js file for fast refresh of the css file.
+					$this->enqueue_style_js_for_dev( $handle );
+				}
 			}
 		}
 
-		if ( $this->login_styles ) {
-			foreach ( $this->login_styles as $handle => $args ) {
-				wp_enqueue_style( self::get_final_handle( $handle ) );
+		if ( $this->login_scripts ) {
+			foreach ( $this->login_scripts as $handle => $args ) {
+				$enqueue_script = apply_filters( 'chisel_enqueue_login_script', true, $handle, $args );
+
+				if ( $enqueue_script ) {
+					wp_enqueue_script( self::get_final_handle( $handle ) );
+					$this->set_script_translations( $handle, $args );
+				}
 			}
 		}
 	}

package/lib/commands/create/creators/app/chisel-starter-theme/classes/Blocks.php

@@ -31,7 +31,7 @@ class Blocks extends RegisterBlocks implements Instance {
 	 *
 	 * @var string
 	 */
-	protected $blocks_twig_base_path = 'src/blocks/';
+	protected $blocks_twig_base_path = 'build/blocks/';
 
 	/**
 	 * Class constructor.
@@ -49,15 +49,12 @@ class Blocks extends RegisterBlocks implements Instance {
 	 * Set properties.
 	 */
 	public function set_properties() {
-		$this->blocks_category           = apply_filters( 'chisel_blocks_category', 'chisel-blocks' );
-		$this->block_patterns_categories = apply_filters(
-			'chisel_block_patterns_categories',
-			array(
-				'cta' => array(
-					'label'       => __( 'Call to Action', 'chisel' ),
-					'description' => __( 'Call to Action Sections.', 'chisel' ),
-				),
-			)
+		$this->blocks_category           = 'chisel-blocks';
+		$this->block_patterns_categories = array(
+			'cta' => array(
+				'label'       => __( 'Call to Action', 'chisel' ),
+				'description' => __( 'Call to Action Sections.', 'chisel' ),
+			),
 		);
 	}
 
@@ -142,7 +139,7 @@ class Blocks extends RegisterBlocks implements Instance {
 
 		foreach ( $this->block_patterns_categories as $slug => $category ) {
 			$category['label'] = '[Chisel] ' . $category['label'];
-			register_block_pattern_category( 'chisel-block-patterns-' . $slug, $category );
+			register_block_pattern_category( 'chisel-patterns/' . $slug, $category );
 		}
 	}