@fdm-monster/server 1.7.4 → 1.7.5
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/.env.template +0 -3
- package/.yarn/install-state.gz +0 -0
- package/.yarn/releases/{yarn-4.5.1.cjs → yarn-4.5.2.cjs} +292 -292
- package/.yarnrc.yml +1 -1
- package/RELEASE_NOTES.MD +11 -0
- package/dist/constants/server-settings.constants.js +0 -9
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/controllers/auth.controller.js +1 -1
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +1 -20
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/middleware/global.middleware.js +1 -25
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/models/Settings.js +0 -10
- package/dist/models/Settings.js.map +1 -1
- package/dist/server.constants.js +1 -2
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +1 -1
- package/dist/server.core.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js +3 -15
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/mongoose/settings.service.js +10 -30
- package/dist/services/mongoose/settings.service.js.map +1 -1
- package/dist/services/octoprint/octoprint-websocket.adapter.js +2 -1
- package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
- package/dist/services/orm/settings.service.js +9 -27
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/validators/settings-service.validation.js +8 -19
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/state/settings.store.js +0 -9
- package/dist/state/settings.store.js.map +1 -1
- package/package.json +12 -13
|
@@ -12,10 +12,6 @@ const _entities = require("../../entities");
|
|
|
12
12
|
const _serversettingsconstants = require("../../constants/server-settings.constants");
|
|
13
13
|
const _baseservice = require("./base.service");
|
|
14
14
|
const _settingsdto = require("../interfaces/settings.dto");
|
|
15
|
-
const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
|
|
16
|
-
const _serverconstants = require("../../server.constants");
|
|
17
|
-
const _validators = require("../../handlers/validators");
|
|
18
|
-
const _settingsservicevalidation = require("../validators/settings-service.validation");
|
|
19
15
|
class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings, _settingsdto.SettingsDto) {
|
|
20
16
|
configService;
|
|
21
17
|
constructor({ configService, typeormService }){
|
|
@@ -140,16 +136,19 @@ class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings,
|
|
|
140
136
|
}
|
|
141
137
|
if (!entity[_serversettingsconstants.serverSettingsKey]) {
|
|
142
138
|
entity[_serversettingsconstants.serverSettingsKey] = (0, _serversettingsconstants.getDefaultServerSettings)();
|
|
139
|
+
} else {
|
|
140
|
+
entity[_serversettingsconstants.serverSettingsKey] = {
|
|
141
|
+
debugSettings: entity[_serversettingsconstants.serverSettingsKey].debugSettings,
|
|
142
|
+
loginRequired: entity[_serversettingsconstants.serverSettingsKey].loginRequired,
|
|
143
|
+
registration: entity[_serversettingsconstants.serverSettingsKey].registration,
|
|
144
|
+
experimentalClientSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalClientSupport,
|
|
145
|
+
experimentalMoonrakerSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
|
|
146
|
+
sentryDiagnosticsEnabled: entity[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled
|
|
147
|
+
};
|
|
143
148
|
}
|
|
144
149
|
if (!entity[_serversettingsconstants.credentialSettingsKey]) {
|
|
145
150
|
entity[_serversettingsconstants.credentialSettingsKey] = (0, _serversettingsconstants.getDefaultCredentialSettings)();
|
|
146
151
|
}
|
|
147
|
-
if (!this.isWhiteListSettingEnabled()) {
|
|
148
|
-
entity.server.whitelistEnabled = false;
|
|
149
|
-
entity.server.whitelistedIpAddresses = (0, _serversettingsconstants.getDefaultWhitelistIpAddresses)();
|
|
150
|
-
} else if (!entity.server.whitelistedIpAddresses?.length) {
|
|
151
|
-
entity.server.whitelistedIpAddresses = (0, _serversettingsconstants.getDefaultWhitelistIpAddresses)();
|
|
152
|
-
}
|
|
153
152
|
if (!entity[_serversettingsconstants.frontendSettingKey]) {
|
|
154
153
|
entity[_serversettingsconstants.frontendSettingKey] = (0, _serversettingsconstants.getDefaultFrontendSettings)();
|
|
155
154
|
}
|
|
@@ -195,23 +194,6 @@ class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings,
|
|
|
195
194
|
await this.update(entity.id, entity);
|
|
196
195
|
return entity;
|
|
197
196
|
}
|
|
198
|
-
async setWhitelist(enabled, ipAddresses) {
|
|
199
|
-
if (!this.isWhiteListSettingEnabled()) {
|
|
200
|
-
throw new _runtimeexceptions.BadRequestException("Whitelist settings are not enabled");
|
|
201
|
-
}
|
|
202
|
-
await (0, _validators.validateInput)({
|
|
203
|
-
whitelistEnabled: enabled,
|
|
204
|
-
whitelistedIpAddresses: ipAddresses
|
|
205
|
-
}, _settingsservicevalidation.whitelistSettingUpdateRules);
|
|
206
|
-
const entity = await this.getOrCreate();
|
|
207
|
-
entity[_serversettingsconstants.serverSettingsKey].whitelistEnabled = enabled;
|
|
208
|
-
entity[_serversettingsconstants.serverSettingsKey].whitelistedIpAddresses = ipAddresses;
|
|
209
|
-
await this.update(entity.id, entity);
|
|
210
|
-
return entity;
|
|
211
|
-
}
|
|
212
|
-
isWhiteListSettingEnabled() {
|
|
213
|
-
return this.configService.get(_serverconstants.AppConstants.ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS, "false") === "true";
|
|
214
|
-
}
|
|
215
197
|
}
|
|
216
198
|
|
|
217
199
|
//# sourceMappingURL=settings.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService2","BaseService","Settings","SettingsDto","configService","constructor","typeormService","toDto","entity","serverSettingsKey","experimentalTypeormSupport","frontendSettingKey","printerFileCleanSettingKey","wizardSettingKey","timeoutSettingKey","getOrCreate","settings","get","create","getDefaultServerSettings","credentialSettingsKey","getDefaultCredentialSettings","getDefaultWizardSettings","getDefaultFileCleanSettings","getDefaultFrontendSettings","getDefaultTimeout","migrateSettingsRuntime","getServerSettings","patchServerSettings","serverSettingsPartial","Error","newServerSettings","updateServerSettings","serverSettings","update","id","updateCredentialSettings","credentialSettings","updateFileCleanSettings","fileCleanSettings","updateFrontendSettings","frontendSettings","updateTimeoutSettings","timeoutSettings","patchWizardSettings","wizardSettingsPartial","newWizardSettings","updateWizardSettings","wizardSettings","settingsList","repository","find","take","length","knownSettings","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService2","BaseService","Settings","SettingsDto","configService","constructor","typeormService","toDto","entity","serverSettingsKey","experimentalTypeormSupport","frontendSettingKey","printerFileCleanSettingKey","wizardSettingKey","timeoutSettingKey","getOrCreate","settings","get","create","getDefaultServerSettings","credentialSettingsKey","getDefaultCredentialSettings","getDefaultWizardSettings","getDefaultFileCleanSettings","getDefaultFrontendSettings","getDefaultTimeout","migrateSettingsRuntime","getServerSettings","patchServerSettings","serverSettingsPartial","Error","newServerSettings","updateServerSettings","serverSettings","update","id","updateCredentialSettings","credentialSettings","updateFileCleanSettings","fileCleanSettings","updateFrontendSettings","frontendSettings","updateTimeoutSettings","timeoutSettings","patchWizardSettings","wizardSettingsPartial","newWizardSettings","updateWizardSettings","wizardSettings","settingsList","repository","find","take","length","knownSettings","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","debugSettings","loginRequired","registration","experimentalClientSupport","experimentalMoonrakerSupport","sentryDiagnosticsEnabled","patchCredentialSettings","patchUpdate","newCredentialSettings","patchFileCleanSettings","newFileCleanSettings","setLoginRequired","enabled","setRegistrationEnabled","setSentryDiagnosticsEnabled"],"mappings":"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"}
|
|
@@ -33,25 +33,19 @@ _export(exports, {
|
|
|
33
33
|
timeoutSettingsUpdateRules: function() {
|
|
34
34
|
return timeoutSettingsUpdateRules;
|
|
35
35
|
},
|
|
36
|
-
whitelistSettingUpdateRules: function() {
|
|
37
|
-
return whitelistSettingUpdateRules;
|
|
38
|
-
},
|
|
39
36
|
wizardUpdateRules: function() {
|
|
40
37
|
return wizardUpdateRules;
|
|
41
38
|
}
|
|
42
39
|
});
|
|
43
40
|
const _envutils = require("../../utils/env.utils");
|
|
44
|
-
const serverSettingsUpdateRules =
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
"whitelistedIpAddresses.*": whitelistFeatureEnabled ? "required|string" : "not",
|
|
53
|
-
experimentalMoonrakerSupport: "boolean"
|
|
54
|
-
});
|
|
41
|
+
const serverSettingsUpdateRules = {
|
|
42
|
+
registration: "boolean",
|
|
43
|
+
loginRequired: "boolean",
|
|
44
|
+
debugSettings: "object",
|
|
45
|
+
"debugSettings.debugSocketEvents": "boolean",
|
|
46
|
+
"debugSettings.debugSocketReconnect": "boolean",
|
|
47
|
+
experimentalMoonrakerSupport: "boolean"
|
|
48
|
+
};
|
|
55
49
|
const timeoutSettingsUpdateRules = {
|
|
56
50
|
apiTimeout: "integer|min:1000"
|
|
57
51
|
};
|
|
@@ -66,11 +60,6 @@ const credentialSettingPatchRules = {
|
|
|
66
60
|
refreshTokenAttempts: "integer|min:-1",
|
|
67
61
|
refreshTokenExpiry: (0, _envutils.isProductionEnvironment)() ? "integer|min:240" : "integer|min:0"
|
|
68
62
|
};
|
|
69
|
-
const whitelistSettingUpdateRules = {
|
|
70
|
-
whitelistedIpAddresses: "required|array|minLength:1",
|
|
71
|
-
"whitelistedIpAddresses.*": "required|string",
|
|
72
|
-
whitelistEnabled: "required|boolean"
|
|
73
|
-
};
|
|
74
63
|
const wizardUpdateRules = {
|
|
75
64
|
wizardCompleted: "required|boolean",
|
|
76
65
|
wizardCompletedAt: "required|date|nullable",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/validators/settings-service.validation.ts"],"names":["clientNextRules","credentialSettingPatchRules","fileCleanSettingsUpdateRules","frontendSettingsUpdateRules","moonrakerSupportRules","sentryDiagnosticsEnabledRules","serverSettingsUpdateRules","timeoutSettingsUpdateRules","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/validators/settings-service.validation.ts"],"names":["clientNextRules","credentialSettingPatchRules","fileCleanSettingsUpdateRules","frontendSettingsUpdateRules","moonrakerSupportRules","sentryDiagnosticsEnabledRules","serverSettingsUpdateRules","timeoutSettingsUpdateRules","wizardUpdateRules","registration","loginRequired","debugSettings","experimentalMoonrakerSupport","apiTimeout","gridCols","gridRows","largeTiles","jwtSecret","jwtExpiresIn","isProductionEnvironment","refreshTokenAttempts","refreshTokenExpiry","wizardCompleted","wizardCompletedAt","wizardVersion","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","enabled"],"mappings":";;;;;;;;;;;IAgDaA,eAAe;eAAfA;;IA3BAC,2BAA2B;eAA3BA;;IAaAC,4BAA4B;eAA5BA;;IAnBAC,2BAA2B;eAA3BA;;IA6BAC,qBAAqB;eAArBA;;IAJAC,6BAA6B;eAA7BA;;IAtCAC,yBAAyB;eAAzBA;;IASAC,0BAA0B;eAA1BA;;IAiBAC,iBAAiB;eAAjBA;;;0BA5B2B;AAEjC,MAAMF,4BAA4B;IACvCG,cAAc;IACdC,eAAe;IACfC,eAAe;IACf,mCAAmC;IACnC,sCAAsC;IACtCC,8BAA8B;AAChC;AAEO,MAAML,6BAA6B;IACxCM,YAAY;AACd;AAEO,MAAMV,8BAA8B;IACzCW,UAAU;IACVC,UAAU;IACVC,YAAY;AACd;AAEO,MAAMf,8BAA8B;IACzCgB,WAAW;IACXC,cAAcC,IAAAA,iCAAuB,MAAK,6BAA6B;IACvEC,sBAAsB;IACtBC,oBAAoBF,IAAAA,iCAAuB,MAAK,oBAAoB;AACtE;AAEO,MAAMX,oBAAoB;IAC/Bc,iBAAiB;IACjBC,mBAAmB;IACnBC,eAAe;AACjB;AAEO,MAAMtB,+BAA+B;IAC1CuB,gCAAgC;IAChCC,0BAA0B;IAC1BC,iCAAiC;AACnC;AAEO,MAAMtB,gCAAgC;IAC3CuB,SAAS;AACX;AAEO,MAAMxB,wBAAwB;IACnCwB,SAAS;AACX;AAEO,MAAM5B,kBAAkB;IAC7B4B,SAAS;AACX"}
|
|
@@ -52,8 +52,6 @@ class SettingsStore {
|
|
|
52
52
|
},
|
|
53
53
|
[_serversettingsconstants.serverSettingsKey]: {
|
|
54
54
|
debugSettings: settings[_serversettingsconstants.serverSettingsKey].debugSettings,
|
|
55
|
-
whitelistEnabled: settings[_serversettingsconstants.serverSettingsKey].whitelistEnabled,
|
|
56
|
-
whitelistedIpAddresses: settings[_serversettingsconstants.serverSettingsKey].whitelistedIpAddresses,
|
|
57
55
|
experimentalMoonrakerSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
|
|
58
56
|
experimentalTypeormSupport: this.isTypeOrmMode,
|
|
59
57
|
experimentalClientSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalClientSupport
|
|
@@ -137,13 +135,6 @@ class SettingsStore {
|
|
|
137
135
|
});
|
|
138
136
|
return this.getSettings();
|
|
139
137
|
}
|
|
140
|
-
async setWhitelist(whitelistEnabled = true, whitelistedIpAddresses) {
|
|
141
|
-
this.settings = await this.settingsService.patchServerSettings({
|
|
142
|
-
whitelistEnabled,
|
|
143
|
-
whitelistedIpAddresses
|
|
144
|
-
});
|
|
145
|
-
return this.getSettings();
|
|
146
|
-
}
|
|
147
138
|
async updateServerSettings(serverSettings) {
|
|
148
139
|
this.settings = await this.settingsService.patchServerSettings(serverSettings);
|
|
149
140
|
return this.getSettings();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","isTypeOrmMode","settingsService","logger","settings","constructor","loggerFactory","isTypeormMode","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","experimentalMoonrakerSupport","experimentalTypeormSupport","experimentalClientSupport","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","
|
|
1
|
+
{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","isTypeOrmMode","settingsService","logger","settings","constructor","loggerFactory","isTypeormMode","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","experimentalMoonrakerSupport","experimentalTypeormSupport","experimentalClientSupport","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","getDebugSettingsSensitive","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","updateCredentialSettings","jwtSecret","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","getServerSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","patchWizardSettings","wizardCompletedAt","Date","setRegistrationEnabled","patchServerSettings","getLoginRequired","setLoginRequired","updateServerSettings","serverSettings","updateTimeoutSettings","timeoutSettings","patchFileCleanSettings","fileClean","credentialSettings","patchCredentialSettings","setSentryDiagnosticsEnabled","setExperimentalMoonrakerSupport","moonrakerEnabled","setExperimentalClientSupport","experimentalClientEnabled","updateFrontendSettings","frontendSettings","sentryEnabled","log","isTestEnvironment","client","getCurrentHub","getClient","warn","getOptions","enabled"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
},
|
|
7
7
|
"author": "David Zwart",
|
|
8
8
|
"license": "AGPL-3.0-or-later",
|
|
9
|
-
"version": "1.7.
|
|
9
|
+
"version": "1.7.5",
|
|
10
10
|
"bin": {
|
|
11
11
|
"fdm-monster": "dist/index.js",
|
|
12
12
|
"fdmm": "dist/index.js"
|
|
@@ -53,11 +53,11 @@
|
|
|
53
53
|
"vue"
|
|
54
54
|
],
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@fdm-monster/client": "1.
|
|
57
|
-
"@fdm-monster/client-next": "0.0.
|
|
56
|
+
"@fdm-monster/client": "1.7.2",
|
|
57
|
+
"@fdm-monster/client-next": "0.0.11",
|
|
58
58
|
"@influxdata/influxdb-client": "1.35.0",
|
|
59
59
|
"@octokit/plugin-throttling": "8.2.0",
|
|
60
|
-
"@sentry/node": "8.
|
|
60
|
+
"@sentry/node": "8.40.0",
|
|
61
61
|
"adm-zip": "0.5.16",
|
|
62
62
|
"awilix": "12.0.3",
|
|
63
63
|
"awilix-express": "9.0.1",
|
|
@@ -75,13 +75,12 @@
|
|
|
75
75
|
"express": "4.21.1",
|
|
76
76
|
"form-data": "4.0.1",
|
|
77
77
|
"helmet": "8.0.0",
|
|
78
|
-
"ip": "2.0.1",
|
|
79
78
|
"js-yaml": "4.1.0",
|
|
80
79
|
"jsonwebtoken": "9.0.2",
|
|
81
80
|
"lodash": "4.17.21",
|
|
82
81
|
"luxon": "3.5.0",
|
|
83
82
|
"migrate-mongo": "11.0.0",
|
|
84
|
-
"mongoose": "6.13.
|
|
83
|
+
"mongoose": "6.13.4",
|
|
85
84
|
"multer": "1.4.5-lts.1",
|
|
86
85
|
"node-input-validator": "4.5.1",
|
|
87
86
|
"nodemon": "3.1.7",
|
|
@@ -102,8 +101,8 @@
|
|
|
102
101
|
"devDependencies": {
|
|
103
102
|
"@lcov-viewer/cli": "1.3.0",
|
|
104
103
|
"@lcov-viewer/istanbul-report": "1.4.0",
|
|
105
|
-
"@swc/cli": "0.5.
|
|
106
|
-
"@swc/core": "1.9.
|
|
104
|
+
"@swc/cli": "0.5.1",
|
|
105
|
+
"@swc/core": "1.9.3",
|
|
107
106
|
"@swc/jest": "0.2.37",
|
|
108
107
|
"@types/adm-zip": "0.5.6",
|
|
109
108
|
"@types/bcryptjs": "2.4.6",
|
|
@@ -118,7 +117,7 @@
|
|
|
118
117
|
"@types/luxon": "3.4.2",
|
|
119
118
|
"@types/migrate-mongo": "10.0.5",
|
|
120
119
|
"@types/multer": "1.4.12",
|
|
121
|
-
"@types/node": "22.9.
|
|
120
|
+
"@types/node": "22.9.3",
|
|
122
121
|
"@types/passport-anonymous": "1.0.5",
|
|
123
122
|
"@types/passport-jwt": "4.0.1",
|
|
124
123
|
"@types/semver": "7.5.8",
|
|
@@ -127,12 +126,12 @@
|
|
|
127
126
|
"@types/ws": "8.5.13",
|
|
128
127
|
"chokidar": "4.0.1",
|
|
129
128
|
"concurrently": "9.1.0",
|
|
130
|
-
"eslint": "9.
|
|
129
|
+
"eslint": "9.15.0",
|
|
131
130
|
"eslint-config-airbnb-base": "15.0.0",
|
|
132
131
|
"eslint-config-prettier": "9.1.0",
|
|
133
132
|
"eslint-config-standard": "17.1.0",
|
|
134
133
|
"eslint-plugin-import": "2.31.0",
|
|
135
|
-
"eslint-plugin-n": "17.
|
|
134
|
+
"eslint-plugin-n": "17.14.0",
|
|
136
135
|
"eslint-plugin-prettier": "4.2.1",
|
|
137
136
|
"eslint-plugin-promise": "7.1.0",
|
|
138
137
|
"express-list-routes": "1.2.4",
|
|
@@ -143,7 +142,7 @@
|
|
|
143
142
|
"prettier": "2.8.8",
|
|
144
143
|
"supertest": "7.0.0",
|
|
145
144
|
"ts-node": "10.9.2",
|
|
146
|
-
"typescript": "5.
|
|
145
|
+
"typescript": "5.7.2"
|
|
147
146
|
},
|
|
148
147
|
"ignore-engines": false,
|
|
149
148
|
"engine-strict": true,
|
|
@@ -165,5 +164,5 @@
|
|
|
165
164
|
],
|
|
166
165
|
"delay": 100
|
|
167
166
|
},
|
|
168
|
-
"packageManager": "yarn@4.5.
|
|
167
|
+
"packageManager": "yarn@4.5.2"
|
|
169
168
|
}
|