Skip to content

Commit 78ba237

Browse files
Vikram KaltaVikram Kalta
authored andcommitted
fix: resolved conflicts
2 parents 42bc09a + d316b36 commit 78ba237

22 files changed

+2511
-3166
lines changed

.talismanrc

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
11
fileignoreconfig:
22
- filename: package-lock.json
3-
checksum: f2a832173c4b84d2105f29c5f83adc9ffbdb017ec869f820251f7496b8ef7f9d
3+
checksum: d388091773e9515cd3c0a5b881644775aa7b8233a405642e49133f296a4ceeeb
44
- filename: test/unit/image-transform.spec.ts
55
checksum: 7beabdd07bd35d620668fcd97e1a303b9cbc40170bf3008a376d75ce0895de2a
66
- filename: test/utils/mocks.ts
77
checksum: a1cb4b1890a584f1facd30f2a0974c97a66f91417022be79d00516338e244227
8-
- filename: test/typescript/taxonomy.test.ts
9-
checksum: e4bdf633e147fd60d929d379f20c814eed5f68b11421d7b53ec8826e9142de37
10-
- filename: src/core/modules/taxonomy.js
11-
checksum: 84589be9805c1be5fd6c56021c41d18365126cf82059ad2cbef1d418c70d08e0
12-
- filename: src/core/lib/utils.js
13-
checksum: 6018f9f13fa32b724d09b9cdf5f78cf030a6332ca549651e1e35fe91e8c7e0e7
14-
- filename: src/core/modules/query.js
15-
checksum: c88b336f9a271397ffedcf8c5085941ceb0bd1cd7e25ed9ada3acd8ce4f8970c
16-
- filename: test/typescript/stack.test.ts
17-
checksum: bbb3c425f8e1a63d4793f69ee9eaba9559294ff53f163a28f70ae54b1792276a
8+
- filename: src/lib/query.ts
9+
checksum: c4529069bc974d15c104303c5ae573c9341185a869c612ab07f0ee7f42e8b149
1810
version: ""

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
### Version: 4.4.2
2+
#### Date: November-16-2024
3+
Fix: Variants reset issue fix on query call
4+
5+
### Version: 4.4.1
6+
#### Date: November-08-2024
7+
Fix: Build via tsup lib
8+
Fix: removed node-localstorage
9+
110
### Version: 4.4.0
211
#### Date: October-21-2024
312
Fix: getData to receive params and headers both in data

config/tsconfig.cjs.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"compilerOptions": {
44
"outDir": "../dist/cjs",
55
"declaration": true,
6+
"module": "CommonJS",
7+
"moduleResolution": "node"
68
},
79
"include": ["../src/**/*.ts"],
810
"exclude": ["node_modules", "../dist/cjs"]

config/tsconfig.esm.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"module": "ESNext",
66
"declaration": true,
77
"declarationDir": "../dist/esm/types",
8+
"moduleResolution": "Node"
89
},
910
"include": ["../src/**/*.ts"], // Adjust this path based on your project structure
1011
"exclude": ["node_modules", "../dist/esm"]

jest.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* eslint-disable */
22
export default {
3+
testEnvironment: 'jsdom',
34
displayName: 'contentstack-delivery',
45
preset: './jest.preset.js',
56
transform: {

jest.preset.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import nxPreset from '@nrwl/jest/preset/index.js';
22

3-
export default { ...nxPreset };
3+
export default { ...nxPreset };

0 commit comments

Comments
 (0)