From a7b6c4a1e546425875349afb7ca66da0bd2c23fc Mon Sep 17 00:00:00 2001 From: Kazuma Oe Date: Tue, 28 Jun 2022 10:24:48 +0900 Subject: [PATCH 1/4] Revert "Use ESM eslint config files (#5263)" This reverts commit 500067b86f38ae7c00b69e476c5bb50b6e1e2c6c. --- .changeset/lovely-foxes-visit.md | 5 ----- .../{.eslintrc.js => .eslintrc.cjs} | 2 +- .../{.eslintrc.js => .eslintrc.cjs} | 2 +- .../+eslint+typescript/{.eslintrc.js => .eslintrc.cjs} | 2 +- .../+eslint-typescript/{.eslintrc.js => .eslintrc.cjs} | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 .changeset/lovely-foxes-visit.md rename packages/create-svelte/shared/+eslint+prettier+typescript/{.eslintrc.js => .eslintrc.cjs} (96%) rename packages/create-svelte/shared/+eslint+prettier-typescript/{.eslintrc.js => .eslintrc.cjs} (93%) rename packages/create-svelte/shared/+eslint+typescript/{.eslintrc.js => .eslintrc.cjs} (96%) rename packages/create-svelte/shared/+eslint-typescript/{.eslintrc.js => .eslintrc.cjs} (93%) diff --git a/.changeset/lovely-foxes-visit.md b/.changeset/lovely-foxes-visit.md deleted file mode 100644 index 9730614570ed..000000000000 --- a/.changeset/lovely-foxes-visit.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'create-svelte': patch ---- - -Use ESM eslint config files diff --git a/packages/create-svelte/shared/+eslint+prettier+typescript/.eslintrc.js b/packages/create-svelte/shared/+eslint+prettier+typescript/.eslintrc.cjs similarity index 96% rename from packages/create-svelte/shared/+eslint+prettier+typescript/.eslintrc.js rename to packages/create-svelte/shared/+eslint+prettier+typescript/.eslintrc.cjs index 1d79a06d018a..3ccf435f02ce 100644 --- a/packages/create-svelte/shared/+eslint+prettier+typescript/.eslintrc.js +++ b/packages/create-svelte/shared/+eslint+prettier+typescript/.eslintrc.cjs @@ -1,4 +1,4 @@ -export default { +module.exports = { root: true, parser: '@typescript-eslint/parser', extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier'], diff --git a/packages/create-svelte/shared/+eslint+prettier-typescript/.eslintrc.js b/packages/create-svelte/shared/+eslint+prettier-typescript/.eslintrc.cjs similarity index 93% rename from packages/create-svelte/shared/+eslint+prettier-typescript/.eslintrc.js rename to packages/create-svelte/shared/+eslint+prettier-typescript/.eslintrc.cjs index 0ca10dff4826..fab32bfc98bb 100644 --- a/packages/create-svelte/shared/+eslint+prettier-typescript/.eslintrc.js +++ b/packages/create-svelte/shared/+eslint+prettier-typescript/.eslintrc.cjs @@ -1,4 +1,4 @@ -export default { +module.exports = { root: true, extends: ['eslint:recommended', 'prettier'], plugins: ['svelte3'], diff --git a/packages/create-svelte/shared/+eslint+typescript/.eslintrc.js b/packages/create-svelte/shared/+eslint+typescript/.eslintrc.cjs similarity index 96% rename from packages/create-svelte/shared/+eslint+typescript/.eslintrc.js rename to packages/create-svelte/shared/+eslint+typescript/.eslintrc.cjs index cb6b93728ee4..13b64140373e 100644 --- a/packages/create-svelte/shared/+eslint+typescript/.eslintrc.js +++ b/packages/create-svelte/shared/+eslint+typescript/.eslintrc.cjs @@ -1,4 +1,4 @@ -export default { +module.exports = { root: true, parser: '@typescript-eslint/parser', extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended'], diff --git a/packages/create-svelte/shared/+eslint-typescript/.eslintrc.js b/packages/create-svelte/shared/+eslint-typescript/.eslintrc.cjs similarity index 93% rename from packages/create-svelte/shared/+eslint-typescript/.eslintrc.js rename to packages/create-svelte/shared/+eslint-typescript/.eslintrc.cjs index da76bf23e287..845ea51cd38b 100644 --- a/packages/create-svelte/shared/+eslint-typescript/.eslintrc.js +++ b/packages/create-svelte/shared/+eslint-typescript/.eslintrc.cjs @@ -1,4 +1,4 @@ -export default { +module.exports = { root: true, extends: ['eslint:recommended'], plugins: ['svelte3'], From 3d0924f5b254af85c6f7f7da3b2b04579ef81697 Mon Sep 17 00:00:00 2001 From: Kazuma Oe Date: Tue, 28 Jun 2022 01:46:22 +0000 Subject: [PATCH 2/4] add changeset --- .changeset/smooth-humans-cover.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/smooth-humans-cover.md diff --git a/.changeset/smooth-humans-cover.md b/.changeset/smooth-humans-cover.md new file mode 100644 index 000000000000..393edf19d71e --- /dev/null +++ b/.changeset/smooth-humans-cover.md @@ -0,0 +1,5 @@ +--- +'create-svelte': patch +--- + +Revert to use ESM eslint config files From 227479867d2cf26167e7a46676ed165c70eda500 Mon Sep 17 00:00:00 2001 From: Kazuma Oe Date: Tue, 28 Jun 2022 02:20:39 +0000 Subject: [PATCH 3/4] Revert old changeset --- .changeset/lovely-foxes-visit.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/lovely-foxes-visit.md diff --git a/.changeset/lovely-foxes-visit.md b/.changeset/lovely-foxes-visit.md new file mode 100644 index 000000000000..74ef76010744 --- /dev/null +++ b/.changeset/lovely-foxes-visit.md @@ -0,0 +1,5 @@ +--- +'create-svelte': patch +--- + +Use ESM eslint config files \ No newline at end of file From 92ca04823228eeb2f21c9a89df491ccae52a235b Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Mon, 27 Jun 2022 19:30:07 -0700 Subject: [PATCH 4/4] restore new line --- .changeset/lovely-foxes-visit.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/lovely-foxes-visit.md b/.changeset/lovely-foxes-visit.md index 74ef76010744..9730614570ed 100644 --- a/.changeset/lovely-foxes-visit.md +++ b/.changeset/lovely-foxes-visit.md @@ -2,4 +2,4 @@ 'create-svelte': patch --- -Use ESM eslint config files \ No newline at end of file +Use ESM eslint config files