Skip to content

Commit e44a58a

Browse files
Merge pull request #11663 from DestinyItemManager/dependabot/npm_and_yarn/minor-65670724dd
Bump the minor group with 6 updates
2 parents a14fe26 + 360292d commit e44a58a

File tree

9 files changed

+211
-307
lines changed

9 files changed

+211
-307
lines changed

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"@bhollis/css-modules-typescript-loader": "^1.0.1",
9696
"@bhollis/eslint-plugin-css-modules": "^1.0.0",
9797
"@bundle-stats/plugin-webpack-filter": "^4.21.7",
98-
"@eslint-react/eslint-plugin": "^2.3.13",
98+
"@eslint-react/eslint-plugin": "^2.4.0",
9999
"@eslint/compat": "^2.0.0",
100100
"@rspack/cli": "^1.6.8",
101101
"@rspack/core": "^1.6.8",
@@ -116,8 +116,8 @@
116116
"@types/webpack": "^5.28.5",
117117
"@types/webpack-env": "^1.18.8",
118118
"@types/webpack-stats-plugin": "^0.3.5",
119-
"@typescript-eslint/eslint-plugin": "^8.50.1",
120-
"@typescript-eslint/parser": "^8.50.1",
119+
"@typescript-eslint/eslint-plugin": "^8.51.0",
120+
"@typescript-eslint/parser": "^8.51.0",
121121
"babel-jest": "^30.2.0",
122122
"babel-loader": "^10.0.0",
123123
"babel-plugin-object-to-json-parse": "^0.2.3",
@@ -167,15 +167,15 @@
167167
"stylelint": "^16.26.1",
168168
"stylelint-config-css-modules": "^4.5.1",
169169
"stylelint-config-standard-scss": "^16.0.0",
170-
"stylelint-order": "^7.0.0",
170+
"stylelint-order": "^7.0.1",
171171
"svgo": "^4.0.0",
172172
"svgo-loader": "^4.0.0",
173173
"ts-checker-rspack-plugin": "^1.2.3",
174174
"ts-jest": "^29.4.6",
175175
"ts-loader": "^9.5.4",
176176
"ts-unused-exports": "^11.0.1",
177177
"typescript": "^5.9.3",
178-
"typescript-eslint": "^8.50.1",
178+
"typescript-eslint": "^8.51.0",
179179
"webpack-stats-plugin": "^1.1.3"
180180
},
181181
"dependencies": {
@@ -205,7 +205,7 @@
205205
"fast-equals": "^6.0.0",
206206
"i18next": "^25.7.3",
207207
"i18next-http-backend": "^3.0.2",
208-
"immer": "^11.1.0",
208+
"immer": "^11.1.3",
209209
"memoize-one": "^6.0.0",
210210
"motion": "^12.23.26",
211211
"papaparse": "^5.5.3",

pnpm-lock.yaml

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

src/app/accounts/destiny-account.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,7 @@ export function compareAccounts(
239239
return Boolean(
240240
account1 === account2 ||
241241
(account1 &&
242-
account2 &&
243-
account1.membershipId === account2.membershipId &&
242+
account1.membershipId === account2?.membershipId &&
244243
account1.destinyVersion === account2.destinyVersion),
245244
);
246245
}

src/app/clarity/descriptions/loadDescriptions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ const loadClarityStats = dedupePromise(async (loadFromIndexedDB: boolean) => {
8181
liveStatsVersion = await fetchClarity<ClarityStatsVersion>('statsVersion');
8282
if (
8383
liveStatsVersion.schemaVersion === CLARITY_STATS_SUPPORTED_SCHEMA &&
84-
(!savedStats || savedStats.lastUpdate !== liveStatsVersion.lastUpdate)
84+
savedStats?.lastUpdate !== liveStatsVersion.lastUpdate
8585
) {
8686
// There's been a live update and we support the update's schema -- fetch it
8787
return await fetchRemoteStats(liveStatsVersion);

src/app/inventory-page/StoreBucket.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,7 @@ export default function StoreBucket({
279279
// updated (so currentStore is cleared) but the store from props is still around because its redux subscription
280280
// hasn't fired yet.
281281
items = items.filter(
282-
(i) =>
283-
i.classType === DestinyClass.Unknown ||
284-
(currentStore && i.classType === currentStore.classType),
282+
(i) => i.classType === DestinyClass.Unknown || i.classType === currentStore?.classType,
285283
);
286284
}
287285

src/app/inventory/item-move-service.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,8 +1132,7 @@ export function sortMoveAsideCandidatesForStore(
11321132
compareBy((displaced) => !displaced.equipped),
11331133
// prefer same bucket over everything, because that makes space in the correct "pocket"
11341134
compareBy(
1135-
(displaced) =>
1136-
!fromStore.isVault && displacer && displaced.bucket.hash === displacer.bucket.hash,
1135+
(displaced) => !fromStore.isVault && displaced.bucket.hash === displacer?.bucket.hash,
11371136
),
11381137

11391138
// TODO: Prefer moving from vault into Inventory (consumables)

src/app/inventory/store/sockets.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ function buildSocket(
707707
if (reusablePlugs) {
708708
// Get options from live info
709709
for (const reusablePlug of reusablePlugs) {
710-
if (plugged && reusablePlug.plugItemHash === plugged.plugDef.hash) {
710+
if (reusablePlug.plugItemHash === plugged?.plugDef.hash) {
711711
if (addPlug(plugged)) {
712712
foundPluggedInOptions = true;
713713
}
@@ -723,7 +723,7 @@ function buildSocket(
723723
const plugSet = defs.PlugSet.get(socketDef.reusablePlugSetHash, forThisItem);
724724
if (plugSet) {
725725
for (const reusablePlug of plugSet.reusablePlugItems) {
726-
if (plugged && reusablePlug.plugItemHash === plugged.plugDef.hash) {
726+
if (reusablePlug.plugItemHash === plugged?.plugDef.hash) {
727727
if (addPlug(plugged)) {
728728
foundPluggedInOptions = true;
729729
}
@@ -742,7 +742,7 @@ function buildSocket(
742742
} else if (socketDef.reusablePlugItems) {
743743
// Get options from definition itself
744744
for (const reusablePlug of socketDef.reusablePlugItems) {
745-
if (plugged && reusablePlug.plugItemHash === plugged.plugDef.hash) {
745+
if (reusablePlug.plugItemHash === plugged?.plugDef.hash) {
746746
if (addPlug(plugged)) {
747747
foundPluggedInOptions = true;
748748
}

src/app/loadout/mod-assignment-utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,7 @@ function isAssigningToDefault(item: DimItem, assignment: Assignment) {
10251025
item.hash,
10261026
);
10271027
}
1028-
return socket && assignment.mod.hash === socket.emptyPlugItemHash;
1028+
return assignment.mod.hash === socket?.emptyPlugItemHash;
10291029
}
10301030

10311031
/**

src/app/search/items/search-filters/sockets.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ const socketFilters: ItemFilterDefinition[] = [
108108
filter: () => (item) =>
109109
item.sockets?.allSockets.some((socket) =>
110110
Boolean(
111-
socket.plugged &&
112-
socket.plugged.plugDef.itemSubType === DestinyItemSubType.Shader &&
111+
socket.plugged?.plugDef.itemSubType === DestinyItemSubType.Shader &&
113112
socket.plugged.plugDef.hash !== DEFAULT_SHADER,
114113
),
115114
),

0 commit comments

Comments
 (0)