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

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 <!-- INSERT-NEW-ENTRIES-HERE -->
 
+## 2.0.0-alpha.4 (2024-09-16)
+
+- adjust plugins ([bc2343a](https://github.com/xfiveco/generator-chisel/commit/bc2343a))
+- bug fixes, phpcs and twigcs fixes ([118297b](https://github.com/xfiveco/generator-chisel/commit/118297b))
+- remove lint staged (it is in coding standards) ([e51b4b6](https://github.com/xfiveco/generator-chisel/commit/e51b4b6))
+- remove unnecessary gitignore ([f48e528](https://github.com/xfiveco/generator-chisel/commit/f48e528))
+- scripts enqueueing fixes ([5a8badf](https://github.com/xfiveco/generator-chisel/commit/5a8badf))
+- theme gitignore update ([9ef8d60](https://github.com/xfiveco/generator-chisel/commit/9ef8d60))
+- twig cs adjustments ([84493cd](https://github.com/xfiveco/generator-chisel/commit/84493cd))
+
 ## 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))

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

@@ -1 +1,2 @@
 /build
+/vendor

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

@@ -127,7 +127,7 @@ class Assets implements Instance {
 						'localize' => array(
 							'name' => 'chiselScripts',
 							'data' => array(
-								'logoData' => Helpers::get_login_page_logo_url(),
+								'logoUrl' => Helpers::get_login_page_logo_url(),
 							),
 						),
 					),
@@ -259,9 +259,10 @@ class Assets implements Instance {
 		if ( $this->frontend_styles ) {
 			foreach ( $this->frontend_styles as $handle => $args ) {
 				$enqueue_style = apply_filters( 'chisel_enqueue_frontend_style', true, $handle, $args );
+				$style_handle  = self::get_final_handle( $handle );
 
-				if ( $enqueue_style ) {
-					wp_enqueue_style( self::get_final_handle( $handle ) );
+				if ( $enqueue_style && wp_style_is( $style_handle, 'registered' ) ) {
+					wp_enqueue_style( $style_handle );
 
 					// Enqueue js file for fast refresh of the css file.
 					$this->enqueue_style_js_for_dev( $handle );
@@ -272,9 +273,10 @@ class Assets implements Instance {
 		if ( $this->frontend_scripts ) {
 			foreach ( $this->frontend_scripts as $handle => $args ) {
 				$enqueue_script = apply_filters( 'chisel_enqueue_frontend_script', true, $handle, $args );
+				$script_handle  = self::get_final_handle( $handle );
 
-				if ( $enqueue_script ) {
-					wp_enqueue_script( self::get_final_handle( $handle ) );
+				if ( $enqueue_script && wp_script_is( $script_handle, 'registered' ) ) {
+					wp_enqueue_script( $script_handle );
 					$this->set_script_translations( $handle, $args );
 				}
 			}
@@ -291,9 +293,10 @@ class Assets implements Instance {
 		if ( $this->admin_styles ) {
 			foreach ( $this->admin_styles as $handle => $args ) {
 				$enqueue_style = apply_filters( 'chisel_enqueue_admin_style', true, $handle, $args );
+				$style_handle  = self::get_final_handle( $handle );
 
-				if ( $enqueue_style ) {
-					wp_enqueue_style( self::get_final_handle( $handle ) );
+				if ( $enqueue_style && wp_style_is( $style_handle, 'registered' ) ) {
+					wp_enqueue_style( $style_handle );
 
 					// Enqueue js file for fast refresh of the css file.
 					$this->enqueue_style_js_for_dev( $handle );
@@ -304,9 +307,10 @@ class Assets implements Instance {
 		if ( $this->admin_scripts ) {
 			foreach ( $this->admin_scripts as $handle => $args ) {
 				$enqueue_script = apply_filters( 'chisel_enqueue_admin_script', true, $handle, $args );
+				$script_handle  = self::get_final_handle( $handle );
 
-				if ( $enqueue_script ) {
-					wp_enqueue_script( self::get_final_handle( $handle ) );
+				if ( $enqueue_script && wp_script_is( $script_handle, 'registered' ) ) {
+					wp_enqueue_script( $script_handle );
 					$this->set_script_translations( $handle, $args );
 				}
 			}
@@ -323,9 +327,10 @@ class Assets implements Instance {
 		if ( $this->editor_styles ) {
 			foreach ( $this->editor_styles as $handle => $args ) {
 				$enqueue_style = apply_filters( 'chisel_enqueue_editor_style', true, $handle, $args );
+				$style_handle  = self::get_final_handle( $handle );
 
-				if ( $enqueue_style ) {
-					wp_enqueue_style( self::get_final_handle( $handle ) );
+				if ( $enqueue_style && wp_style_is( $style_handle, 'registered' ) ) {
+					wp_enqueue_style( $style_handle );
 
 					// Enqueue js file for fast refresh of the css file.
 					$this->enqueue_style_js_for_dev( $handle );
@@ -336,9 +341,10 @@ class Assets implements Instance {
 		if ( $this->editor_scripts ) {
 			foreach ( $this->editor_scripts as $handle => $args ) {
 				$enqueue_script = apply_filters( 'chisel_enqueue_editor_script', true, $handle, $args );
+				$script_handle  = self::get_final_handle( $handle );
 
-				if ( $enqueue_script ) {
-					wp_enqueue_script( self::get_final_handle( $handle ) );
+				if ( $enqueue_script && wp_script_is( $script_handle, 'registered' ) ) {
+					wp_enqueue_script( $script_handle );
 					$this->set_script_translations( $handle, $args );
 				}
 			}
@@ -364,9 +370,10 @@ class Assets implements Instance {
 		if ( $this->login_styles ) {
 			foreach ( $this->login_styles as $handle => $args ) {
 				$enqueue_style = apply_filters( 'chisel_enqueue_login_style', true, $handle, $args );
+				$style_handle  = self::get_final_handle( $handle );
 
-				if ( $enqueue_style ) {
-					wp_enqueue_style( self::get_final_handle( $handle ) );
+				if ( $enqueue_style && wp_style_is( $style_handle, 'registered' ) ) {
+					wp_enqueue_style( $style_handle );
 
 					// Enqueue js file for fast refresh of the css file.
 					$this->enqueue_style_js_for_dev( $handle );
@@ -377,9 +384,10 @@ class Assets implements Instance {
 		if ( $this->login_scripts ) {
 			foreach ( $this->login_scripts as $handle => $args ) {
 				$enqueue_script = apply_filters( 'chisel_enqueue_login_script', true, $handle, $args );
+				$script_handle  = self::get_final_handle( $handle );
 
-				if ( $enqueue_script ) {
-					wp_enqueue_script( self::get_final_handle( $handle ) );
+				if ( $enqueue_script && wp_script_is( $script_handle, 'registered' ) ) {
+					wp_enqueue_script( $script_handle );
 					$this->set_script_translations( $handle, $args );
 				}
 			}

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

@@ -189,7 +189,7 @@ abstract class RegisterBlocks {
 									$block
 								);
 
-								if ( ! in_array( $script, $ignore_scripts ) ) {
+								if ( ! in_array( $script, $ignore_scripts, true ) ) {
 									wp_register_script(
 										$block_handle,
 										$file_url,

package/lib/commands/create/creators/app/chisel-starter-theme/src/blocks-acf/slider/slider.twig

@@ -1,12 +1,12 @@
-{% set slidesHtml = '' %}
+{% set slides_html = '' %}
 
 <div {{ wrapper_attributes }} data-block-id="{{ block.id }}">
   <div class="b-slider__inner alignfull">
     {% if fields.acf_block_slider_slides is not empty %}
       {% for slide in fields.acf_block_slider_slides %}
         {% if slide.acf_bs_image %}
-          {% set slidesHtml %}
-            {{slidesHtml}}
+          {% set slides_html %}
+            {{ slides_html }}
             <div class="b-slider__slide swiper-slide" data-thumbnail-url="{{ get_image(slide.acf_bs_image).src('medium') }}">
               {{ get_responsive_image(slide.acf_bs_image, 'large') }}
             </div>
@@ -15,7 +15,7 @@
       {% endfor %}
 
       {% include 'components/slider.twig' with {
-        slidesHtml,
+        slides_html,
         params: {
           'slides-per-view': 1,
           block_settings: fields.slider_options

package/lib/commands/create/creators/app/chisel-starter-theme/src/scripts/login.js

@@ -13,13 +13,16 @@ class LoginPage {
     };
 
     this.logo = this.loginPage.querySelector('#login h1 a');
+    this.logoUrl = chiselScripts?.logoUrl;
 
-    this.setLogoImage();
+    if (this.logoUrl) {
+      this.setLogoImage();
+    }
   }
 
   setLogoImage() {
     if (this.logo) {
-      this.logo.setAttribute('style', `background-image: url("${chiselScripts.logoUrl}");`);
+      this.logo.setAttribute('style', `background-image: url("${this.logoUrl}");`);
       this.logo.setAttribute('aria-hidden', 'true');
       this.logo.parentElement.classList.add(this.classnames.loaded);
     }

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

@@ -78,10 +78,7 @@
       ],
       "duotone": [
         {
-          "colors": [
-            "#2a1468",
-            "#ff6d54"
-          ],
+          "colors": ["#2a1468", "#ff6d54"],
           "slug": "primary-secondary",
           "name": "Primary & Secondary"
         }
@@ -185,7 +182,7 @@
               "fontStyle": "normal",
               "fontStretch": "normal",
               "fontDisplay": "swap",
-              "src": [ "file:./fonts/quicksand-regular.woff2" ]
+              "src": ["file:./assets/fonts/quicksand-regular.woff2"]
             },
             {
               "fontFamily": "Quicksand",
@@ -193,7 +190,7 @@
               "fontStyle": "normal",
               "fontStretch": "normal",
               "fontDisplay": "swap",
-              "src": [ "file:./fonts/quicksand-700.woff2" ]
+              "src": ["file:./assets/fonts/quicksand-700.woff2"]
             }
           ]
         }
@@ -206,21 +203,14 @@
       "width": false
     },
     "layout": {
-        "contentSize": "1200px",
-        "wideSize": "1440px"
+      "contentSize": "1200px",
+      "wideSize": "1440px"
     },
     "spacing": {
       "blockGap": false,
       "margin": false,
       "padding": false,
-      "units": [
-        "%",
-        "px",
-        "em",
-        "rem",
-        "vh",
-        "vw"
-      ],
+      "units": ["%", "px", "em", "rem", "vh", "vw"],
       "defaultSpacingSizes": false,
       "spacingScale": {
         "operator": "+",

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

@@ -3,10 +3,14 @@ declare(strict_types=1);
 
 use FriendsOfTwig\Twigcs;
 
-$finder = Twigcs\Finder\TemplateFinder::create()->in( __DIR__ . '/views' );
+$finder_1 = Twigcs\Finder\TemplateFinder::create()->in( __DIR__ . '/views' );
+$finder_2 = Twigcs\Finder\TemplateFinder::create()->in( __DIR__ . '/build/blocks' );
+$finder_3 = Twigcs\Finder\TemplateFinder::create()->in( __DIR__ . '/build/blocks-acf' );
 
 return Twigcs\Config\Config::create()
-	->addFinder( $finder )
+	->addFinder( $finder_1 )
+	->addFinder( $finder_2 )
+	->addFinder( $finder_3 )
 	->setName( 'chisel' )
 	->setSeverity( 'warning' )
 	->setDisplay( Twigcs\Config\ConfigInterface::DISPLAY_BLOCKING )

package/lib/commands/create/creators/app/chisel-starter-theme/views/404.twig

@@ -1,7 +1,7 @@
 {% extends "single.twig" %}
 
 {% block inner_content %}
-  <h1>{{ __( '404 - Not found', 'chisel' ) }}</h1>
-  <h2>{{ __( 'Sorry, we couldn\'t find what you\'re looking for', 'chisel' ) }}</h2>
+  <h1>{{ __('404 - Not found', 'chisel') }}</h1>
+  <h2>{{ __('Sorry, we couldn\'t find what you\'re looking for', 'chisel') }}</h2>
 {% endblock %}
 

package/lib/commands/create/creators/app/chisel-starter-theme/views/components/slider.twig

@@ -6,7 +6,7 @@
     <!-- Additional required wrapper -->
     <div class="swiper-wrapper c-slider__slides">
       <!-- Slides html. Each slide must have a 'swiper-slide' class -->
-      {{ slidesHtml }}
+      {{ slides_html }}
     </div>
   </div>
 </div>

package/lib/commands/create/creators/wp-plugins/plugins.json

@@ -1,8 +1,6 @@
 {
   "plugins": {
-    "Classic Editor": "classic-editor",
     "WP Premium: Gravity Forms": "https://github.com/wp-premium/gravityforms/archive/master.zip",
-    "WP Sync DB": "https://github.com/wp-sync-db/wp-sync-db/archive/master.zip",
-    "WP Sync DB Media File Addon": "https://github.com/wp-sync-db/wp-sync-db-media-files/archive/master.zip"
+    "WP Migrate Lite": "wp-migrate-db"
   }
 }

package/lib/commands/create/packages-versions.js

@@ -1,5 +1,5 @@
 module.exports = {
   'chisel-scripts': '2.0.0-alpha.1',
   'chisel-shared-utils': '2.0.0-alpha.0',
-  'generator-chisel': '2.0.0-alpha.3',
+  'generator-chisel': '2.0.0-alpha.4',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-chisel",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.4",
   "description": "A generator for scaffolding front-end and WordPress projects",
   "bin": {
     "chisel": "bin/chisel.js"
@@ -37,5 +37,5 @@
     "tinyqueue": "^2.0.3",
     "update-notifier": "^4.1.0"
   },
-  "gitHead": "135a429a7af5deaae61c03de28371129ae21a34c"
+  "gitHead": "1bc07b55d6086064ee99ae4feae40bd97d90b711"
 }

package/lib/commands/create/creators/app/chisel-starter-theme/lint-staged.config.mjs

@@ -1,8 +0,0 @@
-const listStagedConfig = {
-  '*.{cjs,mjs,js,jsx,ts,tsx}': ['eslint --fix'],
-  '*.vue': ['stylelint --fix', 'eslint --fix --allow-empty-input'],
-  '*.{json,md,yml}': ['prettier --write'],
-  '*.{css,scss}': ['stylelint --fix --allow-empty-input'],
-};
-
-export default listStagedConfig;