@vendure/core 3.6.3-master-202605030307 → 3.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/plugin/default-scheduler-plugin/constants.d.ts +2 -0
- package/dist/plugin/default-scheduler-plugin/constants.js +3 -1
- package/dist/plugin/default-scheduler-plugin/constants.js.map +1 -1
- package/dist/plugin/default-scheduler-plugin/default-scheduler-strategy.d.ts +13 -1
- package/dist/plugin/default-scheduler-plugin/default-scheduler-strategy.js +96 -55
- package/dist/plugin/default-scheduler-plugin/default-scheduler-strategy.js.map +1 -1
- package/dist/plugin/default-scheduler-plugin/stale-task.service.d.ts +1 -1
- package/dist/plugin/default-scheduler-plugin/stale-task.service.js.map +1 -1
- package/dist/service/services/asset.service.js +4 -2
- package/dist/service/services/asset.service.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
export declare const DEFAULT_SCHEDULER_PLUGIN_OPTIONS: unique symbol;
|
|
2
2
|
export declare const DEFAULT_TIMEOUT = 60000;
|
|
3
3
|
export declare const DEFAULT_MANUAL_TRIGGER_CHECK_INTERVAL = 10000;
|
|
4
|
+
export declare const DEFAULT_LOCK_HOLD_FRACTION = 0.8;
|
|
5
|
+
export declare const DEFAULT_MAX_LOCK_HOLD_MS = 5000;
|
|
4
6
|
export declare const loggerCtx = "DefaultSchedulerPlugin";
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.loggerCtx = exports.DEFAULT_MANUAL_TRIGGER_CHECK_INTERVAL = exports.DEFAULT_TIMEOUT = exports.DEFAULT_SCHEDULER_PLUGIN_OPTIONS = void 0;
|
|
3
|
+
exports.loggerCtx = exports.DEFAULT_MAX_LOCK_HOLD_MS = exports.DEFAULT_LOCK_HOLD_FRACTION = exports.DEFAULT_MANUAL_TRIGGER_CHECK_INTERVAL = exports.DEFAULT_TIMEOUT = exports.DEFAULT_SCHEDULER_PLUGIN_OPTIONS = void 0;
|
|
4
4
|
exports.DEFAULT_SCHEDULER_PLUGIN_OPTIONS = Symbol('DEFAULT_SCHEDULER_PLUGIN_OPTIONS');
|
|
5
5
|
exports.DEFAULT_TIMEOUT = 60000;
|
|
6
6
|
exports.DEFAULT_MANUAL_TRIGGER_CHECK_INTERVAL = 10000;
|
|
7
|
+
exports.DEFAULT_LOCK_HOLD_FRACTION = 0.8;
|
|
8
|
+
exports.DEFAULT_MAX_LOCK_HOLD_MS = 5000;
|
|
7
9
|
exports.loggerCtx = 'DefaultSchedulerPlugin';
|
|
8
10
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/plugin/default-scheduler-plugin/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,gCAAgC,GAAG,MAAM,CAAC,kCAAkC,CAAC,CAAC;AAC9E,QAAA,eAAe,GAAG,KAAK,CAAC;AACxB,QAAA,qCAAqC,GAAG,KAAK,CAAC;AAC9C,QAAA,SAAS,GAAG,wBAAwB,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/plugin/default-scheduler-plugin/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,gCAAgC,GAAG,MAAM,CAAC,kCAAkC,CAAC,CAAC;AAC9E,QAAA,eAAe,GAAG,KAAK,CAAC;AACxB,QAAA,qCAAqC,GAAG,KAAK,CAAC;AAC9C,QAAA,0BAA0B,GAAG,GAAG,CAAC;AACjC,QAAA,wBAAwB,GAAG,IAAI,CAAC;AAChC,QAAA,SAAS,GAAG,wBAAwB,CAAC"}
|
|
@@ -23,13 +23,21 @@ export declare class DefaultSchedulerStrategy implements SchedulerStrategy {
|
|
|
23
23
|
init(injector: Injector): void;
|
|
24
24
|
destroy(): Promise<void>;
|
|
25
25
|
registerTask(task: ScheduledTask): void;
|
|
26
|
-
executeTask(task: ScheduledTask): (
|
|
26
|
+
executeTask(task: ScheduledTask): (_job?: Cron) => Promise<void>;
|
|
27
|
+
private runManually;
|
|
28
|
+
private runTask;
|
|
27
29
|
getTasks(): Promise<TaskReport[]>;
|
|
28
30
|
getTask(id: string): Promise<TaskReport | undefined>;
|
|
29
31
|
updateTask(input: UpdateScheduledTaskInput): Promise<TaskReport>;
|
|
30
32
|
triggerTask(task: ScheduledTask): Promise<void>;
|
|
31
33
|
private checkForManuallyTriggeredTasks;
|
|
32
34
|
private entityToReport;
|
|
35
|
+
/**
|
|
36
|
+
* Hold window after task completion during which scheduled re-acquisitions
|
|
37
|
+
* are rejected. Prevents a worker with a lagging clock from re-running a
|
|
38
|
+
* task that has just completed on a faster worker.
|
|
39
|
+
*/
|
|
40
|
+
private computeLockHoldMs;
|
|
33
41
|
private ensureAllTasksAreRegistered;
|
|
34
42
|
/**
|
|
35
43
|
* Attempts to acquire a lock for the given task.
|
|
@@ -41,6 +49,10 @@ export declare class DefaultSchedulerStrategy implements SchedulerStrategy {
|
|
|
41
49
|
*
|
|
42
50
|
* For databases that don't support pessimistic locking (SQLite, SQL.js),
|
|
43
51
|
* we fall back to the atomic UPDATE approach which works correctly for single-connection scenarios.
|
|
52
|
+
*
|
|
53
|
+
* `skipHoldCheck` lets manual triggers bypass the post-completion hold
|
|
54
|
+
* window (see `computeLockHoldMs`); they are already deduplicated via
|
|
55
|
+
* `manuallyTriggeredAt` and have no inter-worker race.
|
|
44
56
|
*/
|
|
45
57
|
private tryAcquireLock;
|
|
46
58
|
private ensureTaskIsRegistered;
|
|
@@ -56,55 +56,61 @@ class DefaultSchedulerStrategy {
|
|
|
56
56
|
});
|
|
57
57
|
}
|
|
58
58
|
executeTask(task) {
|
|
59
|
-
return async (
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
59
|
+
return async (_job) => {
|
|
60
|
+
await this.runTask(task, { skipHoldCheck: false });
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
async runManually(task) {
|
|
64
|
+
await this.runTask(task, { skipHoldCheck: true });
|
|
65
|
+
}
|
|
66
|
+
async runTask(task, options) {
|
|
67
|
+
var _a;
|
|
68
|
+
await this.ensureTaskIsRegistered(task);
|
|
69
|
+
await this.staleTaskService.cleanStaleLocksForTask(task);
|
|
70
|
+
const lockAcquired = await this.tryAcquireLock(task, {
|
|
71
|
+
skipHoldCheck: options.skipHoldCheck,
|
|
72
|
+
});
|
|
73
|
+
if (!lockAcquired) {
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
vendure_logger_1.Logger.verbose(`Executing scheduled task "${task.id}"`);
|
|
77
|
+
let timeoutTimer;
|
|
78
|
+
try {
|
|
79
|
+
this.runningTasks.push(task);
|
|
80
|
+
const timeout = (_a = task.options.timeout) !== null && _a !== void 0 ? _a : this.pluginOptions.defaultTimeout;
|
|
81
|
+
const timeoutMs = typeof timeout === 'number' ? timeout : (0, ms_1.default)(timeout);
|
|
82
|
+
const timeoutPromise = new Promise((_, reject) => {
|
|
83
|
+
timeoutTimer = setTimeout(() => {
|
|
84
|
+
vendure_logger_1.Logger.warn(`Scheduled task ${task.id} timed out after ${timeoutMs}ms`);
|
|
85
|
+
reject(new Error('Task timed out'));
|
|
86
|
+
}, timeoutMs);
|
|
87
|
+
});
|
|
88
|
+
const result = await Promise.race([task.execute(this.injector), timeoutPromise]);
|
|
89
|
+
await this.connection.rawConnection.getRepository(scheduled_task_record_entity_1.ScheduledTaskRecord).update({ taskId: task.id }, {
|
|
90
|
+
lastExecutedAt: new Date(),
|
|
91
|
+
lockedAt: null,
|
|
92
|
+
lastResult: result !== null && result !== void 0 ? result : '',
|
|
93
|
+
});
|
|
94
|
+
vendure_logger_1.Logger.verbose(`Scheduled task "${task.id}" completed successfully`);
|
|
95
|
+
}
|
|
96
|
+
catch (error) {
|
|
97
|
+
let errorMessage = 'Unknown error';
|
|
98
|
+
if (error instanceof Error) {
|
|
99
|
+
errorMessage = error.message;
|
|
92
100
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
lastResult: { error: errorMessage },
|
|
104
|
-
});
|
|
105
|
-
this.runningTasks = this.runningTasks.filter(t => t !== task);
|
|
101
|
+
vendure_logger_1.Logger.error(`Scheduled task "${task.id}" failed with error: ${errorMessage}`);
|
|
102
|
+
await this.connection.rawConnection.getRepository(scheduled_task_record_entity_1.ScheduledTaskRecord).update({ taskId: task.id }, {
|
|
103
|
+
lastExecutedAt: new Date(),
|
|
104
|
+
lockedAt: null,
|
|
105
|
+
lastResult: { error: errorMessage },
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
finally {
|
|
109
|
+
if (timeoutTimer) {
|
|
110
|
+
clearTimeout(timeoutTimer);
|
|
106
111
|
}
|
|
107
|
-
|
|
112
|
+
this.runningTasks = this.runningTasks.filter(t => t !== task);
|
|
113
|
+
}
|
|
108
114
|
}
|
|
109
115
|
async getTasks() {
|
|
110
116
|
await this.ensureAllTasksAreRegistered();
|
|
@@ -174,7 +180,7 @@ class DefaultSchedulerStrategy {
|
|
|
174
180
|
const task = this.tasks.get(taskEntity.taskId);
|
|
175
181
|
if (task) {
|
|
176
182
|
vendure_logger_1.Logger.info(`Executing manually triggered task: ${task.task.id}`);
|
|
177
|
-
void this.
|
|
183
|
+
void this.runManually(task.task);
|
|
178
184
|
}
|
|
179
185
|
}
|
|
180
186
|
}
|
|
@@ -187,6 +193,24 @@ class DefaultSchedulerStrategy {
|
|
|
187
193
|
enabled: task.enabled,
|
|
188
194
|
};
|
|
189
195
|
}
|
|
196
|
+
/**
|
|
197
|
+
* Hold window after task completion during which scheduled re-acquisitions
|
|
198
|
+
* are rejected. Prevents a worker with a lagging clock from re-running a
|
|
199
|
+
* task that has just completed on a faster worker.
|
|
200
|
+
*/
|
|
201
|
+
computeLockHoldMs(task) {
|
|
202
|
+
let intervalMs;
|
|
203
|
+
try {
|
|
204
|
+
intervalMs = this.staleTaskService.getScheduleIntervalMs(task);
|
|
205
|
+
}
|
|
206
|
+
catch (_a) {
|
|
207
|
+
return constants_1.DEFAULT_MAX_LOCK_HOLD_MS;
|
|
208
|
+
}
|
|
209
|
+
if (!Number.isFinite(intervalMs) || intervalMs <= 0) {
|
|
210
|
+
return constants_1.DEFAULT_MAX_LOCK_HOLD_MS;
|
|
211
|
+
}
|
|
212
|
+
return Math.floor(Math.min(intervalMs * constants_1.DEFAULT_LOCK_HOLD_FRACTION, constants_1.DEFAULT_MAX_LOCK_HOLD_MS));
|
|
213
|
+
}
|
|
190
214
|
async ensureAllTasksAreRegistered() {
|
|
191
215
|
for (const task of this.tasks.values()) {
|
|
192
216
|
await this.ensureTaskIsRegistered(task.task);
|
|
@@ -202,10 +226,17 @@ class DefaultSchedulerStrategy {
|
|
|
202
226
|
*
|
|
203
227
|
* For databases that don't support pessimistic locking (SQLite, SQL.js),
|
|
204
228
|
* we fall back to the atomic UPDATE approach which works correctly for single-connection scenarios.
|
|
229
|
+
*
|
|
230
|
+
* `skipHoldCheck` lets manual triggers bypass the post-completion hold
|
|
231
|
+
* window (see `computeLockHoldMs`); they are already deduplicated via
|
|
232
|
+
* `manuallyTriggeredAt` and have no inter-worker race.
|
|
205
233
|
*/
|
|
206
|
-
async tryAcquireLock(task) {
|
|
234
|
+
async tryAcquireLock(task, options = {}) {
|
|
207
235
|
const dbType = this.connection.rawConnection.options.type;
|
|
208
236
|
const supportsPessimisticLocking = ['postgres', 'mysql', 'mariadb'].includes(dbType);
|
|
237
|
+
const holdThreshold = options.skipHoldCheck
|
|
238
|
+
? null
|
|
239
|
+
: new Date(Date.now() - this.computeLockHoldMs(task));
|
|
209
240
|
if (supportsPessimisticLocking) {
|
|
210
241
|
// Use a transaction with pessimistic locking to ensure only one worker
|
|
211
242
|
// can acquire the lock.
|
|
@@ -213,14 +244,19 @@ class DefaultSchedulerStrategy {
|
|
|
213
244
|
// First, try to select the task row with a FOR UPDATE lock.
|
|
214
245
|
// This will block other transactions trying to select the same row
|
|
215
246
|
// until this transaction commits or rolls back.
|
|
216
|
-
const
|
|
247
|
+
const qb = manager
|
|
217
248
|
.getRepository(scheduled_task_record_entity_1.ScheduledTaskRecord)
|
|
218
249
|
.createQueryBuilder('task')
|
|
219
250
|
.setLock('pessimistic_write')
|
|
220
251
|
.where('task.taskId = :taskId', { taskId: task.id })
|
|
221
252
|
.andWhere('task.lockedAt IS NULL')
|
|
222
|
-
.andWhere('task.enabled = TRUE')
|
|
223
|
-
|
|
253
|
+
.andWhere('task.enabled = TRUE');
|
|
254
|
+
if (holdThreshold) {
|
|
255
|
+
qb.andWhere('(task.lastExecutedAt IS NULL OR task.lastExecutedAt <= :holdThreshold)', {
|
|
256
|
+
holdThreshold,
|
|
257
|
+
});
|
|
258
|
+
}
|
|
259
|
+
const taskRecord = await qb.getOne();
|
|
224
260
|
if (!taskRecord) {
|
|
225
261
|
// Task is either already locked, disabled, or doesn't exist
|
|
226
262
|
return false;
|
|
@@ -236,15 +272,20 @@ class DefaultSchedulerStrategy {
|
|
|
236
272
|
// For databases without pessimistic locking support (SQLite, SQL.js),
|
|
237
273
|
// use the atomic UPDATE approach. This works for single-connection scenarios
|
|
238
274
|
// but may have race conditions with multiple connections.
|
|
239
|
-
const
|
|
275
|
+
const qb = this.connection.rawConnection
|
|
240
276
|
.getRepository(scheduled_task_record_entity_1.ScheduledTaskRecord)
|
|
241
277
|
.createQueryBuilder('task')
|
|
242
278
|
.update()
|
|
243
279
|
.set({ lockedAt: new Date() })
|
|
244
280
|
.where('taskId = :taskId', { taskId: task.id })
|
|
245
281
|
.andWhere('lockedAt IS NULL')
|
|
246
|
-
.andWhere('enabled = TRUE')
|
|
247
|
-
|
|
282
|
+
.andWhere('enabled = TRUE');
|
|
283
|
+
if (holdThreshold) {
|
|
284
|
+
qb.andWhere('(lastExecutedAt IS NULL OR lastExecutedAt <= :holdThreshold)', {
|
|
285
|
+
holdThreshold,
|
|
286
|
+
});
|
|
287
|
+
}
|
|
288
|
+
const result = await qb.execute();
|
|
248
289
|
return !!result.affected;
|
|
249
290
|
}
|
|
250
291
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-scheduler-strategy.js","sourceRoot":"","sources":["../../../src/plugin/default-scheduler-plugin/default-scheduler-strategy.ts"],"names":[],"mappings":";;;;;;AAEA,4CAA0C;AAG1C,8CAAiD;AACjD,gEAA4D;AAC5D,uEAA4D;AAC5D,iDAA2D;AAC3D,2DAAuD;AAIvD,
|
|
1
|
+
{"version":3,"file":"default-scheduler-strategy.js","sourceRoot":"","sources":["../../../src/plugin/default-scheduler-plugin/default-scheduler-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ export declare class StaleTaskService {
|
|
|
21
21
|
/**
|
|
22
22
|
* Returns the interval in ms between one run of the task, and the next.
|
|
23
23
|
*/
|
|
24
|
-
|
|
24
|
+
getScheduleIntervalMs(task: ScheduledTask): number;
|
|
25
25
|
private isStale;
|
|
26
26
|
private clearStaleLock;
|
|
27
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stale-task.service.js","sourceRoot":"","sources":["../../../src/plugin/default-scheduler-plugin/stale-task.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,8EAA2C;AAC3C,mCAA8B;AAE9B,4EAA+D;AAC/D,yCAAsC;AACtC,wFAAoF;AAGpF,2CAAwC;AACxC,iFAAqE;AAErE;;;;;;;GAOG;AAGI,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAIzB,YAAoB,UAAmC;QAAnC,eAAU,GAAV,UAAU,CAAyB;QAHvD,qCAAqC;QAC7B,oBAAe,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEM,CAAC;IAE3D;;;OAGG;IACH,KAAK,CAAC,sBAAsB,CAAC,IAAmB;QAC5C,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC;YACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACvD,IAAI,CAAC,UAAU,EAAE,CAAC;gBACd,OAAO;YACX,CAAC;YACD,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;YACpD,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,CAAC;gBAC5C,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;YAC1C,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,eAAM,CAAC,KAAK,CACR,uCAAuC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAC/F,qBAAS,CACZ,CAAC;YACF,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,MAAc;QACxC,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa;aAC/B,aAAa,CAAC,kDAAmB,CAAC;aAClC,kBAAkB,CAAC,MAAM,CAAC;aAC1B,MAAM,CAAC,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;aACxC,KAAK,CAAC,2BAA2B,CAAC;aAClC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC7C,MAAM,EAAE,CAAC;IAClB,CAAC;IAED;;OAEG;
|
|
1
|
+
{"version":3,"file":"stale-task.service.js","sourceRoot":"","sources":["../../../src/plugin/default-scheduler-plugin/stale-task.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -265,7 +265,6 @@ let AssetService = class AssetService {
|
|
|
265
265
|
input.focalPoint.y = to3dp(input.focalPoint.y);
|
|
266
266
|
}
|
|
267
267
|
(0, patch_entity_1.patchEntity)(asset, (0, omit_1.omit)(input, ['tags', 'name', 'translations']));
|
|
268
|
-
await this.customFieldRelationService.updateRelations(ctx, asset_entity_1.Asset, input, asset);
|
|
269
268
|
if (input.tags) {
|
|
270
269
|
asset.tags = await this.tagService.valuesToTags(ctx, input.tags);
|
|
271
270
|
}
|
|
@@ -275,8 +274,11 @@ let AssetService = class AssetService {
|
|
|
275
274
|
if (input.name != null && !translationsInput.some(t => t.languageCode === ctx.languageCode)) {
|
|
276
275
|
translationsInput.push({ languageCode: ctx.languageCode, name: input.name });
|
|
277
276
|
}
|
|
278
|
-
// Save asset first to ensure it exists for translation foreign key
|
|
277
|
+
// Save asset first to ensure it exists for translation foreign key, and so that
|
|
278
|
+
// updateRelations() sees the freshly-patched scalar custom fields when it reloads
|
|
279
|
+
// the entity from the DB.
|
|
279
280
|
const savedAsset = await this.connection.getRepository(ctx, asset_entity_1.Asset).save(asset);
|
|
281
|
+
await this.customFieldRelationService.updateRelations(ctx, asset_entity_1.Asset, input, asset);
|
|
280
282
|
if (translationsInput.length > 0) {
|
|
281
283
|
await this.translatableSaver.update({
|
|
282
284
|
ctx,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset.service.js","sourceRoot":"","sources":["../../../src/service/services/asset.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"asset.service.js","sourceRoot":"","sources":["../../../src/service/services/asset.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vendure/core",
|
|
3
|
-
"version": "3.6.3
|
|
3
|
+
"version": "3.6.3",
|
|
4
4
|
"description": "A modern, headless ecommerce framework",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"@nestjs/platform-express": "^11.0.12",
|
|
50
50
|
"@nestjs/terminus": "^11.0.0",
|
|
51
51
|
"@nestjs/typeorm": "^11.0.0",
|
|
52
|
-
"@vendure/common": "
|
|
52
|
+
"@vendure/common": "3.6.3",
|
|
53
53
|
"bcrypt": "^6.0.0",
|
|
54
54
|
"body-parser": "^1.20.2",
|
|
55
55
|
"cookie-session": "^2.1.0",
|