Merge branch 'main' into feat/flat-config

docs/rules/await-interactions.md

@@ -36,4 +36,4 @@ MyStory.play = async (context) => {
 
 ## When Not To Use It
 
-This rule should not be applied in test files. Please ensure you are defining the storybook rules only for story files. You can see more details [here](https://github.com/storybookjs/eslint-plugin-storybook#eslint-overrides).
+This rule should not be applied in test files. Please ensure you are defining the storybook rules only for story files. You can see more details [here](https://github.com/storybookjs/eslint-plugin-storybook#overridingdisabling-rules).

docs/rules/context-in-play-function.md

@@ -52,4 +52,4 @@ MyStory.play = (context) => {
 
 ## When Not To Use It
 
-This rule should not be applied in test files. Please ensure you are defining the storybook rules only for story files. You can see more details [here](https://github.com/storybookjs/eslint-plugin-storybook#eslint-overrides).
+This rule should not be applied in test files. Please ensure you are defining the storybook rules only for story files. You can see more details [here](https://github.com/storybookjs/eslint-plugin-storybook#overridingdisabling-rules).

docs/rules/default-exports.md

@@ -30,9 +30,9 @@ export const Primary = {}
 
 ## When Not To Use It
 
-This rule should only be applied in your `.stories.*` files. Please ensure you are defining the storybook rules only for story files. You can see more details [here](https://github.com/storybookjs/eslint-plugin-storybook#eslint-overrides).
+This rule should only be applied in your `.stories.*` files. Please ensure you are defining the storybook rules only for story files. You can see more details [here](https://github.com/storybookjs/eslint-plugin-storybook#overridingdisabling-rules).
 
-If you're using [CSF in MDX](https://github.com/storybookjs/storybook/blob/next/addons/docs/docs/recipes.md#csf-stories-with-mdx-docs), you should disable this rule for the stories that use CSF in MDX. You can see how to override the rule [here](https://github.com/storybookjs/eslint-plugin-storybook#eslint-overrides).
+If you're using Storybook 6.5 and [CSF in MDX](https://github.com/storybookjs/storybook/blob/v6.5.0/addons/docs/docs/recipes.md#csf-stories-with-mdx-docs), you should disable this rule for the stories that use CSF in MDX. You can see how to override the rule [here](https://github.com/storybookjs/eslint-plugin-storybook#overridingdisabling-rules).
 
 ## Further Reading
 

docs/rules/meta-inline-properties.md

@@ -29,7 +29,3 @@ export default {
   component: Button,
 }
 ```
-
-## Further Reading
-
-If there are other links that describe the issue this rule addresses, please include them here in a bulleted list.

docs/rules/story-exports.md

@@ -34,7 +34,7 @@ export const Primary = {} // at least one named export!
 
 ## When Not To Use It
 
-This rule should only be applied in your `.stories.*` files. Please ensure you are defining the storybook rules only for story files. You can see more details [here](https://github.com/storybookjs/eslint-plugin-storybook#eslint-overrides).
+This rule should only be applied in your `.stories.*` files. Please ensure you are defining the storybook rules only for story files. You can see more details [here](https://github.com/storybookjs/eslint-plugin-storybook#overridingdisabling-rules).
 
 ## Further Reading
 

docs/rules/use-storybook-expect.md

@@ -33,8 +33,4 @@ Default.play = () => {
 
 ## When Not To Use It
 
-This rule should not be applied in test files. Please ensure you are defining the storybook rules only for story files. You can see more details [here](https://github.com/storybookjs/eslint-plugin-storybook#eslint-overrides).
-
-## Further Reading
-
-If there are other links that describe the issue this rule addresses, please include them here in a bulleted list.
+This rule should not be applied in test files. Please ensure you are defining the storybook rules only for story files. You can see more details [here](https://github.com/storybookjs/eslint-plugin-storybook#overridingdisabling-rules).

docs/rules/use-storybook-testing-library.md

@@ -35,8 +35,4 @@ Default.play = async (context) => {
 
 ## When Not To Use It
 
-This rule should not be applied in test files. Please ensure you are defining the storybook rules only for story files. You can see more details [here](https://github.com/storybookjs/eslint-plugin-storybook#eslint-overrides).
-
-## Further Reading
-
-If there are other links that describe the issue this rule addresses, please include them here in a bulleted list.
+This rule should not be applied in test files. Please ensure you are defining the storybook rules only for story files. You can see more details [here](https://github.com/storybookjs/eslint-plugin-storybook#overridingdisabling-rules).

tools/generate-rule.ts

@@ -81,7 +81,7 @@ const generateRule = async () => {
         meta: {
           type: 'problem', // \`problem\`, \`suggestion\`, or \`layout\`
           docs: {
-            description: 'Fill me in',
+            description: '${ruleDescription}',
             // Add the categories that suit this rule.
             categories: [CategoryId.RECOMMENDED],
             recommended: 'warn', // \`warn\` or \`error\`
@@ -138,7 +138,9 @@ const generateRule = async () => {
             },
           }
         },
-      })\n`)
+      })
+
+`)
   )
 
   logger.log(`creating tests/lib/rules/${ruleId}.test.ts`)
@@ -178,7 +180,8 @@ const generateRule = async () => {
             },
           ],
         })
-    `)
+
+`)
   )
 
   logger.log(`creating docs/rules/${ruleId}.md`)
@@ -197,17 +200,13 @@ const generateRule = async () => {
       Examples of **incorrect** code for this rule:
 
       \`\`\`js
-
       // fill me in
-
       \`\`\`
 
       Examples of **correct** code for this rule:
 
       \`\`\`js
-
       // fill me in
-
       \`\`\`
 
       ### Options
@@ -221,7 +220,8 @@ const generateRule = async () => {
       ## Further Reading
 
       If there are other links that describe the issue this rule addresses, please include them here in a bulleted list. Otherwise, delete this section.
-    `)
+
+`)
   )
 
   const { shouldOpenInVSCode } = await prompts({