From cd708d0570c1f9b1fbe10bd13b9e4b035716a0ce Mon Sep 17 00:00:00 2001 From: Matheus Henrique Caiser Barrozo Date: Thu, 27 Nov 2025 00:56:34 -0300 Subject: [PATCH 01/11] fix: disable pointer events on flying santa canvas --- hotfix_description.md | 13 +++++++++++++ src/components/FlyingSanta.tsx | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 hotfix_description.md diff --git a/hotfix_description.md b/hotfix_description.md new file mode 100644 index 0000000..c445e33 --- /dev/null +++ b/hotfix_description.md @@ -0,0 +1,13 @@ +## Hotfix: Fix Mouse Interaction Issue + +This hotfix resolves a critical issue where the `FlyingSanta` component was blocking mouse interactions across the entire application. + +### Changes + +- Added `style={{ pointerEvents: "none" }}` explicitly to the `Canvas` component in `FlyingSanta.tsx`. +- This ensures that the canvas element generated by React Three Fiber does not capture pointer events, allowing clicks to pass through to the underlying UI. + +### Verification + +- Verified that the `FlyingSanta` component still renders correctly. +- Verified that buttons and links underneath the animation are now clickable. diff --git a/src/components/FlyingSanta.tsx b/src/components/FlyingSanta.tsx index e8b9d6f..c2951e1 100644 --- a/src/components/FlyingSanta.tsx +++ b/src/components/FlyingSanta.tsx @@ -262,7 +262,10 @@ const FlyingSanta = () => { zIndex: 9999, }} > - + From 313f92eeaa144aa0b768eb3a1c2e926bf16b1fae Mon Sep 17 00:00:00 2001 From: Matheus Henrique Caiser Barrozo Date: Thu, 27 Nov 2025 00:56:55 -0300 Subject: [PATCH 02/11] chore: remove temporary hotfix description --- hotfix_description.md | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 hotfix_description.md diff --git a/hotfix_description.md b/hotfix_description.md deleted file mode 100644 index c445e33..0000000 --- a/hotfix_description.md +++ /dev/null @@ -1,13 +0,0 @@ -## Hotfix: Fix Mouse Interaction Issue - -This hotfix resolves a critical issue where the `FlyingSanta` component was blocking mouse interactions across the entire application. - -### Changes - -- Added `style={{ pointerEvents: "none" }}` explicitly to the `Canvas` component in `FlyingSanta.tsx`. -- This ensures that the canvas element generated by React Three Fiber does not capture pointer events, allowing clicks to pass through to the underlying UI. - -### Verification - -- Verified that the `FlyingSanta` component still renders correctly. -- Verified that buttons and links underneath the animation are now clickable. From a745e79a099e69e90ca8a688b3f6952fb1d0777f Mon Sep 17 00:00:00 2001 From: Matheus Henrique Caiser Barrozo Date: Thu, 27 Nov 2025 01:01:53 -0300 Subject: [PATCH 03/11] fix(ci): allow hotfix branches in preview validation --- .github/workflows/preview.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index a8f5ade..8e3badb 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -57,11 +57,11 @@ jobs: run: | SOURCE_BRANCH="${{ github.head_ref }}" echo "Source branch: $SOURCE_BRANCH" - if [[ "$SOURCE_BRANCH" != release/* ]]; then - echo "::error::Pull Request from branch '$SOURCE_BRANCH' cannot be merged into 'main'. Only branches starting with 'release/' are allowed." + if [[ "$SOURCE_BRANCH" != release/* && "$SOURCE_BRANCH" != hotfix/* ]]; then + echo "::error::Pull Request from branch '$SOURCE_BRANCH' cannot be merged into 'main'. Only branches starting with 'release/' or 'hotfix/' are allowed." exit 1 else - echo "Source branch '$SOURCE_BRANCH' is a valid release branch." + echo "Source branch '$SOURCE_BRANCH' is a valid release or hotfix branch." fi update-pr-comment: From 416d3dac0b111fedcb59f2440b8f854490005038 Mon Sep 17 00:00:00 2001 From: Matheus Henrique Caiser Barrozo Date: Thu, 27 Nov 2025 01:06:01 -0300 Subject: [PATCH 04/11] chore(ci): standardize develop environment name --- .github/workflows/develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index c2872c9..e46b127 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -28,7 +28,7 @@ jobs: if: needs.test-and-lint.outputs.code-changed == 'true' uses: ./.github/workflows/reusable-deploy-vercel.yml with: - environment: Development + environment: Develop vercel-environment: preview ref: ${{ github.ref }} prebuilt: true From 7258715ec80000be3427c0fc5f9fb4e18f1016a6 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 27 Nov 2025 04:09:50 +0000 Subject: [PATCH 05/11] chore(release): 1.4.1 --- CHANGELOG.md | 8 ++++++++ package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c9643d..d4ecf75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## [1.4.1](https://github.com/JaegerCaiser/mrdeveloper/compare/v1.4.0...v1.4.1) (2025-11-27) + + +### Bug Fixes + +* **ci:** allow hotfix branches in preview validation ([a745e79](https://github.com/JaegerCaiser/mrdeveloper/commit/a745e79a099e69e90ca8a688b3f6952fb1d0777f)) +* disable pointer events on flying santa canvas ([cd708d0](https://github.com/JaegerCaiser/mrdeveloper/commit/cd708d0570c1f9b1fbe10bd13b9e4b035716a0ce)) + # [1.4.0](https://github.com/JaegerCaiser/mrdeveloper/compare/v1.3.1...v1.4.0) (2025-11-27) diff --git a/package.json b/package.json index 767b8bb..96d42e0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mrdeveloper", - "version": "1.4.0", + "version": "1.4.1", "type": "module", "packageManager": "pnpm@10.20.0", "homepage": "https://www.mrdeveloper.com.br/", From 05048ec3394f7f5824cacf19ae7308ab4a7ca2f1 Mon Sep 17 00:00:00 2001 From: Matheus Henrique Caiser Barrozo Date: Fri, 28 Nov 2025 23:31:52 -0300 Subject: [PATCH 06/11] fix: the sync need to continue even the conflict --- .github/workflows/sync-main-to-develop.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/sync-main-to-develop.yml b/.github/workflows/sync-main-to-develop.yml index 4bfd5d9..ba2e689 100644 --- a/.github/workflows/sync-main-to-develop.yml +++ b/.github/workflows/sync-main-to-develop.yml @@ -57,20 +57,19 @@ jobs: git checkout -B $BRANCH_NAME origin/develop - # Tenta o merge. O '|| true' impede que o script pare em caso de conflito. - git merge origin/main --allow-unrelated-histories --no-edit -m "chore: sync main back to develop" || true - - # Verifica se há arquivos com conflitos (Unmerged paths) - if git diff --name-only --diff-filter=U | grep .; then - echo "::warning::Merge conflicts detected. Committing conflicted state to be resolved in the PR." - # Adiciona todos os arquivos (incluindo os com marcadores de conflito) e faz o commit. + # Attempt to merge main into the sync branch. + # The 'if' statement handles the exit code, so the step won't fail on merge conflicts. + if git merge origin/main --allow-unrelated-histories --no-edit -m "chore: sync main back to develop"; then + echo "Merge successful without conflicts." + else + echo "::warning::Merge failed, likely due to conflicts. Committing files with conflict markers for manual resolution." + # After a failed merge, files with conflicts are in the working directory. + # We add and commit them to be resolved in the PR. git add . git commit -m "chore: sync main with conflicts for manual resolution" - else - echo "Merge completed successfully." fi - # Continua o fluxo e força o push da branch, seja ela com merge limpo ou com conflitos. + # Push the result, whether it's a clean merge or contains conflicts. git push --force https://${GH_PAT}@github.com/${GITHUB_REPOSITORY}.git HEAD:$BRANCH_NAME - name: Create or Update Pull Request From 6f53c91b2afb315b8986baee6a13648da10905fb Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 29 Nov 2025 02:41:05 +0000 Subject: [PATCH 07/11] chore(release): 1.4.2 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4ecf75..b4a206b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.4.2](https://github.com/JaegerCaiser/mrdeveloper/compare/v1.4.1...v1.4.2) (2025-11-29) + + +### Bug Fixes + +* the sync need to continue even the conflict ([05048ec](https://github.com/JaegerCaiser/mrdeveloper/commit/05048ec3394f7f5824cacf19ae7308ab4a7ca2f1)) + ## [1.4.1](https://github.com/JaegerCaiser/mrdeveloper/compare/v1.4.0...v1.4.1) (2025-11-27) diff --git a/package.json b/package.json index 96d42e0..5f1de17 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mrdeveloper", - "version": "1.4.1", + "version": "1.4.2", "type": "module", "packageManager": "pnpm@10.20.0", "homepage": "https://www.mrdeveloper.com.br/", From b7c58a5331fc76d42aa504a4065c1565d28a688b Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 29 Nov 2025 03:29:24 +0000 Subject: [PATCH 08/11] chore(release): 1.4.3 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4a206b..fa547b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.4.3](https://github.com/JaegerCaiser/mrdeveloper/compare/v1.4.2...v1.4.3) (2025-11-29) + + +### Bug Fixes + +* Corrige permissões e autenticação no workflow de sync ([f86d53b](https://github.com/JaegerCaiser/mrdeveloper/commit/f86d53b0e765627fd4b8612cdbde36e5bafcfe5f)) + ## [1.4.2](https://github.com/JaegerCaiser/mrdeveloper/compare/v1.4.1...v1.4.2) (2025-11-29) diff --git a/package.json b/package.json index 5f1de17..16e399c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mrdeveloper", - "version": "1.4.2", + "version": "1.4.3", "type": "module", "packageManager": "pnpm@10.20.0", "homepage": "https://www.mrdeveloper.com.br/", From 6ed025c268299f2e82098eb064cf159867713fb1 Mon Sep 17 00:00:00 2001 From: Matheus Henrique Caiser Barrozo Date: Sat, 29 Nov 2025 00:36:30 -0300 Subject: [PATCH 09/11] =?UTF-8?q?fix(sync-workflow):=20Corrige=20l=C3=B3gi?= =?UTF-8?q?ca=20de=20merge=20com=20else=20duplicado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/sync-main-to-develop.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sync-main-to-develop.yml b/.github/workflows/sync-main-to-develop.yml index 41ea00d..b2cc034 100644 --- a/.github/workflows/sync-main-to-develop.yml +++ b/.github/workflows/sync-main-to-develop.yml @@ -43,16 +43,21 @@ jobs: echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT git checkout -B $BRANCH_NAME origin/develop + # Tenta fazer o merge da 'main' na branch de sincronização. + # A estrutura 'if/else' trata o código de saída, então o passo não falhará em caso de conflitos. if git merge origin/main --allow-unrelated-histories --no-edit -m "chore: sync main back to develop"; then - echo "Merge successful without conflicts." + # Se o merge for bem-sucedido e não houver conflitos. + echo "Merge da main para a branch de sync foi bem-sucedido, sem conflitos." else - echo "::warning::Merge failed due to conflicts. Committing files with conflict markers." + # Se o merge falhar (geralmente por conflitos). + echo "::warning::O merge falhou, provavelmente devido a conflitos. Arquivos com marcadores de conflito serão commitados para resolução manual." + # Após uma falha de merge, os arquivos com conflitos estão no diretório de trabalho. + # Adicionamos e commitamos esses arquivos para que possam ser resolvidos no Pull Request. git add . - git commit -m "chore: sync main with conflicts for manual resolution" - else - echo "Merge completed successfully." + git commit -m "chore: Sincroniza main com conflitos para resolução manual" fi + # Faz o push do resultado para o repositório, seja um merge limpo ou com conflitos. git push --force https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git HEAD:$BRANCH_NAME - name: Create or Update Pull Request From 2f36711fb50c1cc58c86fa590284e71d39a6c88a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 29 Nov 2025 03:39:25 +0000 Subject: [PATCH 10/11] chore(release): 1.4.3-beta.1 --- CHANGELOG.md | 8 ++++++++ package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4a206b..2371e70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## [1.4.3-beta.1](https://github.com/JaegerCaiser/mrdeveloper/compare/v1.4.2...v1.4.3-beta.1) (2025-11-29) + + +### Bug Fixes + +* Corrige permissões e autenticação no workflow de sync ([f86d53b](https://github.com/JaegerCaiser/mrdeveloper/commit/f86d53b0e765627fd4b8612cdbde36e5bafcfe5f)) +* **sync-workflow:** Corrige lógica de merge com else duplicado ([6ed025c](https://github.com/JaegerCaiser/mrdeveloper/commit/6ed025c268299f2e82098eb064cf159867713fb1)) + ## [1.4.2](https://github.com/JaegerCaiser/mrdeveloper/compare/v1.4.1...v1.4.2) (2025-11-29) diff --git a/package.json b/package.json index 5f1de17..cae1254 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mrdeveloper", - "version": "1.4.2", + "version": "1.4.3-beta.1", "type": "module", "packageManager": "pnpm@10.20.0", "homepage": "https://www.mrdeveloper.com.br/", From 1dc43468fb7b7cfd64f098da7cd396c01a79c2a9 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 29 Nov 2025 03:49:37 +0000 Subject: [PATCH 11/11] chore(release): 1.4.4 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2371e70..bba9f6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.4.4](https://github.com/JaegerCaiser/mrdeveloper/compare/v1.4.3...v1.4.4) (2025-11-29) + + +### Bug Fixes + +* **sync-workflow:** Corrige lógica de merge com else duplicado ([6ed025c](https://github.com/JaegerCaiser/mrdeveloper/commit/6ed025c268299f2e82098eb064cf159867713fb1)) + ## [1.4.3-beta.1](https://github.com/JaegerCaiser/mrdeveloper/compare/v1.4.2...v1.4.3-beta.1) (2025-11-29) diff --git a/package.json b/package.json index cae1254..fa920e7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mrdeveloper", - "version": "1.4.3-beta.1", + "version": "1.4.4", "type": "module", "packageManager": "pnpm@10.20.0", "homepage": "https://www.mrdeveloper.com.br/",