Skip to content

Commit eb63272

Browse files
merge: sync with origin/development (taxonomy publish, branch settings, deps update)
Merges development branch changes: - feat: add taxonomy.publish() method with optional api_version and branch params - feat: add branch.updateSettings() method for AM v2 linked workspace configuration - fix: dependencies updated (snyk security fixes) - chore: version bump and changelog update - chore: update sanity-report.mjs Conflict resolutions: - .talismanrc: kept all existing checksums, updated package-lock.json checksum, added new checksums for lib/stack/branch/index.js and lib/stack/taxonomy/index.js - terms-test.js: kept our comprehensive async/await test suite (discarded development's old callback-style test structure which targeted the legacy test file)
2 parents f7dcdbf + 1180524 commit eb63272

File tree

11 files changed

+1107
-2601
lines changed

11 files changed

+1107
-2601
lines changed

.talismanrc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fileignoreconfig:
99
ignore_detectors:
1010
- filecontent
1111
- filename: package-lock.json
12-
checksum: ff309d2a910e885853fb25faa6aa3d2bd2cfc2d316c84a0e984bbda79c596ae9
12+
checksum: d4d4e7c312671307a62df2845cafe7385232530c7411b65f16e12949d0a1b609
1313
- filename: test/unit/ContentstackClient-test.js
1414
checksum: 5d8519b5b93c715e911a62b4033614cc4fb3596eabf31c7216ecb4cc08604a73
1515
- filename: .husky/pre-commit
@@ -120,4 +120,8 @@ fileignoreconfig:
120120
checksum: d6771a51a021977ce9f428afc289c80aee3d2fca211f4102cf782afded354ce7
121121
- filename: .github/workflows/check-version-bump.yml
122122
checksum: c4aff7ca93f40213f67534e5c490d7a633cbebb21bbebd4517ff9b9db37ab52a
123+
- filename: lib/stack/branch/index.js
124+
checksum: 6d352641cbab302d6abfefbe33814fac9b210bb3f6291341c1d6b5493d4756c6
125+
- filename: lib/stack/taxonomy/index.js
126+
checksum: c9cd4a2d43970d530981b2257700770c2e7843786de0ff829c1ca818fc559d23
123127
version: "1.0"

0 commit comments

Comments
 (0)