Skip to content

fix(sv): remove spread operator from ESLint config generation #971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
sacrosanctic wants to merge 3 commits into
base: main
Choose a base branch
from
+33 −21
Draft

fix(sv): remove spread operator from ESLint config generation #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2016284
.
sacrosanctic Mar 5, 2026
3e148bc
add changeset
sacrosanctic Mar 5, 2026
68cfa6d
adjust for js
sacrosanctic Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/rotten-mayflies-knock.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"sv": patch
---

fix(sv): remove spread operator from ESLint config generation
33 changes: 20 additions & 13 deletions packages/sv/src/addons/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type SvelteAst, js, parse, svelte } from '@sveltejs/sv-utils';
import process from 'node:process';

export function addEslintConfigPrettier(content: string): string {
export function addEslintConfigPrettier(content: string, language: 'ts' | 'js'): string {
const { ast, generateCode } = parse.script(content);

// if a default import for `eslint-plugin-svelte` already exists, then we'll use their specifier's name instead
Expand Down Expand Up @@ -32,24 +32,31 @@ export function addEslintConfigPrettier(content: string): string {

const prettier = js.common.parseExpression('prettier');
const sveltePrettierConfig = js.common.parseExpression(`${svelteImportName}.configs.prettier`);
const configSpread = js.common.createSpread(sveltePrettierConfig);
const maybeSpreadConfig =
language === 'ts' ? sveltePrettierConfig : js.common.createSpread(sveltePrettierConfig);

const nodesToInsert = [];
if (!js.common.contains(eslintConfig, prettier)) nodesToInsert.push(prettier);
if (!js.common.contains(eslintConfig, configSpread)) nodesToInsert.push(configSpread);
if (!js.common.contains(eslintConfig, maybeSpreadConfig)) nodesToInsert.push(maybeSpreadConfig);

const elements =
eslintConfig.type === 'ArrayExpression' ? eslintConfig.elements : eslintConfig.arguments;
// finds index of `...svelte.configs["..."]`
const idx = elements.findIndex(
(el) =>
el?.type === 'SpreadElement' &&
el.argument.type === 'MemberExpression' &&
el.argument.object.type === 'MemberExpression' &&
el.argument.object.property.type === 'Identifier' &&
el.argument.object.property.name === 'configs' &&
el.argument.object.object.type === 'Identifier' &&
el.argument.object.object.name === svelteImportName
// finds index of `svelte.configs["..."]`
const idx = elements.findIndex((el) =>
language === 'ts'
? el?.type === 'MemberExpression' &&
el.object.type === 'MemberExpression' &&
el.object.property.type === 'Identifier' &&
el.object.property.name === 'configs' &&
el.object.object.type === 'Identifier' &&
el.object.object.name === svelteImportName
: el?.type === 'SpreadElement' &&
el.argument.type === 'MemberExpression' &&
el.argument.object.type === 'MemberExpression' &&
el.argument.object.property.type === 'Identifier' &&
el.argument.object.property.name === 'configs' &&
el.argument.object.object.type === 'Identifier' &&
el.argument.object.object.name === svelteImportName
);

if (idx !== -1) {
Expand Down
6 changes: 3 additions & 3 deletions packages/sv/src/addons/eslint.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ export default defineAddon({

if (typescript) {
const tsConfig = js.common.parseExpression('ts.configs.recommended');
eslintConfigs.push(js.common.createSpread(tsConfig));
eslintConfigs.push(tsConfig);
}

const svelteConfig = js.common.parseExpression('svelte.configs.recommended');
eslintConfigs.push(js.common.createSpread(svelteConfig));
eslintConfigs.push(typescript ? svelteConfig : js.common.createSpread(svelteConfig));

const globalsBrowser = js.common.createSpread(js.common.parseExpression('globals.browser'));
const globalsNode = js.common.createSpread(js.common.parseExpression('globals.node'));
Expand Down Expand Up @@ -156,7 +156,7 @@ export default defineAddon({
});

if (prettierInstalled) {
sv.file(files.eslintConfig, addEslintConfigPrettier);
sv.file(files.eslintConfig, (content) => addEslintConfigPrettier(content, language));
}
}
});
4 changes: 2 additions & 2 deletions packages/sv/src/addons/prettier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default defineAddon({
shortDescription: 'formatter',
homepage: 'https://prettier.io',
options: {},
run: ({ sv, dependencyVersion, files }) => {
run: ({ sv, language, dependencyVersion, files }) => {
const tailwindcssInstalled = Boolean(dependencyVersion('tailwindcss'));
if (tailwindcssInstalled) sv.devDependency('prettier-plugin-tailwindcss', '^0.7.2');

Expand Down Expand Up @@ -93,7 +93,7 @@ export default defineAddon({

if (eslintInstalled) {
sv.devDependency('eslint-config-prettier', '^10.1.8');
sv.file(files.eslintConfig, addEslintConfigPrettier);
sv.file(files.eslintConfig, (content) => addEslintConfigPrettier(content, language));
}
}
});
Expand Down
6 changes: 3 additions & 3 deletions packages/sv/src/cli/tests/snapshots/create-with-all-addons/eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ const gitignorePath = path.resolve(import.meta.dirname, '.gitignore');
export default defineConfig(
includeIgnoreFile(gitignorePath),
js.configs.recommended,
...ts.configs.recommended,
...svelte.configs.recommended,
ts.configs.recommended,
svelte.configs.recommended,
prettier,
...svelte.configs.prettier,
svelte.configs.prettier,
{
languageOptions: { globals: { ...globals.browser, ...globals.node } },
rules: {
Expand Down
Loading