Skip to content

Commit 5594410

Browse files
authored
Merge branch 'main' into ota-meshi-patch-2
2 parents b50d1cb + bd9e6cc commit 5594410

File tree

15 files changed

+60
-54
lines changed

15 files changed

+60
-54
lines changed

docs-svelte-kit/src/lib/eslint/MonacoEditor.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<script context="module">
1+
<script module>
22
const appStarting = new Promise((resolve) => setTimeout(resolve, 300));
33
</script>
44

package.json

+20-20
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,34 @@
1515
},
1616
"devDependencies": {
1717
"@changesets/changelog-github": "^0.5.0",
18-
"@changesets/cli": "^2.27.5",
19-
"@changesets/get-release-plan": "^4.0.2",
20-
"@eslint-community/eslint-plugin-eslint-comments": "^4.3.0",
21-
"@ota-meshi/eslint-plugin": "^0.17.1",
22-
"@types/eslint": "^8.56.10",
23-
"@typescript-eslint/eslint-plugin": "^7.13.0",
24-
"@typescript-eslint/parser": "^7.13.0",
18+
"@changesets/cli": "^2.27.8",
19+
"@changesets/get-release-plan": "^4.0.4",
20+
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
21+
"@ota-meshi/eslint-plugin": "^0.17.5",
22+
"@types/eslint": "^9.6.1",
23+
"@typescript-eslint/eslint-plugin": "^7.18.0",
24+
"@typescript-eslint/parser": "^7.18.0",
2525
"env-cmd": "^10.1.0",
26-
"eslint": "^9.4.0",
26+
"eslint": "^9.10.0",
2727
"eslint-config-prettier": "^9.1.0",
2828
"eslint-formatter-friendly": "^7.0.0",
29-
"eslint-plugin-eslint-plugin": "^6.1.0",
30-
"eslint-plugin-jsdoc": "^50.0.0",
31-
"eslint-plugin-json-schema-validator": "^5.1.0",
29+
"eslint-plugin-eslint-plugin": "^6.2.0",
30+
"eslint-plugin-jsdoc": "^50.2.2",
31+
"eslint-plugin-json-schema-validator": "^5.1.2",
3232
"eslint-plugin-jsonc": "^2.16.0",
33-
"eslint-plugin-markdown": "^5.0.0",
33+
"eslint-plugin-markdown": "^5.1.0",
3434
"eslint-plugin-mdx": "^3.1.5",
35-
"eslint-plugin-n": "^17.9.0",
35+
"eslint-plugin-n": "^17.10.2",
3636
"eslint-plugin-node-dependencies": "^0.12.0",
37-
"eslint-plugin-prettier": "^5.1.3",
37+
"eslint-plugin-prettier": "^5.2.1",
3838
"eslint-plugin-regexp": "^2.6.0",
3939
"eslint-plugin-yml": "^1.14.0",
40-
"npm-run-all2": "^6.2.0",
41-
"prettier": "^3.3.2",
42-
"prettier-plugin-svelte": "^3.2.4",
43-
"rimraf": "^6.0.0",
44-
"typescript": "~5.5.0",
45-
"typescript-eslint": "^7.13.0"
40+
"npm-run-all2": "^6.2.2",
41+
"prettier": "^3.3.3",
42+
"prettier-plugin-svelte": "^3.2.6",
43+
"rimraf": "^6.0.1",
44+
"typescript": "~5.5.4",
45+
"typescript-eslint": "^7.18.0"
4646
},
4747
"publishConfig": {
4848
"access": "public"

packages/eslint-plugin-svelte/package.json

+18-18
Original file line numberDiff line numberDiff line change
@@ -69,39 +69,39 @@
6969
"svelte-eslint-parser": "^0.41.1"
7070
},
7171
"devDependencies": {
72-
"@babel/core": "^7.24.7",
73-
"@babel/eslint-parser": "^7.24.7",
72+
"@babel/core": "^7.25.2",
73+
"@babel/eslint-parser": "^7.25.1",
7474
"@babel/plugin-proposal-function-bind": "^7.24.7",
75-
"@eslint-community/eslint-plugin-eslint-comments": "^4.3.0",
75+
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
7676
"@types/babel__core": "^7.20.5",
7777
"@types/eslint-utils": "^3.0.5",
7878
"@types/esutils": "^2.0.2",
7979
"@types/json-schema": "^7.0.15",
8080
"@types/less": "^3.0.6",
81-
"@types/mocha": "^10.0.6",
82-
"@types/node": "^20.14.2",
81+
"@types/mocha": "^10.0.8",
82+
"@types/node": "^20.16.5",
8383
"@types/postcss-safe-parser": "^5.0.4",
8484
"@types/semver": "^7.5.8",
8585
"@types/stylus": "^0.48.42",
86-
"acorn": "^8.12.0",
86+
"acorn": "^8.12.1",
8787
"assert": "^2.1.0",
88-
"esbuild": "^0.23.0",
89-
"esbuild-register": "^3.5.0",
90-
"eslint-scope": "^8.0.1",
91-
"eslint-typegen": "^0.3.0",
88+
"esbuild": "^0.23.1",
89+
"esbuild-register": "^3.6.0",
90+
"eslint-scope": "^8.0.2",
91+
"eslint-typegen": "^0.3.2",
9292
"eslint-visitor-keys": "^4.0.0",
93-
"espree": "^10.0.1",
93+
"espree": "^10.1.0",
9494
"less": "^4.2.0",
95-
"mocha": "^10.4.0",
95+
"mocha": "^10.7.3",
9696
"nyc": "^17.0.0",
97-
"postcss-nested": "^6.0.1",
98-
"sass": "^1.77.5",
99-
"source-map-js": "^1.2.0",
97+
"postcss-nested": "^6.2.0",
98+
"sass": "^1.78.0",
99+
"source-map-js": "^1.2.1",
100100
"stylus": "^0.63.0",
101-
"svelte": "^5.0.0-next.191",
101+
"svelte": "5.0.0-next.245",
102102
"svelte-i18n": "^4.0.0",
103-
"type-coverage": "^2.29.0",
104-
"yaml": "^2.4.5"
103+
"type-coverage": "^2.29.1",
104+
"yaml": "^2.5.1"
105105
},
106106
"publishConfig": {
107107
"access": "public"

packages/eslint-plugin-svelte/src/configs/all.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import path from 'node:path';
33
import { rules } from '../utils/rules';
44
const base = require.resolve('./base');
55
const baseExtend = path.extname(`${base}`) === '.ts' ? 'plugin:svelte/base' : base;
6-
const config: Linter.Config = {
6+
const config: Linter.LegacyConfig = {
77
extends: [baseExtend],
88
rules: Object.fromEntries(
99
rules

packages/eslint-plugin-svelte/src/configs/base.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// This file has been automatically generated,
33
// in order to update its content execute "pnpm run update"
44
import type { Linter } from 'eslint';
5-
const config: Linter.Config = {
5+
const config: Linter.LegacyConfig = {
66
plugins: ['svelte'],
77
overrides: [
88
{

packages/eslint-plugin-svelte/src/configs/flat/base.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// This file has been automatically generated,
33
// in order to update its content execute "pnpm run update"
44
import type { ESLint, Linter } from 'eslint';
5-
const config: Linter.FlatConfig[] = [
5+
const config: Linter.Config[] = [
66
{
77
name: 'svelte:base:setup-plugin',
88
plugins: {

packages/eslint-plugin-svelte/src/configs/flat/prettier.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// in order to update its content execute "pnpm run update"
44
import type { Linter } from 'eslint';
55
import base from './base';
6-
const config: Linter.FlatConfig[] = [
6+
const config: Linter.Config[] = [
77
...base,
88
{
99
name: 'svelte:prettier:turn-off-rules',

packages/eslint-plugin-svelte/src/configs/flat/recommended.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// in order to update its content execute "pnpm run update"
44
import type { Linter } from 'eslint';
55
import base from './base';
6-
const config: Linter.FlatConfig[] = [
6+
const config: Linter.Config[] = [
77
...base,
88
{
99
name: 'svelte:recommended:rules',

packages/eslint-plugin-svelte/src/configs/prettier.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { Linter } from 'eslint';
55
import path from 'node:path';
66
const base = require.resolve('./base');
77
const baseExtend = path.extname(`${base}`) === '.ts' ? 'plugin:svelte/base' : base;
8-
const config: Linter.Config = {
8+
const config: Linter.LegacyConfig = {
99
extends: [baseExtend],
1010
rules: {
1111
// eslint-plugin-svelte rules

packages/eslint-plugin-svelte/src/configs/recommended.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { Linter } from 'eslint';
55
import path from 'node:path';
66
const base = require.resolve('./base');
77
const baseExtend = path.extname(`${base}`) === '.ts' ? 'plugin:svelte/base' : base;
8-
const config: Linter.Config = {
8+
const config: Linter.LegacyConfig = {
99
extends: [baseExtend],
1010
rules: {
1111
// eslint-plugin-svelte rules
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"svelte": "^3.0.0 || ^4.0.0"
3+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"svelte": "^3.0.0 || ^4.0.0"
3+
}

packages/eslint-plugin-svelte/tests/fixtures/rules/valid-compile/valid/script-comment-input.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<script context="module">
1+
<script module>
22
let foo;
33
</script>
44

packages/eslint-plugin-svelte/tests/fixtures/rules/valid-compile/valid/ts/script-comment-input.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<script context="module">
1+
<script module>
22
let foo;
33
</script>
44

packages/eslint-plugin-svelte/tools/update-rulesets.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const legacyBaseContent = `/*
1212
* in order to update its content execute "pnpm run update"
1313
*/
1414
import type { Linter } from 'eslint'
15-
const config: Linter.Config = {
15+
const config: Linter.LegacyConfig = {
1616
plugins: ["svelte"],
1717
overrides: [
1818
{
@@ -55,7 +55,7 @@ import path from "node:path"
5555
const base = require.resolve("./base")
5656
const baseExtend =
5757
path.extname(\`\${base}\`) === ".ts" ? "plugin:svelte/base" : base
58-
const config: Linter.Config = {
58+
const config: Linter.LegacyConfig = {
5959
extends: [baseExtend],
6060
rules: {
6161
// eslint-plugin-svelte rules
@@ -86,7 +86,7 @@ import path from "node:path"
8686
const base = require.resolve("./base")
8787
const baseExtend =
8888
path.extname(\`\${base}\`) === ".ts" ? "plugin:svelte/base" : base
89-
const config: Linter.Config = {
89+
const config: Linter.LegacyConfig = {
9090
extends: [baseExtend],
9191
rules: {
9292
// eslint-plugin-svelte rules
@@ -114,7 +114,7 @@ const baseContent = `/*
114114
* in order to update its content execute "pnpm run update"
115115
*/
116116
import type { ESLint, Linter } from 'eslint';
117-
const config: Linter.FlatConfig[] = [
117+
const config: Linter.Config[] = [
118118
{
119119
name: 'svelte:base:setup-plugin',
120120
plugins: {
@@ -165,7 +165,7 @@ const recommendedContent = `/*
165165
*/
166166
import type { Linter } from 'eslint';
167167
import base from "./base"
168-
const config: Linter.FlatConfig[] = [
168+
const config: Linter.Config[] = [
169169
...base,
170170
{
171171
name: 'svelte:recommended:rules',
@@ -196,7 +196,7 @@ const prettierContent = `/*
196196
*/
197197
import type { Linter } from 'eslint';
198198
import base from "./base"
199-
const config: Linter.FlatConfig[] = [
199+
const config: Linter.Config[] = [
200200
...base,
201201
{
202202
name: 'svelte:prettier:turn-off-rules',

0 commit comments

Comments
 (0)