From 83568682077a47d356041e52ac9b2b9f91523bec Mon Sep 17 00:00:00 2001
From: Flo Edelmann <git@flo-edelmann.de>
Date: Thu, 22 Jun 2023 13:14:59 +0200
Subject: [PATCH 1/7] Rename `vue/component-tags-order` to `vue/block-order`

---
 ...component-tags-order.md => block-order.md} | 42 +++++++++----------
 docs/rules/index.md                           |  2 +-
 lib/configs/recommended.js                    |  2 +-
 lib/configs/vue3-recommended.js               |  2 +-
 lib/index.js                                  |  2 +-
 ...component-tags-order.js => block-order.js} |  2 +-
 ...component-tags-order.js => block-order.js} | 10 ++---
 7 files changed, 29 insertions(+), 33 deletions(-)
 rename docs/rules/{component-tags-order.md => block-order.md} (65%)
 rename lib/rules/{component-tags-order.js => block-order.js} (98%)
 rename tests/lib/rules/{component-tags-order.js => block-order.js} (97%)

diff --git a/docs/rules/component-tags-order.md b/docs/rules/block-order.md
similarity index 65%
rename from docs/rules/component-tags-order.md
rename to docs/rules/block-order.md
index 4fc8d245e..7d56304e1 100644
--- a/docs/rules/component-tags-order.md
+++ b/docs/rules/block-order.md
@@ -1,14 +1,14 @@
 ---
 pageClass: rule-details
 sidebarDepth: 0
-title: vue/component-tags-order
+title: vue/block-order
 description: enforce order of component top-level elements
-since: v6.1.0
 ---
-# vue/component-tags-order
+# vue/block-order
 
 > enforce order of component top-level elements
 
+- :exclamation: <badge text="This rule has not been released yet." vertical="middle" type="error"> ***This rule has not been released yet.*** </badge>
 - :gear: This rule is included in `"plugin:vue/vue3-recommended"` and `"plugin:vue/recommended"`.
 - :wrench: The `--fix` option on the [command line](https://eslint.org/docs/user-guide/command-line-interface#fixing-problems) can automatically fix some of the problems reported by this rule.
 
@@ -20,7 +20,7 @@ This rule warns about the order of the top-level tags, such as `<script>`, `<tem
 
 ```json
 {
-  "vue/component-tags-order": ["error", {
+  "vue/block-order": ["error", {
     "order": [ [ "script", "template" ], "style" ]
   }]
 }
@@ -30,7 +30,7 @@ This rule warns about the order of the top-level tags, such as `<script>`, `<tem
 
 ### `{ "order": [ [ "script", "template" ], "style" ] }` (default)
 
-<eslint-code-block fix :rules="{'vue/component-tags-order': ['error']}">
+<eslint-code-block fix :rules="{'vue/block-order': ['error']}">
 
 ```vue
 <!-- ✓ GOOD -->
@@ -41,7 +41,7 @@ This rule warns about the order of the top-level tags, such as `<script>`, `<tem
 
 </eslint-code-block>
 
-<eslint-code-block fix :rules="{'vue/component-tags-order': ['error']}">
+<eslint-code-block fix :rules="{'vue/block-order': ['error']}">
 
 ```vue
 <!-- ✓ GOOD -->
@@ -52,7 +52,7 @@ This rule warns about the order of the top-level tags, such as `<script>`, `<tem
 
 </eslint-code-block>
 
-<eslint-code-block fix :rules="{'vue/component-tags-order': ['error']}">
+<eslint-code-block fix :rules="{'vue/block-order': ['error']}">
 
 ```vue
 <!-- ✗ BAD -->
@@ -65,7 +65,7 @@ This rule warns about the order of the top-level tags, such as `<script>`, `<tem
 
 ### `{ "order": ["template", "script", "style"] }`
 
-<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['template', 'script', 'style'] }]}">
+<eslint-code-block fix :rules="{'vue/block-order': ['error', { 'order': ['template', 'script', 'style'] }]}">
 
 ```vue
 <!-- ✓ GOOD -->
@@ -76,7 +76,7 @@ This rule warns about the order of the top-level tags, such as `<script>`, `<tem
 
 </eslint-code-block>
 
-<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['template', 'script', 'style'] }]}">
+<eslint-code-block fix :rules="{'vue/block-order': ['error', { 'order': ['template', 'script', 'style'] }]}">
 
 ```vue
 <!-- ✗ BAD -->
@@ -89,7 +89,7 @@ This rule warns about the order of the top-level tags, such as `<script>`, `<tem
 
 ### `{ "order": ["docs", "template", "script", "style"] }`
 
-<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['docs', 'template', 'script', 'style'] }]}">
+<eslint-code-block fix :rules="{'vue/block-order': ['error', { 'order': ['docs', 'template', 'script', 'style'] }]}">
 
 ```vue
 <!-- ✓ GOOD -->
@@ -101,7 +101,7 @@ This rule warns about the order of the top-level tags, such as `<script>`, `<tem
 
 </eslint-code-block>
 
-<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['docs', 'template', 'script', 'style'] }]}">
+<eslint-code-block fix :rules="{'vue/block-order': ['error', { 'order': ['docs', 'template', 'script', 'style'] }]}">
 
 ```vue
 <!-- ✗ BAD -->
@@ -115,7 +115,7 @@ This rule warns about the order of the top-level tags, such as `<script>`, `<tem
 
 ### `{ 'order': ['template', 'script:not([setup])', 'script[setup]'] }`
 
-<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['template', 'script:not([setup])', 'script[setup]'] }]}">
+<eslint-code-block fix :rules="{'vue/block-order': ['error', { 'order': ['template', 'script:not([setup])', 'script[setup]'] }]}">
 
 ```vue
 <!-- ✓ GOOD -->
@@ -126,7 +126,7 @@ This rule warns about the order of the top-level tags, such as `<script>`, `<tem
 
 </eslint-code-block>
 
-<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['template', 'script:not([setup])', 'script[setup]'] }]}">
+<eslint-code-block fix :rules="{'vue/block-order': ['error', { 'order': ['template', 'script:not([setup])', 'script[setup]'] }]}">
 
 ```vue
 <!-- ✗ BAD -->
@@ -139,7 +139,7 @@ This rule warns about the order of the top-level tags, such as `<script>`, `<tem
 
 ### `{ 'order': ['template', 'style:not([scoped])', 'style[scoped]'] }`
 
-<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['template', 'style:not([scoped])', 'style[scoped]'] }]}">
+<eslint-code-block fix :rules="{'vue/block-order': ['error', { 'order': ['template', 'style:not([scoped])', 'style[scoped]'] }]}">
 
 ```vue
 <!-- ✓ GOOD -->
@@ -150,7 +150,7 @@ This rule warns about the order of the top-level tags, such as `<script>`, `<tem
 
 </eslint-code-block>
 
-<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['template', 'style:not([scoped])', 'style[scoped]'] }]}">
+<eslint-code-block fix :rules="{'vue/block-order': ['error', { 'order': ['template', 'style:not([scoped])', 'style[scoped]'] }]}">
 
 ```vue
 <!-- ✗ BAD -->
@@ -163,7 +163,7 @@ This rule warns about the order of the top-level tags, such as `<script>`, `<tem
 
 ### `{ 'order': ['template', 'i18n:not([locale=en])', 'i18n[locale=en]'] }`
 
-<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['template', 'i18n:not([locale=en])', 'i18n[locale=en]'] }]}">
+<eslint-code-block fix :rules="{'vue/block-order': ['error', { 'order': ['template', 'i18n:not([locale=en])', 'i18n[locale=en]'] }]}">
 
 ```vue
 <!-- ✓ GOOD -->
@@ -174,7 +174,7 @@ This rule warns about the order of the top-level tags, such as `<script>`, `<tem
 
 </eslint-code-block>
 
-<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['template', 'i18n:not([locale=en])', 'i18n[locale=en]'] }]}">
+<eslint-code-block fix :rules="{'vue/block-order': ['error', { 'order': ['template', 'i18n:not([locale=en])', 'i18n[locale=en]'] }]}">
 
 ```vue
 <!-- ✗ BAD -->
@@ -189,11 +189,7 @@ This rule warns about the order of the top-level tags, such as `<script>`, `<tem
 
 - [Style guide - Single-file component top-level element order](https://vuejs.org/style-guide/rules-recommended.html#single-file-component-top-level-element-order)
 
-## :rocket: Version
-
-This rule was introduced in eslint-plugin-vue v6.1.0
-
 ## :mag: Implementation
 
-- [Rule source](https://github.com/vuejs/eslint-plugin-vue/blob/master/lib/rules/component-tags-order.js)
-- [Test source](https://github.com/vuejs/eslint-plugin-vue/blob/master/tests/lib/rules/component-tags-order.js)
+- [Rule source](https://github.com/vuejs/eslint-plugin-vue/blob/master/lib/rules/block-order.js)
+- [Test source](https://github.com/vuejs/eslint-plugin-vue/blob/master/tests/lib/rules/block-order.js)
diff --git a/docs/rules/index.md b/docs/rules/index.md
index c2093a8c4..664551eb8 100644
--- a/docs/rules/index.md
+++ b/docs/rules/index.md
@@ -178,7 +178,7 @@ Rules in this category are enabled for all presets provided by eslint-plugin-vue
 | Rule ID | Description |    |    |
 |:--------|:------------|:--:|:--:|
 | [vue/attributes-order](./attributes-order.md) | enforce order of attributes | :wrench: | :three::two::hammer: |
-| [vue/component-tags-order](./component-tags-order.md) | enforce order of component top-level elements | :wrench: | :three::two::hammer: |
+| [vue/block-order](./block-order.md) | enforce order of component top-level elements | :wrench: | :three::two::hammer: |
 | [vue/no-lone-template](./no-lone-template.md) | disallow unnecessary `<template>` |  | :three::two::warning: |
 | [vue/no-multiple-slot-args](./no-multiple-slot-args.md) | disallow to pass multiple arguments to scoped slots |  | :three::two::warning: |
 | [vue/no-v-html](./no-v-html.md) | disallow use of v-html to prevent XSS attack |  | :three::two::hammer: |
diff --git a/lib/configs/recommended.js b/lib/configs/recommended.js
index 3db36d8c0..5f05dbaf6 100644
--- a/lib/configs/recommended.js
+++ b/lib/configs/recommended.js
@@ -7,7 +7,7 @@ module.exports = {
   extends: require.resolve('./strongly-recommended'),
   rules: {
     'vue/attributes-order': 'warn',
-    'vue/component-tags-order': 'warn',
+    'vue/block-order': 'warn',
     'vue/no-lone-template': 'warn',
     'vue/no-multiple-slot-args': 'warn',
     'vue/no-v-html': 'warn',
diff --git a/lib/configs/vue3-recommended.js b/lib/configs/vue3-recommended.js
index 34b181e29..3d3fe3a2b 100644
--- a/lib/configs/vue3-recommended.js
+++ b/lib/configs/vue3-recommended.js
@@ -7,7 +7,7 @@ module.exports = {
   extends: require.resolve('./vue3-strongly-recommended'),
   rules: {
     'vue/attributes-order': 'warn',
-    'vue/component-tags-order': 'warn',
+    'vue/block-order': 'warn',
     'vue/no-lone-template': 'warn',
     'vue/no-multiple-slot-args': 'warn',
     'vue/no-v-html': 'warn',
diff --git a/lib/index.js b/lib/index.js
index 66ab217bd..07f5698cb 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -15,6 +15,7 @@ module.exports = {
     'attribute-hyphenation': require('./rules/attribute-hyphenation'),
     'attributes-order': require('./rules/attributes-order'),
     'block-lang': require('./rules/block-lang'),
+    'block-order': require('./rules/block-order'),
     'block-spacing': require('./rules/block-spacing'),
     'block-tag-newline': require('./rules/block-tag-newline'),
     'brace-style': require('./rules/brace-style'),
@@ -27,7 +28,6 @@ module.exports = {
     'component-definition-name-casing': require('./rules/component-definition-name-casing'),
     'component-name-in-template-casing': require('./rules/component-name-in-template-casing'),
     'component-options-name-casing': require('./rules/component-options-name-casing'),
-    'component-tags-order': require('./rules/component-tags-order'),
     'custom-event-name-casing': require('./rules/custom-event-name-casing'),
     'define-emits-declaration': require('./rules/define-emits-declaration'),
     'define-macros-order': require('./rules/define-macros-order'),
diff --git a/lib/rules/component-tags-order.js b/lib/rules/block-order.js
similarity index 98%
rename from lib/rules/component-tags-order.js
rename to lib/rules/block-order.js
index 23fbc031b..9f99ceb5a 100644
--- a/lib/rules/component-tags-order.js
+++ b/lib/rules/block-order.js
@@ -39,7 +39,7 @@ module.exports = {
     docs: {
       description: 'enforce order of component top-level elements',
       categories: ['vue3-recommended', 'recommended'],
-      url: 'https://eslint.vuejs.org/rules/component-tags-order.html'
+      url: 'https://eslint.vuejs.org/rules/block-order.html'
     },
     fixable: 'code',
     schema: [
diff --git a/tests/lib/rules/component-tags-order.js b/tests/lib/rules/block-order.js
similarity index 97%
rename from tests/lib/rules/component-tags-order.js
rename to tests/lib/rules/block-order.js
index 51ed7140b..e9b9348ff 100644
--- a/tests/lib/rules/component-tags-order.js
+++ b/tests/lib/rules/block-order.js
@@ -3,7 +3,7 @@
  */
 'use strict'
 
-const rule = require('../../../lib/rules/component-tags-order')
+const rule = require('../../../lib/rules/block-order')
 const RuleTester = require('eslint').RuleTester
 const assert = require('assert')
 const { ESLint } = require('../../eslint-compat')
@@ -18,7 +18,7 @@ const eslint = new ESLint({
     plugins: ['vue'],
     rules: {
       'vue/comment-directive': 'error',
-      'vue/component-tags-order': 'error'
+      'vue/block-order': 'error'
     }
   },
   useEslintrc: false,
@@ -30,7 +30,7 @@ const tester = new RuleTester({
   parser: require.resolve('vue-eslint-parser')
 })
 
-tester.run('component-tags-order', rule, {
+tester.run('block-order', rule, {
   valid: [
     // default
     '<script></script><template></template><style></style>',
@@ -478,7 +478,7 @@ tester.run('component-tags-order', rule, {
 describe('suppress reporting with eslint-disable-next-line', () => {
   it('do not report if <!-- eslint-disable-next-line -->', async () => {
     const code = `<style></style><template></template>
-    <!-- eslint-disable-next-line vue/component-tags-order -->
+    <!-- eslint-disable-next-line vue/block-order -->
     <script></script>`
     const [{ messages, output }] = await eslint.lintText(code, {
       filePath: 'test.vue'
@@ -488,7 +488,7 @@ describe('suppress reporting with eslint-disable-next-line', () => {
     assert.strictEqual(
       output,
       `<template></template><style></style>
-    <!-- eslint-disable-next-line vue/component-tags-order -->
+    <!-- eslint-disable-next-line vue/block-order -->
     <script></script>`
     )
   })

From 842d1a0d41772b913d02a3ae8c5d75f6813516f5 Mon Sep 17 00:00:00 2001
From: Flo Edelmann <git@flo-edelmann.de>
Date: Thu, 22 Jun 2023 13:21:45 +0200
Subject: [PATCH 2/7] Add back (deprecated) `vue/component-tags-order` rule

---
 docs/rules/component-tags-order.md      | 199 ++++++++++
 docs/rules/index.md                     |   1 +
 lib/index.js                            |   1 +
 lib/rules/component-tags-order.js       |  22 ++
 tests/lib/rules/component-tags-order.js | 495 ++++++++++++++++++++++++
 5 files changed, 718 insertions(+)
 create mode 100644 docs/rules/component-tags-order.md
 create mode 100644 lib/rules/component-tags-order.js
 create mode 100644 tests/lib/rules/component-tags-order.js

diff --git a/docs/rules/component-tags-order.md b/docs/rules/component-tags-order.md
new file mode 100644
index 000000000..242a21154
--- /dev/null
+++ b/docs/rules/component-tags-order.md
@@ -0,0 +1,199 @@
+---
+pageClass: rule-details
+sidebarDepth: 0
+title: vue/component-tags-order
+description: enforce order of component top-level elements
+since: v6.1.0
+---
+# vue/component-tags-order
+
+> enforce order of component top-level elements
+
+- :warning: This rule was **deprecated** and replaced by [vue/block-order](block-order.md) rule.
+- :wrench: The `--fix` option on the [command line](https://eslint.org/docs/user-guide/command-line-interface#fixing-problems) can automatically fix some of the problems reported by this rule.
+
+## :book: Rule Details
+
+This rule warns about the order of the top-level tags, such as `<script>`, `<template>` & `<style>`.
+
+## :wrench: Options
+
+```json
+{
+  "vue/component-tags-order": ["error", {
+    "order": [ [ "script", "template" ], "style" ]
+  }]
+}
+```
+
+- `order` (`(string|string[])[]`) ... The order of top-level element names. default `[ [ "script", "template" ], "style" ]`. May also be CSS selectors, such as `script[setup]` and `i18n:not([locale=en])`.
+
+### `{ "order": [ [ "script", "template" ], "style" ] }` (default)
+
+<eslint-code-block fix :rules="{'vue/component-tags-order': ['error']}">
+
+```vue
+<!-- ✓ GOOD -->
+<script>/* ... */</script>
+<template>...</template>
+<style>/* ... */</style>
+```
+
+</eslint-code-block>
+
+<eslint-code-block fix :rules="{'vue/component-tags-order': ['error']}">
+
+```vue
+<!-- ✓ GOOD -->
+<template>...</template>
+<script>/* ... */</script>
+<style>/* ... */</style>
+```
+
+</eslint-code-block>
+
+<eslint-code-block fix :rules="{'vue/component-tags-order': ['error']}">
+
+```vue
+<!-- ✗ BAD -->
+<style>/* ... */</style>
+<script>/* ... */</script>
+<template>...</template>
+```
+
+</eslint-code-block>
+
+### `{ "order": ["template", "script", "style"] }`
+
+<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['template', 'script', 'style'] }]}">
+
+```vue
+<!-- ✓ GOOD -->
+<template>...</template>
+<script>/* ... */</script>
+<style>/* ... */</style>
+```
+
+</eslint-code-block>
+
+<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['template', 'script', 'style'] }]}">
+
+```vue
+<!-- ✗ BAD -->
+<script>/* ... */</script>
+<template>...</template>
+<style>/* ... */</style>
+```
+
+</eslint-code-block>
+
+### `{ "order": ["docs", "template", "script", "style"] }`
+
+<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['docs', 'template', 'script', 'style'] }]}">
+
+```vue
+<!-- ✓ GOOD -->
+<docs> documentation </docs>
+<template>...</template>
+<script>/* ... */</script>
+<style>/* ... */</style>
+```
+
+</eslint-code-block>
+
+<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['docs', 'template', 'script', 'style'] }]}">
+
+```vue
+<!-- ✗ BAD -->
+<template>...</template>
+<script>/* ... */</script>
+<docs> documentation </docs>
+<style>/* ... */</style>
+```
+
+</eslint-code-block>
+
+### `{ 'order': ['template', 'script:not([setup])', 'script[setup]'] }`
+
+<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['template', 'script:not([setup])', 'script[setup]'] }]}">
+
+```vue
+<!-- ✓ GOOD -->
+<template>...</template>
+<script>/* ... */</script>
+<script setup>/* ... */</script>
+```
+
+</eslint-code-block>
+
+<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['template', 'script:not([setup])', 'script[setup]'] }]}">
+
+```vue
+<!-- ✗ BAD -->
+<template>...</template>
+<script setup>/* ... */</script>
+<script>/* ... */</script>
+```
+
+</eslint-code-block>
+
+### `{ 'order': ['template', 'style:not([scoped])', 'style[scoped]'] }`
+
+<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['template', 'style:not([scoped])', 'style[scoped]'] }]}">
+
+```vue
+<!-- ✓ GOOD -->
+<template>...</template>
+<style>/* ... */</style>
+<style scoped>/* ... */</style>
+```
+
+</eslint-code-block>
+
+<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['template', 'style:not([scoped])', 'style[scoped]'] }]}">
+
+```vue
+<!-- ✗ BAD -->
+<template>...</template>
+<style scoped>/* ... */</style>
+<style>/* ... */</style>
+```
+
+</eslint-code-block>
+
+### `{ 'order': ['template', 'i18n:not([locale=en])', 'i18n[locale=en]'] }`
+
+<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['template', 'i18n:not([locale=en])', 'i18n[locale=en]'] }]}">
+
+```vue
+<!-- ✓ GOOD -->
+<template>...</template>
+<i18n locale="ja">/* ... */</i18n>
+<i18n locale="en">/* ... */</i18n>
+```
+
+</eslint-code-block>
+
+<eslint-code-block fix :rules="{'vue/component-tags-order': ['error', { 'order': ['template', 'i18n:not([locale=en])', 'i18n[locale=en]'] }]}">
+
+```vue
+<!-- ✗ BAD -->
+<template>...</template>
+<i18n locale="en">/* ... */</i18n>
+<i18n locale="ja">/* ... */</i18n>
+```
+
+</eslint-code-block>
+
+## :books: Further Reading
+
+- [Style guide - Single-file component top-level element order](https://vuejs.org/style-guide/rules-recommended.html#single-file-component-top-level-element-order)
+
+## :rocket: Version
+
+This rule was introduced in eslint-plugin-vue v6.1.0
+
+## :mag: Implementation
+
+- [Rule source](https://github.com/vuejs/eslint-plugin-vue/blob/master/lib/rules/component-tags-order.js)
+- [Test source](https://github.com/vuejs/eslint-plugin-vue/blob/master/tests/lib/rules/component-tags-order.js)
diff --git a/docs/rules/index.md b/docs/rules/index.md
index 664551eb8..3c3673cf0 100644
--- a/docs/rules/index.md
+++ b/docs/rules/index.md
@@ -333,6 +333,7 @@ The following rules extend the rules provided by ESLint itself and apply them to
 
 | Rule ID | Replaced by |
 |:--------|:------------|
+| [vue/component-tags-order](./component-tags-order.md) | [vue/block-order](./block-order.md) |
 | [vue/no-invalid-model-keys](./no-invalid-model-keys.md) | [vue/valid-model-definition](./valid-model-definition.md) |
 | [vue/script-setup-uses-vars](./script-setup-uses-vars.md) | (no replacement) |
 | [vue/v-on-function-call](./v-on-function-call.md) | [vue/v-on-handler-style](./v-on-handler-style.md) |
diff --git a/lib/index.js b/lib/index.js
index 07f5698cb..e0eecbf2c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -28,6 +28,7 @@ module.exports = {
     'component-definition-name-casing': require('./rules/component-definition-name-casing'),
     'component-name-in-template-casing': require('./rules/component-name-in-template-casing'),
     'component-options-name-casing': require('./rules/component-options-name-casing'),
+    'component-tags-order': require('./rules/component-tags-order'),
     'custom-event-name-casing': require('./rules/custom-event-name-casing'),
     'define-emits-declaration': require('./rules/define-emits-declaration'),
     'define-macros-order': require('./rules/define-macros-order'),
diff --git a/lib/rules/component-tags-order.js b/lib/rules/component-tags-order.js
new file mode 100644
index 000000000..5955f4adf
--- /dev/null
+++ b/lib/rules/component-tags-order.js
@@ -0,0 +1,22 @@
+'use strict'
+
+const baseRule = require('./block-order')
+
+module.exports = {
+  // eslint-disable-next-line eslint-plugin/require-meta-schema -- inherit schema from base rule
+  meta: {
+    ...baseRule.meta,
+    type: baseRule.meta.type,
+    docs: {
+      description: baseRule.meta.docs.description,
+      categories: undefined,
+      url: 'https://eslint.vuejs.org/rules/component-tags-order.html'
+    },
+    deprecated: true,
+    replacedBy: ['block-order']
+  },
+  /** @param {RuleContext} context */
+  create(context) {
+    return baseRule.create(context)
+  }
+}
diff --git a/tests/lib/rules/component-tags-order.js b/tests/lib/rules/component-tags-order.js
new file mode 100644
index 000000000..51ed7140b
--- /dev/null
+++ b/tests/lib/rules/component-tags-order.js
@@ -0,0 +1,495 @@
+/**
+ * @author Yosuke Ota
+ */
+'use strict'
+
+const rule = require('../../../lib/rules/component-tags-order')
+const RuleTester = require('eslint').RuleTester
+const assert = require('assert')
+const { ESLint } = require('../../eslint-compat')
+
+// Initialize linter.
+const eslint = new ESLint({
+  overrideConfig: {
+    parser: require.resolve('vue-eslint-parser'),
+    parserOptions: {
+      ecmaVersion: 2015
+    },
+    plugins: ['vue'],
+    rules: {
+      'vue/comment-directive': 'error',
+      'vue/component-tags-order': 'error'
+    }
+  },
+  useEslintrc: false,
+  plugins: { vue: require('../../../lib/index') },
+  fix: true
+})
+
+const tester = new RuleTester({
+  parser: require.resolve('vue-eslint-parser')
+})
+
+tester.run('component-tags-order', rule, {
+  valid: [
+    // default
+    '<script></script><template></template><style></style>',
+    '<template></template><script></script><style></style>',
+    '<script> /*script*/ </script><template><div id="id">text <!--comment--> </div><br></template><style>.button{ color: red; }</style>',
+    '<docs></docs><script></script><template></template><style></style>',
+    '<script></script><docs></docs><template></template><style></style>',
+    '<docs></docs><template></template><script></script><style></style>',
+    '<template></template><script></script><docs></docs><style></style>',
+    '<script></script><template></template>',
+    '<template></template><script></script>',
+    '<script setup></script><script></script>',
+    '<docs></docs><template></template><script></script><script setup></script><style></style>',
+    `
+      <template>
+      </template>
+
+      <script>
+      </script>
+
+      <style>
+      </style>
+    `,
+    `
+      <script>
+      </script>
+
+      <template>
+      </template>
+
+      <style>
+      </style>
+    `,
+
+    // order
+    {
+      code: '<script></script><template></template><style></style>',
+      output: null,
+      options: [{ order: ['script', 'template', 'style'] }]
+    },
+    {
+      code: '<template></template><script></script><style></style>',
+      output: null,
+      options: [{ order: ['template', 'script', 'style'] }]
+    },
+    {
+      code: '<style></style><template></template><script></script>',
+      output: null,
+      options: [{ order: ['style', 'template', 'script'] }]
+    },
+    {
+      code: '<template></template><script></script><style></style>',
+      output: null,
+      options: [{ order: ['template', 'docs', 'script', 'style'] }]
+    },
+    {
+      code: '<template></template><docs></docs><script></script><style></style>',
+      output: null,
+      options: [{ order: ['template', 'script', 'style'] }]
+    },
+    {
+      code: '<docs><div id="id">text <!--comment--> </div><br></docs><script></script><template></template><style></style>',
+      output: null,
+      options: [{ order: ['docs', 'script', 'template', 'style'] }]
+    },
+    {
+      code: '<script setup></script><script></script><template></template><style></style>',
+      output: null,
+      options: [
+        { order: ['script[setup]', 'script:not([setup])', 'template', 'style'] }
+      ]
+    },
+    {
+      code: '<template></template><script setup></script><script></script><style></style>',
+      output: null,
+      options: [
+        {
+          order: [['script[setup]', 'script:not([setup])', 'template'], 'style']
+        }
+      ]
+    },
+    {
+      code: '<script></script><script setup></script><template></template><style></style>',
+      output: null,
+      options: [{ order: ['script', 'template', 'style'] }]
+    },
+    {
+      code: '<template></template><script></script><script setup></script><style></style>',
+      output: null,
+      options: [{ order: [['script', 'template'], 'style'] }]
+    },
+    {
+      code: '<script></script><script setup></script><template></template><style></style>',
+      output: null,
+      options: [
+        { order: ['script:not([setup])', 'script[setup]', 'template', 'style'] }
+      ]
+    },
+    {
+      code: '<template></template><script></script><script setup></script><style></style>',
+      output: null,
+      options: [
+        {
+          order: [['script:not([setup])', 'script[setup]', 'template'], 'style']
+        }
+      ]
+    },
+    {
+      code: '<template></template><script></script><script setup></script><style scoped></style><style></style><i18n locale="ja"></i18n><i18n locale="en"></i18n>',
+      output: null,
+      options: [
+        {
+          order: [
+            ['script:not([setup])', 'script[setup]', 'template'],
+            'style[scoped]',
+            'style:not([scoped])',
+            'i18n:not([locale=en])',
+            'i18n:not([locale=ja])'
+          ]
+        }
+      ]
+    },
+    {
+      code: '<template></template><script></script><script setup></script><style scoped></style><style></style><i18n locale="en"></i18n><i18n locale="ja"></i18n>',
+      output: null,
+      options: [
+        {
+          order: [
+            'template',
+            'script:not([setup])',
+            'script[setup]',
+            'style[scoped]',
+            'style:not([scoped])',
+            'i18n[locale=en]',
+            'i18n[locale=ja]'
+          ]
+        }
+      ]
+    },
+    {
+      code: '<template></template><docs></docs><script></script><style></style>',
+      output: null,
+      options: [{ order: [['docs', 'script', 'template'], 'style'] }]
+    },
+    {
+      code: '<i18n locale="en"></i18n><i18n locale="ja"></i18n>',
+      output: null,
+      options: [{ order: ['i18n[locale=en]', 'i18n[locale=ja]'] }]
+    },
+    {
+      code: '<style></style><style scoped></style>',
+      output: null,
+      options: [{ order: ['style:not([scoped])', 'style[scoped]'] }]
+    },
+
+    `<script></script><style></style>`,
+
+    // Invalid EOF
+    '<template><div a=">test</div></template><style></style>',
+    '<template><div><!--test</div></template><style></style>'
+  ],
+  invalid: [
+    {
+      code: '<style></style><template></template><script></script>',
+      errors: [
+        {
+          message: "'<template>' should be above '<style>' on line 1.",
+          line: 1,
+          column: 16
+        },
+        {
+          message: "'<script>' should be above '<style>' on line 1.",
+          line: 1,
+          column: 37
+        }
+      ],
+      output: '<template></template><style></style><script></script>'
+    },
+    {
+      code: '<template></template><script></script><style></style>',
+      options: [{ order: ['script', 'template', 'style'] }],
+      errors: [
+        {
+          message: "'<script>' should be above '<template>' on line 1.",
+          line: 1,
+          column: 22
+        }
+      ],
+      output: '<script></script><template></template><style></style>'
+    },
+    {
+      code: `
+        <template></template>
+
+        <style></style>
+
+        <script></script>`,
+      errors: [
+        {
+          message: "'<script>' should be above '<style>' on line 4.",
+          line: 6
+        }
+      ],
+      output:
+        '\n' +
+        '        <template></template>\n' +
+        '\n' +
+        '        <script></script>\n' +
+        '\n' +
+        '        <style></style>'
+    },
+    {
+      code: `
+        <template></template>
+        <script></script>
+        <style></style>
+      `,
+      options: [{ order: ['script', 'template', 'style'] }],
+      errors: [
+        {
+          message: "'<script>' should be above '<template>' on line 2.",
+          line: 3
+        }
+      ],
+      output:
+        '\n' +
+        '        <script></script>\n' +
+        '        <template></template>\n' +
+        '        <style></style>\n' +
+        '      '
+    },
+    {
+      code: `
+        <script></script>
+        <template></template>
+        <style></style>
+      `,
+      options: [{ order: ['template', 'script', 'style'] }],
+      errors: [
+        {
+          message: "'<template>' should be above '<script>' on line 2.",
+          line: 3
+        }
+      ],
+      output:
+        '\n' +
+        '        <template></template>\n' +
+        '        <script></script>\n' +
+        '        <style></style>\n' +
+        '      '
+    },
+    {
+      code: `
+        <template></template>
+        <docs></docs>
+        <script></script>
+        <style></style>
+      `,
+      options: [{ order: ['docs', 'template', 'script', 'style'] }],
+      errors: [
+        {
+          message: "'<docs>' should be above '<template>' on line 2.",
+          line: 3
+        }
+      ],
+      output:
+        '\n' +
+        '        <docs></docs>\n' +
+        '        <template></template>\n' +
+        '        <script></script>\n' +
+        '        <style></style>\n' +
+        '      '
+    },
+    {
+      code: `
+        <template></template>
+        <docs></docs>
+        <script></script>
+        <style></style>
+      `,
+      options: [{ order: ['script', 'template', 'style'] }],
+      errors: [
+        {
+          message: "'<script>' should be above '<template>' on line 2.",
+          line: 4
+        }
+      ],
+      output:
+        '\n' +
+        '        <script></script>\n' +
+        '        <template></template>\n' +
+        '        <docs></docs>\n' +
+        '        <style></style>\n' +
+        '      '
+    },
+    {
+      code: `
+        <template></template>
+        <docs>
+        </docs>
+        <script></script>
+        <style></style>
+      `,
+      options: [{ order: ['script', 'template', 'style'] }],
+      errors: [
+        {
+          message: "'<script>' should be above '<template>' on line 2.",
+          line: 5
+        }
+      ],
+      output:
+        '\n' +
+        '        <script></script>\n' +
+        '        <template></template>\n' +
+        '        <docs>\n' +
+        '        </docs>\n' +
+        '        <style></style>\n' +
+        '      '
+    },
+    {
+      code: `
+        <script></script>
+        <template></template>
+      `,
+      options: [{ order: ['template', 'script'] }],
+      errors: [
+        {
+          message: "'<template>' should be above '<script>' on line 2.",
+          line: 3
+        }
+      ],
+      output:
+        '\n        <template></template>\n        <script></script>\n      '
+    },
+    {
+      code: `
+        <style></style>
+        <template></template>
+        <script></script>
+      `,
+      errors: [
+        {
+          message: "'<template>' should be above '<style>' on line 2.",
+          line: 3
+        },
+        {
+          message: "'<script>' should be above '<style>' on line 2.",
+          line: 4
+        }
+      ],
+      output:
+        '\n' +
+        '        <template></template>\n' +
+        '        <style></style>\n' +
+        '        <script></script>\n' +
+        '      '
+    },
+    {
+      code: `
+        <style></style>
+        <docs></docs>
+        <template></template>
+        <script></script>
+      `,
+      errors: [
+        {
+          message: "'<template>' should be above '<style>' on line 2.",
+          line: 4
+        },
+        {
+          message: "'<script>' should be above '<style>' on line 2.",
+          line: 5
+        }
+      ],
+      output:
+        '\n' +
+        '        <template></template>\n' +
+        '        <style></style>\n' +
+        '        <docs></docs>\n' +
+        '        <script></script>\n' +
+        '      '
+    },
+    // no <template>
+    {
+      code: `
+        <style></style>
+        <script></script>
+      `,
+      errors: [
+        {
+          message: "'<script>' should be above '<style>' on line 2.",
+          line: 3
+        }
+      ],
+      output: '\n        <script></script>\n        <style></style>\n      '
+    },
+    {
+      code: '<i18n locale="ja"></i18n><i18n locale="en"></i18n>',
+      output: '<i18n locale="en"></i18n><i18n locale="ja"></i18n>',
+      options: [{ order: ['i18n[locale=en]', 'i18n[locale=ja]'] }],
+      errors: [
+        {
+          message:
+            "'<i18n locale=en>' should be above '<i18n locale=ja>' on line 1.",
+          line: 1
+        }
+      ]
+    },
+    {
+      code: '<style scoped></style><style></style>',
+      output: '<style></style><style scoped></style>',
+      options: [{ order: ['style:not([scoped])', 'style[scoped]'] }],
+      errors: [
+        {
+          message: "'<style>' should be above '<style scoped>' on line 1.",
+          line: 1
+        }
+      ]
+    },
+    {
+      code: '<style></style><style scoped></style>',
+      output: '<style scoped></style><style></style>',
+      options: [{ order: ['style[scoped]', 'style:not([scoped])'] }],
+      errors: [
+        {
+          message: "'<style scoped>' should be above '<style>' on line 1.",
+          line: 1
+        }
+      ]
+    },
+    {
+      code: '<style></style><script></script>',
+      output: '<script></script><style></style>',
+      options: [{ order: ['script:not([scoped])', 'style:not([scoped])'] }],
+      errors: [
+        {
+          message: "'<script>' should be above '<style>' on line 1.",
+          line: 1
+        }
+      ]
+    }
+  ]
+})
+
+describe('suppress reporting with eslint-disable-next-line', () => {
+  it('do not report if <!-- eslint-disable-next-line -->', async () => {
+    const code = `<style></style><template></template>
+    <!-- eslint-disable-next-line vue/component-tags-order -->
+    <script></script>`
+    const [{ messages, output }] = await eslint.lintText(code, {
+      filePath: 'test.vue'
+    })
+    assert.strictEqual(messages.length, 0)
+    // should not fix <script>
+    assert.strictEqual(
+      output,
+      `<template></template><style></style>
+    <!-- eslint-disable-next-line vue/component-tags-order -->
+    <script></script>`
+    )
+  })
+})

From 6ad1a08f09f966468fe5991e8e7b63d0c4e8f492 Mon Sep 17 00:00:00 2001
From: Flo Edelmann <git@flo-edelmann.de>
Date: Wed, 26 Jul 2023 16:13:01 +0200
Subject: [PATCH 3/7] Reorder `vue/block-order` test cases

---
 tests/lib/rules/block-order.js | 138 ++++++++++++++++-----------------
 1 file changed, 69 insertions(+), 69 deletions(-)

diff --git a/tests/lib/rules/block-order.js b/tests/lib/rules/block-order.js
index e9b9348ff..aefd11cef 100644
--- a/tests/lib/rules/block-order.js
+++ b/tests/lib/rules/block-order.js
@@ -195,6 +195,7 @@ tester.run('block-order', rule, {
   invalid: [
     {
       code: '<style></style><template></template><script></script>',
+      output: '<template></template><style></style><script></script>',
       errors: [
         {
           message: "'<template>' should be above '<style>' on line 1.",
@@ -206,11 +207,11 @@ tester.run('block-order', rule, {
           line: 1,
           column: 37
         }
-      ],
-      output: '<template></template><style></style><script></script>'
+      ]
     },
     {
       code: '<template></template><script></script><style></style>',
+      output: '<script></script><template></template><style></style>',
       options: [{ order: ['script', 'template', 'style'] }],
       errors: [
         {
@@ -218,8 +219,7 @@ tester.run('block-order', rule, {
           line: 1,
           column: 22
         }
-      ],
-      output: '<script></script><template></template><style></style>'
+      ]
     },
     {
       code: `
@@ -228,19 +228,19 @@ tester.run('block-order', rule, {
         <style></style>
 
         <script></script>`,
-      errors: [
-        {
-          message: "'<script>' should be above '<style>' on line 4.",
-          line: 6
-        }
-      ],
       output:
         '\n' +
         '        <template></template>\n' +
         '\n' +
         '        <script></script>\n' +
         '\n' +
-        '        <style></style>'
+        '        <style></style>',
+      errors: [
+        {
+          message: "'<script>' should be above '<style>' on line 4.",
+          line: 6
+        }
+      ]
     },
     {
       code: `
@@ -248,19 +248,19 @@ tester.run('block-order', rule, {
         <script></script>
         <style></style>
       `,
+      output:
+        '\n' +
+        '        <script></script>\n' +
+        '        <template></template>\n' +
+        '        <style></style>\n' +
+        '      ',
       options: [{ order: ['script', 'template', 'style'] }],
       errors: [
         {
           message: "'<script>' should be above '<template>' on line 2.",
           line: 3
         }
-      ],
-      output:
-        '\n' +
-        '        <script></script>\n' +
-        '        <template></template>\n' +
-        '        <style></style>\n' +
-        '      '
+      ]
     },
     {
       code: `
@@ -268,19 +268,19 @@ tester.run('block-order', rule, {
         <template></template>
         <style></style>
       `,
+      output:
+        '\n' +
+        '        <template></template>\n' +
+        '        <script></script>\n' +
+        '        <style></style>\n' +
+        '      ',
       options: [{ order: ['template', 'script', 'style'] }],
       errors: [
         {
           message: "'<template>' should be above '<script>' on line 2.",
           line: 3
         }
-      ],
-      output:
-        '\n' +
-        '        <template></template>\n' +
-        '        <script></script>\n' +
-        '        <style></style>\n' +
-        '      '
+      ]
     },
     {
       code: `
@@ -289,20 +289,20 @@ tester.run('block-order', rule, {
         <script></script>
         <style></style>
       `,
-      options: [{ order: ['docs', 'template', 'script', 'style'] }],
-      errors: [
-        {
-          message: "'<docs>' should be above '<template>' on line 2.",
-          line: 3
-        }
-      ],
       output:
         '\n' +
         '        <docs></docs>\n' +
         '        <template></template>\n' +
         '        <script></script>\n' +
         '        <style></style>\n' +
-        '      '
+        '      ',
+      options: [{ order: ['docs', 'template', 'script', 'style'] }],
+      errors: [
+        {
+          message: "'<docs>' should be above '<template>' on line 2.",
+          line: 3
+        }
+      ]
     },
     {
       code: `
@@ -311,20 +311,20 @@ tester.run('block-order', rule, {
         <script></script>
         <style></style>
       `,
-      options: [{ order: ['script', 'template', 'style'] }],
-      errors: [
-        {
-          message: "'<script>' should be above '<template>' on line 2.",
-          line: 4
-        }
-      ],
       output:
         '\n' +
         '        <script></script>\n' +
         '        <template></template>\n' +
         '        <docs></docs>\n' +
         '        <style></style>\n' +
-        '      '
+        '      ',
+      options: [{ order: ['script', 'template', 'style'] }],
+      errors: [
+        {
+          message: "'<script>' should be above '<template>' on line 2.",
+          line: 4
+        }
+      ]
     },
     {
       code: `
@@ -334,13 +334,6 @@ tester.run('block-order', rule, {
         <script></script>
         <style></style>
       `,
-      options: [{ order: ['script', 'template', 'style'] }],
-      errors: [
-        {
-          message: "'<script>' should be above '<template>' on line 2.",
-          line: 5
-        }
-      ],
       output:
         '\n' +
         '        <script></script>\n' +
@@ -348,22 +341,29 @@ tester.run('block-order', rule, {
         '        <docs>\n' +
         '        </docs>\n' +
         '        <style></style>\n' +
-        '      '
+        '      ',
+      options: [{ order: ['script', 'template', 'style'] }],
+      errors: [
+        {
+          message: "'<script>' should be above '<template>' on line 2.",
+          line: 5
+        }
+      ]
     },
     {
       code: `
         <script></script>
         <template></template>
       `,
+      output:
+        '\n        <template></template>\n        <script></script>\n      ',
       options: [{ order: ['template', 'script'] }],
       errors: [
         {
           message: "'<template>' should be above '<script>' on line 2.",
           line: 3
         }
-      ],
-      output:
-        '\n        <template></template>\n        <script></script>\n      '
+      ]
     },
     {
       code: `
@@ -371,6 +371,12 @@ tester.run('block-order', rule, {
         <template></template>
         <script></script>
       `,
+      output:
+        '\n' +
+        '        <template></template>\n' +
+        '        <style></style>\n' +
+        '        <script></script>\n' +
+        '      ',
       errors: [
         {
           message: "'<template>' should be above '<style>' on line 2.",
@@ -380,13 +386,7 @@ tester.run('block-order', rule, {
           message: "'<script>' should be above '<style>' on line 2.",
           line: 4
         }
-      ],
-      output:
-        '\n' +
-        '        <template></template>\n' +
-        '        <style></style>\n' +
-        '        <script></script>\n' +
-        '      '
+      ]
     },
     {
       code: `
@@ -395,6 +395,13 @@ tester.run('block-order', rule, {
         <template></template>
         <script></script>
       `,
+      output:
+        '\n' +
+        '        <template></template>\n' +
+        '        <style></style>\n' +
+        '        <docs></docs>\n' +
+        '        <script></script>\n' +
+        '      ',
       errors: [
         {
           message: "'<template>' should be above '<style>' on line 2.",
@@ -404,14 +411,7 @@ tester.run('block-order', rule, {
           message: "'<script>' should be above '<style>' on line 2.",
           line: 5
         }
-      ],
-      output:
-        '\n' +
-        '        <template></template>\n' +
-        '        <style></style>\n' +
-        '        <docs></docs>\n' +
-        '        <script></script>\n' +
-        '      '
+      ]
     },
     // no <template>
     {
@@ -419,13 +419,13 @@ tester.run('block-order', rule, {
         <style></style>
         <script></script>
       `,
+      output: '\n        <script></script>\n        <style></style>\n      ',
       errors: [
         {
           message: "'<script>' should be above '<style>' on line 2.",
           line: 3
         }
-      ],
-      output: '\n        <script></script>\n        <style></style>\n      '
+      ]
     },
     {
       code: '<i18n locale="ja"></i18n><i18n locale="en"></i18n>',

From 14583eee74b83315e073adbd55c3172f8bbd3c33 Mon Sep 17 00:00:00 2001
From: Flo Edelmann <git@flo-edelmann.de>
Date: Wed, 26 Jul 2023 16:13:20 +0200
Subject: [PATCH 4/7] Add back deprecated rule to recommended config

---
 docs/rules/block-order.md         | 1 -
 docs/rules/index.md               | 3 ++-
 lib/configs/recommended.js        | 2 +-
 lib/configs/vue3-recommended.js   | 2 +-
 lib/rules/block-order.js          | 2 +-
 lib/rules/component-tags-order.js | 5 +++--
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/rules/block-order.md b/docs/rules/block-order.md
index 7d56304e1..fe32e99e2 100644
--- a/docs/rules/block-order.md
+++ b/docs/rules/block-order.md
@@ -9,7 +9,6 @@ description: enforce order of component top-level elements
 > enforce order of component top-level elements
 
 - :exclamation: <badge text="This rule has not been released yet." vertical="middle" type="error"> ***This rule has not been released yet.*** </badge>
-- :gear: This rule is included in `"plugin:vue/vue3-recommended"` and `"plugin:vue/recommended"`.
 - :wrench: The `--fix` option on the [command line](https://eslint.org/docs/user-guide/command-line-interface#fixing-problems) can automatically fix some of the problems reported by this rule.
 
 ## :book: Rule Details
diff --git a/docs/rules/index.md b/docs/rules/index.md
index 918fe47da..2651bb8d4 100644
--- a/docs/rules/index.md
+++ b/docs/rules/index.md
@@ -178,7 +178,7 @@ Rules in this category are enabled for all presets provided by eslint-plugin-vue
 | Rule ID | Description |    |    |
 |:--------|:------------|:--:|:--:|
 | [vue/attributes-order](./attributes-order.md) | enforce order of attributes | :wrench: | :three::two::hammer: |
-| [vue/block-order](./block-order.md) | enforce order of component top-level elements | :wrench: | :three::two::hammer: |
+| [vue/component-tags-order](./component-tags-order.md) | enforce order of component top-level elements | :wrench::warning: | :three::two::hammer: |
 | [vue/no-lone-template](./no-lone-template.md) | disallow unnecessary `<template>` |  | :three::two::warning: |
 | [vue/no-multiple-slot-args](./no-multiple-slot-args.md) | disallow to pass multiple arguments to scoped slots |  | :three::two::warning: |
 | [vue/no-v-html](./no-v-html.md) | disallow use of v-html to prevent XSS attack |  | :three::two::hammer: |
@@ -207,6 +207,7 @@ For example:
 | Rule ID | Description |    |    |
 |:--------|:------------|:--:|:--:|
 | [vue/block-lang](./block-lang.md) | disallow use other than available `lang` |  | :hammer: |
+| [vue/block-order](./block-order.md) | enforce order of component top-level elements | :wrench: | :hammer: |
 | [vue/block-tag-newline](./block-tag-newline.md) | enforce line breaks after opening and before closing block-level tags | :wrench: | :lipstick: |
 | [vue/component-api-style](./component-api-style.md) | enforce component API style |  | :hammer: |
 | [vue/component-name-in-template-casing](./component-name-in-template-casing.md) | enforce specific casing for the component naming style in template | :wrench: | :hammer: |
diff --git a/lib/configs/recommended.js b/lib/configs/recommended.js
index 5f05dbaf6..3db36d8c0 100644
--- a/lib/configs/recommended.js
+++ b/lib/configs/recommended.js
@@ -7,7 +7,7 @@ module.exports = {
   extends: require.resolve('./strongly-recommended'),
   rules: {
     'vue/attributes-order': 'warn',
-    'vue/block-order': 'warn',
+    'vue/component-tags-order': 'warn',
     'vue/no-lone-template': 'warn',
     'vue/no-multiple-slot-args': 'warn',
     'vue/no-v-html': 'warn',
diff --git a/lib/configs/vue3-recommended.js b/lib/configs/vue3-recommended.js
index 3d3fe3a2b..34b181e29 100644
--- a/lib/configs/vue3-recommended.js
+++ b/lib/configs/vue3-recommended.js
@@ -7,7 +7,7 @@ module.exports = {
   extends: require.resolve('./vue3-strongly-recommended'),
   rules: {
     'vue/attributes-order': 'warn',
-    'vue/block-order': 'warn',
+    'vue/component-tags-order': 'warn',
     'vue/no-lone-template': 'warn',
     'vue/no-multiple-slot-args': 'warn',
     'vue/no-v-html': 'warn',
diff --git a/lib/rules/block-order.js b/lib/rules/block-order.js
index 9f99ceb5a..91d3eaa6f 100644
--- a/lib/rules/block-order.js
+++ b/lib/rules/block-order.js
@@ -38,7 +38,7 @@ module.exports = {
     type: 'suggestion',
     docs: {
       description: 'enforce order of component top-level elements',
-      categories: ['vue3-recommended', 'recommended'],
+      categories: undefined,
       url: 'https://eslint.vuejs.org/rules/block-order.html'
     },
     fixable: 'code',
diff --git a/lib/rules/component-tags-order.js b/lib/rules/component-tags-order.js
index 5955f4adf..a2a5cd656 100644
--- a/lib/rules/component-tags-order.js
+++ b/lib/rules/component-tags-order.js
@@ -3,13 +3,14 @@
 const baseRule = require('./block-order')
 
 module.exports = {
-  // eslint-disable-next-line eslint-plugin/require-meta-schema -- inherit schema from base rule
+  // eslint-disable-next-line eslint-plugin/require-meta-schema, eslint-plugin/prefer-message-ids -- inherit schema from base rule
   meta: {
     ...baseRule.meta,
+    // eslint-disable-next-line eslint-plugin/meta-property-ordering
     type: baseRule.meta.type,
     docs: {
       description: baseRule.meta.docs.description,
-      categories: undefined,
+      categories: ['vue3-recommended', 'recommended'],
       url: 'https://eslint.vuejs.org/rules/component-tags-order.html'
     },
     deprecated: true,

From c45dbe18b00a88fd61194d8817721855df740d26 Mon Sep 17 00:00:00 2001
From: Flo Edelmann <git@flo-edelmann.de>
Date: Wed, 26 Jul 2023 16:14:12 +0200
Subject: [PATCH 5/7] Regenerate docs

---
 docs/rules/component-tags-order.md | 2 +-
 docs/rules/index.md                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/rules/component-tags-order.md b/docs/rules/component-tags-order.md
index 242a21154..227aea097 100644
--- a/docs/rules/component-tags-order.md
+++ b/docs/rules/component-tags-order.md
@@ -9,7 +9,7 @@ since: v6.1.0
 
 > enforce order of component top-level elements
 
-- :warning: This rule was **deprecated** and replaced by [vue/block-order](block-order.md) rule.
+- :no_entry_sign: This rule was **deprecated** and replaced by [vue/block-order](block-order.md) rule.
 - :wrench: The `--fix` option on the [command line](https://eslint.org/docs/user-guide/command-line-interface#fixing-problems) can automatically fix some of the problems reported by this rule.
 
 ## :book: Rule Details
diff --git a/docs/rules/index.md b/docs/rules/index.md
index 2651bb8d4..6b06a7c71 100644
--- a/docs/rules/index.md
+++ b/docs/rules/index.md
@@ -178,7 +178,7 @@ Rules in this category are enabled for all presets provided by eslint-plugin-vue
 | Rule ID | Description |    |    |
 |:--------|:------------|:--:|:--:|
 | [vue/attributes-order](./attributes-order.md) | enforce order of attributes | :wrench: | :three::two::hammer: |
-| [vue/component-tags-order](./component-tags-order.md) | enforce order of component top-level elements | :wrench::warning: | :three::two::hammer: |
+| [vue/component-tags-order](./component-tags-order.md) | enforce order of component top-level elements | :wrench::no_entry_sign: | :three::two::hammer: |
 | [vue/no-lone-template](./no-lone-template.md) | disallow unnecessary `<template>` |  | :three::two::warning: |
 | [vue/no-multiple-slot-args](./no-multiple-slot-args.md) | disallow to pass multiple arguments to scoped slots |  | :three::two::warning: |
 | [vue/no-v-html](./no-v-html.md) | disallow use of v-html to prevent XSS attack |  | :three::two::hammer: |

From 2a7915d6d08e8c3ebac44ddb4aa523e296afef4c Mon Sep 17 00:00:00 2001
From: Flo Edelmann <git@flo-edelmann.de>
Date: Wed, 26 Jul 2023 16:16:22 +0200
Subject: [PATCH 6/7] Adjust update script to allow deprecated rules in configs

---
 tools/update-docs.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/update-docs.js b/tools/update-docs.js
index 65b0eae5c..aecee5fdd 100644
--- a/tools/update-docs.js
+++ b/tools/update-docs.js
@@ -117,7 +117,8 @@ class DocFile {
       } else {
         notes.push(`- :no_entry_sign: This rule was **deprecated**.`)
       }
-    } else if (meta.docs.categories) {
+    }
+    if (meta.docs?.categories) {
       const presets = getPresetIds(meta.docs.categories).map(
         (categoryId) => `\`"plugin:vue/${categoryId}"\``
       )

From 15eeb51406fab87fff3dd386865fb05af1652498 Mon Sep 17 00:00:00 2001
From: Flo Edelmann <git@flo-edelmann.de>
Date: Wed, 26 Jul 2023 16:16:26 +0200
Subject: [PATCH 7/7] Regenerate docs

---
 docs/rules/component-tags-order.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/rules/component-tags-order.md b/docs/rules/component-tags-order.md
index 227aea097..22b161aa0 100644
--- a/docs/rules/component-tags-order.md
+++ b/docs/rules/component-tags-order.md
@@ -10,6 +10,7 @@ since: v6.1.0
 > enforce order of component top-level elements
 
 - :no_entry_sign: This rule was **deprecated** and replaced by [vue/block-order](block-order.md) rule.
+- :gear: This rule is included in `"plugin:vue/vue3-recommended"` and `"plugin:vue/recommended"`.
 - :wrench: The `--fix` option on the [command line](https://eslint.org/docs/user-guide/command-line-interface#fixing-problems) can automatically fix some of the problems reported by this rule.
 
 ## :book: Rule Details