generator-chisel 2.3.3 → 2.4.0

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

@@ -1,7 +1,7 @@
 {% extends "base.twig" %}
 
 {% block content %}
-  <article id="post-{{ post.ID }}" class="c-post {{ post_classes(post.class) }}">
+  <article id="post-{{ post.ID }}" class="{{ post_classes(post.class) }}">
     <section class="o-wrapper__inner c-post__inner {{ wrapper_class }}">
 
       <div class="o-layout c-content{% if sidebar.content %} has-sidebar{% endif %}">
@@ -13,45 +13,57 @@
 
           {% block inner_content %}
 
-            <div class="c-post__meta">
-              <span class="c-post__author"><a href="{{ post.author.link }}">{{ __('By', 'chisel') }} {{ post.author.name }}</a></span> •
-              <time datetime="{{ post.date }}">{{ post.date }}</time></span>
-            </div>
-
-            {% if post.get_thumbnail('large') %}
-              <div class="c-post__image">
-                {{ post.get_thumbnail() }}
+            {% block post_meta %}
+              <div class="c-post__meta">
+                <span class="c-post__author"><a href="{{ post.author.link }}">{{ __('By', 'chisel') }} {{ post.author.name }}</a></span> •
+                <time datetime="{{ post.date }}">{{ post.date }}</time></span>
               </div>
-            {% endif %}
-
-            <div class="c-post__terms">
-              {% if post.categories %}
-                <p class="c-post__categories">
-                  {{ __('Categories', 'chisel') }}:
-                  {% for category in post.categories %}
-                    <span class="c-post__categories"><a href="{{ category.link }}">{{ category }}</a>{% if not loop.last %}, {% endif %}</span>
-                  {% endfor %}
-                </p>
-              {% endif %}
+            {% endblock %}
 
-              {% if post.tags %}
-                <p class="c-post__tags">
-                  {{ __('Tags', 'chisel') }}:
-                  {% for tag in post.tags %}
-                    <span class="c-post__tags"><a href="{{ tag.link }}">#{{ tag }}</a>{% if not loop.last %}, {% endif %}</span>
-                  {% endfor %}
-                </p>
+            {% block post_image %}
+              {% if post.get_thumbnail('large') %}
+                <div class="c-post__image">
+                  {{ post.get_thumbnail() }}
+                </div>
               {% endif %}
-            </div>
+            {% endblock %}
+
+            {% block post_terms %}
+              <div class="c-post__terms">
+                {% if post.categories %}
+                  <p class="c-post__categories">
+                    {{ __('Categories', 'chisel') }}:
+                    {% for category in post.categories %}
+                      <span class="c-post__categories"><a href="{{ category.link }}">{{ category }}</a>{% if not loop.last %}, {% endif %}</span>
+                    {% endfor %}
+                  </p>
+                {% endif %}
 
-            {{ post.content }}
+                {% if post.tags %}
+                  <p class="c-post__tags">
+                    {{ __('Tags', 'chisel') }}:
+                    {% for tag in post.tags %}
+                      <span class="c-post__tags"><a href="{{ tag.link }}">#{{ tag }}</a>{% if not loop.last %}, {% endif %}</span>
+                    {% endfor %}
+                  </p>
+                {% endif %}
+              </div>
+            {% endblock %}
+
+            {% block post_content %}
+              {{ post.content }}
+            {% endblock %}
 
-            {{ comments_template() }}
+            {% block post_comments %}
+              {{ comments_template() }}
+            {% endblock %}
           {% endblock %}
         </div>
 
         {% if sidebar.content %}
-          {% include 'sidebar-blog.twig' %}
+          {% block post_sidebar %}
+            {% include 'sidebar-blog.twig' %}
+          {% endblock %}
         {% endif %}
       </div>
     </section>

package/lib/commands/create/creators/app/chisel-starter-theme/views/woocommerce/content-product.twig

@@ -1,4 +1,4 @@
-<article class="{{ post_classes(post.class) }} c-product-item c-post-card">
+<article class="c-product-item c-post-card {{ post_classes(post.class) }}">
 
   {{ timber_set_product(post) }}
 

package/lib/commands/create/creators/app/index.js

@@ -14,7 +14,10 @@ module.exports = async (api) => {
   let app;
 
   const runLocalCurrent = (args, opts) =>
-    runLocal(args, { ...opts, cwd: api.resolve(app.themePath) });
+    runLocal(args, {
+      ...opts,
+      cwd: api.resolve(app.themePath),
+    });
 
   api.schedule(api.PRIORITIES.PROMPT, async () => {
     const userName = execa('git', ['config', 'user.name'], {
@@ -65,7 +68,10 @@ module.exports = async (api) => {
   let installedPackages;
   api.schedule(api.PRIORITIES.COPY, async () => {
     await api.copy();
-    await api.copy({ from: 'chisel-starter-theme', to: app.themePath });
+    await api.copy({
+      from: 'chisel-starter-theme',
+      to: app.themePath,
+    });
 
     const modifyDependencies = (deps) => {
       Object.keys(deps).forEach((dep) => {
@@ -89,7 +95,9 @@ module.exports = async (api) => {
   api.schedule(api.PRIORITIES.INSTALL_DEPENDENCIES, async () => {
     if (api.creator.cmd.skipDependenciesInstall) return;
 
-    await installDependencies({ cwd: api.resolve(app.themePath) });
+    await installDependencies({
+      cwd: api.resolve(app.themePath),
+    });
 
     // await run(['xfive-coding-standards', '--skip-checks'], {
     //   cwd: api.resolve(app.themePath),
@@ -128,15 +136,23 @@ module.exports = async (api) => {
         .catch(() => false)
     ) {
       await api.modifyFile(preCommitPath, (body) => {
-        const str = [
+        const devcontainerSnippet = [
           '',
+          '# Set up devcontainer alias if needed (for all npx commands)',
           'if [ -f .use-devcontainer ]; then',
           '  alias npx="/usr/bin/env bash ../../../.devcontainer/exec npx"',
           'fi',
           '',
         ].join('\n');
 
-        return body.replace('npx ', str + '\nnpx ');
+        // Insert after shebang line
+        const shebangPattern = /^(#!\/bin\/sh)\n/;
+        if (shebangPattern.test(body)) {
+          return body.replace(shebangPattern, `$1\n${devcontainerSnippet}\n`);
+        }
+
+        // Fallback: prepend to file
+        return devcontainerSnippet + '\n' + body;
       });
     }
 
@@ -148,7 +164,9 @@ module.exports = async (api) => {
 
       for (const pkg of installedAndAvailable) {
         console.log(`Running npm link ${pkg}...`);
-        await run(['npm', 'link', pkg], { cwd: api.resolve(app.themePath) });
+        await run(['npm', 'link', pkg], {
+          cwd: api.resolve(app.themePath),
+        });
       }
     }
   });
@@ -171,7 +189,67 @@ module.exports = async (api) => {
     });
   });
 
-  // api.schedule(api.PRIORITIES.END_MESSAGE, async () => {
-  //   console.log('')
-  // });
+  // Set up git hooks after build
+  api.schedule(api.PRIORITIES.HUSKY, async () => {
+    const themePath = api.resolve(app.themePath);
+
+    // Check if git is initialized (in theme folder or project root)
+    const gitInTheme = await fs
+      .access(path.join(themePath, '.git'))
+      .then(() => true)
+      .catch(() => false);
+    const gitInRoot = await fs
+      .access(api.resolve('.git'))
+      .then(() => true)
+      .catch(() => false);
+
+    if (gitInTheme || gitInRoot) {
+      console.log('');
+      console.log('Setting up git hooks...');
+      try {
+        await runLocalCurrent(['chisel-scripts', 'husky-init'], {
+          execaOpts: { stdio: 'inherit' },
+        });
+        console.log('✔ Git hooks installed successfully');
+      } catch (error) {
+        console.log(
+          '⚠️  Failed to set up git hooks. Run "npm run prepare" manually.',
+        );
+      }
+    } else {
+      console.log('');
+      console.log(
+        '╔══════════════════════════════════════════════════════════════════════════════╗',
+      );
+      console.log(
+        '║  ⚠️  Git not initialized - pre-commit hooks not set up                        ║',
+      );
+      console.log(
+        '╠══════════════════════════════════════════════════════════════════════════════╣',
+      );
+      console.log(
+        '║                                                                              ║',
+      );
+      console.log(
+        '║  To enable core folder protection, run:                                      ║',
+      );
+      console.log(
+        '║                                                                              ║',
+      );
+      console.log(
+        '║    git init                                                                  ║',
+      );
+      console.log(`║    cd ${app.themePath.padEnd(71)}║`);
+      console.log(
+        '║    npm run prepare                                                           ║',
+      );
+      console.log(
+        '║                                                                              ║',
+      );
+      console.log(
+        '╚══════════════════════════════════════════════════════════════════════════════╝',
+      );
+    }
+    console.log('');
+  });
 };

package/lib/commands/create/creators/wp/index.js

@@ -176,7 +176,15 @@ module.exports = (api) => {
     await wp(['theme', 'activate', themeName]);
   });
 
-  // api.schedule(api.PRIORITIES., async () => {
+  api.schedule(api.PRIORITIES.WP_UPDATE_OPTIONS, async () => {
+    if (api.creator.cmd.skipWpCommands) return;
 
-  // });
+    await wp(['option', 'update', 'permalink_structure', '/%postname%/']);
+    await wp(['option', 'update', 'blog_public', '0']);
+    await wp(['option', 'update', 'default_comment_status', 'closed']);
+    await wp(['option', 'update', 'default_pingback_flag', '0']);
+    await wp(['option', 'update', 'default_ping_status', 'closed']);
+    await wp(['option', 'update', 'comment_moderation', '1']);
+    await wp(['option', 'update', 'comment_registration', '1']);
+  });
 };

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

@@ -1,5 +1,5 @@
 module.exports = {
-  'chisel-scripts': '2.1.5',
+  'chisel-scripts': '2.2.0',
   'chisel-shared-utils': '2.0.0-alpha.1',
-  'generator-chisel': '2.3.3',
+  'generator-chisel': '2.4.0',
 };

package/lib/commands/create/priorities.js

@@ -22,10 +22,13 @@ module.exports = {
   WP_INSTALL_PLUGINS: 1400,
   WP_THEME_ACTIVATE: 1500,
   WP_PLUGINS: 1600,
+  WP_UPDATE_OPTIONS: 1900,
 
   FORMAT: 2500,
 
   BUILD: 3000,
 
+  HUSKY: 4000,
+
   END_MESSAGE: 5000,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-chisel",
-  "version": "2.3.3",
+  "version": "2.4.0",
   "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": "116fc0781cdef419ebc0959289b1bae96a1198e9"
+  "gitHead": "259173a22a8cb7a7380936bfc01baf4b87f6afa3"
 }

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Controllers/AjaxController.php

@@ -1,156 +0,0 @@
-<?php
-
-namespace Chisel\Controllers;
-
-use Chisel\WP\AjaxEndpoints;
-use Chisel\Interfaces\InstanceInterface;
-use Chisel\Interfaces\HooksInterface;
-use Chisel\Traits\Singleton;
-
-/**
- * Custom Ajax class based on REST API.
- *
- * @package Chisel
- */
-final class AjaxController extends \WP_REST_Controller implements InstanceInterface, HooksInterface {
-
-	use Singleton;
-
-	/**
-	 * Ajax custom route namespace.
-	 *
-	 * @var string
-	 */
-	public const ROUTE_NAMESPACE = 'chisel/v2';
-
-	/**
-	 * Ajax custom route base.
-	 *
-	 * @var string
-	 */
-	public const ROUTE_BASE = 'ajax';
-
-	/**
-	 * Ajax custom routes.
-	 *
-	 * @var array
-	 */
-	private array $routes = array();
-
-	/**
-	 * Class constructor.
-	 */
-	private function __construct() {
-		add_action( 'after_setup_theme', array( $this, 'set_properties' ), 7 );
-
-		$this->action_hooks();
-		$this->filter_hooks();
-	}
-
-	/**
-	 * Set properties.
-	 */
-	public function set_properties(): void {
-		$this->routes = array(
-			'load-more' => array(),
-		);
-	}
-
-	/**
-	 * Register action hooks.
-	 */
-	public function action_hooks(): void {
-		add_action( 'rest_api_init', array( $this, 'register_endpoints' ) );
-	}
-
-	/**
-	 * Register filter hooks.
-	 */
-	public function filter_hooks(): void {}
-
-	/**
-	 * Register endpoints
-	 *
-	 * @return void
-	 */
-	public function register_endpoints(): void {
-		$this->routes = apply_filters( 'chisel_ajax_routes', $this->routes );
-
-		if ( $this->routes ) {
-			foreach ( $this->routes as $route_name => $route_params ) {
-				$route   = sprintf( '%s/%s/', self::ROUTE_BASE, $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 ),
-					)
-				);
-			}
-		}
-	}
-
-	/**
-	 * Create dynamic route callback
-	 *
-	 * @param \WP_REST_Request $request WP_REST_Request.
-	 *
-	 * @return \WP_REST_Response|\WP_Error|array
-	 */
-	public function callback( \WP_REST_Request $request ): \WP_REST_Response|\WP_Error|array {
-		$callback       = $this->get_callback_name( $request );
-		$ajax_endpoints = new AjaxEndpoints();
-
-		if ( method_exists( $ajax_endpoints, $callback ) ) {
-			if ( ! defined( 'DOING_AJAX' ) ) {
-				define( 'DOING_AJAX', true );
-			}
-
-			if ( ! defined( 'DOING_CHISEL_AJAX' ) ) {
-				define( 'DOING_CHISEL_AJAX', true );
-			}
-
-			$callable = array( $ajax_endpoints, $callback );
-
-			return $callable( $request );
-		}
-
-		return new \WP_Error( 'chisel_ajax_callback_missing', sprintf( 'Callback %s not found', $callback ), array( 'status' => 404 ) );
-	}
-
-	/**
-	 * Check ajax request permissions.
-	 *
-	 * @param \WP_REST_Request $request WP_REST_Request.
-	 *
-	 * @return boolean
-	 */
-	public function permissions_check( \WP_REST_Request $request ): bool|\WP_Error {
-		$verify_nonce = wp_verify_nonce( $request->get_header( 'x_wp_nonce' ), 'wp_rest' );
-		$allowed      = (bool) $verify_nonce;
-
-		$permission = apply_filters( 'chisel_ajax_permissions_check', $allowed, $this->get_callback_name( $request ), $request );
-
-		return $permission;
-	}
-
-	/**
-	 * Get callback name from ajax request.
-	 *
-	 * @param \WP_REST_Request $request
-	 *
-	 * @return string
-	 */
-	private function get_callback_name( \WP_REST_Request $request ): string {
-		$route       = $request->get_route();
-		$route_parts = explode( '/', $route );
-		$callback    = str_replace( '-', '_', end( $route_parts ) );
-
-		return $callback;
-	}
-}

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Interfaces/HooksInterface.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Chisel\Interfaces;
-
-/**
- * Hooks Interface
- *
- * @package Chisel
- */
-interface HooksInterface {
-
-	/**
-	 * Set class properties.
-	 */
-	public function set_properties(): void;
-
-	/**
-	 * Register action hooks.
-	 */
-	public function action_hooks(): void;
-
-	/**
-	 * Register filter hooks.
-	 */
-	public function filter_hooks(): void;
-}

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Interfaces/InstanceInterface.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace Chisel\Interfaces;
-
-/**
- * Instance Interface
- *
- * @package Chisel
- */
-interface InstanceInterface {
-
-	/**
-	 * Get the instance of the class.
-	 */
-	public static function get_instance(): static;
-}

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Plugins/Yoast.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace Chisel\Plugins;
-
-use Chisel\Interfaces\InstanceInterface;
-use Chisel\Interfaces\HooksInterface;
-use Chisel\Traits\Singleton;
-use Chisel\Helpers\YoastHelpers;
-
-/**
- * Yoast SEO plugin related functionalities.
- *
- * @package Chisel
- */
-final class Yoast implements InstanceInterface, HooksInterface {
-
-	use Singleton;
-
-	/**
-	 * Class constructor.
-	 */
-	private function __construct() {
-		if ( ! YoastHelpers::is_yoast_active() ) {
-			return;
-		}
-
-		$this->set_properties();
-		$this->action_hooks();
-		$this->filter_hooks();
-	}
-
-	/**
-	 * Set properties.
-	 */
-	public function set_properties(): void {}
-
-	/**
-	 * Register action hooks.
-	 */
-	public function action_hooks(): void {}
-
-	/**
-	 * Register filter hooks.
-	 */
-	public function filter_hooks(): void {}
-}