Merge branch '1.x' of https://github.com/craftcms/generator into 2.x

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Release Notes for Craft Generator
 
+## 2.1.0 - 2024-06-19
+- Generated plugins and modules now call `$this->attachEventHandlers()` directly from `init()`, and clarify when `onInit()` should be used.
+
 ## 2.0.1 - 2024-03-08
 - Generated field types, utilities, and widget types now provide default icons.
 - Fixed an error that occurred when generating a utility. ([#34](https://github.com/craftcms/generator/issues/34))
@@ -8,6 +11,9 @@
 - Craft Generator now requires Craft 5.
 - Renamed `craft\generator\Command\EVENT_REGISTER_GENERATOR_TYPES` to `EVENT_REGISTER_GENERATORS`.
 
+## 1.8.0 - 2024-06-19
+- Generated plugins and modules now call `$this->attachEventHandlers()` directly from `init()`, and clarify when `onInit()` should be used.
+
 ## 1.7.0 - 2024-03-06
 - Added the behavior generator. ([#27](https://github.com/craftcms/generator/pull/27))
 - Generator now prompts for new modules’ names. ([#28](https://github.com/craftcms/generator/pull/28))

src/generators/Module.php

@@ -187,9 +187,11 @@ private function methods(): array
 
 parent::init();
 
-// Defer most setup tasks until Craft is fully initialized
+\$this->attachEventHandlers();
+
+// Any code that creates an element query or loads Twig should be deferred until
+// after Craft is fully initialized, to avoid conflicts with other plugins/modules
 Craft::\$app->onInit(function() {
-    \$this->attachEventHandlers();
     // ...
 });
 PHP,

src/generators/Plugin.php

@@ -719,9 +719,11 @@ private function pluginMethods(): array
             'init' => <<<PHP
 parent::init();
 
-// Defer most setup tasks until Craft is fully initialized
+\$this->attachEventHandlers();
+
+// Any code that creates an element query or loads Twig should be deferred until
+// after Craft is fully initialized, to avoid conflicts with other plugins/modules
 Craft::\$app->onInit(function() {
-    \$this->attachEventHandlers();
     // ...
 });
 PHP,