From 2bb5279a0fc912910213eb0627632bbb30bea3bd Mon Sep 17 00:00:00 2001
From: Yosuke Ota <otameshiyo23@gmail.com>
Date: Fri, 25 Jun 2021 18:33:11 +0900
Subject: [PATCH 1/2] Fix false positives for trailing comma with import in
 `vue/script-indent` rule (#1525)

---
 lib/utils/indent-common.js                             | 7 +++++--
 tests/fixtures/script-indent/import-declaration-11.vue | 7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 tests/fixtures/script-indent/import-declaration-11.vue

diff --git a/lib/utils/indent-common.js b/lib/utils/indent-common.js
index 7d2349d3c..8ec6bbe41 100644
--- a/lib/utils/indent-common.js
+++ b/lib/utils/indent-common.js
@@ -1498,8 +1498,11 @@ module.exports.defineVisitor = function create(
       }
       if (namedSpecifiers.length) {
         const leftBrace = tokenStore.getTokenBefore(namedSpecifiers[0])
-        const rightBrace = tokenStore.getTokenAfter(
-          namedSpecifiers[namedSpecifiers.length - 1]
+        const rightBrace = /** @type {Token} */ (
+          tokenStore.getTokenAfter(
+            namedSpecifiers[namedSpecifiers.length - 1],
+            isClosingBraceToken
+          )
         )
         processNodeList(namedSpecifiers, leftBrace, rightBrace, 1)
         for (const token of tokenStore.getTokensBetween(
diff --git a/tests/fixtures/script-indent/import-declaration-11.vue b/tests/fixtures/script-indent/import-declaration-11.vue
new file mode 100644
index 000000000..83289b1f4
--- /dev/null
+++ b/tests/fixtures/script-indent/import-declaration-11.vue
@@ -0,0 +1,7 @@
+<!--{ "options": [4, { "baseIndent": 1, "switchCase": 1 } ] }-->
+<script>
+    import {
+        computed, defineComponent, PropType, ref, watch,
+    } from '@vue/composition-api';
+</script>
+<!-- https://github.com/vuejs/eslint-plugin-vue/issues/1524 -->

From 49d34c9a3e7fe0b6733e0541f6f7ea35a71d2abe Mon Sep 17 00:00:00 2001
From: yosuke ota <otameshiyo23@gmail.com>
Date: Fri, 25 Jun 2021 18:35:32 +0900
Subject: [PATCH 2/2] 7.12.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ad1cfb3b1..c7c7b10a7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-vue",
-  "version": "7.12.0",
+  "version": "7.12.1",
   "description": "Official ESLint plugin for Vue.js",
   "main": "lib/index.js",
   "scripts": {