Skip to content
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

chore: Switch default ESLint plugin from eslint-plugin-svelte3 to eslint-plugin-svelte #9749

Merged
merged 8 commits into from
Apr 25, 2023
Merged

chore: Switch default ESLint plugin from eslint-plugin-svelte3 to eslint-plugin-svelte #9749

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
019152c
switch default eslint plugin
baseballyama Apr 22, 2023
be54f7d
add cangeset
baseballyama Apr 22, 2023
b009c20
fix test
baseballyama Apr 22, 2023
1e4c26c
remove eslint disabled
baseballyama Apr 23, 2023
6e2f206
Update packages/create-svelte/shared/+eslint+prettier+typescript/.esl…
baseballyama Apr 23, 2023
8364fe2
Update packages/create-svelte/shared/+eslint+typescript/.eslintrc.cjs
baseballyama Apr 23, 2023
9b5e373
Update .changeset/curly-moons-sin.md
baseballyama Apr 24, 2023
14cb64d
Update .changeset/curly-moons-sin.md
baseballyama Apr 25, 2023
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/curly-moons-sin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'create-svelte': major
---

Switch default ESLint plugin from `eslint-plugin-svelte3` to `eslint-plugin-svelte`
baseballyama marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion packages/create-svelte/bin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ if (options.types === 'typescript') {

if (options.features.includes('eslint')) {
console.log(bold('✔ ESLint'));
console.log(cyan(' https://github.com/sveltejs/eslint-plugin-svelte3\n'));
console.log(cyan(' https://github.com/sveltejs/eslint-plugin-svelte\n'));
}

if (options.features.includes('prettier')) {
Expand Down
27 changes: 19 additions & 8 deletions packages/create-svelte/shared/+eslint+prettier+typescript/.eslintrc.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,31 @@
module.exports = {
root: true,
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:svelte/recommended',
'prettier'
],
parser: '@typescript-eslint/parser',
extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier'],
plugins: ['svelte3', '@typescript-eslint'],
plugins: ['@typescript-eslint'],
ignorePatterns: ['*.cjs'],
overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
settings: {
'svelte3/typescript': () => require('typescript')
},
parserOptions: {
sourceType: 'module',
ecmaVersion: 2020
ecmaVersion: 2020,
extraFileExtensions: ['.svelte']
},
env: {
browser: true,
es2017: true,
node: true
}
},
overrides: [
{
files: ['*.svelte'],
parser: 'svelte-eslint-parser',
parserOptions: {
parser: '@typescript-eslint/parser'
}
}
]
};
7 changes: 3 additions & 4 deletions packages/create-svelte/shared/+eslint+prettier-typescript/.eslintrc.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
module.exports = {
root: true,
extends: ['eslint:recommended', 'prettier'],
plugins: ['svelte3'],
overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
extends: ['eslint:recommended', 'plugin:svelte/recommended', 'prettier'],
parserOptions: {
sourceType: 'module',
ecmaVersion: 2020
ecmaVersion: 2020,
extraFileExtensions: ['.svelte']
},
env: {
browser: true,
Expand Down
26 changes: 18 additions & 8 deletions packages/create-svelte/shared/+eslint+typescript/.eslintrc.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,30 @@
module.exports = {
root: true,
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:svelte/recommended'
],
parser: '@typescript-eslint/parser',
extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended'],
plugins: ['svelte3', '@typescript-eslint'],
plugins: ['@typescript-eslint'],
ignorePatterns: ['*.cjs'],
overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
settings: {
'svelte3/typescript': () => require('typescript')
},
parserOptions: {
sourceType: 'module',
ecmaVersion: 2020
ecmaVersion: 2020,
extraFileExtensions: ['.svelte']
},
env: {
browser: true,
es2017: true,
node: true
}
},
overrides: [
{
files: ['*.svelte'],
parser: 'svelte-eslint-parser',
parserOptions: {
parser: '@typescript-eslint/parser'
}
}
]
};
7 changes: 3 additions & 4 deletions packages/create-svelte/shared/+eslint-typescript/.eslintrc.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
module.exports = {
root: true,
extends: ['eslint:recommended'],
plugins: ['svelte3'],
overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
extends: ['eslint:recommended', 'plugin:svelte/recommended'],
parserOptions: {
sourceType: 'module',
ecmaVersion: 2020
ecmaVersion: 2020,
extraFileExtensions: ['.svelte']
},
env: {
browser: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/create-svelte/shared/+eslint/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"devDependencies": {
"eslint": "^8.28.0",
"eslint-plugin-svelte3": "^4.0.0"
"eslint-plugin-svelte": "^2.26.0"
}
}
4 changes: 2 additions & 2 deletions packages/create-svelte/templates/default/src/routes/sverdle/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@
<a class="how-to-play" href="/sverdle/how-to-play">How to play</a>

<div class="grid" class:playing={!won} class:bad-guess={form?.badGuess}>
{#each Array(6) as _, row}
{#each Array.from(Array(6).keys()) as row (row)}
{@const current = row === i}
<h2 class="visually-hidden">Row {row + 1}</h2>
<div class="row" class:current>
{#each Array(5) as _, column}
{#each Array.from(Array(5).keys()) as column (column)}
{@const answer = data.answers[row]?.[column]}
{@const value = data.guesses[row]?.[column] ?? ''}
{@const selected = current && column === data.guesses[row].length}
Expand Down