[Fix]: Merge conflicts resolves 2.0.0#116
Merged
theMasudRana merged 5 commits intodevelopfrom Apr 13, 2026
Merged
Conversation
Release `v1.0.3`
Merge `develop` into `main` [skip ci]
Fix: Outdated plugin version in plugin header
* refactor: update changelog script to use npx and remove conventional-changelog-cli dependency - Changed the changelog script in package.json to use npx for conventional-changelog-cli. - Removed conventional-changelog-cli from dependencies in package-lock.json. - Cleaned up unnecessary dependencies related to conventional changelog generation. * chore: update CHANGELOG for version 1.0.1 with bug fixes and new features * chore: remove unused dependency scrivo/highlight.php from composer files * feat: add .distignore file to exclude unnecessary files from WordPress.org distribution * feat: add localization support and update package.json for repository and bugs metadata * feat: add readme.txt with plugin details and installation instructions * feat: update license and version in carousel-kit.php; add index.php for plugin structure * feat: add screenshot for plugin preview in WordPress.org * feat: update .distignore to refine exclusions for WordPress.org distribution * fix(styles): remove unnecessary grid-template-columns property * refactor(styles): improve transition effects and clean up unused properties * fix: CSS linting issues * refactor: Remove unrelated changes from current PR * feat: add placeholder logos and update hero carousel pattern * feat: update .distignore to exclude README.md and enhance carousel-kit.php for direct access protection * feat: Updated pot file * feat: update PHP requirement to 8.2, bump stable tag to 1.0.3, and add changelog entries for fixes * chore: format package.json for consistency in spacing * chore: remove upgrade notice section from readme.txt * chore: remove version field from package.json * feat: update PHP requirement to 8.2 and reorder contributors in plugin header * chore: remove version field from package-lock.json * docs: add link to full changelog in readme.txt * chore: remove version field from package-lock.json * fix: update file paths in phpcs and phpstan configuration * feat: implement autoloader for PHP classes and refactor constant definitions * fix: ignore phpcs warning for including pattern file from a fixed directory * fix: update script paths in composer.json and improve constant definitions in tests * fix: update POT-Creation-Date and add missing autoloader error message * chore: update @wordpress/scripts to version 31.5.0 * feat: add new screenshot image and remove outdated PNG file * fix: clean up .distignore by removing unnecessary files and directories * fix: remove outdated screenshots description from readme * fix: update dist target to exclude additional configuration and development files * fix: ensure direct access to Autoloader.php exits gracefully * fix: update package dependencies for minimatch and serialize-javascript * fix: update script paths in composer.json to use local binaries * feat: update README with minimum requirements and add uninstall functionality * fix: update WordPress minimum requirement to 6.6 in README, INSTALLATION, and readme.txt * fix: update contributors list in plugin header and readme.txt * fix: update package-lock.json to remove unused dependency and upgrade svgo and immutable versions * fix: update tested up to version in readme.txt from 6.9.1 to 6.9 * fix: correct release link in INSTALLATION.md and update node_modules exclusion in phpstan.neon.dist * fix: update @wordpress/scripts version to allow minor updates * chore(release): Prepare v1.0.4 release (#76) * chore: update version to 1.0.4 and enhance readme with changelog details * fix: update stable tag in readme.txt to 1.0.4 * fix: update changelog links to point to the correct repository * fix: update contributors list in README and readme.txt * docs: update Composer installation instructions in INSTALLATION.md * docs: fix formatting in Composer installation instructions in INSTALLATION.md * fix: correct release link format in CHANGELOG.md for version 1.0.1 * fix: remove hardcoded plugin version from Makefile and update installation instructions in INSTALLATION.md * docs: update note on WPackagist availability in INSTALLATION.md Co-authored-by: Utsav Patel <75293077+up1512001@users.noreply.github.com> * Fix: Wide Alignment + Block Tree Selection (#70) * fix: resolve slide translation and Block Tree selection issues with wide alignment * feat: add hooks for observing DOM mutations and resize events in carousel * fix: adjust full and wide alignment styles for carousel container * fix: clarify comment on full alignment breaking out of container * fix: refactor slide count change detection logic in useEmblaQueryLoopObserver * fix: improve slide count detection and optimize viewport scroll handling * fix: add BlockEditorSelectors interface for improved type safety in edit component * fix: ensure viewportEl is set only when node is not null to avoid state updates during unmount * fix: add box-sizing property to ensure no horizontal scroll bar in editor * fix: improve resize observer logic to prevent unnecessary reinitializations * fix: refactor viewportEl state management to prevent unnecessary reinitializations * fix: update documentation for Embla observers to clarify initialization logic * fix: enhance resize observer to track column size changes * fix: improve first slide observation logic to prevent unnecessary re-observations * fix: consolidate resize and mutation observers into a unified hook for improved carousel init * fix: update comment to reflect change from manual debounced ResizeObserver in useCarouselObservers * fix: handle empty template case by destroying Embla instance to prevent stale references Co-authored-by: Aviral Mittal aviral.ideabox@gmail.com Co-authored-by: Vishal Kotak vishalkotak200@gmail.com Co-authored-by: Aishwarrya Pande <169024277+AishwarryaPande@users.noreply.github.com> Co-authored-by: Raj Patel <71687258+imrraaj@users.noreply.github.com> Co-authored-by: Sanket Parmar <7807348+sanketio@users.noreply.github.com> * fix: add direct access protection to example pattern files (#84) Co-authored-by: rtCamp <1128395+rtCamp@users.noreply.github.com> Co-authored-by: Gagan Deep Singh <1535505+gagan0123@users.noreply.github.com> Co-authored-by: Sagar Tamang <8264719+mi5t4n@users.noreply.github.com> Co-authored-by: Aviral Mittal <68884287+aviral-mittal@users.noreply.github.com> Co-authored-by: Vishal Kotak <34092861+vishal4669@users.noreply.github.com> * feat: add new asset images and replace old screenshot (#86) --------- Co-authored-by: Utsav Patel <75293077+up1512001@users.noreply.github.com> Co-authored-by: Aishwarrya Pande <169024277+AishwarryaPande@users.noreply.github.com> Co-authored-by: Raj Patel <71687258+imrraaj@users.noreply.github.com> Co-authored-by: Sanket Parmar <7807348+sanketio@users.noreply.github.com> Co-authored-by: rtCamp <1128395+rtCamp@users.noreply.github.com> Co-authored-by: Gagan Deep Singh <1535505+gagan0123@users.noreply.github.com> Co-authored-by: Sagar Tamang <8264719+mi5t4n@users.noreply.github.com> Co-authored-by: Aviral Mittal <68884287+aviral-mittal@users.noreply.github.com> Co-authored-by: Vishal Kotak <34092861+vishal4669@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Copilot wasn't able to review any files in this pull request.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
milindmore22
approved these changes
Apr 13, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR will resolve the merge conflicts with main branch
Type of change
Related issue(s)
Closes #
Relates to # (if applicable)
What changed
Breaking changes
Does this introduce a breaking change? If yes, describe the impact and migration path below.
Testing
Describe how this was tested.
Test details:
Screenshots / recordings
If applicable, add screenshots or short recordings.
Checklist