miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(storybook): check storybook is installed and not on v7 already (#16402)

Browse Source
This commit is contained in:
Katerina Skroumpelou 2023-04-19 15:30:41 +03:00 committed by GitHub
parent 4446bf749a
commit 2e979628b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/storybook/src/executors/build-storybook/build-storybook.impl.ts
View File

@ -3,8 +3,8 @@ import * as build from '@storybook/core-server';
import { CLIOptions } from '@storybook/types'; // TODO(katerina): Remove when Storybook 7
import 'dotenv/config';
import {
isStorybookV7,
storybookConfigExistsCheck,
storybookMajorVersion,
} from '../../utils/utilities';
import { CommonNxStorybookConfig } from '../../utils/models';
import {
@ -18,7 +18,7 @@ export default async function buildStorybookExecutor(
context: ExecutorContext
) {
storybookConfigExistsCheck(options.configDir, context.projectName);
const storybook7 = isStorybookV7();
const storybook7 = storybookMajorVersion() === 7;
if (storybook7) {
const buildOptions: CLIOptions = options;
logger.info(`NX Storybook builder starting ...`);

4
packages/storybook/src/executors/storybook/storybook.impl.ts
View File

@ -2,8 +2,8 @@ import { ExecutorContext } from '@nx/devkit';
import * as build from '@storybook/core-server';
import 'dotenv/config';
import {
isStorybookV7,
storybookConfigExistsCheck,
storybookMajorVersion,
} from '../../utils/utilities';
import {
getStorybookFrameworkPath,
@ -20,7 +20,7 @@ export default async function* storybookExecutor(
success: boolean;
info?: { port: number; baseUrl?: string };
}> {
const storybook7 = isStorybookV7();
const storybook7 = storybookMajorVersion() === 7;
storybookConfigExistsCheck(options.configDir, context.projectName);
if (storybook7) {
const buildOptions: CLIOptions = options;

6
packages/storybook/src/migrations/update-16-0-0/update-sb-7.ts
View File

@ -1,8 +1,14 @@
import { Tree } from '@nx/devkit';
import { output } from 'nx/src/utils/output';
import migrate7Generator from '../../generators/migrate-7/migrate-7';
import { storybookMajorVersion } from '../../utils/utilities';
export default async function changeStorybookTargets(tree: Tree) {
const storybookVersion = storybookMajorVersion();
if (!storybookVersion || storybookVersion === 7) {
return;
}
output.log({
title: 'Migrating Storybook to v7',
bodyLines: [

12
packages/storybook/src/utils/utilities.ts
View File

@ -4,7 +4,7 @@ import { storybookVersion } from './versions';
import { statSync } from 'fs';
import { findNodes } from '@nx/js';
import ts = require('typescript');
import { gte, lt, major } from 'semver';
import { major } from 'semver';
import { join } from 'path';
export const Constants = {
@ -51,15 +51,7 @@ type Framework = {
uiFramework: Constants['uiFrameworks'][keyof Constants['uiFrameworks']];
};
export function isStorybookV7() {
const storybookPackageVersion = require(join(
'@storybook/core-server',
'package.json'
)).version;
return gte(storybookPackageVersion, '7.0.0-alpha.0');
}
export function storybookMajorVersion() {
export function storybookMajorVersion(): number | undefined {
try {
const storybookPackageVersion = require(join(
'@storybook/core-server',