From c7ad37c3fe688dd1682da85824764d3a5e90a782 Mon Sep 17 00:00:00 2001 From: yosuke ota Date: Sun, 9 Jun 2024 20:48:27 +0900 Subject: [PATCH 1/2] feat: update svelte2tsx to >=0.7.9 --- .npmrc | 3 ++- package.json | 2 +- src/transform/svelte.ts | 6 ++++-- tests/src/utils/utils.ts | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.npmrc b/.npmrc index 9cf9495..5b57f1e 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1,2 @@ -package-lock=false \ No newline at end of file +package-lock=false +force=true diff --git a/package.json b/package.json index 6734f47..cf54aee 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "peerDependencies": { "@typescript-eslint/parser": ">=5.41.0", "astrojs-compiler-sync": ">=0.3.1", - "svelte2tsx": ">=0.5.20", + "svelte2tsx": ">=0.7.9", "typescript": ">=4.8.4", "vue": "^3.2.45" }, diff --git a/src/transform/svelte.ts b/src/transform/svelte.ts index 6d513d2..1df35ee 100644 --- a/src/transform/svelte.ts +++ b/src/transform/svelte.ts @@ -7,13 +7,15 @@ export function transformForSvelte( if (context.current) { return code; } + // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires -- ignore const svelte2tsx: typeof Svelte2tsx = require("svelte2tsx"); const result = svelte2tsx.svelte2tsx(code, { filename: context.filePath, }); - return `/// - + return `/// +/// + ${result.code}`; } diff --git a/tests/src/utils/utils.ts b/tests/src/utils/utils.ts index dab6727..a1ccbf9 100644 --- a/tests/src/utils/utils.ts +++ b/tests/src/utils/utils.ts @@ -2,7 +2,7 @@ import type * as tsEslintParser from "@typescript-eslint/parser"; import path from "path"; import * as vueParser from "vue-eslint-parser"; -const PROJECT_ROOT = path.join(__dirname, "../../.."); +const PROJECT_ROOT = path.normalize(path.join(__dirname, "../../..")); export function buildTypes( input: string, @@ -59,7 +59,7 @@ export function buildTypes( return `${l} // ${types[i].join(", ").replace(/\n\s*/g, " ")}`; }) .join("\n") - .replace(new RegExp(escapeRegExp(PROJECT_ROOT), "gu"), ""); + .replace(new RegExp(escapeRegExp(PROJECT_ROOT), "giu"), ""); } function escapeRegExp(string: string) { From 623cadde0214b4a8c640c26554202e9aed0ad586 Mon Sep 17 00:00:00 2001 From: Yosuke Ota Date: Sun, 9 Jun 2024 20:49:09 +0900 Subject: [PATCH 2/2] Create loud-bags-film.md --- .changeset/loud-bags-film.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/loud-bags-film.md diff --git a/.changeset/loud-bags-film.md b/.changeset/loud-bags-film.md new file mode 100644 index 0000000..c3757b1 --- /dev/null +++ b/.changeset/loud-bags-film.md @@ -0,0 +1,5 @@ +--- +"typescript-eslint-parser-for-extra-files": minor +--- + +feat: update svelte2tsx to >=0.7.9