Skip to content

Commit 8a3a15e

Browse files
Merge pull request #2365 from contentstack/fix/merge-development-beta
Fix/merge development beta
2 parents f5f3306 + df99a3a commit 8a3a15e

7 files changed

Lines changed: 549 additions & 623 deletions

File tree

.talismanrc

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,6 @@
11
fileignoreconfig:
2-
- filename: pnpm-lock.yaml
3-
checksum: f20d4336b379ba896f0092ed8dd03df2c6e5bc34fe200e58002efc2c77fd9359
4-
- filename: package-lock.json
5-
checksum: b41714137255ba498375116ae9410e04af150d75ba323c8dbaeb8995564a4677
6-
- filename: packages/contentstack-audit/test/unit/mock/contents/composable_studio/environments/environments.json
7-
checksum: 0402604e5919a7e38ecb5ff0916d6ae5ab7d98fe78ff6ac9eba8a9b8130af34d
8-
- filename: packages/contentstack-utilities/src/helpers.ts
9-
checksum: 6a741bb972f59c56d2c0f3a9f96e2963392361db2e401948c9c1796829478e13
10-
- filename: packages/contentstack-audit/test/unit/mock/contents/composable_studio/composable_studio.json
11-
checksum: 6912e5ea32b4456ad04d1645750c72bbb29ab1895368c3a242ab39e9350ec531
12-
- filename: packages/contentstack-utilities/src/logger/session-path.ts
13-
checksum: 4c66980a857bc12012a45e50790c0eaab06883db5e1476d84fb142a08b70b2e7
14-
- filename: packages/contentstack-import/test/unit/commands/cm/stacks/import.test.ts
15-
checksum: a9e24596e7ae54b71cc28a41cf9d65bbdbf6754446e08958288e90a579cc351d
16-
- filename: packages/contentstack-audit/src/modules/modulesData.ts
17-
checksum: 1e6c1fba1172512401038d5454c8d218201ec62262449c5c878609592e0124c4
18-
- filename: packages/contentstack-audit/test/unit/mock/contents/composable_studio/invalid_composable_studio.json
19-
checksum: e6465aa0011d1565a2de848d9cca74395d11419e6ac840e7dfb52e1d255b1c4f
20-
- filename: packages/contentstack-audit/src/modules/composable-studio.ts
21-
checksum: 4fc97ff582d6dff9a54b3a50dfa3cbb5febd38a55aeb8737034b97188ad543ba
22-
- filename: packages/contentstack-utilities/test/unit/logger.test.ts
23-
checksum: a1939dea16166b1893a248179524a76f2ed20b04b99c83bd1a5a13fcf6f0dadc
24-
- filename: packages/contentstack-clone/README.md
25-
checksum: 8580ab3f52a079a6411c27cbaad66e3a70d9ac5ea59fc429a8f17c95d09399f8
26-
- filename: packages/contentstack/README.md
27-
checksum: 72850c976661f2912b5bca39734de09d56c311c2266fc67696c45ed3fb0b7511
28-
version: "1.0"
2+
- filename: pnpm-lock.yaml
3+
checksum: 2ab7172b5b105a5e903aa7d4fc4b38d282e2c32befdc8b219c3bb3fb40aead2a
4+
- filename: package-lock.json
5+
checksum: 62030a34e011bd34bc4a071d868210cfe9c90ae5241250a576f7cb212084dbf1
6+
version: '1.0'

package-lock.json

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

packages/contentstack-export-to-csv/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {
88
"@contentstack/cli-command": "~1.7.2",
9-
"@contentstack/cli-utilities": "~1.17.0",
9+
"@contentstack/cli-utilities": "~1.17.1",
1010
"@oclif/core": "^4.8.0",
1111
"@oclif/plugin-help": "^6.2.32",
1212
"fast-csv": "^4.3.6",

packages/contentstack-import-setup/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {
88
"@contentstack/cli-command": "~1.7.2",
9-
"@contentstack/cli-utilities": "~1.17.0",
9+
"@contentstack/cli-utilities": "~1.17.1",
1010
"@oclif/core": "^4.3.0",
1111
"big-json": "^3.2.0",
1212
"chalk": "^4.1.2",
@@ -85,4 +85,4 @@
8585
}
8686
},
8787
"repository": "https://github.com/contentstack/cli"
88-
}
88+
}

packages/contentstack-import/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {
8-
"@contentstack/cli-audit": "~2.0.0-beta.1",
9-
"@contentstack/cli-command": "~1.7.0",
10-
"@contentstack/cli-utilities": "~1.17.0",
8+
"@contentstack/cli-audit": "~1.17.1",
9+
"@contentstack/cli-command": "~1.7.1",
10+
"@contentstack/cli-utilities": "~1.17.1",
1111
"@contentstack/management": "~1.27.3",
1212
"@contentstack/cli-variants": "~2.0.0-beta.4",
1313
"@oclif/core": "^4.3.0",

packages/contentstack-migration/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"author": "@contentstack",
55
"bugs": "https://github.com/contentstack/cli/issues",
66
"dependencies": {
7-
"@contentstack/cli-command": "~1.7.02",
8-
"@contentstack/cli-utilities": "~1.17.0",
7+
"@contentstack/cli-command": "~1.7.2",
8+
"@contentstack/cli-utilities": "~1.17.1",
99
"@oclif/core": "^4.3.0",
1010
"@oclif/plugin-help": "^6.2.28",
1111
"async": "^3.2.6",
@@ -62,4 +62,4 @@
6262
"cm:stacks:migration": "MGRTN"
6363
}
6464
}
65-
}
65+
}

0 commit comments

Comments
 (0)