From 07b2679511065bcae5f9299df7d45de52fd062bf Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Thu, 11 Nov 2021 16:34:37 +0100 Subject: [PATCH] simplify override file regex --- lib/configs/addon-interactions.ts | 2 +- lib/configs/csf.ts | 2 +- lib/configs/recommended.ts | 2 +- tools/update-configs.ts | 8 +++++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/configs/addon-interactions.ts b/lib/configs/addon-interactions.ts index 057407c..ea59ea1 100644 --- a/lib/configs/addon-interactions.ts +++ b/lib/configs/addon-interactions.ts @@ -7,7 +7,7 @@ export = { plugins: ['storybook'], overrides: [ { - files: ['*.stor(y|ies).([mc]?[jt])sx?'], + files: ['*.stories.@(ts|tsx|js|mjs|cjs)', '*.story.@(ts|tsx|js|mjs|cjs)'], rules: { 'import/no-anonymous-default-export': 'off', 'storybook/await-interactions': 'error', diff --git a/lib/configs/csf.ts b/lib/configs/csf.ts index acc6bd7..1912df3 100644 --- a/lib/configs/csf.ts +++ b/lib/configs/csf.ts @@ -7,7 +7,7 @@ export = { plugins: ['storybook'], overrides: [ { - files: ['*.stor(y|ies).([mc]?[jt])sx?'], + files: ['*.stories.@(ts|tsx|js|mjs|cjs)', '*.story.@(ts|tsx|js|mjs|cjs)'], rules: { 'import/no-anonymous-default-export': 'off', 'storybook/csf-component': 'warn', diff --git a/lib/configs/recommended.ts b/lib/configs/recommended.ts index ddaecaf..e5ceb2c 100644 --- a/lib/configs/recommended.ts +++ b/lib/configs/recommended.ts @@ -7,7 +7,7 @@ export = { plugins: ['storybook'], overrides: [ { - files: ['*.stor(y|ies).([mc]?[jt])sx?'], + files: ['*.stories.@(ts|tsx|js|mjs|cjs)', '*.story.@(ts|tsx|js|mjs|cjs)'], rules: { 'import/no-anonymous-default-export': 'off', 'storybook/await-interactions': 'error', diff --git a/tools/update-configs.ts b/tools/update-configs.ts index 4c969d4..ce50560 100644 --- a/tools/update-configs.ts +++ b/tools/update-configs.ts @@ -31,6 +31,12 @@ function formatRules(rules: any) { return JSON.stringify(obj, null, 2) } +const SUPPORTED_EXTENSIONS = ['ts', 'tsx', 'js', 'mjs', 'cjs'] +const STORIES_GLOBS = [ + `'*.stories.@(${SUPPORTED_EXTENSIONS.join('|')})'`, + `'*.story.@(${SUPPORTED_EXTENSIONS.join('|')})'`, +] + function formatCategory(category: any) { const extendsCategoryId = extendsCategories[category.categoryId] if (extendsCategoryId == null) { @@ -44,7 +50,7 @@ function formatCategory(category: any) { 'storybook' ], overrides: [{ - files: ['*.stor(y|ies).([mc]?[jt])sx?'], + files: [${STORIES_GLOBS.join(', ')}], rules: ${formatRules(category.rules)} }] }