Skip to content

Commit 8ddcbf3

Browse files
Coly010Coly010
committed
fix(storybook): do not install removed @storybook/test* related packages
1 parent 18b4c61 commit 8ddcbf3

File tree

23 files changed

+44
-355
lines changed

23 files changed

+44
-355
lines changed

‎docs/generated/packages/storybook/migrations/21.1.0-package-updates.json

+8
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
"version": "^9.0.0",
3333
"alwaysAddToPackageJson": false
3434
},
35+
"@storybook/nextjs": {
36+
"version": "^9.0.0",
37+
"alwaysAddToPackageJson": false
38+
},
3539
"@storybook/preact": {
3640
"version": "^9.0.0",
3741
"alwaysAddToPackageJson": false
@@ -64,6 +68,10 @@
6468
"version": "^9.0.0",
6569
"alwaysAddToPackageJson": false
6670
},
71+
"@storybook/sveltekit": {
72+
"version": "^9.0.0",
73+
"alwaysAddToPackageJson": false
74+
},
6775
"@storybook/vue-vite": {
6876
"version": "^9.0.0",
6977
"alwaysAddToPackageJson": false

‎e2e/react-native/src/react-native-legacy.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ describe('@nx/react-native (legacy)', () => {
172172

173173
it('should create storybook with application', async () => {
174174
runCLI(
175-
`generate @nx/react-native:storybook-configuration ${appName} --generateStories --no-interactive`
175+
`generate @nx/react:storybook-configuration ${appName} --generateStories --no-interactive`
176176
);
177177
checkFilesExist(
178178
`apps/${appName}/.storybook/main.ts`,
@@ -296,7 +296,7 @@ describe('@nx/react-native (legacy)', () => {
296296
}
297297

298298
runCLI(
299-
`generate @nx/react-native:storybook-configuration ${appName2} --generateStories --no-interactive`
299+
`generate @nx/react:storybook-configuration ${appName2} --generateStories --no-interactive`
300300
);
301301
checkFilesExist(
302302
`apps/${appName2}/.storybook/main.ts`,

‎e2e/react-native/src/react-native.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ describe('@nx/react-native', () => {
125125

126126
it('should create storybook with application', async () => {
127127
runCLI(
128-
`generate @nx/react-native:storybook-configuration ${appName} --generateStories --no-interactive`
128+
`generate @nx/react:storybook-configuration ${appName} --generateStories --no-interactive`
129129
);
130130
checkFilesExist(
131131
`${appName}/.storybook/main.ts`,
@@ -148,7 +148,7 @@ describe('@nx/react-native', () => {
148148

149149
it('should create storybook with library', async () => {
150150
runCLI(
151-
`generate @nx/react-native:storybook-configuration ${libName} --generateStories --no-interactive`
151+
`generate @nx/react:storybook-configuration ${libName} --generateStories --no-interactive`
152152
);
153153
checkFilesExist(
154154
`${libName}/.storybook/main.ts`,
@@ -162,7 +162,7 @@ describe('@nx/react-native', () => {
162162
it('should run build with vite bundler and e2e with playwright', async () => {
163163
const appName2 = uniq('my-app');
164164
runCLI(
165-
`generate @nx/react-native:application ${appName2} --directory=apps/${appName2} --bundler=vite --e2eTestRunner=playwright --install=false --no-interactive --unitTestRunner=jest --linter=eslint`
165+
`generate @nx/react:application ${appName2} --directory=apps/${appName2} --bundler=vite --e2eTestRunner=playwright --install=false --no-interactive --unitTestRunner=jest --linter=eslint`
166166
);
167167
expect(() => runCLI(`build ${appName2}`)).not.toThrow();
168168
if (runE2ETests()) {
@@ -178,7 +178,7 @@ describe('@nx/react-native', () => {
178178
}
179179

180180
runCLI(
181-
`generate @nx/react-native:storybook-configuration ${appName2} --generateStories --no-interactive`
181+
`generate @nx/react:storybook-configuration ${appName2} --generateStories --no-interactive`
182182
);
183183
checkFilesExist(
184184
`apps/${appName2}/.storybook/main.ts`,

‎nx.json

+1-29
Original file line numberDiff line numberDiff line change
@@ -336,56 +336,28 @@
336336
"@typescript-eslint/typescript-estree"
337337
],
338338
[
339-
"@storybook/addon-controls",
340-
"@storybook/addon-essentials",
341-
"@storybook/addon-jest",
342-
"@storybook/addon-mdx-gfm",
343339
"@storybook/addon-onboarding",
344340
"@storybook/addon-themes",
345341
"@storybook/angular",
346-
"@storybook/blocks",
347-
"@storybook/builder-manager",
348342
"@storybook/builder-webpack5",
349-
"@storybook/cli",
350-
"@storybook/components",
351-
"@storybook/core",
352-
"@storybook/core-common",
353-
"@storybook/core-events",
354-
"@storybook/core-server",
355343
"@storybook/core-webpack",
356-
"@storybook/csf-tools",
357344
"@storybook/html",
358345
"@storybook/html-vite",
359-
"@storybook/html-webpack5",
360-
"@storybook/manager",
361-
"@storybook/manager-api",
362346
"@storybook/nextjs",
363347
"@storybook/preact",
364348
"@storybook/preact-vite",
365-
"@storybook/preact-webpack5",
366-
"@storybook/preset-create-react-app",
367-
"@storybook/preset-html-webpack",
368-
"@storybook/preset-preact-webpack",
369-
"@storybook/preset-react-webpack",
370-
"@storybook/preset-server-webpack",
371-
"@storybook/preset-vue3-webpack",
372349
"@storybook/react",
373350
"@storybook/react-vite",
374351
"@storybook/react-webpack5",
375-
"@storybook/router",
376352
"@storybook/server",
377353
"@storybook/server-webpack5",
378354
"@storybook/svelte",
379355
"@storybook/svelte-vite",
380356
"@storybook/sveltekit",
381-
"@storybook/theming",
382-
"@storybook/types",
383357
"@storybook/vue3",
384358
"@storybook/vue3-vite",
385-
"@storybook/vue3-webpack5",
386359
"@storybook/web-components",
387-
"@storybook/web-components-vite",
388-
"@storybook/web-components-webpack5"
360+
"@storybook/web-components-vite"
389361
]
390362
]
391363
}

‎packages/angular/src/generators/stories/stories.ts

+1-15
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { nxVersion } from '../../utils/versions';
2323
export async function angularStoriesGenerator(
2424
tree: Tree,
2525
options: StoriesGeneratorOptions
26-
): Promise<GeneratorCallback> {
26+
) {
2727
const entryPoints = getProjectEntryPoints(tree, options.name);
2828
const componentsInfo: ComponentInfo[] = [];
2929
for (const entryPoint of entryPoints) {
@@ -62,24 +62,10 @@ export async function angularStoriesGenerator(
6262
skipFormat: true,
6363
});
6464
}
65-
const tasks: GeneratorCallback[] = [];
66-
67-
if (options.interactionTests) {
68-
const { interactionTestsDependencies, addInteractionsInAddons } =
69-
ensurePackage<typeof import('@nx/storybook')>('@nx/storybook', nxVersion);
70-
71-
const projectConfiguration = readProjectConfiguration(tree, options.name);
72-
addInteractionsInAddons(tree, projectConfiguration);
73-
74-
tasks.push(
75-
addDependenciesToPackageJson(tree, {}, interactionTestsDependencies())
76-
);
77-
}
7865

7966
if (!options.skipFormat) {
8067
await formatFiles(tree);
8168
}
82-
return runTasksInSerial(...tasks);
8369
}
8470

8571
export default angularStoriesGenerator;

‎packages/angular/src/generators/storybook-configuration/storybook-configuration.spec.ts

-7
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,6 @@ describe('StorybookConfiguration generator', () => {
9595

9696
const packageJson = JSON.parse(tree.read('package.json', 'utf-8'));
9797
expect(packageJson.devDependencies['@storybook/angular']).toBeDefined();
98-
expect(
99-
packageJson.devDependencies['@storybook/addon-interactions']
100-
).toBeDefined();
101-
expect(packageJson.devDependencies['@storybook/test-runner']).toBeDefined();
102-
expect(
103-
packageJson.devDependencies['@storybook/testing-library']
104-
).toBeDefined();
10598
});
10699

107100
it('should generate the right files', async () => {

‎packages/react/src/generators/stories/stories.lib.spec.ts

-7
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,6 @@ describe('react:stories for libraries', () => {
5252
).toMatchSnapshot();
5353

5454
const packageJson = JSON.parse(appTree.read('package.json', 'utf-8'));
55-
expect(
56-
packageJson.devDependencies['@storybook/addon-interactions']
57-
).toBeDefined();
58-
expect(packageJson.devDependencies['@storybook/test-runner']).toBeDefined();
59-
expect(
60-
packageJson.devDependencies['@storybook/testing-library']
61-
).toBeDefined();
6255
});
6356

6457
it('should create the stories without interaction tests', async () => {

‎packages/react/src/generators/stories/stories.nextjs.spec.ts

-7
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,6 @@ describe('nextjs:stories for applications', () => {
4242
).toMatchSnapshot();
4343

4444
const packageJson = JSON.parse(tree.read('package.json', 'utf-8'));
45-
expect(
46-
packageJson.devDependencies['@storybook/addon-interactions']
47-
).toBeDefined();
48-
expect(packageJson.devDependencies['@storybook/test-runner']).toBeDefined();
49-
expect(
50-
packageJson.devDependencies['@storybook/testing-library']
51-
).toBeDefined();
5245
});
5346

5447
it('should create the stories without interaction tests', async () => {

‎packages/react/src/generators/stories/stories.ts

-12
Original file line numberDiff line numberDiff line change
@@ -158,21 +158,9 @@ export async function storiesGenerator(
158158
schema.ignorePaths
159159
);
160160

161-
const tasks: GeneratorCallback[] = [];
162-
163-
if (schema.interactionTests) {
164-
const { interactionTestsDependencies, addInteractionsInAddons } =
165-
ensurePackage<typeof import('@nx/storybook')>('@nx/storybook', nxVersion);
166-
tasks.push(
167-
addDependenciesToPackageJson(host, {}, interactionTestsDependencies())
168-
);
169-
addInteractionsInAddons(host, projectConfiguration);
170-
}
171-
172161
if (!schema.skipFormat) {
173162
await formatFiles(host);
174163
}
175-
return runTasksInSerial(...tasks);
176164
}
177165

178166
async function isNextJsProject(tree: Tree, config: ProjectConfiguration) {

‎packages/react/src/generators/storybook-configuration/configuration.spec.ts

-7
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,6 @@ describe('react:storybook-configuration', () => {
4040

4141
const packageJson = JSON.parse(appTree.read('package.json', 'utf-8'));
4242
expect(packageJson.devDependencies['@storybook/react-vite']).toBeDefined();
43-
expect(
44-
packageJson.devDependencies['@storybook/addon-interactions']
45-
).toBeDefined();
46-
expect(packageJson.devDependencies['@storybook/test-runner']).toBeDefined();
47-
expect(
48-
packageJson.devDependencies['@storybook/testing-library']
49-
).toBeDefined();
5043
});
5144

5245
it('should generate stories for components', async () => {

‎packages/remix/src/generators/storybook-configuration/__snapshots__/storybook-configuration.impl.spec.ts.snap

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ exports[`Storybook Configuration it should create a storybook configuration and
2424
2525
const config: StorybookConfig = {
2626
stories: ['../src/lib/**/*.@(mdx|stories.@(js|jsx|ts|tsx))'],
27-
addons: ['@storybook/addon-essentials', '@storybook/addon-interactions'],
27+
addons: [],
2828
framework: {
2929
name: '@storybook/react-vite',
3030
options: {
@@ -67,7 +67,7 @@ exports[`Storybook Configuration it should create a storybook configuration and
6767
6868
const config: StorybookConfig = {
6969
stories: ['../src/lib/**/*.@(mdx|stories.@(js|jsx|ts|tsx))'],
70-
addons: ['@storybook/addon-essentials', '@storybook/addon-interactions'],
70+
addons: [],
7171
framework: {
7272
name: '@storybook/react-vite',
7373
options: {
@@ -121,7 +121,7 @@ exports[`Storybook Configuration it should create a storybook configuration and
121121
122122
const config: StorybookConfig = {
123123
stories: ['../src/lib/**/*.@(mdx|stories.@(js|jsx|ts|tsx))'],
124-
addons: ['@storybook/addon-essentials', '@storybook/addon-interactions'],
124+
addons: [],
125125
framework: {
126126
name: '@storybook/react-vite',
127127
options: {

‎packages/storybook/index.ts

-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
export { configurationGenerator } from './src/generators/configuration/configuration';
22
export { storybookVersion } from './src/utils/versions';
3-
export {
4-
interactionTestsDependencies,
5-
addInteractionsInAddons,
6-
} from './src/generators/configuration/lib/interaction-testing.utils';

‎packages/storybook/migrations.json

+8
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,10 @@
784784
"version": "^9.0.0",
785785
"alwaysAddToPackageJson": false
786786
},
787+
"@storybook/nextjs": {
788+
"version": "^9.0.0",
789+
"alwaysAddToPackageJson": false
790+
},
787791
"@storybook/preact": {
788792
"version": "^9.0.0",
789793
"alwaysAddToPackageJson": false
@@ -816,6 +820,10 @@
816820
"version": "^9.0.0",
817821
"alwaysAddToPackageJson": false
818822
},
823+
"@storybook/sveltekit": {
824+
"version": "^9.0.0",
825+
"alwaysAddToPackageJson": false
826+
},
819827
"@storybook/vue-vite": {
820828
"version": "^9.0.0",
821829
"alwaysAddToPackageJson": false

‎packages/storybook/src/generators/configuration/__snapshots__/configuration.spec.ts.snap

-22
Original file line numberDiff line numberDiff line change
@@ -263,28 +263,6 @@ export default config;
263263

264264
exports[`@nx/storybook:configuration for Storybook v9 generate Storybook configuration for all types of projects should contain the correct configuration in "apps/wv1/.storybook/" 2`] = `null`;
265265

266-
exports[`@nx/storybook:configuration for Storybook v9 generate Storybook configuration for all types of projects should contain the correct configuration in "apps/ww1/.storybook/" 1`] = `
267-
"import type { StorybookConfig } from '@storybook/web-components-webpack5';
268-
269-
const config: StorybookConfig = {
270-
stories: ['../src/app/**/*.@(mdx|stories.@(js|jsx|ts|tsx))'],
271-
addons: [],
272-
framework: {
273-
name: '@storybook/web-components-webpack5',
274-
options: {},
275-
},
276-
};
277-
278-
export default config;
279-
280-
// To customize your webpack configuration you can use the webpackFinal field.
281-
// Check https://storybook.js.org/docs/react/builders/webpack#extending-storybooks-webpack-config
282-
// and https://nx.dev/recipes/storybook/custom-builder-configs
283-
"
284-
`;
285-
286-
exports[`@nx/storybook:configuration for Storybook v9 generate Storybook configuration for all types of projects should contain the correct configuration in "apps/ww1/.storybook/" 2`] = `null`;
287-
288266
exports[`@nx/storybook:configuration for Storybook v9 generate Storybook configuration for all types of projects should contain the correct configuration in "libs/react-rollup/.storybook/" 1`] = `
289267
"import type { StorybookConfig } from '@storybook/react-webpack5';
290268

0 commit comments

Comments
 (0)