chore: reconcile diverged git histories - #392
Merged
Merged
Conversation
Fix/conflicts
Development
Merge pull request #245 from contentstack/staging
…ll/postupdate scripts
feat: implement download script for regions.json and update postinsta…
Development
…Entries, Pagination, Query, and Stack classes - Added tests for debug logging integration in Contentstack.
…es-coverage Fix/dx 3674 improve testcases coverage
…oints-region Revert "feat: implement download script for regions.json and update postinsta…"
- Fix all failing test suites (632 tests now passing) - Add 21 new comprehensive test suites covering: * Asset management, cache & persistence * Complex queries, deep references, field projections * Global fields, JSON RTE, live preview * Metadata, modular blocks, multi-reference * Pagination, performance benchmarks * Query encoding, operators, sync operations * Taxonomy queries - Fix TypeScript errors (TS18048, TS2304, TS2554, TS1128, TS1005) - Fix Axios errors (422, 400) with graceful error handling - Fix circular references in deep reference chains (WeakSet tracking) - Fix flaky performance tests (network variance handling) - Add global console.error suppression for SDK validation (jest.setup.ts) - Remove redundant synchronization.spec.ts (superseded by comprehensive version) - Update .gitignore to exclude build artifacts - Sync with latest development (19 commits) - Remove @nrwl/jest dependency (from upstream) Test Results: Test Suites: 39 passed, 39 total (100%) Tests: 632 passed, 632 total (100%) Status: Production Ready Breaking Changes: None Security: All credentials use environment variables
…emove deprecated regions.json file.
…or messages for invalid regions
…tentstackEndpoint refactor: region handling logic to utilize getContentstackEndpoint. …
…tentstackEndpoint chore: 🗑️ remove redundant code
Enh: add type casting helper for BaseQuery methods to return Query type
Fix/update dependency
fix version bump
Development
DX | 12-11-2025 | Release
….4.0 feat(taxonomy): remove locale param from fetch(), bump to v5.4.0
chore: back-merge main into development
… clarity; enhance constructor overloads in Query class
Added Branches support in entry variants
Reporting: - Add request-capture plugin, assertion tracker, and a single-file HTML reporter that shows per-test SDK method, API request, copy-paste cURL, request/response, and Assertions Verified (expected vs actual) inline. Gated by ENABLE_HTTP_CAPTURE; tokens masked. Wired into jest config/setup. - Fix stale console-error suppression to match the current SDK message. Test fixes: - Reference specs use complex_all_fields fields (single_ref/multi_ref/self_ref). - Sync token assertions handle both no-change (stable) and change (advanced) cases. - Asset dimension asserts on an image asset; raise slow error-path test timeout. Bundlers: - run-with-report.sh: regenerate lockfile, surface install errors, fix counting. - Pin webpack to 5.108.0 (5.109 resolver regression with @ljharb transitive deps). .talismanrc: whitelist the 4 new/updated report+bundler files (false positives).
…-suite-fixes test: rich HTML report + API suite fixes for enriched v5 stack
DX | 29-07-2026 | Release
chore: back-merge main into development
…and package-lock.json
DX | 03-08-2026 | Release
back merge
Bumps @contentstack/core to ^1.5.1, which fixes MODULE_NOT_FOUND / "expression is too dynamic" build failures in bundlers (Next.js/Turbopack, webpack) and native ESM ReferenceErrors from the keep-alive agent setup. NOTE: do not publish until @contentstack/core 1.5.1 is live on npm, or the ^1.5.1 range will not resolve. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
…-1.5.1 chore: Prepare 5.5.2 release with @contentstack/core ^1.5.1
DX | 05-08-2026 | Hotfix
…xtures Test fixtures use placeholder API keys/tokens, not real secrets. Add inline deepcode ignore annotations so Snyk Code suppresses the finding at the source instead of relying on org-level web UI ignores. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
fix: suppress Snyk hardcoded-secret false positive in bundler test fixtures
Force push on main after PR#389/PR#390 broke shared ancestry. Preserves DX-10060 (network error retry) from development. Adds snyk false-positive suppression from main.
✅ Snyk checks have passed. No issues have been found so far.
💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse. |
🔒 Security Scan Results
⏱️ SLA Breach Summary
✅ BUILD PASSED - All security checks passed |
Coverage report
Test suite run success720 tests passing in 36 suites. Report generated by 🧪jest coverage report action from f9738ce |
OMpawar-21
approved these changes
Aug 11, 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
14 participants
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.
What
Force push on
mainafter PR#389 was merged and PR#390 (back-merge) was already done broke the shared git ancestry betweenmainanddevelopment. Both branches diverged back to 2022.What this does
mainintodevelopmentwith--allow-unrelated-historiesto reconnect the two historiesdevelopmentmainConflict resolution
CHANGELOG.mdpackage.jsonsrc/common/utils.tssrc/stack/contentstack.tstest/bundlers/esbuild-app/src/index.jstest/bundlers/rollup-app/src/index.jsAfter merging
Future PRs from
development → mainwill show only actual new commits — no more phantom 390-commit history.