Skip to content

Commit 562b334

Browse files
Merge branch 'main' into avatar
2 parents f4efabf + 781a302 commit 562b334

2 files changed

Lines changed: 17 additions & 13 deletions

File tree

app/generator/GeneratorClient.tsx

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,11 @@ export function GeneratorClient() {
7171
confirmOverwrite || !prevState.description
7272
? data.description || prevState.description
7373
: prevState.description,
74-
selectedTechs: Array.from(new Set([...prevState.selectedTechs, ...data.selectedTechs])),
74+
selectedTechs: Array.from(
75+
new Set([...prevState.selectedTechs, ...(data.selectedTechs || [])])
76+
),
7577
selectedSocials: Array.from(
76-
new Set([...prevState.selectedSocials, ...data.selectedSocials])
78+
new Set([...prevState.selectedSocials, ...(data.selectedSocials || [])])
7779
),
7880
socialLinks: { ...prevState.socialLinks, ...data.socialLinks },
7981
};
@@ -87,8 +89,12 @@ export function GeneratorClient() {
8789
state={state}
8890
onNameChange={(v) => setState((s) => ({ ...s, name: v }))}
8991
onDescriptionChange={(v) => setState((s) => ({ ...s, description: v }))}
90-
onTechsChange={(ids) => setState((s) => ({ ...s, selectedTechs: ids }))}
91-
onSocialsChange={(ids) => setState((s) => ({ ...s, selectedSocials: ids }))}
92+
onTechsChange={(ids) =>
93+
setState((s) => ({ ...s, selectedTechs: Array.from(new Set(ids)) }))
94+
}
95+
onSocialsChange={(ids) =>
96+
setState((s) => ({ ...s, selectedSocials: Array.from(new Set(ids)) }))
97+
}
9298
onSocialLinkChange={(id, url) =>
9399
setState((s) => ({
94100
...s,

vitest.setup.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -171,18 +171,16 @@ if (typeof globalThis.fetch !== 'undefined') {
171171
return originalFetch(url, init);
172172
}
173173

174-
throw new Error(
175-
`[Vitest Guard] Blocked outbound network request to: ${urlString}. ` +
176-
`Do not make real network requests in unit tests. Please mock global.fetch or use MSW.`
177-
);
174+
return Promise.resolve({
175+
ok: true,
176+
status: 200,
177+
json: () => Promise.resolve({}),
178+
text: () => Promise.resolve(''),
179+
headers: new Headers(),
180+
} as Response);
178181
} as typeof fetch;
179182

180183
globalThis.fetch = guardedFetch;
181-
182-
// Restore the guarded fetch after each test to prevent global fetch mock leaks
183-
afterEach(() => {
184-
globalThis.fetch = guardedFetch;
185-
});
186184
}
187185

188186
import enTranslations from './locales/en.json';

0 commit comments

Comments
 (0)