Skip to content

Commit b7791ab

Browse files
authored
chore(Deps): Update deps
2 parents 5231237 + bf1cdf5 commit b7791ab

35 files changed

Lines changed: 660 additions & 682 deletions

File tree

.oxlintrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"eslint-plugin-unicorn/no-array-sort": "off",
1111
"eslint-plugin-unicorn/prefer-add-event-listener": "off",
1212
"eslint/no-debugger": "warn",
13+
"eslint/no-shadow": ["error", { "ignoreOnInitialization": true }],
1314
"eslint/prefer-const": "warn",
1415
"import/no-unassigned-import": ["error", { "allow": ["**/*.css"] }],
1516
"no-map-spread": "off",

client/package-lock.json

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

client/package.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,30 +34,29 @@
3434
"socket.io-client": "^4.8.3",
3535
"swiper": "^7.3.1",
3636
"tinycolor2": "^1.6.0",
37-
"vue": "^3.5.28",
37+
"vue": "^3.5.29",
3838
"vue-draggable-plus": "^0.6.1",
3939
"vue-i18n": "11.2.8",
4040
"vue-markdown-render": "^2.3.0",
41-
"vue-router": "^5.0.2",
41+
"vue-router": "^5.0.3",
4242
"vue-toastification": "^2.0.0-rc.5"
4343
},
4444
"devDependencies": {
4545
"@esbuild-plugins/esm-externals": "^0.1.2",
46-
"@intlify/unplugin-vue-i18n": "^11.0.3",
47-
"@types/lodash": "^4.17.23",
46+
"@intlify/unplugin-vue-i18n": "^11.0.7",
47+
"@types/lodash": "^4.17.24",
4848
"@types/markdown-it": "^14.1.2",
4949
"@types/swiper": "^5.4.3",
5050
"@types/tinycolor2": "^1.4.6",
5151
"@vitejs/plugin-vue": "^6.0.4",
5252
"@vitest/coverage-v8": "^4.0.18",
5353
"bufferutil": "^4.1.0",
5454
"c8": "^10.1.3",
55-
"happy-dom": "^20.6.1",
55+
"happy-dom": "^20.7.0",
5656
"json-schema-to-typescript": "^15.0.4",
57-
"oxfmt": "^0.32.0",
58-
"oxlint": "^1.47.0",
59-
"oxlint-tsgolint": "^0.12.2",
60-
"rollup-plugin-visualizer": "^6.0.5",
57+
"oxfmt": "^0.35.0",
58+
"oxlint": "^1.50.0",
59+
"oxlint-tsgolint": "^0.15.0",
6160
"sass": "^1.97.3",
6261
"typescript": "^5.9.3",
6362
"upath": "^2.0.1",
@@ -66,6 +65,6 @@
6665
"vite-plugin-ejs": "^1.7.0",
6766
"vite-plugin-vue-devtools": "^8.0.6",
6867
"vitest": "^4.0.18",
69-
"vue-tsc": "^3.2.4"
68+
"vue-tsc": "^3.2.5"
7069
}
7170
}

client/src/assets/search.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ export function useAssetSearch(searchBar: Ref<HTMLInputElement | null>): AssetSe
4141

4242
const debouncedSearch = debounce(search, 300);
4343

44-
watch([filter, includeSharedAssets], async ([filter]) => {
45-
if (filter.length < 3) {
44+
watch([filter, includeSharedAssets], async ([newFilter]) => {
45+
if (newFilter.length < 3) {
4646
results.value = [];
4747
return;
4848
}
4949

50-
await debouncedSearch(filter);
50+
await debouncedSearch(newFilter);
5151
});
5252

5353
return { clear, filter, results, loading, includeSharedAssets };

client/src/core/components/ColourPicker.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ function onSaturationUp(event: PointerEvent): void {
223223
}
224224
225225
function setRgba(options: { r?: number; g?: number; b?: number; a?: number }): void {
226+
// oxlint-disable-next-line no-shadow
226227
const rgb = tc.value.toRgb();
227228
tc.value = tinycolor({
228229
...rgb,
@@ -237,6 +238,7 @@ function setRgbaString(rgba: string): void {
237238
}
238239
239240
function setHsla(options: { h?: number; s?: string; l?: string; a?: number }): void {
241+
// oxlint-disable-next-line no-shadow
240242
const hsl = tc.value.toHsl();
241243
242244
tc.value = tinycolor({
@@ -248,8 +250,8 @@ function setHsla(options: { h?: number; s?: string; l?: string; a?: number }): v
248250
emit("update:colour", rgbaString.value);
249251
}
250252
251-
function setHex(hex: string): void {
252-
tc.value = tinycolor(hex);
253+
function setHex(newHex: string): void {
254+
tc.value = tinycolor(newHex);
253255
emit("update:colour", rgbaString.value);
254256
}
255257
</script>

client/src/core/components/ToggleGroup.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const props = withDefaults(
2222
);
2323
const emit = defineEmits<(e: "update:modelValue", s: MS extends true ? T[] : T) => void>();
2424
25-
const data = computed(() => (props.multiSelect ? props.modelValue : [props.modelValue]) as T[]);
25+
const toggleData = computed(() => (props.multiSelect ? props.modelValue : [props.modelValue]) as T[]);
2626
2727
function toggle(option: T): void {
2828
if (props.disabled) return;
@@ -48,7 +48,7 @@ function toggle(option: T): void {
4848
<div
4949
v-for="option of options"
5050
:key="option.label"
51-
:class="{ selected: data.includes(option.value) }"
51+
:class="{ selected: toggleData.includes(option.value) }"
5252
@click="toggle(option.value)"
5353
>
5454
{{ option.label }}

client/src/core/components/contextMenu/ContextMenu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ watch(
4747
4848
function isVisible(section: Section): boolean {
4949
if (Array.isArray(section)) return section.some((item) => isVisible(item));
50-
else if ("subitems" in section) return section.subitems.some((section) => isVisible(section));
50+
else if ("subitems" in section) return section.subitems.some((s) => isVisible(s));
5151
return !(section.disabled ?? false);
5252
}
5353

client/src/core/components/modals/PanelModal.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const selection = defineModel<string | undefined>("selection", { required: true
2121
const { t } = useI18n();
2222
2323
const activeTab = computed(() => {
24-
const tab = tabs.find((t) => t.id === selection.value);
24+
const tab = tabs.find((tab) => tab.id === selection.value);
2525
if (tab === undefined) return undefined;
2626
return {
2727
...tab,

client/src/core/iter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ export function* filter<T>(iterable: Iterable<T>, predicate: Predicate<T>): Iter
1414
}
1515
}
1616

17-
export function* guard<T, Y extends T>(iterable: Iterable<T>, guard: (a: T) => a is Y): Iterable<Y> {
17+
export function* guard<T, Y extends T>(iterable: Iterable<T>, guardFn: (a: T) => a is Y): Iterable<Y> {
1818
for (const value of iterable) {
19-
if (guard(value)) {
19+
if (guardFn(value)) {
2020
yield value;
2121
}
2222
}

client/src/game/layers/variants/layer.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,13 @@ export class Layer implements ILayer {
109109

110110
for (i = sectorLeft; i <= sectorRight; i += SECTOR_SIZE) {
111111
for (j = sectorTop; j <= sectorBot; j += SECTOR_SIZE) {
112-
const x = this.xSectors.get(i);
113-
const y = this.ySectors.get(j);
114-
if (x !== undefined && y !== undefined) {
115-
for (const id of filter(x, (x) => y.has(x))) {
112+
const xShapes = this.xSectors.get(i);
113+
const yShapes = this.ySectors.get(j);
114+
if (xShapes !== undefined && yShapes !== undefined) {
115+
for (const id of filter(xShapes, (x) => yShapes.has(x))) {
116116
this.shapeIdsInSector.add(id);
117117
}
118-
for (const id of filter(y, (y) => x.has(y))) {
118+
for (const id of filter(yShapes, (y) => xShapes.has(y))) {
119119
this.shapeIdsInSector.add(id);
120120
}
121121
}

0 commit comments

Comments
 (0)