Skip to content

Commit b7c145e

Browse files
valentinpalkovicshilman
authored andcommitted
Merge pull request #22492 from storybookjs/valentin/fix-could-not-find-framework-renderer
CLI: Remove unsupported frameworks/renderers and improve builder detection
1 parent cbbc01f commit b7c145e

28 files changed

+42
-518
lines changed

.spelling

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ addon
77
addons
88
api
99
apollo
10-
aurelia
1110
bundlers
1211
center
1312
centered

code/.eslintrc.js

-6
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,6 @@ module.exports = {
139139
'spaced-comment': 'off',
140140
},
141141
},
142-
{
143-
files: ['**/mithril/**/*'],
144-
rules: {
145-
'react/no-unknown-property': 'off', // Need to deactivate otherwise eslint replaces some unknown properties with React ones
146-
},
147-
},
148142
{
149143
files: ['**/e2e-tests/**/*'],
150144
rules: {

code/addons/links/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@
124124
"displayName": "Links",
125125
"icon": "https://user-images.githubusercontent.com/263385/101991673-48355c80-3c7c-11eb-9b6e-b627c96a75f6.png",
126126
"unsupportedFrameworks": [
127-
"marko",
128127
"react-native"
129128
]
130129
}

code/addons/storyshots-core/README.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -603,11 +603,10 @@ initStoryshots({
603603

604604
Use this table as a reference for manually specifying the framework.
605605

606-
| angular | html | preact |
607-
| -------------- | ---- | ------------ |
608-
| react | riot | react-native |
609-
| svelte | vue | vue3 |
610-
| web-components | rax | |
606+
| angular | html | preact |
607+
| ------- | ------------ | -------------- |
608+
| react | react-native | vue3 |
609+
| svelte | vue | web-components |
611610

612611
### `test`
613612

code/addons/storyshots-core/package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,7 @@
147147
"displayName": "Storyshots",
148148
"icon": "https://user-images.githubusercontent.com/263385/101991676-48cdf300-3c7c-11eb-8aa1-944dab6ab29b.png",
149149
"unsupportedFrameworks": [
150-
"ember",
151-
"mithril",
152-
"marko"
150+
"ember"
153151
]
154152
}
155153
}

code/addons/storyshots-core/src/frameworks/SupportedFramework.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ export type SupportedFramework =
33
| 'html'
44
| 'preact'
55
| 'react'
6-
| 'riot'
76
| 'react-native'
87
| 'svelte'
98
| 'vue'
109
| 'vue3'
11-
| 'web-components'
12-
| 'rax';
10+
| 'web-components';

code/addons/storyshots-core/src/frameworks/rax/loader.ts

-60
This file was deleted.

code/addons/storyshots-core/src/frameworks/rax/renderTree.ts

-12
This file was deleted.

code/addons/storyshots-core/src/frameworks/riot/loader.ts

-65
This file was deleted.

code/addons/storyshots-core/src/frameworks/riot/renderTree.ts

-36
This file was deleted.

code/addons/storyshots-core/src/typings.d.ts

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
declare module 'jest-preset-angular/*';
44
declare module 'preact-render-to-string/jsx';
55
declare module 'react-test-renderer*';
6-
declare module 'rax-test-renderer*';
76

87
declare module '@storybook/babel-plugin-require-context-hook/register';
98

code/lib/cli/src/automigrate/fixes/new-frameworks.test.ts

-15
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,6 @@ describe('new-frameworks fix', () => {
4040
).resolves.toBeFalsy();
4141
});
4242

43-
it('in sb 7 with unsupported package', async () => {
44-
const packageJson = { dependencies: { '@storybook/riot': '^7.0.0' } };
45-
await expect(
46-
checkNewFrameworks({
47-
packageJson,
48-
main: {
49-
framework: '@storybook/riot',
50-
core: {
51-
builder: 'webpack5',
52-
},
53-
},
54-
})
55-
).resolves.toBeFalsy();
56-
});
57-
5843
it('in sb 7 with correct structure already', async () => {
5944
const packageJson = { dependencies: { '@storybook/angular': '^7.0.0' } };
6045
await expect(

code/lib/cli/src/detect-webpack.ts

-32
This file was deleted.

code/lib/cli/src/detect.test.ts

-61
Original file line numberDiff line numberDiff line change
@@ -212,46 +212,6 @@ const MOCK_FRAMEWORK_FILES: {
212212
},
213213
},
214214
},
215-
{
216-
name: ProjectType.MITHRIL,
217-
files: {
218-
'package.json': {
219-
dependencies: {
220-
mithril: '1.0.0',
221-
},
222-
},
223-
},
224-
},
225-
{
226-
name: ProjectType.MARIONETTE,
227-
files: {
228-
'package.json': {
229-
dependencies: {
230-
'backbone.marionette': '1.0.0',
231-
},
232-
},
233-
},
234-
},
235-
{
236-
name: ProjectType.MARKO,
237-
files: {
238-
'package.json': {
239-
dependencies: {
240-
marko: '1.0.0',
241-
},
242-
},
243-
},
244-
},
245-
{
246-
name: ProjectType.RIOT,
247-
files: {
248-
'package.json': {
249-
dependencies: {
250-
riot: '1.0.0',
251-
},
252-
},
253-
},
254-
},
255215
{
256216
name: ProjectType.PREACT,
257217
files: {
@@ -272,27 +232,6 @@ const MOCK_FRAMEWORK_FILES: {
272232
},
273233
},
274234
},
275-
{
276-
name: ProjectType.RAX,
277-
files: {
278-
'.rax': 'file content',
279-
'package.json': {
280-
dependencies: {
281-
rax: '1.0.0',
282-
},
283-
},
284-
},
285-
},
286-
{
287-
name: ProjectType.AURELIA,
288-
files: {
289-
'package.json': {
290-
dependencies: {
291-
'aurelia-bootstrapper': '1.0.0',
292-
},
293-
},
294-
},
295-
},
296235
];
297236

298237
describe('Detect', () => {

0 commit comments

Comments
 (0)