fix: Compose V2 Makefiles and prepare release 1.3.1

Prefer docker compose with V1 fallback, make monorepo update-deps includes
optional, and document the patch in CHANGELOG/UPGRADING.

Author: HecFranco

Makefile

@@ -2,7 +2,9 @@
 .PHONY: help up down build shell install test test-coverage coverage-php-percent cs-check cs-fix qa clean assets assets-build assets-watch test-ts ensure-up rector rector-dry phpstan release-check release-check-demos composer-sync update validate validate-translations check-no-cursor-coauthor check-open-prs demo-smoke strip-cursor-coauthor-from-history setup-hooks
 
 COMPOSE_FILE ?= docker-compose.yml
-COMPOSE     ?= docker-compose -f $(COMPOSE_FILE)
+# Prefer Compose V2 plugin (GitHub Actions / modern Docker Desktop); fall back to docker-compose V1 (REQ-MAKE-010).
+COMPOSE_BIN ?= $(shell docker compose version >/dev/null 2>&1 && echo "docker compose" || echo "docker-compose")
+COMPOSE     ?= $(COMPOSE_BIN) -f $(COMPOSE_FILE)
 SERVICE_PHP ?= php
 
 help:
@@ -130,4 +132,5 @@ validate: ensure-up
 
 # REQ-MAKE-008: update-deps (REQ-MAKE-008)
 BUNDLE_ROOT := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
-include $(BUNDLE_ROOT)/../.scripts/Makefile.update-deps.mk
+# Optional: monorepo helper absent on standalone GitHub Actions checkout (REQ-MAKE-009).
+-include $(BUNDLE_ROOT)/../.scripts/Makefile.update-deps.mk

demo/Makefile

@@ -1,6 +1,9 @@
 # Makefile for CKEditor 5 Editor Bundle Demo
 # Each demo has its own docker-compose.yml and can be run independently
 
+# Prefer Compose V2 plugin (GitHub Actions / modern Docker Desktop); fall back to docker-compose V1 (REQ-MAKE-010).
+COMPOSE ?= $(shell docker compose version >/dev/null 2>&1 && echo "docker compose" || echo "docker-compose")
+
 DEMOS := symfony8
 
 .PHONY: help clean test-all test-coverage-all verify-all release-check release-verify demo-smoke
@@ -73,7 +76,7 @@ endef
 
 define logs-target-template
 logs-$(1):
-	@cd $(1) && docker-compose logs -f
+	@cd $(1) && $(COMPOSE) logs -f
 endef
 
 define test-target-template
@@ -187,4 +190,5 @@ clean:
 
 # REQ-MAKE-008: update-deps-all (REQ-MAKE-008)
 BUNDLE_ROOT := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/..)
-include $(BUNDLE_ROOT)/../.scripts/Makefile.demo-aggregate-update-deps.mk
+# Optional: monorepo helper absent on standalone GitHub Actions checkout (REQ-MAKE-009).
+-include $(BUNDLE_ROOT)/../.scripts/Makefile.demo-aggregate-update-deps.mk

demo/symfony8/Makefile

@@ -1,6 +1,9 @@
-# Makefile for Symfony 8.0 Demo (Tiptap Editor Bundle)
+# Makefile for Symfony 8 Demo (CKEditor 5 Editor Bundle)
 # Run from this directory: make up, make install, etc.
 
+# Prefer Compose V2 plugin (GitHub Actions / modern Docker Desktop); fall back to docker-compose V1 (REQ-MAKE-010).
+COMPOSE ?= $(shell docker compose version >/dev/null 2>&1 && echo "docker compose" || echo "docker-compose")
+
 .PHONY: help up down build install shell logs test test-coverage cache-clear link-bundle update-bundle ensure-up restart
 
 help:
@@ -23,65 +26,66 @@ help:
 up:
 	@if [ ! -f .env ]; then cp .env.example .env 2>/dev/null || true; fi
 	@echo "Installing dependencies (one-off container)..."
-	@docker-compose run --rm -T --entrypoint composer -e COMPOSER_MEMORY_LIMIT=-1 php install --no-interaction --no-scripts
+	@$(COMPOSE) run --rm -T --entrypoint composer -e COMPOSER_MEMORY_LIMIT=-1 php install --no-interaction --no-scripts
 	@echo "Warming cache and installing assets..."
-	@docker-compose run --rm -T --entrypoint php php -d memory_limit=256M bin/console cache:clear
-	@docker-compose run --rm -T --entrypoint php php bin/console assets:install public
+	@$(COMPOSE) run --rm -T --entrypoint php php -d memory_limit=256M bin/console cache:clear
+	@$(COMPOSE) run --rm -T --entrypoint php php bin/console assets:install public
 	@echo "Starting server..."
-	docker-compose up -d
+	$(COMPOSE) up -d
 	@echo "Waiting for app to respond..."
 	@PORT=$$(grep -E '^PORT=' .env 2>/dev/null | cut -d= -f2); PORT=$${PORT:-8021}; \
 	for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do \
 		curl -s -o /dev/null -w "%{http_code}" "http://127.0.0.1:$$PORT/" 2>/dev/null | grep -qE '^[23]' && echo "Demo started at: http://localhost:$$PORT"; exit 0; \
 		echo "  waiting... $$i/15"; sleep 2; \
 	done; \
-	echo "App did not respond in time. Check: docker-compose logs php"; exit 1
+	echo "App did not respond in time. Check: $(COMPOSE) logs php"; exit 1
 
 down:
-	docker-compose down
+	$(COMPOSE) down
 
 restart: ensure-up
-	docker-compose restart
+	$(COMPOSE) restart
 
 build:
-	docker-compose build --no-cache
+	$(COMPOSE) build --no-cache
 
 ensure-up:
-	@if ! docker-compose exec -T php true 2>/dev/null; then \
+	@if ! $(COMPOSE) exec -T php true 2>/dev/null; then \
 		echo "Starting container..."; \
-		docker-compose up -d; \
+		$(COMPOSE) up -d; \
 		sleep 3; \
 	fi
 
 install: ensure-up
-	docker-compose exec -T -e COMPOSER_MEMORY_LIMIT=-1 php composer install --no-interaction
+	$(COMPOSE) exec -T -e COMPOSER_MEMORY_LIMIT=-1 php composer install --no-interaction
 
 shell: ensure-up
-	docker-compose exec php sh
+	$(COMPOSE) exec php sh
 
 logs:
-	docker-compose logs -f
+	$(COMPOSE) logs -f
 
 test: ensure-up
-	docker-compose exec -e APP_ENV=test php composer test
+	$(COMPOSE) exec -e APP_ENV=test php composer test
 
 test-coverage: ensure-up
-	docker-compose exec php composer test-coverage
+	$(COMPOSE) exec php composer test-coverage
 
 cache-clear: ensure-up
-	docker-compose exec php php bin/console cache:clear
+	$(COMPOSE) exec php php bin/console cache:clear
 
 link-bundle: ensure-up
-	docker-compose exec php sh -c "rm -rf vendor/nowo-tech/ckeditor5-editor-bundle && ln -s /var/ckeditor5-editor-bundle vendor/nowo-tech/ckeditor5-editor-bundle && php bin/console cache:clear"
+	$(COMPOSE) exec php sh -c "rm -rf vendor/nowo-tech/ckeditor5-editor-bundle && ln -s /var/ckeditor5-editor-bundle vendor/nowo-tech/ckeditor5-editor-bundle && php bin/console cache:clear"
 	@echo "Bundle linked to mounted source. Reload the page in the browser."
 
 update-bundle: ensure-up
-	docker-compose exec php composer update nowo-tech/ckeditor5-editor-bundle --no-interaction
-	docker-compose exec php php bin/console cache:clear --env=dev
+	$(COMPOSE) exec php composer update nowo-tech/ckeditor5-editor-bundle --no-interaction
+	$(COMPOSE) exec php php bin/console cache:clear --env=dev
 	@echo "Bundle updated. Reload the page in the browser."
 
 
 # REQ-MAKE-008: update-deps (REQ-MAKE-008)
 BUNDLE_ROOT := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/../..)
 SERVICE_PHP := php
-include $(BUNDLE_ROOT)/../.scripts/Makefile.demo-update-deps.mk
+# Optional: monorepo helper absent on standalone GitHub Actions checkout (REQ-MAKE-009).
+-include $(BUNDLE_ROOT)/../.scripts/Makefile.demo-update-deps.mk

docs/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.3.1] - 2026-07-29
+
+### Changed
+
+- **REQ-MAKE-010:** Makefiles prefer `docker compose` (V2) with fallback to `docker-compose` (V1).
+- **REQ-MAKE-009:** monorepo `update-deps` includes are optional (`-include`) so standalone CI checkouts do not fail.
+
 ## [1.3.0] - 2026-07-28
 
 ### Added
@@ -162,7 +169,8 @@ First semver release (documented stable line, CI and Packagist aligned with tag
 - PHPUnit: integration suite + unit test for `upload_url` CSRF branch (**100%** PHP Clover on `src/`).
 - PHP-CS-Fixer finder excludes generated integration fixture cache and `tests/Fixtures/app/config/reference.php`.
 
-[Unreleased]: https://github.com/nowo-tech/Ckeditor5EditorBundle/compare/v1.3.0...HEAD
+[Unreleased]: https://github.com/nowo-tech/Ckeditor5EditorBundle/compare/v1.3.1...HEAD
+[1.3.1]: https://github.com/nowo-tech/Ckeditor5EditorBundle/compare/v1.3.0...v1.3.1
 [1.3.0]: https://github.com/nowo-tech/Ckeditor5EditorBundle/compare/v1.2.3...v1.3.0
 [1.2.3]: https://github.com/nowo-tech/Ckeditor5EditorBundle/compare/v1.2.2...v1.2.3
 [1.2.2]: https://github.com/nowo-tech/Ckeditor5EditorBundle/compare/v1.2.1...v1.2.2

docs/UPGRADING.md

@@ -3,6 +3,7 @@
 ## Table of contents
 
 - [General](#general)
+- [To 1.3.1 from 1.3.0](#to-131-from-130)
 - [To 1.3.0 from 1.2.3](#to-130-from-123)
 - [To 1.0.0 (first Git / Packagist semver tag)](#to-100-first-git-packagist-semver-tag)
 - [To 1.0.1 from 1.0.0](#to-101-from-100)
@@ -27,6 +28,15 @@
 - Pin versions in `composer.json` (e.g. `^1.0`) instead of relying only on `dev-main` for production apps.
 - After upgrading, run `php bin/console cache:clear` and `php bin/console assets:install public` so Twig and published bundle assets stay in sync.
 
+## To 1.3.1 from 1.3.0
+
+Patch release: Makefile Compose V2 preference and optional monorepo `update-deps` includes. No bundle API, YAML, or runtime behaviour changes for applications.
+
+- **Composer:** `composer update nowo-tech/ckeditor5-editor-bundle` only if you pin an exact patch (e.g. `1.3.0`); with `^1.0` or `^1.3`, **1.3.1** is included on update.
+- **Contributors / demos:** Makefiles use `docker compose` when available (fallback `docker-compose`). Standalone clones no longer require `bundles/.scripts` for `make` to load.
+
+See [`CHANGELOG.md`](CHANGELOG.md) (section **1.3.1**).
+
 ## To 1.3.0 from 1.2.3
 
 Minor release: public backed enum `EditorTheme` for chrome palette values, plus Nowo standards (deprecations helper, PHPStan baseline, pnpm-only frontend, demo PHP 8.5). YAML `theme` string values are unchanged.