Merge pull request #22492 from storybookjs/valentin/fix-could-not-fin…

…d-framework-renderer CLI: Remove unsupported frameworks/renderers and improve builder detection
storybookjs · May 12, 2023 · b7c145e · b7c145e
1 parent cbbc01f
commit b7c145e
Show file tree

Hide file tree

Showing 28 changed files with 42 additions and 518 deletions.
diff --git a/.spelling b/.spelling
@@ -7,7 +7,6 @@ addon
 addons
 api
 apollo
-aurelia
 bundlers
 center
 centered

diff --git a/code/.eslintrc.js b/code/.eslintrc.js
@@ -139,12 +139,6 @@ module.exports = {
         'spaced-comment': 'off',
       },
     },
-    {
-      files: ['**/mithril/**/*'],
-      rules: {
-        'react/no-unknown-property': 'off', // Need to deactivate otherwise eslint replaces some unknown properties with React ones
-      },
-    },
     {
       files: ['**/e2e-tests/**/*'],
       rules: {

diff --git a/code/addons/links/package.json b/code/addons/links/package.json
@@ -124,7 +124,6 @@
     "displayName": "Links",
     "icon": "https://user-images.githubusercontent.com/263385/101991673-48355c80-3c7c-11eb-9b6e-b627c96a75f6.png",
     "unsupportedFrameworks": [
-      "marko",
       "react-native"
     ]
   }

diff --git a/code/addons/storyshots-core/README.md b/code/addons/storyshots-core/README.md
@@ -603,11 +603,10 @@ initStoryshots({
 
 Use this table as a reference for manually specifying the framework.
 
-| angular        | html | preact       |
-| -------------- | ---- | ------------ |
-| react          | riot | react-native |
-| svelte         | vue  | vue3         |
-| web-components | rax  |              |
+| angular | html         | preact         |
+| ------- | ------------ | -------------- |
+| react   | react-native | vue3           |
+| svelte  | vue          | web-components |
 
 ### `test`
 

diff --git a/code/addons/storyshots-core/package.json b/code/addons/storyshots-core/package.json
@@ -147,9 +147,7 @@
     "displayName": "Storyshots",
     "icon": "https://user-images.githubusercontent.com/263385/101991676-48cdf300-3c7c-11eb-8aa1-944dab6ab29b.png",
     "unsupportedFrameworks": [
-      "ember",
-      "mithril",
-      "marko"
+      "ember"
     ]
   }
 }
diff --git a/code/addons/storyshots-core/src/frameworks/SupportedFramework.ts b/code/addons/storyshots-core/src/frameworks/SupportedFramework.ts
@@ -3,10 +3,8 @@ export type SupportedFramework =
   | 'html'
   | 'preact'
   | 'react'
-  | 'riot'
   | 'react-native'
   | 'svelte'
   | 'vue'
   | 'vue3'
-  | 'web-components'
-  | 'rax';
+  | 'web-components';
diff --git a/code/addons/storyshots-core/src/frameworks/rax/loader.ts b/code/addons/storyshots-core/src/frameworks/rax/loader.ts
diff --git a/code/addons/storyshots-core/src/frameworks/rax/renderTree.ts b/code/addons/storyshots-core/src/frameworks/rax/renderTree.ts
diff --git a/code/addons/storyshots-core/src/frameworks/riot/loader.ts b/code/addons/storyshots-core/src/frameworks/riot/loader.ts
diff --git a/code/addons/storyshots-core/src/frameworks/riot/renderTree.ts b/code/addons/storyshots-core/src/frameworks/riot/renderTree.ts
diff --git a/code/addons/storyshots-core/src/typings.d.ts b/code/addons/storyshots-core/src/typings.d.ts
@@ -3,7 +3,6 @@
 declare module 'jest-preset-angular/*';
 declare module 'preact-render-to-string/jsx';
 declare module 'react-test-renderer*';
-declare module 'rax-test-renderer*';
 
 declare module '@storybook/babel-plugin-require-context-hook/register';
 

diff --git a/code/lib/cli/src/automigrate/fixes/new-frameworks.test.ts b/code/lib/cli/src/automigrate/fixes/new-frameworks.test.ts
@@ -40,21 +40,6 @@ describe('new-frameworks fix', () => {
       ).resolves.toBeFalsy();
     });
 
-    it('in sb 7 with unsupported package', async () => {
-      const packageJson = { dependencies: { '@storybook/riot': '^7.0.0' } };
-      await expect(
-        checkNewFrameworks({
-          packageJson,
-          main: {
-            framework: '@storybook/riot',
-            core: {
-              builder: 'webpack5',
-            },
-          },
-        })
-      ).resolves.toBeFalsy();
-    });
-
     it('in sb 7 with correct structure already', async () => {
       const packageJson = { dependencies: { '@storybook/angular': '^7.0.0' } };
       await expect(

diff --git a/code/lib/cli/src/detect-webpack.ts b/code/lib/cli/src/detect-webpack.ts
diff --git a/code/lib/cli/src/detect.test.ts b/code/lib/cli/src/detect.test.ts
@@ -212,46 +212,6 @@ const MOCK_FRAMEWORK_FILES: {
       },
     },
   },
-  {
-    name: ProjectType.MITHRIL,
-    files: {
-      'package.json': {
-        dependencies: {
-          mithril: '1.0.0',
-        },
-      },
-    },
-  },
-  {
-    name: ProjectType.MARIONETTE,
-    files: {
-      'package.json': {
-        dependencies: {
-          'backbone.marionette': '1.0.0',
-        },
-      },
-    },
-  },
-  {
-    name: ProjectType.MARKO,
-    files: {
-      'package.json': {
-        dependencies: {
-          marko: '1.0.0',
-        },
-      },
-    },
-  },
-  {
-    name: ProjectType.RIOT,
-    files: {
-      'package.json': {
-        dependencies: {
-          riot: '1.0.0',
-        },
-      },
-    },
-  },
   {
     name: ProjectType.PREACT,
     files: {
@@ -272,27 +232,6 @@ const MOCK_FRAMEWORK_FILES: {
       },
     },
   },
-  {
-    name: ProjectType.RAX,
-    files: {
-      '.rax': 'file content',
-      'package.json': {
-        dependencies: {
-          rax: '1.0.0',
-        },
-      },
-    },
-  },
-  {
-    name: ProjectType.AURELIA,
-    files: {
-      'package.json': {
-        dependencies: {
-          'aurelia-bootstrapper': '1.0.0',
-        },
-      },
-    },
-  },
 ];
 
 describe('Detect', () => {