From 528f704935ebac4f4b1ec5a75f925c737bd6f816 Mon Sep 17 00:00:00 2001 From: ota-meshi Date: Thu, 29 Feb 2024 19:11:07 +0900 Subject: [PATCH 1/4] fix: update deps --- package.json | 152 +++++++++++++++++++++++++-------------------------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/package.json b/package.json index a1fe3aef6..681355385 100644 --- a/package.json +++ b/package.json @@ -67,114 +67,114 @@ } }, "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@jridgewell/sourcemap-codec": "^1.4.14", - "debug": "^4.3.1", + "@eslint-community/eslint-utils": "^4.4.0", + "@jridgewell/sourcemap-codec": "^1.4.15", + "debug": "^4.3.4", "eslint-compat-utils": "^0.4.1", "esutils": "^2.0.3", "known-css-properties": "^0.29.0", - "postcss": "^8.4.5", + "postcss": "^8.4.35", "postcss-load-config": "^3.1.4", "postcss-safe-parser": "^6.0.0", - "postcss-selector-parser": "^6.0.11", - "semver": "^7.5.3", - "svelte-eslint-parser": ">=0.34.0-next.9 <1.0.0" + "postcss-selector-parser": "^6.0.15", + "semver": "^7.6.0", + "svelte-eslint-parser": ">=0.34.0-next.10 <1.0.0" }, "devDependencies": { "@1stg/browserslist-config": "^2.0.0", "@1stg/stylelint-config": "^6.0.0", - "@babel/core": "^7.16.0", - "@babel/eslint-parser": "^7.17.0", - "@babel/plugin-proposal-function-bind": "^7.16.7", - "@babel/types": "^7.16.0", + "@babel/core": "^7.24.0", + "@babel/eslint-parser": "^7.23.10", + "@babel/plugin-proposal-function-bind": "^7.23.3", + "@babel/types": "^7.24.0", "@changesets/changelog-github": "^0.5.0", - "@changesets/cli": "^2.24.2", + "@changesets/cli": "^2.27.1", "@changesets/get-release-plan": "^4.0.0", - "@fontsource/fira-mono": "^5.0.0", - "@ota-meshi/eslint-plugin": "^0.15.0", - "@sindresorhus/slugify": "^2.1.0", + "@fontsource/fira-mono": "^5.0.8", + "@ota-meshi/eslint-plugin": "^0.15.2", + "@sindresorhus/slugify": "^2.2.1", "@sveltejs/adapter-static": "^3.0.1", - "@sveltejs/kit": "^2.3.0", - "@sveltejs/vite-plugin-svelte": "^3.0.1", - "@types/babel__core": "^7.1.19", - "@types/cross-spawn": "^6.0.2", - "@types/escape-html": "^1.0.2", - "@types/eslint": "^8.0.0", - "@types/eslint-scope": "^3.7.0", - "@types/eslint-utils": "^3.0.1", + "@sveltejs/kit": "^2.5.2", + "@sveltejs/vite-plugin-svelte": "^3.0.2", + "@types/babel__core": "^7.20.5", + "@types/cross-spawn": "^6.0.6", + "@types/escape-html": "^1.0.4", + "@types/eslint": "^8.56.5", + "@types/eslint-scope": "^3.7.7", + "@types/eslint-utils": "^3.0.5", "@types/eslint-visitor-keys": "^1.0.0", - "@types/esutils": "^2.0.0", - "@types/json-schema": "^7.0.11", - "@types/less": "^3.0.3", - "@types/markdown-it": "^13.0.0", - "@types/markdown-it-container": "^2.0.5", + "@types/esutils": "^2.0.2", + "@types/json-schema": "^7.0.15", + "@types/less": "^3.0.6", + "@types/markdown-it": "^13.0.7", + "@types/markdown-it-container": "^2.0.9", "@types/markdown-it-emoji": "^2.0.4", - "@types/mocha": "^10.0.0", - "@types/node": "^20.0.0", - "@types/postcss-safe-parser": "^5.0.1", - "@types/prismjs": "^1.26.0", - "@types/semver": "^7.5.0", - "@types/stylus": "^0.48.38", - "@typescript-eslint/eslint-plugin": "^7.0.0", - "@typescript-eslint/parser": "^7.0.0", - "@typescript/vfs": "^1.4.0", - "acorn": "^8.8.2", - "assert": "^2.0.0", + "@types/mocha": "^10.0.6", + "@types/node": "^20.11.22", + "@types/postcss-safe-parser": "^5.0.4", + "@types/prismjs": "^1.26.3", + "@types/semver": "^7.5.8", + "@types/stylus": "^0.48.42", + "@typescript-eslint/eslint-plugin": "^7.1.0", + "@typescript-eslint/parser": "^7.1.0", + "@typescript/vfs": "^1.5.0", + "acorn": "^8.11.3", + "assert": "^2.1.0", "cross-spawn": "^7.0.3", "env-cmd": "^10.1.0", - "esbuild": "^0.20.0", - "esbuild-register": "^3.2.0", + "esbuild": "^0.20.1", + "esbuild-register": "^3.5.0", "escape-html": "^1.0.3", - "eslint": "^8.40.0", - "eslint-config-prettier": "^9.0.0", + "eslint": "^8.57.0", + "eslint-config-prettier": "^9.1.0", "eslint-formatter-friendly": "^7.0.0", "eslint-plugin-eslint-comments": "^3.2.0", - "eslint-plugin-eslint-plugin": "^5.0.0", - "eslint-plugin-json-schema-validator": "^4.0.0", - "eslint-plugin-jsonc": "^2.0.0", - "eslint-plugin-markdown": "^3.0.0", - "eslint-plugin-mdx": "^3.0.0", - "eslint-plugin-n": "^16.0.0", - "eslint-plugin-node-dependencies": "^0.11.0", - "eslint-plugin-prettier": "^5.0.0", - "eslint-plugin-regexp": "^2.0.0", - "eslint-plugin-svelte": "^2.28.0", - "eslint-plugin-yml": "^1.0.0", + "eslint-plugin-eslint-plugin": "^5.4.0", + "eslint-plugin-json-schema-validator": "^4.8.3", + "eslint-plugin-jsonc": "^2.13.0", + "eslint-plugin-markdown": "^3.0.1", + "eslint-plugin-mdx": "^3.1.5", + "eslint-plugin-n": "^16.6.2", + "eslint-plugin-node-dependencies": "^0.11.2", + "eslint-plugin-prettier": "^5.1.3", + "eslint-plugin-regexp": "^2.2.0", + "eslint-plugin-svelte": "^2.35.1", + "eslint-plugin-yml": "^1.12.2", "eslint-scope": "^8.0.0", "eslint-visitor-keys": "^4.0.0", - "espree": "^10.0.0", - "estree-walker": "^3.0.0", - "less": "^4.1.2", + "espree": "^10.0.1", + "estree-walker": "^3.0.3", + "less": "^4.2.0", "locate-character": "^3.0.0", - "magic-string": "^0.30.0", - "markdown-it-anchor": "^8.4.1", + "magic-string": "^0.30.7", + "markdown-it-anchor": "^8.6.7", "markdown-it-container": "^4.0.0", "markdown-it-emoji": "^3.0.0", - "mocha": "^10.0.0", - "npm-run-all2": "^6.0.0", + "mocha": "^10.3.0", + "npm-run-all2": "^6.1.2", "nyc": "^15.1.0", - "pako": "^2.0.3", - "postcss-nested": "^6.0.0", - "prettier": "^3.1.1", - "prettier-plugin-pkg": "^0.18.0", - "prettier-plugin-svelte": "^3.1.2", + "pako": "^2.1.0", + "postcss-nested": "^6.0.1", + "prettier": "^3.2.5", + "prettier-plugin-pkg": "^0.18.1", + "prettier-plugin-svelte": "^3.2.2", "prism-svelte": "^0.5.0", - "prismjs": "^1.25.0", - "rimraf": "^5.0.0", - "sass": "^1.64.0", + "prismjs": "^1.29.0", + "rimraf": "^5.0.5", + "sass": "^1.71.1", "source-map-js": "^1.0.2", - "stylelint": "^16.0.0", + "stylelint": "^16.2.1", "stylelint-config-standard": "^36.0.0", "stylus": "^0.62.0", - "svelte": "^5.0.0-next.68", + "svelte": "^5.0.0-next.69", "svelte-adapter-ghpages": "0.2.2", "svelte-i18n": "^4.0.0", - "tslib": "^2.5.0", - "type-coverage": "^2.22.0", - "typescript": "~5.3.0", - "vite": "^5.0.0", + "tslib": "^2.6.2", + "type-coverage": "^2.27.1", + "typescript": "~5.3.3", + "vite": "^5.1.4", "vite-plugin-svelte-md": "^0.1.7", - "yaml": "^2.1.1" + "yaml": "^2.4.0" }, "publishConfig": { "access": "public" From b9608261635489a788e75550738606e35adc6051 Mon Sep 17 00:00:00 2001 From: Yosuke Ota Date: Thu, 29 Feb 2024 19:11:41 +0900 Subject: [PATCH 2/4] Create fifty-deers-pretend.md --- .changeset/fifty-deers-pretend.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/fifty-deers-pretend.md diff --git a/.changeset/fifty-deers-pretend.md b/.changeset/fifty-deers-pretend.md new file mode 100644 index 000000000..8c4eb671f --- /dev/null +++ b/.changeset/fifty-deers-pretend.md @@ -0,0 +1,5 @@ +--- +"eslint-plugin-svelte": patch +--- + +fix: update dependencies From a25c3ea63116e2379fb5f0f6fe1a1bea15a4ad3d Mon Sep 17 00:00:00 2001 From: Yosuke Ota Date: Thu, 29 Feb 2024 19:13:55 +0900 Subject: [PATCH 3/4] Update fifty-deers-pretend.md --- .changeset/fifty-deers-pretend.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/fifty-deers-pretend.md b/.changeset/fifty-deers-pretend.md index 8c4eb671f..8bab6fc50 100644 --- a/.changeset/fifty-deers-pretend.md +++ b/.changeset/fifty-deers-pretend.md @@ -2,4 +2,4 @@ "eslint-plugin-svelte": patch --- -fix: update dependencies +fix: update dependencies & some fixes From cecdd36bfcf85efb4378a00c4431114c73e813c6 Mon Sep 17 00:00:00 2001 From: ota-meshi Date: Thu, 29 Feb 2024 19:16:43 +0900 Subject: [PATCH 4/4] fix bug for render tag in indent rule --- src/rules/indent-helpers/svelte.ts | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/rules/indent-helpers/svelte.ts b/src/rules/indent-helpers/svelte.ts index 0aae3a9f9..d6dd006dd 100644 --- a/src/rules/indent-helpers/svelte.ts +++ b/src/rules/indent-helpers/svelte.ts @@ -218,16 +218,7 @@ export function defineVisitor(context: IndentContext): NodeListener { const openToken = sourceCode.getFirstToken(node); const renderToken = sourceCode.getTokenAfter(openToken)!; offsets.setOffsetToken(renderToken, 1, openToken); - const calleeToken = sourceCode.getFirstToken(node.callee); - offsets.setOffsetToken(calleeToken, 1, renderToken); - const leftParenToken = sourceCode.getTokenAfter(node.callee, { - filter: isOpeningParenToken, - includeComments: false - })!; - const rightParenToken = sourceCode.getTokenBefore(sourceCode.getLastToken(node)); - - offsets.setOffsetToken(leftParenToken, 1, calleeToken); - offsets.setOffsetElementList(node.arguments, leftParenToken, rightParenToken, 1); + offsets.setOffsetToken(node.expression, 1, renderToken); }, // ---------------------------------------------------------------------- // BLOCKS