Merge branch 'release/5.0.2' into v5

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Template Comments Changelog
 
+## 5.0.2 - 2024.09.03
+### Fixed
+* Fixed an issue with a change in Twig `3.12.0` (which is now used by Craft `5.4.0`) which would cause an exception to be thrown when rendering templates ([#44](https://github.com/nystudio107/craft-templatecomments/issues/44))
+
 ## 5.0.1 - 2024.08.06
 ### Fixed
 * Fixed an issue where Template Comments would cause the Craft Closure `^1.0.6` package to not work

Makefile

@@ -0,0 +1,24 @@
+MAJOR_VERSION?=5
+PLUGINDEV_PROJECT_DIR?=/Users/andrew/webdev/sites/plugindev/cms_v${MAJOR_VERSION}/
+VENDOR?=nystudio107
+PROJECT_PATH?=${VENDOR}/$(shell basename $(CURDIR))
+
+.PHONY: dev docs release
+
+# Start up the buildchain dev server
+dev:
+# Start up the docs dev server
+docs:
+	${MAKE} -C docs/ dev
+# Run code quality tools, tests, and build the buildchain & docs in preparation for a release
+release: --code-quality --code-tests --buildchain-clean-build --docs-clean-build
+# The internal targets used by the dev & release targets
+--buildchain-clean-build:
+--code-quality:
+	${MAKE} -C ${PLUGINDEV_PROJECT_DIR} -- ecs check vendor/${PROJECT_PATH}/src --fix
+	${MAKE} -C ${PLUGINDEV_PROJECT_DIR} -- phpstan analyze -c vendor/${PROJECT_PATH}/phpstan.neon
+--code-tests:
+--docs-clean-build:
+	${MAKE} -C docs/ clean
+	${MAKE} -C docs/ image-build
+	${MAKE} -C docs/ fix

composer.json

@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-templatecomments",
   "description": "Adds a HTML comment with performance timings to demarcate `{% block %}`s and each Twig template that is included or extended.",
   "type": "craft-plugin",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "keywords": [
     "craftcms",
     "craft-plugin",

docs/docs/index.md

@@ -34,20 +34,20 @@ It also records performance data, so you know how much overhead each `{% block %
 
 With more complicated "content builder" setups, this can help bring clarity to where the various HTML on your pages is coming from.
 
-This can be especially handy when dealing with OPC (Other People's Code). It solves [this problem](https://craftcms.stackexchange.com/questions/27769/how-can-i-print-the-name-of-every-template-being-rendered-in-html-comments-when).
+This can be especially handy when dealing with OPC (Other People’s Code). It solves [this problem](https://craftcms.stackexchange.com/questions/27769/how-can-i-print-the-name-of-every-template-being-rendered-in-html-comments-when).
 
 ![Screenshot](./resources/screenshots/templatecomments-example.png)
 
-In Craft 5, it also adds support for [Rendering Elements](https://craftcms.com/docs/5.x/system/elements.html#rendering-elements) by outputting comments for the `_partials` templates that are rendered via Craft 5's `.render()` function:
+In Craft 5, it also adds support for [Rendering Elements](https://craftcms.com/docs/5.x/system/elements.html#rendering-elements) by outputting comments for the `_partials` templates that are rendered via Craft 5’s `.render()` function:
 
 ![Screenshot](./resources/screenshots/templatecomments-render.png)
 
 
 ## Configuring Template Comments
 
-All configuration is done via the `config.php`. For it to work, you'll need to copy it to your `craft/config/` directory, and rename it `templatecomments.php`
+All configuration is done via the `config.php`. For it to work, you’ll need to copy it to your `craft/config/` directory, and rename it `templatecomments.php`
 
-Here's what the default settings look like:
+Here’s what the default settings look like:
 
 ```php
 return [
@@ -90,9 +90,9 @@ return [
 
 ## Using Template Comments
 
-Nothing much to say here; install the plugin, and it "just works". If `devMode` is off, it doesn't even install itself, so there should be zero effect in production.
+Nothing much to say here; install the plugin, and it "just works". If `devMode` is off, it doesn’t even install itself, so there should be zero effect in production.
 
-The `<<< END <<<` comments all include performance data in milliseconds, e.g.:
+The `<<< END <<<` comments all include performance data in milliseconds, for example:
 ```html
 <!-- 22.34ms <<< TEMPLATE END <<< templatecomments/_layout.twig -->
 ```