Skip to content

Commit ba14f2e

Browse files
author
naman-contentstack
committed
Merge branch 'v2-beta-dev' into feat/DX-3820
2 parents 26f9582 + e4ee650 commit ba14f2e

File tree

6 files changed

+94
-239
lines changed

6 files changed

+94
-239
lines changed

.talismanrc

Lines changed: 4 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,6 @@
11
fileignoreconfig:
2-
- filename: package-lock.json
3-
checksum: aba0ed42e6c53ae660a5269acc0a9c01025f7e406ebbec8c5c7fbd25eaf575f8
42
- filename: pnpm-lock.yaml
5-
checksum: 209bac9e2ca412822c9d72ed208e290338ff8190b112724ff992331117e2ffef
6-
- filename: packages/contentstack-import/src/commands/cm/stacks/import.ts
7-
checksum: ee643d664d69eafc6f82923048a85c4dc26f78b1ac93cfe1e152c69945b65d9e
8-
- filename: packages/contentstack-seed/src/commands/cm/stacks/seed.ts
9-
checksum: d04770564196b080878566255ea0faf1c82c1460161d2004d2b1edece0546493
10-
- filename: packages/contentstack-import/README.md
11-
checksum: f701583669afcf9be38c8b1698aede39658c0df5afe6691ba1301408d20c7c69
12-
- filename: packages/contentstack-auth/test/unit/commands/tokens-remove.test.ts
13-
checksum: 7e256db86c516b40c47eab78b3881b7ece525607281ebcd0b8711c089bdac056
14-
- filename: packages/contentstack-export/src/commands/cm/stacks/export.ts
15-
checksum: 0f419db76a2e4132e8f833ae2b194d2c2658a0417265390a6036b63b3401c876
16-
- filename: packages/contentstack-export/README.md
17-
checksum: ed79c7f29e1cb17a4889c9b19877fd2d7596aec4cc8fcbf4f83643155ef1800c
18-
- filename: packages/contentstack-import-setup/README.md
19-
checksum: f1640c025b0f7603b5f81b511802bf9de18ee6daefbf01521b8d2347490c7757
20-
- filename: packages/contentstack-import-setup/src/commands/cm/stacks/import-setup.ts
21-
checksum: a903276f842ec00e49ed4751d6df8f4f7213fb1aaa631323f6ce593dad0b236c
22-
- filename: packages/contentstack-migration/README.md
23-
checksum: f25b5601b30057471827d44b41483ea9664586f6c65559ac04a3d39bfb319526
24-
- filename: packages/contentstack-import-setup/src/utils/login-handler.ts
25-
checksum: ca22ae9649dbc11eba4a4399ef517bdd3f3e3b0ca815307a3313bc9332be3f85
26-
- filename: packages/contentstack-migration/src/commands/cm/stacks/migration.js
27-
checksum: ebc17ed46356ec89d294fa0caa84a654d09823410ba5f122331c0ebd83decd92
28-
- filename: packages/contentstack-import-setup/test/unit/login-handler.test.ts
29-
checksum: 51155d629b9825ab8218023cba367ea41264ce534f891e3a6e14a829c2399654
30-
- filename: packages/contentstack-bootstrap/test/bootstrap-integration.test.js
31-
checksum: d3e3902b2ee72aa41483da5c135e5c4bcec85f65939695708e9bec9478f6336c
32-
- filename: packages/contentstack-migration/test/unit/utils/map.test.js
33-
checksum: 7d570280b2f379531dde84946b06171d50f92489ff0de6336f7fbd81c336ee89
34-
- filename: packages/contentstack-seed/test/commands/cm/stacks/seed.test.ts
35-
checksum: 61143bbb2ac86c24afc6972d17d9179c6181ec68a909b84570afdad2aaa13ade
36-
- filename: packages/contentstack-config/test/unit/commands/remove-base-branch.test.ts
37-
checksum: 3e73b079b749120221f357d66ac7351ddb300d283f28410d5e6f3b0309ab3962
38-
- filename: packages/contentstack-migration/test/unit/validators/edit-content-type-validator.test.js
39-
checksum: bde4bc6b2a90e7ce5872e6fbbabef9f2db352705be4d2f8d28d71d84209a714e
40-
- filename: packages/contentstack-bootstrap/test/bootstrap.test.js
41-
checksum: b1f46b3447b1b358f80d6404d9d5b385fb385714e5c1f865ca97d64d6edaefc2
42-
- filename: packages/contentstack-seed/README.md
43-
checksum: 67378f35a33ae250a8099bbb42a5e644486e7279715685e3ba5c65add6451c46
44-
- filename: packages/contentstack-utilities/test/unit/contentstack-marketplace-sdk.test.ts
45-
checksum: ccf521d7eafe03d5c4b597c8b30c4cceac00e75d597685fbfb411da4603fbd29
46-
- filename: packages/contentstack-migration/test/unit/validators/create-content-type-validator.test.js
47-
checksum: f92e39a542cd2d561c441d23395515cadc24c9514de55c3edb038f70bd2458b3
48-
- filename: packages/contentstack-migration/test/unit/modules/parser.test.js
49-
checksum: 243fa1c45875675f719f660c0c988e2ba9266c562a37aaeb09b0db93a0cb037d
50-
- filename: packages/contentstack-bootstrap/test/interactive.test.js
51-
checksum: fb0c32cd846cce3a53927316699a1c5aaa814939fe9b33bcd9141addbbe447d0
52-
- filename: packages/contentstack-seed/test/seed/interactive.test.ts
53-
checksum: e7a823051b5eb27f2674ca2c31719205fa822e9cac1524dbd14e48b1ec078c06
54-
- filename: packages/contentstack/README.md
55-
checksum: e650b0eb54404b08fb2b802a05883dc5984bff43842876df70bcbb5821034fe5
56-
- filename: packages/contentstack-seed/test/seed/importer.test.ts
57-
checksum: 77bc27f5217c6d69c21bac51afc94d677ad67374c1b39b0575646300eb0decd3
58-
- filename: packages/contentstack-seed/test/seed/contentstack/client.test.ts
59-
checksum: f1bc369c9c3c4a84ddd590864c0f3e8b13be956b8fb8891b6324f44cdcc7d568
60-
- filename: packages/contentstack-export/test/unit/export/modules/environments.test.ts
61-
checksum: 3f219e9ecb060cd590bdd4815cf31f2db81396be49d357eadc8d972e7e0d49a2
62-
- filename: packages/contentstack-import/test/unit/utils/backup-handler.test.ts
63-
checksum: 2743a1d7370a9c1a255549a0c1ad8615618bbe4d30645e18224dcfe813411fa0
64-
- filename: packages/contentstack-export/test/unit/export/modules/global-fields.test.ts
65-
checksum: 9f3577388677fa0fa36bf8b280c2137ec6255392cca784d650080d174444cf99
66-
- filename: packages/contentstack-export/test/unit/export/modules/content-types.test.ts
67-
checksum: 90edb36569d165e88f09c49f1989fc499081d61b8da4a56536e55f8a392ba748
68-
- filename: packages/contentstack-import/test/unit/import/module-importer.test.ts
69-
checksum: 383bd60e12028617e450e291c3d84f87b1990e9f14c0898f77b7f63fb3bd0957
70-
- filename: packages/contentstack-export/test/unit/export/modules/base-class.test.ts
71-
checksum: 8755d3c8a6b4f82780a24d1fa4804f90c6c10796b1fe6a0193ac612d14f8f6bb
72-
- filename: packages/contentstack-export/test/unit/export/modules/assets.test.ts
73-
checksum: 12d899d85de5852337a8df36830bb43829be335fb982629134027ede679357a5
74-
- filename: packages/contentstack-export/test/unit/export/modules/marketplace-apps.test.ts
75-
checksum: 2dfcd63eaf8c1692f37ace4f6d300834d752998e56fed13f8aac750c572197ff
76-
- filename: packages/contentstack-export/test/unit/export/modules/locales.test.ts
77-
checksum: cc1f1cebbfffb1c03f5f98268aec55656e60f5251154592e6234b7ce08b6918e
78-
- filename: packages/contentstack-export/test/unit/export/modules/entries.test.ts
79-
checksum: 12de03aa82ba2c7a58f3b6d39cdcadffc5108b6268d599f14c2c50a38ce1091a
80-
- filename: packages/contentstack-export/test/unit/export/modules/stack.test.ts
81-
checksum: dc28ecf8c9f7e9f4f20af1211d789924ee00e5ae33f0ce05c9caa80768b1a734
82-
- filename: packages/contentstack-export/test/unit/export/modules/taxonomies.test.ts
83-
checksum: f6175a8e89fb9dde4b0ff269d65a9e42c4374ef7efb1b828e54e2ebd7c4379fa
84-
- filename: packages/contentstack-export/test/unit/export/modules/workflows.test.ts
85-
checksum: 9da983731811064de04e60a7ddd05ea558661dd17ac4e0c7da5be6cca8b2749d
86-
- filename: packages/contentstack-export/test/unit/utils/export-config-handler.test.ts
87-
checksum: 18600d1aab9507e3f8ee3caed3e6bd79ee05aff9444a2461fcb2f4d7fe6f27a6
88-
- filename: packages/contentstack-import/test/unit/import/modules/entries.test.ts
89-
checksum: 544e11881bc55ea7a1afc05e067d7b29fb2d165783ccd0ce3ff741ef7106b134
90-
- filename: packages/contentstack-export/src/export/modules/environments.ts
91-
checksum: 9c6e2cd260fba0ffd4deaf38835924642ab5ec2a4140185b3fe7eaec13305acb
92-
- filename: packages/contentstack-import/src/utils/common-helper.ts
93-
checksum: 68b605f9e952b05cbf1e9be04214e48f7409bce1eb5a3440183cea13b8cce49a
94-
- filename: packages/contentstack-export/src/utils/marketplace-app-helper.ts
95-
checksum: f5783ace09260150f63edc65e2d91b40310db60b57f9f56675e49b791bac84c8
96-
- filename: packages/contentstack-import/src/utils/asset-helper.ts
97-
checksum: e34bb0522ca8317408f905ee864e25d43acf52c595acaf397d1f35fcc49cbf4a
98-
- filename: packages/contentstack-import/src/utils/login-handler.ts
99-
checksum: 8bcefa5db69f894f3db49d8bca662dcc30f9247a3c4bf278c0d84d24a42481f6
100-
- filename: packages/contentstack-import/src/utils/marketplace-app-helper.ts
101-
checksum: caba03ffade8217dc8f82217a7f767fa6562fba63421d48f0aa8412b8463e21a
102-
- filename: packages/contentstack-clone/src/lib/util/clone-handler.js
103-
checksum: 3cf5eec54f0940eb269e3576298f1170268105073210af4a842b38fd7e969f43
104-
- filename: packages/contentstack-import/src/import/modules/marketplace-apps.ts
105-
checksum: b232e1c5a2b9dec7d6f01e671fd04eaa09351904ef0d20a8ab10f8ca60a2c365
106-
- filename: packages/contentstack-export/src/export/modules/stack.ts
107-
checksum: c2f1e06199bf55fd6d2ebd493edf9e746eabc00fd7c3b8da2785b024a35c9e7c
108-
- filename: packages/contentstack-export/src/utils/basic-login.ts
109-
checksum: d777e56768b53ecd9e5b0a27f4a59950e0791a5487dbcf4d2666510195e20767
110-
- filename: packages/contentstack-import/test/unit/utils/import-config-handler.test.ts
111-
checksum: 5c0add2367ef71367709a6668f4814f80fedda4cafba1f2149f8ceb136128c18
112-
- filename: packages/contentstack-export/test/unit/utils/marketplace-app-helper.test.ts
113-
checksum: 7378a63f935c67af0b4fe40175d24f5f1c91e2b3dbaeda503e2d060700eadb20
114-
- filename: packages/contentstack-import/test/unit/utils/marketplace-app-helper.test.ts
115-
checksum: 24c05dc08fe6fd2c0f19754a6dea61505f2cb124c7697750f9c27f11084fd4f0
116-
- filename: packages/contentstack-import/test/unit/utils/common-helper.test.ts
117-
checksum: 533043fcc944d91d1bfa084a6ba6e87409986c2931197d145237862f55143374
118-
version: '1.0'
3+
checksum: 41bc1d60449ab0682d9267172e54a5802c837869a1728b0560eea8052336c2fe
4+
- filename: package-lock.json
5+
checksum: 0514f96f07a6c2c5be811d8973a0b1197943303cfcf224c0b01745342699f545
6+
version: "1.0"

package-lock.json

Lines changed: 58 additions & 76 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/contentstack-bootstrap/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@oclif/plugin-help": "^6.2.28",
2424
"inquirer": "8.2.7",
2525
"mkdirp": "^1.0.4",
26-
"tar": "^6.2.1 "
26+
"tar": "^7.5.4 "
2727
},
2828
"devDependencies": {
2929
"@oclif/test": "^4.1.13",

packages/contentstack-seed/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@contentstack/management": "~1.22.0",
1212
"inquirer": "8.2.7",
1313
"mkdirp": "^1.0.4",
14-
"tar": "^6.2.1",
14+
"tar": "^7.5.4",
1515
"tmp": "^0.2.3"
1616
},
1717
"devDependencies": {

packages/contentstack-utilities/test/unit/summaryManager.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,7 @@ describe('SummaryManager', () => {
294294

295295
// Should show mixed results
296296
const mixedCall = logCalls.find(call =>
297-
call.args[0] && call.args[0].includes('completed with') &&
298-
call.args[0].includes('failed modules')
297+
call.args[0] && call.args[0].includes('completed with failures')
299298
);
300299
expect(mixedCall).to.not.be.undefined;
301300
});

0 commit comments

Comments
 (0)